Skip to content

Commit dd05ff3

Browse files
SylvainJugeSylvainJuge
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-rmi
2 parents a7fdf1a + 515298c commit dd05ff3

File tree

666 files changed

+16015
-9439
lines changed

Some content is hidden

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

666 files changed

+16015
-9439
lines changed

‎.github/renovate.json5‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"groupName": "quarkus packages"
4747
},
4848
{
49-
"matchPackagePrefixes": ["com.gradle.enterprise"],
50-
"groupName": "gradle enterprise packages"
49+
"matchPackagePrefixes": ["com.gradle.develocity"],
50+
"groupName": "gradle develocity packages"
5151
},
5252
{
5353
"matchPackagePrefixes": ["org.eclipse.jetty:"],

‎.github/repository-settings.md‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,18 @@ for [`dependabot/**/**`](https://github.com/open-telemetry/community/blob/main/d
6464

6565
## Secrets and variables > Actions
6666

67+
### Repository secrets
68+
6769
- `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
6870
- `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
69-
- `GRADLE_ENTERPRISE_ACCESS_KEY` - owned by [@trask](https://github.com/trask)
70-
- Generated at https://ge.opentelemetry.io > My settings > Access keys
71-
- format of env var is `ge.opentelemetry.io=<access key>`,
72-
see [docs](https://docs.gradle.com/enterprise/gradle-plugin/#via_environment_variable)
7371
- `GRADLE_PUBLISH_KEY`
7472
- `GRADLE_PUBLISH_SECRET`
7573
- `NVD_API_KEY` - stored in OpenTelemetry-Java 1Password
76-
- `OPENTELEMETRYBOT_GITHUB_TOKEN` - owned by [@trask](https://github.com/trask)
74+
- Generated at https://nvd.nist.gov/developers/request-an-api-key
75+
- Key is associated with [@trask](https://github.com/trask)'s gmail address
7776
- `SONATYPE_KEY` - owned by [@trask](https://github.com/trask)
7877
- `SONATYPE_USER` - owned by [@trask](https://github.com/trask)
78+
79+
### Organization secrets
80+
81+
- `OPENTELEMETRYBOT_GITHUB_TOKEN`

‎.github/workflows/auto-update-otel-sdk.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
java-version-file: .java-version
7373

7474
- name: Setup Gradle
75-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
75+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
7676

7777
- name: Update license report
7878
run: ./gradlew generateLicenseReport

‎.github/workflows/build-common.yml‎

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ on:
99
no-build-cache:
1010
type: boolean
1111
required: false
12+
max-test-retries:
13+
type: string
14+
required: false
1215
skip-openj9-tests:
1316
type: boolean
1417
required: false
1518
skip-windows-smoke-tests:
1619
type: boolean
1720
required: false
18-
secrets:
19-
GRADLE_ENTERPRISE_ACCESS_KEY:
20-
required: false
2121

2222
permissions:
2323
contents: read
@@ -38,23 +38,21 @@ jobs:
3838
java-version-file: .java-version
3939

4040
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
41+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
4242
with:
4343
cache-read-only: ${{ inputs.cache-read-only }}
4444
# gradle enterprise is used for the build cache
4545
gradle-home-cache-excludes: caches/build-cache-1
4646

4747
- name: Spotless
48-
env:
49-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
5048
run: ./gradlew spotlessCheck ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
5149

5250
gradle-wrapper-validation:
5351
runs-on: ubuntu-latest
5452
steps:
5553
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5654

57-
- uses: gradle/actions/wrapper-validation@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
55+
- uses: gradle/actions/wrapper-validation@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
5856

5957
license-check:
6058
runs-on: ubuntu-latest
@@ -71,18 +69,14 @@ jobs:
7169
java-version-file: .java-version
7270

7371
- name: Setup Gradle
74-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
72+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
7573
with:
7674
cache-read-only: ${{ inputs.cache-read-only }}
7775
# gradle enterprise is used for the build cache
7876
gradle-home-cache-excludes: caches/build-cache-1
7977

8078
- name: Generate license report
81-
env:
82-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
83-
# currently ignoring inputs.no-build-cache and always running with --no-build-cache
84-
# see https://github.com/jk1/Gradle-License-Report/issues/231
85-
run: ./gradlew generateLicenseReport --no-build-cache
79+
run: ./gradlew generateLicenseReport ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
8680

8781
- name: Check licenses
8882
run: |
@@ -144,15 +138,13 @@ jobs:
144138
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
145139
146140
- name: Setup Gradle
147-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
141+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
148142
with:
149143
cache-read-only: ${{ inputs.cache-read-only }}
150144
# gradle enterprise is used for the build cache
151145
gradle-home-cache-excludes: caches/build-cache-1
152146

153147
- name: Build
154-
env:
155-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
156148
# javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
157149
run: ./gradlew check spdxSbom -x javadoc -x spotlessCheck -PskipTests=true ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
158150

@@ -238,7 +230,7 @@ jobs:
238230

239231
# vaadin tests use pnpm
240232
- name: Cache pnpm modules
241-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
233+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
242234
with:
243235
path: ~/.pnpm-store
244236
key: ${{ runner.os }}-test-cache-pnpm-modules
@@ -247,16 +239,14 @@ jobs:
247239
run: .github/scripts/deadlock-detector.sh
248240

249241
- name: Setup Gradle
250-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
242+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
251243
with:
252244
# only push cache for one matrix option since github action cache space is limited
253245
cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
254246
# gradle enterprise is used for the build cache
255247
gradle-home-cache-excludes: caches/build-cache-1
256248

257249
- name: List tests
258-
env:
259-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
260250
# "check" is needed to activate all tests for listing purposes
261251
# listTestsInPartition writes test tasks that apply to the given partition to a file named
262252
# "test-tasks.txt" and then disables all tasks (including tests) after it runs
@@ -271,8 +261,6 @@ jobs:
271261
echo "test-tasks=$(cat test-tasks.txt | xargs echo | sed 's/\n/ /g')" >> $GITHUB_ENV
272262
273263
- name: Test
274-
env:
275-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
276264
# spotless is checked separately since it's a common source of failure
277265
run: >
278266
./gradlew
@@ -282,6 +270,7 @@ jobs:
282270
-Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
283271
-Porg.gradle.java.installations.auto-download=false
284272
${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
273+
${{ inputs.max-test-retries && format(' -PmaxTestRetries={0}', inputs.max-test-retries) || '' }}
285274
286275
- name: Build scan
287276
if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}
@@ -346,22 +335,18 @@ jobs:
346335
java-version-file: .java-version
347336

348337
- name: Set up Gradle cache
349-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
338+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
350339
with:
351340
# only push cache for one matrix option per OS since github action cache space is limited
352341
cache-read-only: ${{ inputs.cache-read-only || matrix.smoke-test-suite != 'tomcat' }}
353342
# gradle enterprise is used for the build cache
354343
gradle-home-cache-excludes: caches/build-cache-1
355344

356345
- name: Build
357-
env:
358-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
359346
# running suite "none" compiles everything needed by smoke tests without executing any tests
360347
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=none --no-daemon ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
361348

362349
- name: Test
363-
env:
364-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
365350
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }}${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
366351

367352
- name: Upload jvm crash dump files if any
@@ -399,7 +384,7 @@ jobs:
399384
java-version-file: .java-version
400385

401386
- name: Setup Gradle
402-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
387+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
403388
with:
404389
cache-read-only: ${{ inputs.cache-read-only }}
405390

@@ -422,7 +407,7 @@ jobs:
422407
java-version-file: .java-version
423408

424409
- name: Set up Gradle cache
425-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
410+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
426411
with:
427412
cache-read-only: ${{ inputs.cache-read-only }}
428413

‎.github/workflows/build-daily-no-build-cache.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,20 @@ jobs:
1010
common:
1111
uses: ./.github/workflows/build-common.yml
1212
with:
13+
max-test-retries: 0
1314
no-build-cache: true
14-
secrets:
15-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
1615

1716
test-latest-deps:
1817
uses: ./.github/workflows/reusable-test-latest-deps.yml
1918
with:
19+
max-test-retries: 0
20+
no-build-cache: true
21+
22+
test-indy:
23+
uses: ./.github/workflows/reusable-test-indy.yml
24+
with:
25+
max-test-retries: 0
2026
no-build-cache: true
21-
secrets:
22-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
2327

2428
# muzzle is not included here because it doesn't use gradle cache anyway and so is already covered
2529
# by the normal daily build

‎.github/workflows/build-daily.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,18 @@ on:
99
jobs:
1010
common:
1111
uses: ./.github/workflows/build-common.yml
12-
secrets:
13-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
12+
with:
13+
max-test-retries: 0
1414

1515
test-latest-deps:
1616
uses: ./.github/workflows/reusable-test-latest-deps.yml
17-
secrets:
18-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
17+
with:
18+
max-test-retries: 0
19+
20+
test-indy:
21+
uses: ./.github/workflows/reusable-test-indy.yml
22+
with:
23+
max-test-retries: 0
1924

2025
muzzle:
2126
uses: ./.github/workflows/reusable-muzzle.yml

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,13 @@ on:
1010
jobs:
1111
common:
1212
uses: ./.github/workflows/build-common.yml
13-
secrets:
14-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
1513

1614
test-latest-deps:
1715
# release branches are excluded
1816
# because any time a new library version is released to maven central it can fail
1917
# which requires unnecessary release branch maintenance, especially for patches
2018
if: "!startsWith(github.ref_name, 'release/')"
2119
uses: ./.github/workflows/reusable-test-latest-deps.yml
22-
secrets:
23-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
2420

2521
muzzle:
2622
# release branches are excluded
@@ -73,14 +69,13 @@ jobs:
7369
java-version-file: .java-version
7470

7571
- name: Setup Gradle
76-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
72+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
7773
with:
7874
# gradle enterprise is used for the build cache
7975
gradle-home-cache-excludes: caches/build-cache-1
8076

8177
- name: Build and publish artifact snapshots
8278
env:
83-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
8479
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
8580
SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
8681
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
@@ -89,7 +84,6 @@ jobs:
8984

9085
- name: Build and publish gradle plugin snapshots
9186
env:
92-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
9387
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
9488
SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
9589
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}

‎.github/workflows/codeql-daily.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ jobs:
3030
java-version-file: .java-version
3131

3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
33+
uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
3434
with:
3535
languages: java
3636
# using "latest" helps to keep up with the latest Kotlin support
3737
# see https://github.com/github/codeql-action/issues/1555#issuecomment-1452228433
3838
tools: latest
3939

4040
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
41+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
4242

4343
- name: Build
4444
# skipping build cache is needed so that all modules will be analyzed
4545
run: ./gradlew assemble -x javadoc --no-build-cache --no-daemon
4646

4747
- name: Perform CodeQL analysis
48-
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
48+
uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
4949

5050
workflow-notification:
5151
needs:

‎.github/workflows/overhead-benchmark-daily.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
rsync -avv gh-pages/benchmark-overhead/results/ benchmark-overhead/results/
2525
2626
- name: Setup Gradle
27-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
27+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
2828

2929
- name: Run tests
3030
working-directory: benchmark-overhead

‎.github/workflows/owasp-dependency-check-daily.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: |
2929
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
3030
31-
- uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
31+
- uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
3232

3333
- run: ./gradlew :javaagent:dependencyCheckAnalyze
3434
env:

0 commit comments

Comments
 (0)