Skip to content

Commit fb5d0c7

Browse files
committed
Merge branch 'main' into hadoop-jmx-metics-semconv-alignment
2 parents 01f6503 + efc7151 commit fb5d0c7

File tree

145 files changed

+2573
-471
lines changed

Some content is hidden

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

145 files changed

+2573
-471
lines changed

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

Lines changed: 1 addition & 1 deletion
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

.github/workflows/auto-spotless.yml

Lines changed: 1 addition & 1 deletion
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

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

Lines changed: 3 additions & 3 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:
@@ -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@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
echo "exists=true" >> $GITHUB_OUTPUT
3434
fi
3535
36-
- uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
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@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
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: 12 additions & 12 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
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

.github/workflows/codeql.yml

Lines changed: 5 additions & 5 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

@@ -63,12 +63,12 @@ jobs:
6363
cache-read-only: ${{ github.event_name == 'pull_request' }}
6464

6565
- name: Initialize CodeQL
66-
uses: github/codeql-action/init@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
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@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
82+
uses: github/codeql-action/analyze@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
8383
with:
8484
category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: 'Checkout Repository'
20-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2121
- name: 'Dependency Review'
2222
uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1

.github/workflows/documentation-disable-list-audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
crawl:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
15+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1616

1717
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
1818
with:

0 commit comments

Comments
 (0)