Skip to content

Commit d89492f

Browse files
Merge remote-tracking branch 'origin/main' into grpc-req-res-size
2 parents 484f0e8 + c04b8fc commit d89492f

File tree

394 files changed

+10824
-1731
lines changed

Some content is hidden

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

394 files changed

+10824
-1731
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,10 @@ body:
4848
attributes:
4949
label: Additional context
5050
description: Add any other context about the problem here.
51+
- type: dropdown
52+
attributes:
53+
label: Tip
54+
description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
55+
options:
56+
- <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
57+
default: 0

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,10 @@ body:
2222
attributes:
2323
label: Additional context
2424
description: Add any other context or screenshots about the feature request here.
25+
- type: dropdown
26+
attributes:
27+
label: Tip
28+
description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
29+
options:
30+
- <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
31+
default: 0

.github/workflows/auto-license-report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
check:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
19+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2020

2121
- name: Free disk space
2222
run: .github/scripts/gha-free-disk-space.sh
@@ -28,7 +28,7 @@ jobs:
2828
java-version-file: .java-version
2929

3030
- name: Set up gradle
31-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
31+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
3232
with:
3333
cache-read-only: true
3434

.github/workflows/auto-spotless.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
check:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
19+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2020

2121
- name: Free disk space
2222
run: .github/scripts/gha-free-disk-space.sh
@@ -28,7 +28,7 @@ jobs:
2828
java-version-file: .java-version
2929

3030
- name: Set up gradle
31-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
31+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
3232
with:
3333
cache-read-only: true
3434

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
latest-version: ${{ steps.check-versions.outputs.latest-version }}
1818
already-opened: ${{ steps.check-versions.outputs.already-opened }}
1919
steps:
20-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2121

2222
- id: check-versions
2323
name: Check versions
@@ -55,7 +55,7 @@ jobs:
5555
needs:
5656
- check-versions
5757
steps:
58-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
58+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5959

6060
- name: Update version
6161
env:
@@ -72,7 +72,7 @@ jobs:
7272
java-version-file: .java-version
7373

7474
- name: Setup Gradle
75-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
75+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
7676

7777
- name: Update license report
7878
run: ./gradlew generateLicenseReport
@@ -84,7 +84,7 @@ jobs:
8484
- name: Use CLA approved bot
8585
run: .github/scripts/use-cla-approved-bot.sh
8686

87-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
87+
- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
8888
id: otelbot-token
8989
with:
9090
app-id: ${{ vars.OTELBOT_APP_ID }}

.github/workflows/auto-update-pull-request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pull-requests: write
1919
steps:
2020
- name: Download patch
21-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
21+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
2222
with:
2323
run-id: ${{ github.event.workflow_run.id }}
2424
path: ${{ runner.temp }}
@@ -33,14 +33,14 @@ jobs:
3333
echo "exists=true" >> $GITHUB_OUTPUT
3434
fi
3535
36-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
36+
- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
3737
if: steps.unzip-patch.outputs.exists == 'true'
3838
id: otelbot-token
3939
with:
4040
app-id: 1295839
4141
private-key: ${{ secrets.OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY }}
4242

43-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
43+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4444
if: steps.unzip-patch.outputs.exists == 'true'
4545
with:
4646
repository: "${{ github.event.workflow_run.head_repository.full_name }}"

.github/workflows/backport.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
exit 1
2222
fi
2323
24-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
24+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2525
with:
2626
# history is needed to run git cherry-pick below
2727
fetch-depth: 0
2828

2929
- name: Use CLA approved bot
3030
run: .github/scripts/use-cla-approved-bot.sh
3131

32-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
32+
- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
3333
id: otelbot-token
3434
with:
3535
app-id: ${{ vars.OTELBOT_APP_ID }}

.github/workflows/build-common.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
spotless:
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
32+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3333

3434
- name: Free disk space
3535
run: .github/scripts/gha-free-disk-space.sh
@@ -41,7 +41,7 @@ jobs:
4141
java-version-file: .java-version
4242

4343
- name: Setup Gradle
44-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
44+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
4545
with:
4646
cache-read-only: ${{ inputs.cache-read-only }}
4747

@@ -51,7 +51,7 @@ jobs:
5151
license-check:
5252
runs-on: ubuntu-latest
5353
steps:
54-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
54+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5555

5656
- name: Free disk space
5757
run: .github/scripts/gha-free-disk-space.sh
@@ -63,7 +63,7 @@ jobs:
6363
java-version-file: .java-version
6464

6565
- name: Setup Gradle
66-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
66+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
6767
with:
6868
cache-read-only: ${{ inputs.cache-read-only }}
6969

@@ -90,7 +90,7 @@ jobs:
9090
fossa-configuration-check:
9191
runs-on: ubuntu-latest
9292
steps:
93-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
93+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
9494

9595
- name: Free disk space
9696
run: .github/scripts/gha-free-disk-space.sh
@@ -102,7 +102,7 @@ jobs:
102102
java-version-file: .java-version
103103

104104
- name: Setup Gradle
105-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
105+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
106106
with:
107107
cache-read-only: ${{ inputs.cache-read-only }}
108108

@@ -129,7 +129,7 @@ jobs:
129129
extra-dependency-management-enforcement:
130130
runs-on: ubuntu-latest
131131
steps:
132-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
132+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
133133

134134
- name: Dependency check
135135
run: |
@@ -152,28 +152,28 @@ jobs:
152152
check-javaagent-suppression-keys:
153153
runs-on: ubuntu-latest
154154
steps:
155-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
155+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
156156

