Skip to content

Commit a189db9

Browse files
trasktrask
committed
Merge remote-tracking branch 'upstream/main' into end-span-after-closing-scope
2 parents fa3e9b6 + 54abdea commit a189db9

File tree

73 files changed

+388
-215
lines changed

Some content is hidden

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

73 files changed

+388
-215
lines changed

‎.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: 21 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
@@ -128,7 +128,7 @@ jobs:
128128
run: .github/scripts/gha-free-disk-space.sh
129129

130130
- name: Set up JDK for running Gradle
131-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
131+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
132132
with:
133133
distribution: temurin
134134
java-version-file: .java-version
@@ -138,7 +138,7 @@ jobs:
138138
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
139139
140140
- name: Setup Gradle
141-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
141+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
142142
with:
143143
cache-read-only: ${{ inputs.cache-read-only }}
144144
# gradle enterprise is used for the build cache
@@ -163,7 +163,7 @@ jobs:
163163
fi
164164
165165
- name: Upload agent jar
166-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
166+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
167167
with:
168168
name: opentelemetry-javaagent.jar
169169
path: javaagent/build/libs/opentelemetry-javaagent-*-SNAPSHOT.jar
@@ -174,7 +174,7 @@ jobs:
174174
mkdir sboms
175175
cp javaagent/build/spdx/*.spdx.json sboms
176176
177-
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
177+
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
178178
name: Upload SBOMs
179179
with:
180180
name: opentelemetry-java-instrumentation-SBOM.zip
@@ -210,14 +210,14 @@ jobs:
210210

211211
- id: setup-test-java
212212
name: Set up JDK ${{ matrix.test-java-version }}-${{ matrix.vm }} for running tests
213-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
213+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
214214
with:
215215
# using zulu because new releases get published quickly
216216
distribution: ${{ matrix.vm == 'hotspot' && 'zulu' || 'adopt-openj9'}}
217217
java-version: ${{ matrix.test-java-version }}
218218

219219
- name: Set up JDK for running Gradle
220-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
220+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
221221
with:
222222
distribution: temurin
223223
java-version-file: .java-version
@@ -239,7 +239,7 @@ jobs:
239239
run: .github/scripts/deadlock-detector.sh
240240

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

279279
- name: Upload deadlock detector artifacts if any
280280
if: failure()
281-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
281+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
282282
with:
283283
name: deadlock-detector-test-${{ matrix.test-java-version }}-${{ matrix.vm }}-${{ matrix.test-partition }}
284284
path: /tmp/deadlock-detector-*
285285
if-no-files-found: ignore
286286

287287
- name: Upload jvm crash dump files if any
288288
if: failure()
289-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
289+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
290290
with:
291291
name: javacore-test-${{ matrix.test-java-version }}-${{ matrix.test-partition }}
292292
path: |
@@ -329,13 +329,13 @@ jobs:
329329
run: .github/scripts/gha-free-disk-space.sh
330330

331331
- name: Set up JDK for running Gradle
332-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
332+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
333333
with:
334334
distribution: temurin
335335
java-version-file: .java-version
336336

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

352352
- name: Upload jvm crash dump files if any
353353
if: failure()
354-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
354+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
355355
with:
356356
name: javacore-smoke-test-${{ matrix.smoke-test-suite }}-${{ matrix.os }}
357357
# we expect crash dumps either in root director or in smoke-tests
@@ -378,13 +378,13 @@ jobs:
378378
run: .github/scripts/gha-free-disk-space.sh
379379

380380
- name: Set up JDK for running Gradle
381-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
381+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
382382
with:
383383
distribution: temurin
384384
java-version-file: .java-version
385385

386386
- name: Setup Gradle
387-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
387+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
388388
with:
389389
cache-read-only: ${{ inputs.cache-read-only }}
390390

@@ -401,13 +401,13 @@ jobs:
401401
run: .github/scripts/gha-free-disk-space.sh
402402

403403
- name: Set up JDK for running Gradle
404-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
404+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
405405
with:
406406
distribution: temurin
407407
java-version-file: .java-version
408408

409409
- name: Set up Gradle cache
410-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
410+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
411411
with:
412412
cache-read-only: ${{ inputs.cache-read-only }}
413413

‎.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

‎.github/workflows/pr-smoke-test-early-jdk8-images.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ 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
2626

2727
- name: Setup Gradle
28-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
28+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
2929
with:
3030
cache-read-only: true
3131
# gradle enterprise is used for the build cache

‎.github/workflows/pr-smoke-test-fake-backend-images.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ 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
2626

2727
- name: Setup Gradle
28-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
28+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
2929
with:
3030
cache-read-only: true
3131
# gradle enterprise is used for the build cache
@@ -46,13 +46,13 @@ jobs:
4646
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4747

4848
- name: Set up JDK for running Gradle
49-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
49+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
5050
with:
5151
distribution: temurin
5252
java-version-file: .java-version
5353

5454
- name: Setup Gradle
55-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
55+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
5656
with:
5757
cache-read-only: true
5858

0 commit comments

Comments
 (0)