Skip to content

Commit 68bcc0a

Browse files
SylvainJugeSylvainJuge
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-migration-3
2 parents b0ec59e + fd9949d commit 68bcc0a

File tree

293 files changed

+11719
-955
lines changed

Some content is hidden

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

293 files changed

+11719
-955
lines changed

‎.fossa.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,9 @@ targets:
724724
- type: gradle
725725
path: ./
726726
target: ':instrumentation:opensearch:opensearch-rest-1.0:javaagent'
727+
- type: gradle
728+
path: ./
729+
target: ':instrumentation:opensearch:opensearch-rest-3.0:javaagent'
727730
- type: gradle
728731
path: ./
729732
target: ':instrumentation:opensearch:opensearch-rest-common:javaagent'
@@ -763,6 +766,9 @@ targets:
763766
- type: gradle
764767
path: ./
765768
target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.47:javaagent'
769+
- type: gradle
770+
path: ./
771+
target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.50:javaagent'
766772
- type: gradle
767773
path: ./
768774
target: ':instrumentation:pekko:pekko-actor-1.0:javaagent'

‎.github/renovate.json5‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
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
ignorePaths: [
98
'instrumentation/**',
@@ -32,6 +31,7 @@
3231
'io.opentelemetry.contrib:opentelemetry-aws-resources',
3332
'io.opentelemetry.contrib:opentelemetry-aws-xray-propagator',
3433
'io.opentelemetry.contrib:opentelemetry-gcp-resources',
34+
'io.opentelemetry.contrib:opentelemetry-cloudfoundry-resources',
3535
'io.opentelemetry.contrib:opentelemetry-baggage-processor',
3636
'io.opentelemetry.proto:opentelemetry-proto',
3737
'io.opentelemetry.semconv:opentelemetry-semconv',
@@ -329,8 +329,8 @@
329329
{
330330
customType: 'regex',
331331
datasourceTemplate: 'pypi',
332-
fileMatch: [
333-
'^.github/workflows/',
332+
managerFilePatterns: [
333+
'/^.github/workflows//',
334334
],
335335
matchStrings: [
336336
'pip install (?<depName>[^=]+)==(?<currentValue>[^\\s]+)',
@@ -339,8 +339,8 @@
339339
{
340340
customType: 'regex',
341341
datasourceTemplate: 'npm',
342-
fileMatch: [
343-
'^.github/workflows/',
342+
managerFilePatterns: [
343+
'/^.github/workflows//',
344344
],
345345
matchStrings: [
346346
'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',

‎.github/repository-settings.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf
132132

133133
- `FOSSA_API_KEY`
134134
- `OTELBOT_PRIVATE_KEY`
135+
- `OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY`
135136

136137
### Organization variables
137138

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Auto license report
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: Free disk space
22+
run: .github/scripts/gha-free-disk-space.sh
23+
24+
- name: Set up JDK for running Gradle
25+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
26+
with:
27+
distribution: temurin
28+
java-version-file: .java-version
29+
30+
- name: Set up gradle
31+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
32+
with:
33+
cache-read-only: true
34+
35+
- name: Check out PR branch
36+
env:
37+
GH_TOKEN: ${{ github.token }}
38+
run: gh pr checkout ${{ github.event.pull_request.number }}
39+
40+
- name: Update license report
41+
run: ./gradlew generateLicenseReport --no-build-cache
42+
43+
- id: create-patch
44+
name: Create patch file
45+
run: |
46+
git diff > patch
47+
if [ -s patch ]; then
48+
echo "exists=true" >> "$GITHUB_OUTPUT"
49+
fi
50+
51+
- name: Upload patch file
52+
if: steps.create-patch.outputs.exists == 'true'
53+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
54+
with:
55+
path: patch
56+
name: patch

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Auto spotless
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: Free disk space
22+
run: .github/scripts/gha-free-disk-space.sh
23+
24+
- name: Set up JDK for running Gradle
25+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
26+
with:
27+
distribution: temurin
28+
java-version-file: .java-version
29+
30+
- name: Set up gradle
31+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
32+
with:
33+
cache-read-only: true
34+
35+
- name: Check out PR branch
36+
env:
37+
GH_TOKEN: ${{ github.token }}
38+
run: gh pr checkout ${{ github.event.pull_request.number }}
39+
40+
- name: Spotless
41+
run: ./gradlew spotlessApply
42+
43+
- id: create-patch
44+
name: Create patch file
45+
run: |
46+
git diff > patch
47+
if [ -s patch ]; then
48+
echo "exists=true" >> "$GITHUB_OUTPUT"
49+
fi
50+
51+
- name: Upload patch file
52+
if: steps.create-patch.outputs.exists == 'true'
53+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
54+
with:
55+
path: patch
56+
name: patch

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
java-version-file: .java-version
7373

7474
- name: Setup Gradle
75-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
75+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
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@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
87+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
8888
id: otelbot-token
8989
with:
9090
app-id: ${{ vars.OTELBOT_APP_ID }}

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

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

0 commit comments

Comments
 (0)