Skip to content

Commit 6b06a82

Browse files
jaydelucajaydeluca
committed
Merge branch 'main' of github.com:jaydeluca/opentelemetry-java-instrumentation into convert-dropwizard
2 parents c872c42 + 4efd454 commit 6b06a82

File tree

340 files changed

+5184
-2368
lines changed

Some content is hidden

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

340 files changed

+5184
-2368
lines changed

‎.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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
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: 19 additions & 19 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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
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
@@ -105,7 +105,7 @@ jobs:
105105
extra-dependency-management-enforcement:
106106
runs-on: ubuntu-latest
107107
steps:
108-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
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
@@ -211,34 +211,34 @@ jobs:
211211
- vm: ${{ inputs.skip-openj9-tests && 'openj9' || '' }}
212212
fail-fast: false
213213
steps:
214-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
214+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
215215

216216
- name: Free disk space
217217
run: .github/scripts/gha-free-disk-space.sh
218218

219219
- id: setup-test-java
220220
name: Set up JDK ${{ matrix.test-java-version }}-${{ matrix.vm }} for running tests
221-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
221+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
222222
with:
223223
# using zulu because new releases get published quickly
224224
distribution: ${{ matrix.vm == 'hotspot' && 'zulu' || 'adopt-openj9'}}
225225
java-version: ${{ matrix.test-java-version }}
226226

227227
- name: Set up JDK for running Gradle
228-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
228+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
229229
with:
230230
distribution: temurin
231231
java-version-file: .java-version
232232

233233
# vaadin 14 tests fail with node 18
234234
- name: Set up Node
235-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
235+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
236236
with:
237237
node-version: 16
238238

239239
# vaadin tests use pnpm
240240
- name: Cache pnpm modules
241-
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
241+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
242242
with:
243243
path: ~/.pnpm-store
244244
key: ${{ runner.os }}-test-cache-pnpm-modules
@@ -334,13 +334,13 @@ jobs:
334334
run: git config --system core.longpaths true
335335
if: matrix.os == 'windows-latest'
336336

337-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
337+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
338338

339339
- name: Free disk space
340340
run: .github/scripts/gha-free-disk-space.sh
341341

342342
- name: Set up JDK for running Gradle
343-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
343+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
344344
with:
345345
distribution: temurin
346346
java-version-file: .java-version
@@ -387,13 +387,13 @@ jobs:
387387
gradle-plugins:
388388
runs-on: ubuntu-latest
389389
steps:
390-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
390+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
391391

392392
- name: Free disk space
393393
run: .github/scripts/gha-free-disk-space.sh
394394

395395
- name: Set up JDK for running Gradle
396-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
396+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
397397
with:
398398
distribution: temurin
399399
java-version-file: .java-version
@@ -410,13 +410,13 @@ jobs:
410410
examples:
411411
runs-on: ubuntu-latest
412412
steps:
413-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
413+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
414414

415415
- name: Free disk space
416416
run: .github/scripts/gha-free-disk-space.sh
417417

418418
- name: Set up JDK for running Gradle
419-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
419+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
420420
with:
421421
distribution: temurin
422422
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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
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@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
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@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
12+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1313

14-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
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: 2 additions & 2 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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
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

‎.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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
buildLinux:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
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
@@ -43,10 +43,10 @@ jobs:
4343
- name: Support long paths
4444
run: git config --system core.longpaths true
4545

46-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
46+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4747

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

0 commit comments

Comments
 (0)