Skip to content

Commit 5a3e71c

Browse files
trasktrask
committed
Merge remote-tracking branch 'upstream/main' into remove-component-provider-generic-type
2 parents c172389 + 36ca9b8 commit 5a3e71c

File tree

377 files changed

+6872
-2627
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

377 files changed

+6872
-2627
lines changed

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
# Code owners file.
2-
# This file controls who is tagged for review for any given pull request.
1+
#
2+
# Learn about membership in OpenTelemetry community:
3+
# https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md
4+
#
35

4-
# For anything not explicitly taken by someone else:
56
* @open-telemetry/java-approvers

‎.github/config/lychee.toml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Lychee configuration file
2+
# See https://lychee.cli.rs/config/
3+
4+
timeout = 30
5+
retry_wait_time = 5
6+
max_retries = 6
7+
max_concurrency = 4
8+
9+
# Check link anchors
10+
include_fragments = true
11+
12+
remap = [
13+
# workaround for https://github.com/lycheeverse/lychee/issues/1729
14+
"https://github.com/(.*?)/(.*?)/blob/(.*?)/(.*#.*)$ https://raw.githubusercontent.com/$1/$2/$3/$4",
15+
]
16+
17+
# excluding links to pull requests and issues is done for performance
18+
exclude = [
19+
"^https://github.com/open-telemetry/opentelemetry-java/(issues|pull)/\\d+$",
20+
"^https://www.javadoc.io/badge/(.*?)/(.*?).svg$", # returns 522
21+
]