157157
- run: .github/scripts/check-javaagent-suppression-keys.sh
158158

159159
check-latest-dep-test-overrides:
160160
runs-on: ubuntu-latest
161161
steps:
162-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
162+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
163163

164164
- run: .github/scripts/check-latest-dep-test-overrides.sh
165165

166166
check-package-names:
167167
runs-on: ubuntu-latest
168168
steps:
169-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
169+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
170170

171171
- run: .github/scripts/check-package-names.sh
172172

173173
build:
174174
runs-on: ubuntu-latest
175175
steps:
176-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
176+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
177177

178178
- name: Free disk space
179179
run: .github/scripts/gha-free-disk-space.sh
@@ -189,7 +189,7 @@ jobs:
189189
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
190190
191191
- name: Setup Gradle
192-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
192+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
193193
with:
194194
cache-read-only: ${{ inputs.cache-read-only }}
195195

@@ -264,7 +264,7 @@ jobs:
264264
vm: openj9
265265
fail-fast: false
266266
steps:
267-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
267+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
268268

269269
- name: Free disk space
270270
run: .github/scripts/gha-free-disk-space.sh
@@ -291,7 +291,7 @@ jobs:
291291

292292
# vaadin tests use pnpm
293293
- name: Cache pnpm modules
294-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
294+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
295295
with:
296296
path: ~/.pnpm-store
297297
key: ${{ runner.os }}-test-cache-pnpm-modules
@@ -300,7 +300,7 @@ jobs:
300300
run: .github/scripts/deadlock-detector.sh
301301

302302
- name: Setup Gradle
303-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
303+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
304304
with:
305305
# only push cache for one matrix option since github action cache space is limited
306306
cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
@@ -419,7 +419,7 @@ jobs:
419419
run: git config --system core.longpaths true
420420
if: matrix.os == 'windows-latest'
421421

422-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
422+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
423423

424424
- name: Free disk space
425425
run: .github/scripts/gha-free-disk-space.sh
@@ -431,7 +431,7 @@ jobs:
431431
java-version-file: .java-version
432432

433433
- name: Set up Gradle cache
434-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
434+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
435435
with:
436436
# only push cache for one matrix option per OS since github action cache space is limited
437437
cache-read-only: ${{ inputs.cache-read-only || matrix.smoke-test-suite != 'tomcat' }}
@@ -471,7 +471,7 @@ jobs:
471471
gradle-plugins:
472472
runs-on: ubuntu-latest
473473
steps:
474-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
474+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
475475

476476
- name: Free disk space
477477
run: .github/scripts/gha-free-disk-space.sh
@@ -483,7 +483,7 @@ jobs:
483483
java-version-file: .java-version
484484

485485
- name: Setup Gradle
486-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
486+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
487487
with:
488488
cache-read-only: ${{ inputs.cache-read-only }}
489489

@@ -494,7 +494,7 @@ jobs:
494494
examples:
495495
runs-on: ubuntu-latest
496496
steps:
497-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
497+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
498498

499499
- name: Free disk space
500500
run: .github/scripts/gha-free-disk-space.sh
@@ -506,7 +506,7 @@ jobs:
506506
java-version-file: .java-version
507507

508508
- name: Set up Gradle cache
509-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
509+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
510510
with:
511511
cache-read-only: ${{ inputs.cache-read-only }}
512512

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
# skipping release branches because the versions in those branches are not snapshots
6565
if: github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java-instrumentation'
6666
steps:
67-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
67+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6868

6969
- name: Free disk space
7070
run: .github/scripts/gha-free-disk-space.sh
@@ -76,7 +76,7 @@ jobs:
7676
java-version-file: .java-version
7777

7878
- name: Setup Gradle
79-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
79+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
8080

8181
- name: Build and publish artifact snapshots
8282
env:

.github/workflows/codeql.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- language: java
3535
runs-on: oracle-8cpu-32gb-x86-64
3636
steps:
37-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
37+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3838

3939
# don't need to free disk space (which takes time) since running on larger machine
4040

@@ -58,17 +58,17 @@ jobs:
5858
5959
- name: Set up Gradle
6060
if: matrix.language == 'java'
61-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
61+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
6262
with:
6363
cache-read-only: ${{ github.event_name == 'pull_request' }}
6464

6565
- name: Initialize CodeQL
66-
uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
66+
uses: github/codeql-action/init@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
6767
with:
6868
languages: ${{ matrix.language }}
69-
# using "latest" helps to keep up with the latest Kotlin support
69+
# using "linked" helps to keep up with the linked Kotlin support
7070
# see https://github.com/github/codeql-action/issues/1555#issuecomment-1452228433
71-
tools: latest
71+
tools: linked
7272

7373
- name: Assemble
7474
if: matrix.language == 'java'
@@ -79,6 +79,6 @@ jobs:
7979
run: ./gradlew assemble -x javadoc -x :instrumentation:quarkus-resteasy-reactive:quarkus3-testing:quarkusGenerateCodeDev -x :instrumentation:quarkus-resteasy-reactive:quarkus2-testing:quarkusGenerateCodeDev --no-build-cache --no-daemon
8080

8181
- name: Perform CodeQL analysis
82-
uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
82+
uses: github/codeql-action/analyze@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
8383
with:
8484
category: "/language:${{matrix.language}}"

0 commit comments

Comments
 (0)