Skip to content

Commit eb7314c

Browse files
Cirilla-zmhCirilla-zmh
authored
Merge branch 'open-telemetry:main' into main
2 parents b40d6c4 + fc6507e commit eb7314c

File tree

69 files changed

+1689
-231
lines changed

Some content is hidden

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

69 files changed

+1689
-231
lines changed

‎.github/renovate.json5

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
{
22
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
33
extends: [
4-
'config:recommended',
5-
'docker:pinDigests',
6-
'helpers:pinGitHubActionDigests',
4+
'config:best-practices',
5+
'helpers:pinGitHubActionDigestsToSemver',
76
],
87
ignorePresets: [
98
':ignoreModulesAndTests', // needed to keep maven-extension test pom files up-to-date
109
],
11-
prHourlyLimit: 5,
10+
prHourlyLimit: 5, // we have a large number of parallel runners
11+
labels: [
12+
'dependencies'
13+
],
1214
packageRules: [
1315
{
14-
// this is to reduce the number of renovate PRs
15-
matchManagers: [
16-
'github-actions',
17-
'dockerfile',
18-
],
19-
extends: [
20-
'schedule:weekly',
21-
],
22-
groupName: 'weekly update',
16+
// reduces the number of Renovate PRs
17+
// (patch updates are typically non-breaking)
18+
"groupName": "all patch versions",
19+
"matchUpdateTypes": ["patch"],
20+
"schedule": ["before 8am every weekday"]
21+
},
22+
{
23+
// avoids these Renovate PRs from trickling in throughout the week
24+
// (consolidating the review process)
25+
"matchUpdateTypes": ["minor", "major"],
26+
"schedule": ["before 8am on Monday"]
2327
},
2428
{
2529
matchPackageNames: [
@@ -165,8 +169,8 @@
165169
{
166170
customType: 'regex',
167171
datasourceTemplate: 'npm',
168-
fileMatch: [
169-
'^.github/workflows/',
172+
managerFilePatterns: [
173+
'/^.github/workflows//',
170174
],
171175
matchStrings: [
172176
'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',

‎.github/workflows/assign-reviewers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
pull-requests: write # for assigning reviewers
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: open-telemetry/assign-reviewers-action@ab8aca8056f3b5af18282b54baa57a852c47abf8 # main
21+
- uses: open-telemetry/assign-reviewers-action@cb42e3ee14a59c01abccd401f126a0f4c3991cb3 # main
2222
with:
2323
config-file: .github/component_owners.yml

‎.github/workflows/auto-spotless-apply.yml

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
name: Auto spotless apply
2+
on:
3+
workflow_run:
4+
workflows:
5+
- "Auto spotless check"
6+
types:
7+
- completed
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
apply:
14+
runs-on: ubuntu-latest
15+
permissions:
16+
contents: write
17+
pull-requests: write
18+
steps:
19+
- name: Download patch
20+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
21+
with:
22+
run-id: ${{ github.event.workflow_run.id }}
23+
path: ${{ runner.temp }}
24+
merge-multiple: true
25+
github-token: ${{ github.token }}
26+
27+
- id: unzip-patch
28+
name: Unzip patch
29+
working-directory: ${{ runner.temp }}
30+
run: |
31+
if [ -f patch ]; then
32+
echo "exists=true" >> $GITHUB_OUTPUT
33+
fi
34+
35+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
36+
if: steps.unzip-patch.outputs.exists == 'true'
37+
id: otelbot-token
38+
with:
39+
app-id: 1296620
40+
private-key: ${{ secrets.OTELBOT_JAVA_CONTRIB_PRIVATE_KEY }}
41+
42+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
43+
if: steps.unzip-patch.outputs.exists == 'true'
44+
with:
45+
token: ${{ steps.otelbot-token.outputs.token }}
46+
47+
- id: get-pr
48+
if: steps.unzip-patch.outputs.exists == 'true'
49+
name: Get PR
50+
env:
51+
PR_BRANCH: |-
52+
${{
53+
(github.event.workflow_run.head_repository.owner.login != github.event.workflow_run.repository.owner.login)
54+
&& format('{0}:{1}', github.event.workflow_run.head_repository.owner.login, github.event.workflow_run.head_branch)
55+
|| github.event.workflow_run.head_branch
56+
}}
57+
GH_TOKEN: ${{ github.token }}
58+
run: |
59+
echo gh pr view "${PR_BRANCH}" --json number --jq .number
60+
number=$(gh pr view "${PR_BRANCH}" --json number --jq .number)
61+
echo $number
62+
echo "number=$number" >> $GITHUB_OUTPUT
63+
64+
- name: Check out PR branch
65+
if: steps.unzip-patch.outputs.exists == 'true'
66+
env:
67+
GH_TOKEN: ${{ github.token }}
68+
run: gh pr checkout ${{ steps.get-pr.outputs.number }}
69+
70+
- name: Use CLA approved github bot
71+
if: steps.unzip-patch.outputs.exists == 'true'
72+
# IMPORTANT do not call the .github/scripts/use-cla-approved-bot.sh
73+
# since that script could have been compromised in the PR branch
74+
run: |
75+
git config user.name otelbot
76+
git config user.email [email protected]
77+
78+
- name: Apply patch and push
79+
if: steps.unzip-patch.outputs.exists == 'true'
80+
run: |
81+
git apply "${{ runner.temp }}/patch"
82+
git commit -a -m "./gradlew spotlessApply"
83+
git push
84+
85+
- if: steps.unzip-patch.outputs.exists == 'true' && success()
86+
env:
87+
GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
88+
run: |
89+
gh pr comment ${{ steps.get-pr.outputs.number }} --body "🔧 The result from spotlessApply was committed to the PR branch."
90+
91+
- if: steps.unzip-patch.outputs.exists == 'true' && failure()
92+
env:
93+
GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
94+
run: |
95+
gh pr comment ${{ steps.get-pr.outputs.number }} --body "❌ The result from spotlessApply could not be committed to the PR branch, see logs: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID."

‎.github/workflows/auto-spotless-check.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Auto spotless check
2+
on:
3+
pull_request:
4+
types:
5+
- opened
6+
- synchronize
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
10+
cancel-in-progress: true
11+
12+
permissions:
13+
contents: read
14+
15+
jobs:
16+
check:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20+
21+
- name: Set up JDK for running Gradle
22+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
23+
with:
24+
distribution: temurin
25+
java-version: 17
26+
27+
- name: Set up gradle
28+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
29+
with:
30+
cache-read-only: true
31+
32+
- name: Check out PR branch
33+
env:
34+
GH_TOKEN: ${{ github.token }}
35+
run: gh pr checkout ${{ github.event.pull_request.number }}
36+
37+
- name: Spotless
38+
run: ./gradlew spotlessApply
39+
40+
- id: create-patch
41+
name: Create patch file
42+
run: |
43+
git diff > patch
44+
if [ -s patch ]; then
45+
echo "exists=true" >> "$GITHUB_OUTPUT"
46+
fi
47+
48+
- name: Upload patch file
49+
if: steps.create-patch.outputs.exists == 'true'
50+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
51+
with:
52+
path: patch
53+
name: patch

‎.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Use CLA approved bot
3030
run: .github/scripts/use-cla-approved-bot.sh
3131

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

‎.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
java-version: 17
3030

3131
- name: Set up gradle
32-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
32+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
3333
with:
3434
cache-read-only: ${{ github.event_name == 'pull_request' }}
3535
- name: Gradle build and test
@@ -65,7 +65,7 @@ jobs:
6565
java-version: 17
6666

6767
- name: Set up gradle
68-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
68+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
6969
with:
7070
cache-read-only: ${{ github.event_name == 'pull_request' }}
7171
- name: Gradle test
@@ -87,7 +87,7 @@ jobs:
8787
java-version: 17
8888

8989
- name: Set up gradle
90-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
90+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
9191
with:
9292
cache-read-only: ${{ github.event_name == 'pull_request' }}
9393

@@ -139,7 +139,7 @@ jobs:
139139
java-version: 17
140140

141141
- name: Set up gradle
142-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
142+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
143143
# skipping release branches because the versions in those branches are not snapshots
144144
# (also this skips pull requests)
145145
if: ${{ github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java-contrib' }}

‎.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535
java-version: 17
3636

3737
- name: Set up gradle
38-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
38+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
3939

4040
- name: Initialize CodeQL
41-
uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
41+
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
4242
with:
4343
languages: java, actions
4444
# using "latest" helps to keep up with the latest Kotlin support
@@ -52,4 +52,4 @@ jobs:
5252
run: ./gradlew assemble --no-build-cache --no-daemon
5353

5454
- name: Perform CodeQL analysis
55-
uses: github/codeql-action/analyze@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
55+
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18

‎.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616

17-
- uses: fossas/fossa-action@c0a7d013f84c8ee5e910593186598625513cc1e4 # v1.6.0
17+
- uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
1818
with:
1919
api-key: ${{secrets.FOSSA_API_KEY}}
2020
team: OpenTelemetry

‎.github/workflows/gradle-wrapper-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1919

20-
- uses: gradle/actions/wrapper-validation@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
20+
- uses: gradle/actions/wrapper-validation@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0

‎.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
45+
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
4646
with:
4747
sarif_file: results.sarif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: |
2828
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
2929
30-
- uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
30+
- uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
3131

3232
- run: ./gradlew dependencyCheckAnalyze
3333
env:

‎.github/workflows/prepare-patch-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Use CLA approved bot
4848
run: .github/scripts/use-cla-approved-bot.sh
4949

50-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
50+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
5151
id: otelbot-token
5252
with:
5353
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/prepare-release-branch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Use CLA approved bot
6060
run: .github/scripts/use-cla-approved-bot.sh
6161

62-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
62+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
6363
id: otelbot-token
6464
with:
6565
app-id: ${{ vars.OTELBOT_APP_ID }}
@@ -116,7 +116,7 @@ jobs:
116116
- name: Use CLA approved bot
117117
run: .github/scripts/use-cla-approved-bot.sh
118118

119-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
119+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
120120
id: otelbot-token
121121
with:
122122
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
java-version: 17
1919

2020
- name: Set up gradle
21-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
21+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
2222
- name: Gradle build
2323
run: ./gradlew build
2424

@@ -41,7 +41,7 @@ jobs:
4141
java-version: 17
4242

4343
- name: Set up gradle
44-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
44+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
4545
- name: Integration test
4646
run: ./gradlew integrationTest
4747

@@ -124,7 +124,7 @@ jobs:
124124
java-version: 17
125125

126126
- name: Set up gradle
127-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
127+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
128128
- name: Build and publish artifacts
129129
run: ./gradlew assemble publishToSonatype closeAndReleaseSonatypeStagingRepository
130130
env:
@@ -221,7 +221,7 @@ jobs:
221221
- name: Use CLA approved bot
222222
run: .github/scripts/use-cla-approved-bot.sh
223223

224-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
224+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
225225
id: otelbot-token
226226
with:
227227
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/reusable-markdown-link-check.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1414

15-
- uses: lycheeverse/lychee-action@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c # v2.4.0
15+
- uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2.4.1
1616
with:
1717
# excluding links to pull requests and issues is done for performance
1818
args: >
1919
--include-fragments
20-
--exclude "^https://github.com/open-telemetry/opentelemetry-java-contrib/(issue|pull)/\\d+$"
20+
--exclude "^https://github.com/open-telemetry/opentelemetry-java-contrib/(issues|pull)/\\d+$"
2121
--max-retries 6
22+
--max-concurrency 1
2223
.

‎.github/workflows/reusable-markdown-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414

1515
- name: Run markdownlint
1616
run: |
17-
npx markdownlint-cli@0.44.0 -c .github/config/markdownlint.yml **/*.md
17+
npx markdownlint-cli@0.45.0 -c .github/config/markdownlint.yml **/*.md

0 commit comments

Comments
 (0)