Skip to content

Commit 3fa85f6

Browse files
lauritlaurit
committed
Merge branch 'main' into heya/convert-play-ws-groovy-to-java
2 parents b64cdc4 + 8900886 commit 3fa85f6

File tree

503 files changed

+11197
-6768
lines changed

Some content is hidden

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

503 files changed

+11197
-6768
lines changed

‎.github/renovate.json5‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,14 @@
149149
"matchUpdateTypes": ["major"],
150150
"enabled": false
151151
},
152+
{
153+
// intentionally pinning specifically to guice 5 in the play smoke test
154+
// until we are able to test against the latest version of play
155+
"matchFileNames": ["smoke-tests/images/play/build.gradle.kts"],
156+
"matchPackagePrefixes": ["com.google.inject:", "com.google.inject.extensions:"],
157+
"matchUpdateTypes": ["major"],
158+
"enabled": false
159+
},
152160
{
153161
// intentionally aligning both netty 4.0 and 4.1 version in this convention
154162
"matchFileNames": ["conventions/src/main/kotlin/otel.java-conventions.gradle.kts"],

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
latest-version: ${{ steps.check-versions.outputs.latest-version }}
1515
already-opened: ${{ steps.check-versions.outputs.already-opened }}
1616
steps:
17-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
17+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1818

1919
- id: check-versions
2020
name: Check versions
@@ -52,7 +52,7 @@ jobs:
5252
needs:
5353
- check-versions
5454
steps:
55-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
55+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5656

5757
- name: Update version
5858
env:
@@ -66,7 +66,7 @@ jobs:
6666
run: .github/scripts/gha-free-disk-space.sh
6767

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

‎.github/workflows/backport.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
exit 1
2222
fi
2323
24-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2525
with:
2626
# history is needed to run git cherry-pick below
2727
fetch-depth: 0

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

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
spotless:
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
29+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3030

3131
- name: Free disk space
3232
run: .github/scripts/gha-free-disk-space.sh
3333

3434
- name: Set up JDK for running Gradle
35-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
35+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
3636
with:
3737
distribution: temurin
3838
java-version-file: .java-version
@@ -52,20 +52,20 @@ jobs:
5252
gradle-wrapper-validation:
5353
runs-on: ubuntu-latest
5454
steps:
55-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
55+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5656

5757
- uses: gradle/actions/wrapper-validation@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
5858

5959
license-check:
6060
runs-on: ubuntu-latest
6161
steps:
62-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
62+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6363

6464
- name: Free disk space
6565
run: .github/scripts/gha-free-disk-space.sh
6666

6767
- name: Set up JDK for running Gradle
68-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
68+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
6969
with:
7070
distribution: temurin
7171
java-version-file: .java-version
@@ -94,9 +94,9 @@ jobs:
9494
else
9595
echo "Licenses are not up-to-date, please run './gradlew generateLicenseReport --no-build-cache' locally and commit."
9696
echo
97-
echo "$(git diff --cached --stat licenses)"
97+
git diff --cached --stat licenses
9898
echo
99-
echo "$(git diff --cached licenses)"
99+
git diff --cached licenses
100100
exit 1
101101
fi
102102
@@ -105,7 +105,7 @@ jobs:
105105
extra-dependency-management-enforcement:
106106
runs-on: ubuntu-latest
107107
steps:
108-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
108+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
109109

110110
- name: Dependency check
111111
run: |
@@ -128,13 +128,13 @@ jobs:
128128
build:
129129
runs-on: ubuntu-latest
130130
steps:
131-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
131+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
132132

133133
- name: Free disk space
134134
run: .github/scripts/gha-free-disk-space.sh
135135

136136
- name: Set up JDK for running Gradle
137-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
137+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
138138
with:
139139
distribution: temurin
140140
java-version-file: .java-version
@@ -165,13 +165,13 @@ jobs:
165165
echo "No diff detected."
166166
else
167167
echo "Diff detected - did you run './gradlew jApiCmp'?"
168-
echo $(git diff --cached --name-only)
169-
echo $(git diff --cached)
168+
git diff --cached --name-only
169+
git diff --cached
170170
exit 1
171171
fi
172172
173173
- name: Upload agent jar
174-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
174+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
175175
with:
176176
name: opentelemetry-javaagent.jar
177177
path: javaagent/build/libs/opentelemetry-javaagent-*-SNAPSHOT.jar
@@ -182,7 +182,7 @@ jobs:
182182
mkdir sboms
183183
cp javaagent/build/spdx/*.spdx.json sboms
184184
185-
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
185+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
186186
name: Upload SBOMs
187187
with:
188188
name: opentelemetry-java-instrumentation-SBOM.zip
@@ -209,38 +209,36 @@ jobs:
209209
- 3
210210
exclude:
211211
- vm: ${{ inputs.skip-openj9-tests && 'openj9' || '' }}
212-
- test-java-version: 23
213-
vm: openj9
214212
fail-fast: false
215213
steps:
216-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
214+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
217215

218216
- name: Free disk space
219217
run: .github/scripts/gha-free-disk-space.sh
220218

221219
- id: setup-test-java
222220
name: Set up JDK ${{ matrix.test-java-version }}-${{ matrix.vm }} for running tests
223-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
221+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
224222
with:
225223
# using zulu because new releases get published quickly
226224
distribution: ${{ matrix.vm == 'hotspot' && 'zulu' || 'adopt-openj9'}}
227225
java-version: ${{ matrix.test-java-version }}
228226

229227
- name: Set up JDK for running Gradle
230-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
228+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
231229
with:
232230
distribution: temurin
233231
java-version-file: .java-version
234232

235233
# vaadin 14 tests fail with node 18
236234
- name: Set up Node
237-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
235+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
238236
with:
239237
node-version: 16
240238

241239
# vaadin tests use pnpm
242240
- name: Cache pnpm modules
243-
uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
241+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
244242
with:
245243
path: ~/.pnpm-store
246244
key: ${{ runner.os }}-test-cache-pnpm-modules
@@ -291,15 +289,15 @@ jobs:
291289

292290
- name: Upload deadlock detector artifacts if any
293291
if: failure()
294-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
292+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
295293
with:
296294
name: deadlock-detector-test-${{ matrix.test-java-version }}-${{ matrix.vm }}-${{ matrix.test-partition }}
297295
path: /tmp/deadlock-detector-*
298296
if-no-files-found: ignore
299297

300298
- name: Upload jvm crash dump files if any
301299
if: failure()
302-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
300+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
303301
with:
304302
name: javacore-test-${{ matrix.test-java-version }}-${{ matrix.test-partition }}
305303
path: |
@@ -336,13 +334,13 @@ jobs:
336334
run: git config --system core.longpaths true
337335
if: matrix.os == 'windows-latest'
338336

339-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
337+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
340338

341339
- name: Free disk space
342340
run: .github/scripts/gha-free-disk-space.sh
343341

344342
- name: Set up JDK for running Gradle
345-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
343+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
346344
with:
347345
distribution: temurin
348346
java-version-file: .java-version
@@ -368,7 +366,7 @@ jobs:
368366

369367
- name: Upload jvm crash dump files if any
370368
if: failure()
371-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
369+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
372370
with:
373371
name: javacore-smoke-test-${{ matrix.smoke-test-suite }}-${{ matrix.os }}
374372
# we expect crash dumps either in root director or in smoke-tests
@@ -389,13 +387,13 @@ jobs:
389387
gradle-plugins:
390388
runs-on: ubuntu-latest
391389
steps:
392-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
390+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
393391

394392
- name: Free disk space
395393
run: .github/scripts/gha-free-disk-space.sh
396394

397395
- name: Set up JDK for running Gradle
398-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
396+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
399397
with:
400398
distribution: temurin
401399
java-version-file: .java-version
@@ -412,13 +410,13 @@ jobs:
412410
examples:
413411
runs-on: ubuntu-latest
414412
steps:
415-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
413+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
416414

417415
- name: Free disk space
418416
run: .github/scripts/gha-free-disk-space.sh
419417

420418
- name: Set up JDK for running Gradle
421-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
419+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
422420
with:
423421
distribution: temurin
424422
java-version-file: .java-version

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ jobs:
6161
# skipping release branches because the versions in those branches are not snapshots
6262
if: github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java-instrumentation'
6363
steps:
64-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
64+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6565

6666
- name: Free disk space
6767
run: .github/scripts/gha-free-disk-space.sh
6868

6969
- name: Set up JDK for running Gradle
70-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
70+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
7171
with:
7272
distribution: temurin
7373
java-version-file: .java-version

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
21+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2222

2323
- name: Free disk space
2424
run: .github/scripts/gha-free-disk-space.sh
2525

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

3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
33+
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
3434
with:
3535
languages: java
3636
# using "latest" helps to keep up with the latest Kotlin support
@@ -45,7 +45,7 @@ jobs:
4545
run: ./gradlew assemble -x javadoc --no-build-cache --no-daemon
4646

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

5050
workflow-notification:
5151
needs:

‎.github/workflows/issue-management-feedback-label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
github.event.comment.user.login == github.event.issue.user.login
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
14+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1515

1616
- name: Remove labels
1717
env:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
run-overhead-tests:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
12+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1313

14-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
14+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1515
with:
1616
ref: gh-pages
1717
path: gh-pages

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
16+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717

1818
- name: Free disk space
1919
run: .github/scripts/gha-free-disk-space.sh
2020

2121
- name: Set up JDK for running Gradle
22-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
22+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
2323
with:
2424
distribution: temurin
2525
java-version-file: .java-version
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Upload report
3838
if: always()
39-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
39+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
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
@@ -13,13 +13,13 @@ jobs:
1313
build:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
16+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717

1818
- name: Free disk space
1919
run: .github/scripts/gha-free-disk-space.sh
2020

2121
- name: Set up JDK for running Gradle
22-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
22+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
2323
with:
2424
distribution: temurin
2525
java-version-file: .java-version

0 commit comments

Comments
 (0)