Skip to content

Commit 1ca13d9

Browse files
lauritlaurit
committed
Merge branch 'main' into aws-2.2-client-core
2 parents 2d1ff0e + 2c3b50e commit 1ca13d9

File tree

175 files changed

+1270
-1300
lines changed

Some content is hidden

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

175 files changed

+1270
-1300
lines changed

‎.github/scripts/check-latest-dep-test-overrides.sh‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash -e
2+
3+
# all missing version coverage should be documented in supported-libraries.md
4+
5+
if grep -r --include build.gradle.kts latestDepTestLibrary instrumentation \
6+
| grep -v :+\" \
7+
| grep -v "// see .* module" \
8+
| grep -v "// see test suite below" \
9+
| grep -v "// no longer applicable" \
10+
| grep -v "// related dependency" \
11+
| grep -v "// native on-by-default instrumentation after this version" \
12+
| grep -v "// documented limitation" \
13+
| grep -v "instrumentation/jaxrs-client/jaxrs-client-2.0-testing/build.gradle.kts"; then
14+
15+
echo
16+
echo "Found an undocumented latestDepTestLibrary (see above)."
17+
echo
18+
echo "See .gith/scripts/check-latest-dep-test-overrides.sh in this repository"
19+
echo "and add one of the required comments."
20+
exit 1
21+
fi

‎.github/scripts/find-instrumentation-with-upper-version-limits.sh‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.github/scripts/get-version.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash -e
22

3-
grep -Po "val stableVersion = \"\K[0-9]+.[0-9]+.[0-9]+" version.gradle.kts
3+
grep "val stableVersion = " version.gradle.kts | grep -Eo "[0-9]+.[0-9]+.[0-9]+"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ jobs:
6666
run: .github/scripts/gha-free-disk-space.sh
6767

6868
- name: Set up JDK for running Gradle
69-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
69+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
7070
with:
7171
distribution: temurin
7272
java-version-file: .java-version
7373

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

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

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

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ jobs:
3232
run: .github/scripts/gha-free-disk-space.sh
3333

3434
- name: Set up JDK for running Gradle
35-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
35+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
3636
with:
3737
distribution: temurin
3838
java-version-file: .java-version
3939

4040
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
41+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
4242
with:
4343
cache-read-only: ${{ inputs.cache-read-only }}
4444
# gradle enterprise is used for the build cache
@@ -52,7 +52,7 @@ jobs:
5252
steps:
5353
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5454

55-
- uses: gradle/actions/wrapper-validation@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
55+
- uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
5656

5757
license-check:
5858
runs-on: ubuntu-latest
@@ -63,13 +63,13 @@ jobs:
6363
run: .github/scripts/gha-free-disk-space.sh
6464

6565
- name: Set up JDK for running Gradle
66-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
66+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
6767
with:
6868
distribution: temurin
6969
java-version-file: .java-version
7070

7171
- name: Setup Gradle
72-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
72+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
7373
with:
7474
cache-read-only: ${{ inputs.cache-read-only }}
7575
# gradle enterprise is used for the build cache
@@ -119,6 +119,13 @@ jobs:
119119
exit 1
120120
fi
121121
122+
check-latest-dep-test-overrides:
123+
runs-on: ubuntu-latest
124+
steps:
125+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
126+
127+
- run: .github/scripts/check-latest-dep-test-overrides.sh
128+
122129
build:
123130
runs-on: ubuntu-latest
124131
steps:
@@ -128,7 +135,7 @@ jobs:
128135
run: .github/scripts/gha-free-disk-space.sh
129136