‎.github/renovate.json5‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
'config:best-practices',
55
'helpers:pinGitHubActionDigestsToSemver',
66
],
7+
ignorePresets: [
8+
'workarounds:javaLTSVersions', // Allow all Java major versions, not just LTS
9+
],
710
ignorePaths: [], // overwrite default ignore which includes **/test/**
811
// used to update docker image versions used in Java test files
912
packageRules: [
@@ -31,6 +34,17 @@
3134
ignoreUnstable: false,
3235
allowedVersions: '!/\\-SNAPSHOT$/',
3336
},
37+
{
38+
// junit 6+ requires Java 17+
39+
matchPackageNames: [
40+
'org.junit:**',
41+
'org.junit.jupiter:**',
42+
],
43+
matchUpdateTypes: [
44+
'major',
45+
],
46+
enabled: false,
47+
},
3448
{
3549
// junit-pioneer 2+ requires Java 11+
3650
matchPackageNames: [
@@ -48,7 +62,7 @@
4862
],
4963
enabled: false,
5064
matchPackageNames: [
51-
'org.mockito:{/,}**',
65+
'org.mockito:**',
5266
],
5367
},
5468
{
@@ -73,7 +87,8 @@
7387
{
7488
groupName: 'spotless packages',
7589
matchPackageNames: [
76-
'com.diffplug.spotless{/,}**',
90+
'com.diffplug.spotless',
91+
'com.diffplug.spotless:**',
7792
],
7893
},
7994
{
@@ -95,6 +110,7 @@
95110
'(?<currentValue>\\d+) # renovate: datasource=java-version',
96111
],
97112
depNameTemplate: 'java',
113+
extractVersionTemplate: '^(?<version>\\d+)',
98114
},
99115
{
100116
customType: 'regex',

‎.github/repository-settings.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ private admin repo.
66

77
## Secrets and variables > Actions
88

9+
### Repository secrets
10+
911
- `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
1012
- `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
1113
- `NVD_API_KEY` - stored in OpenTelemetry-Java 1Password
@@ -16,6 +18,8 @@ private admin repo.
1618

1719
### Organization secrets
1820

21+
- `CODECOV_TOKEN`
22+
- `DEVELOCITY_ACCESS_KEY` (scoped only to Java repos)
1923
- `FOSSA_API_KEY`
2024
- `OTELBOT_PRIVATE_KEY`
2125

.github/scripts/use-cla-approved-github-bot.sh renamed to .github/scripts/use-cla-approved-bot.sh

File renamed without changes.

‎.github/workflows/backport.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
exit 1
2222
fi
2323
24-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
24+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2525
with:
2626
# history is needed to run git cherry-pick below
2727
fetch-depth: 0
2828

2929
- name: Use CLA approved github bot
30-
run: .github/scripts/use-cla-approved-github-bot.sh
30+
run: .github/scripts/use-cla-approved-bot.sh
3131

32-
- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
32+
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
3333
id: otelbot-token
3434
with:
3535
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/benchmark-tags.yml‎

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,62 +11,42 @@ jobs:
1111
permissions:
1212
contents: write # for git push to benchmarks branch
1313
name: Benchmark SDK
14-
runs-on: equinix-bare-metal
15-
timeout-minutes: 10
14+
runs-on: oracle-bare-metal-64cpu-512gb-x86-64
15+
container:
16+
image: ubuntu:24.04@sha256:66460d557b25769b102175144d538d88219c077c678a49af4afca6fbfc1b5252
17+
timeout-minutes: 20 # since there is only a single bare metal runner across all repos
1618
strategy:
1719
fail-fast: false
1820
matrix:
1921
tag-version:
20-
- v1.6.0
21-
- v1.7.0
22-
- v1.7.1
23-
- v1.10.0
24-
- v1.10.1
25-
- v1.11.0
26-
- v1.12.0
27-
- v1.13.0
28-
- v1.14.0
29-
- v1.15.0
30-
- v1.16.0
31-
- v1.17.0
32-
- v1.18.0
33-
- v1.19.0
34-
- v1.21.0
35-
- v1.22.0
36-
- v1.23.0
37-
- v1.23.1
38-
- v1.24.0
39-
- v1.25.0
40-
- v1.26.0
41-
- v1.27.0
42-
- v1.28.0
4322
- v1.29.0
4423
- v1.30.0
45-
- v1.30.1
4624
steps:
47-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
25+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4826
with:
4927
ref: ${{ matrix.tag-version }}
5028

5129
- id: setup-java
5230
name: Set up Java for build
53-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
31+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
5432
with:
5533
distribution: temurin
56-
java-version: 17
34+
java-version: 21
5735

5836
- name: Set up gradle
59-
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
37+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
6038
- name: Run jmh
6139
run: ./gradlew jmhJar
40+
env:
41+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6242

6343
- name: Run Benchmark
6444
run: |
6545
cd sdk/trace/build
6646
java -jar libs/opentelemetry-sdk-trace-*-jmh.jar -rf json SpanBenchmark SpanPipelineBenchmark ExporterBenchmark
6747
6848
- name: Store benchmark results
69-
uses: benchmark-action/github-action-benchmark@d48d326b4ca9ba73ca0cd0d59f108f9e02a381c7 # v1.20.4
49+
uses: benchmark-action/github-action-benchmark@4bdcce38c94cec68da58d012ac24b7b1155efe8b # v1.20.7
7050
with:
7151
tool: 'jmh'
7252
output-file-path: sdk/trace/build/jmh-result.json

‎.github/workflows/benchmark.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: Benchmark SDK
1616
runs-on: oracle-bare-metal-64cpu-512gb-x86-64
1717
container:
18-
image: ubuntu:24.04@sha256:7c06e91f61fa88c08cc74f7e1b7c69ae24910d745357e0dfe1d2c0322aaf20f9
18+
image: ubuntu:24.04@sha256:66460d557b25769b102175144d538d88219c077c678a49af4afca6fbfc1b5252
1919
timeout-minutes: 20 # since there is only a single bare metal runner across all repos
2020
steps:
2121
- name: Install Git
@@ -26,30 +26,32 @@ jobs:
2626
- name: Configure Git safe directory
2727
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
2828

29-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
29+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3030

3131
- id: setup-java
3232
name: Set up Java for build
33-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
33+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
3434
with:
3535
distribution: temurin
36-
java-version: 17
36+
java-version: 21
3737

3838
- name: Set up gradle
39-
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
39+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
4040
- name: Run jmh
4141
run: ./gradlew jmhJar
42+
env:
43+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
4244

4345
- name: Run Benchmark
4446
run: |
4547
cd sdk/trace/build
4648
java -jar libs/opentelemetry-sdk-trace-*-jmh.jar -rf json SpanBenchmark SpanPipelineBenchmark ExporterBenchmark
4749
4850
- name: Use CLA approved github bot
49-
run: .github/scripts/use-cla-approved-github-bot.sh
51+
run: .github/scripts/use-cla-approved-bot.sh
5052

5153
- name: Store benchmark results
52-
uses: benchmark-action/github-action-benchmark@d48d326b4ca9ba73ca0cd0d59f108f9e02a381c7 # v1.20.4
54+
uses: benchmark-action/github-action-benchmark@4bdcce38c94cec68da58d012ac24b7b1155efe8b # v1.20.7
5355
with:
5456
tool: 'jmh'
5557
output-file-path: sdk/trace/build/jmh-result.json

‎.github/workflows/build-tracecontext-testsuite.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
packages: write
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
22+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2323

2424
- name: Login to GitHub package registry
25-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
25+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
2626
with:
2727
registry: ghcr.io
2828
username: ${{ github.repository_owner }}

‎.github/workflows/build.yml‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- 11
3333
- 17
3434
- 21
35-
- 23 # renovate: datasource=java-version
35+
- 25 # renovate: datasource=java-version
3636
# Collect coverage on latest LTS
3737
include:
3838
- os: ubuntu-latest
@@ -50,26 +50,26 @@ jobs:
5050
- os: macos-13
5151
test-java-version: 21
5252
- os: macos-13
53-
test-java-version: 23 # renovate: datasource=java-version
53+
test-java-version: 25 # renovate: datasource=java-version
5454
steps:
55-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
55+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5656

5757
- id: setup-java-test
5858
name: Set up Java ${{ matrix.test-java-version }} for tests
59-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
59+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
6060
with:
6161
distribution: temurin
6262
java-version: ${{ matrix.test-java-version }}
6363

6464
- id: setup-java
6565
name: Set up Java for build
66-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
66+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
6767
with:
6868
distribution: temurin
69-
java-version: 17
69+
java-version: 21
7070

7171
- name: Set up gradle
72-
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
72+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
7373
- name: Build
7474
run: >
7575
./gradlew build
@@ -78,8 +78,9 @@ jobs:
7878
"-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}"
7979
"-Porg.gradle.java.installations.auto-download=false"
8080
env:
81-
# JMH-based tests run only if this environment variable is set to true
81+
# JMH-based tests run only if this environment variable is set to true
8282
RUN_JMH_BASED_TESTS: ${{ matrix.jmh-based-tests }}
83+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
8384

8485
- name: Check for diff
8586
# The jApiCmp diff compares current to latest, which isn't appropriate for release branches
@@ -99,12 +100,12 @@ jobs:
99100
exit 1
100101
fi
101102
102-
- uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
103+
- uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
103104
if: ${{ matrix.coverage }}
104105
env:
105106
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
106107

107-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
108+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
108109
if: ${{ matrix.coverage }}
109110
with:
110111
name: coverage-report
@@ -113,7 +114,7 @@ jobs:
113114
markdown-link-check:
114115
# release branches are excluded to avoid unnecessary maintenance
115116
if: ${{ !startsWith(github.ref_name, 'release/') }}
116-
uses: ./.github/workflows/reusable-markdown-link-check.yml
117+
uses: ./.github/workflows/reusable-link-check.yml
117118

118119
misspell-check:
119120
# release branches are excluded to avoid unnecessary maintenance
@@ -135,17 +136,17 @@ jobs:
135136
needs: build
136137
runs-on: ubuntu-24.04
137138
steps:
138-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
139+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
139140

140141
- id: setup-java
141142
name: Set up Java
142-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
143+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
143144
with:
144145
distribution: temurin
145-
java-version: 17
146+
java-version: 21
146147

147148
- name: Set up gradle
148-
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
149+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
149150
# skipping release branches because the versions in those branches are not snapshots
150151
# (also this skips pull requests)
151152
if: ${{ github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java' }}
@@ -159,6 +160,7 @@ jobs:
159160
SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
160161
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
161162
GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
163+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
162164

163165
build-graal:
164166
name: Build GraalVM
@@ -168,10 +170,10 @@ jobs:
168170
matrix:
169171
test-graal-version:
170172
- 21
171-
- 23
173+
- 25 # renovate: datasource=java-version
172174
steps:
173-
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
174-
- uses: graalvm/setup-graalvm@7f488cf82a3629ee755e4e97342c01d6bed318fa # v1.3.5
175+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
176+
- uses: graalvm/setup-graalvm@eec48106e0bf45f2976c2ff0c3e22395cced8243 # v1.4.2
175177
with:
176178
java-version: ${{ matrix.test-graal-version }}
177179
distribution: 'graalvm'
@@ -184,6 +186,8 @@ jobs:
184186
java --version
185187
native-image --version
186188
./gradlew nativeTest
189+
env:
190+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
187191

188192
required-status-check:
189193
# markdown-link-check is not required so pull requests are not blocked if external links break

0 commit comments

Comments
 (0)