130137
- name: Set up JDK for running Gradle
131-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
138+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
132139
with:
133140
distribution: temurin
134141
java-version-file: .java-version
@@ -138,7 +145,7 @@ jobs:
138145
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
139146
140147
- name: Setup Gradle
141-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
148+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
142149
with:
143150
cache-read-only: ${{ inputs.cache-read-only }}
144151
# gradle enterprise is used for the build cache
@@ -163,7 +170,7 @@ jobs:
163170
fi
164171
165172
- name: Upload agent jar
166-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
173+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
167174
with:
168175
name: opentelemetry-javaagent.jar
169176
path: javaagent/build/libs/opentelemetry-javaagent-*-SNAPSHOT.jar
@@ -174,7 +181,7 @@ jobs:
174181
mkdir sboms
175182
cp javaagent/build/spdx/*.spdx.json sboms
176183
177-
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
184+
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
178185
name: Upload SBOMs
179186
with:
180187
name: opentelemetry-java-instrumentation-SBOM.zip
@@ -210,14 +217,14 @@ jobs:
210217

211218
- id: setup-test-java
212219
name: Set up JDK ${{ matrix.test-java-version }}-${{ matrix.vm }} for running tests
213-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
220+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
214221
with:
215222
# using zulu because new releases get published quickly
216223
distribution: ${{ matrix.vm == 'hotspot' && 'zulu' || 'adopt-openj9'}}
217224
java-version: ${{ matrix.test-java-version }}
218225

219226
- name: Set up JDK for running Gradle
220-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
227+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
221228
with:
222229
distribution: temurin
223230
java-version-file: .java-version
@@ -239,7 +246,7 @@ jobs:
239246
run: .github/scripts/deadlock-detector.sh
240247

241248
- name: Setup Gradle
242-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
249+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
243250
with:
244251
# only push cache for one matrix option since github action cache space is limited
245252
cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
@@ -278,15 +285,15 @@ jobs:
278285

279286
- name: Upload deadlock detector artifacts if any
280287
if: failure()
281-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
288+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
282289
with:
283290
name: deadlock-detector-test-${{ matrix.test-java-version }}-${{ matrix.vm }}-${{ matrix.test-partition }}
284291
path: /tmp/deadlock-detector-*
285292
if-no-files-found: ignore
286293

287294
- name: Upload jvm crash dump files if any
288295
if: failure()
289-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
296+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
290297
with:
291298
name: javacore-test-${{ matrix.test-java-version }}-${{ matrix.test-partition }}
292299
path: |
@@ -329,13 +336,13 @@ jobs:
329336
run: .github/scripts/gha-free-disk-space.sh
330337

331338
- name: Set up JDK for running Gradle
332-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
339+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
333340
with:
334341
distribution: temurin
335342
java-version-file: .java-version
336343

337344
- name: Set up Gradle cache
338-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
345+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
339346
with:
340347
# only push cache for one matrix option per OS since github action cache space is limited
341348
cache-read-only: ${{ inputs.cache-read-only || matrix.smoke-test-suite != 'tomcat' }}
@@ -351,7 +358,7 @@ jobs:
351358

352359
- name: Upload jvm crash dump files if any
353360
if: failure()
354-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
361+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
355362
with:
356363
name: javacore-smoke-test-${{ matrix.smoke-test-suite }}-${{ matrix.os }}
357364
# we expect crash dumps either in root director or in smoke-tests
@@ -378,13 +385,13 @@ jobs:
378385
run: .github/scripts/gha-free-disk-space.sh
379386

380387
- name: Set up JDK for running Gradle
381-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
388+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
382389
with:
383390
distribution: temurin
384391
java-version-file: .java-version
385392

386393
- name: Setup Gradle
387-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
394+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
388395
with:
389396
cache-read-only: ${{ inputs.cache-read-only }}
390397

@@ -401,13 +408,13 @@ jobs:
401408
run: .github/scripts/gha-free-disk-space.sh
402409

403410
- name: Set up JDK for running Gradle
404-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
411+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
405412
with:
406413
distribution: temurin
407414
java-version-file: .java-version
408415

409416
- name: Set up Gradle cache
410-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
417+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
411418
with:
412419
cache-read-only: ${{ inputs.cache-read-only }}
413420

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ jobs:
6363
run: .github/scripts/gha-free-disk-space.sh
6464

6565
- name: Set up JDK for running Gradle
66-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
66+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
6767
with:
6868
distribution: temurin
6969
java-version-file: .java-version
7070

7171
- name: Setup Gradle
72-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
72+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
7373
with:
7474
# gradle enterprise is used for the build cache
7575
gradle-home-cache-excludes: caches/build-cache-1

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,28 @@ jobs:
2424
run: .github/scripts/gha-free-disk-space.sh
2525

2626
- name: Set up Java 17
27-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
27+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
2828
with:
2929
distribution: temurin
3030
java-version-file: .java-version
3131

3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
33+
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
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@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
41+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
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@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
48+
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
4949

5050
workflow-notification:
5151
needs:

‎.github/workflows/issue-management-stale-action.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ jobs:
1818
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
1919
with:
2020
repo-token: ${{ secrets.GITHUB_TOKEN }}
21-
days-before-stale: 7
21+
# TODO (trask) update back to 7 days after end of year break
22+
days-before-stale: 21
2223
days-before-close: 7
2324
only-labels: "needs author feedback"
2425
stale-issue-label: stale

‎.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@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
27+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
2828

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
run: .github/scripts/gha-free-disk-space.sh
2020

2121
- name: Set up JDK for running Gradle
22-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
22+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
2323
with:
2424
distribution: temurin
2525
java-version-file: .java-version
@@ -28,15 +28,15 @@ jobs:
2828
run: |
2929
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
3030
31-
- uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
31+
- uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
3232

3333
- run: ./gradlew :javaagent:dependencyCheckAnalyze
3434
env:
3535
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
3636

3737
- name: Upload report
3838
if: always()
39-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
39+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
4040
with:
4141
path: javaagent/build/reports
4242

0 commit comments

Comments
 (0)