Skip to content

Commit 77a4f00

Browse files
SylvainJugeSylvainJuge
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-leftovers
2 parents 2ed4e96 + d83b66e commit 77a4f00

File tree

44 files changed

+1147
-883
lines changed

Some content is hidden

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

44 files changed

+1147
-883
lines changed

‎.github/repository-settings.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ for [`dependabot/**/**`](https://github.com/open-telemetry/community/blob/main/d
7575
- Key is associated with [@trask](https://github.com/trask)'s gmail address
7676
- `SONATYPE_KEY` - owned by [@trask](https://github.com/trask)
7777
- `SONATYPE_USER` - owned by [@trask](https://github.com/trask)
78+
- `FLAKY_TEST_REPORTER_ACCESS_KEY` - owned by [@laurit](https://github.com/laurit)
7879

7980
### Organization secrets
8081

‎.github/workflows/build-common.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,36 @@ jobs:
290290
if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}
291291
run: cat build-scan.txt
292292

293+
- name: Get current job url
294+
id: jobs
295+
if: ${{ !cancelled() }}
296+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
297+
env:
298+
matrix: ${{ toJson(matrix) }}
299+
with:
300+
result-encoding: string
301+
script: |
302+
const { data: workflow_run } = await github.rest.actions.listJobsForWorkflowRun({
303+
owner: context.repo.owner,
304+
repo: context.repo.repo,
305+
run_id: context.runId,
306+
per_page: 100
307+
});
308+
const matrix = JSON.parse(process.env.matrix);
309+
const job_name = `common / test${ matrix['test-partition'] } (${ matrix['test-java-version'] }, ${ matrix.vm })`;
310+
return workflow_run.jobs.find((job) => job.name === job_name).html_url;
311+
312+
- name: Flaky test report
313+
if: ${{ !cancelled() }}
314+
env:
315+
FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
316+
JOB_URL: ${{ steps.jobs.outputs.result }}
317+
run: |
318+
if [ -s build-scan.txt ]; then
319+
export BUILD_SCAN_URL=$(cat build-scan.txt)
320+
fi
321+
./gradlew :test-report:reportFlakyTests
322+
293323
- name: Upload deadlock detector artifacts if any
294324
if: failure()
295325
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0

‎.github/workflows/build-daily-no-build-cache.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,16 @@ jobs:
1010
common:
1111
uses: ./.github/workflows/build-common.yml
1212
with:
13-
max-test-retries: 0
1413
no-build-cache: true
1514

1615
test-latest-deps:
1716
uses: ./.github/workflows/reusable-test-latest-deps.yml
1817
with:
19-
max-test-retries: 0
2018
no-build-cache: true
2119

2220
test-indy:
2321
uses: ./.github/workflows/reusable-test-indy.yml
2422
with:
25-
max-test-retries: 0
2623
no-build-cache: true
2724

2825
# muzzle is not included here because it doesn't use gradle cache anyway and so is already covered

‎.github/workflows/build-daily.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,12 @@ on:
99
jobs:
1010
common:
1111
uses: ./.github/workflows/build-common.yml
12-
with:
13-
max-test-retries: 0
1412

1513
test-latest-deps:
1614
uses: ./.github/workflows/reusable-test-latest-deps.yml
17-
with:
18-
max-test-retries: 0
1915

2016
test-indy:
2117
uses: ./.github/workflows/reusable-test-indy.yml
22-
with:
23-
max-test-retries: 0
2418

2519
muzzle:
2620
uses: ./.github/workflows/reusable-muzzle.yml

‎.github/workflows/codeql-daily.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
java-version-file: .java-version
3131

3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
33+
uses: github/codeql-action/init@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
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@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
48+
uses: github/codeql-action/analyze@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
4949

5050
workflow-notification:
5151
needs:

‎.github/workflows/issue-management-stale-action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
pull-requests: write # for actions/stale to close stale PRs
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
18+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
1919
with:
2020
repo-token: ${{ secrets.GITHUB_TOKEN }}
2121
days-before-stale: 7

‎.github/workflows/publish-petclinic-benchmark-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: echo "TS=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_ENV
3030

3131
- name: Push to GitHub packages
32-
uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
32+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
3333
with:
3434
push: true
3535
file: benchmark-overhead/Dockerfile-petclinic-base

‎.github/workflows/reusable-native-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1919
- id: read-java
2020
run: echo "version=$(cat .java-version)" >> "$GITHUB_OUTPUT"
21-
- uses: graalvm/setup-graalvm@c09e29bb115a83bd4b7c7e99bb46e2e8a1c50466 # v1.2.7.1
21+
- uses: graalvm/setup-graalvm@aafbedb8d382ed0ca6167d3a051415f20c859274 # v1.2.8.1
2222
with:
2323
version: "latest"
2424
java-version: "${{ steps.read-java.outputs.version }}"

‎.github/workflows/reusable-test-indy.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,33 @@ jobs:
8686
- name: Build scan
8787
if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}
8888
run: cat build-scan.txt
89+
90+
- name: Get current job url
91+
id: jobs
92+
if: ${{ !cancelled() }}
93+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
94+
env:
95+
matrix: ${{ toJson(matrix) }}
96+
with:
97+
result-encoding: string
98+
script: |
99+
const { data: workflow_run } = await github.rest.actions.listJobsForWorkflowRun({
100+
owner: context.repo.owner,
101+
repo: context.repo.repo,
102+
run_id: context.runId,
103+
per_page: 100
104+
});
105+
const matrix = JSON.parse(process.env.matrix);
106+
const job_name = `test-indy / testIndy${ matrix['test-partition'] }`;
107+
return workflow_run.jobs.find((job) => job.name === job_name).html_url;
108+
109+
- name: Flaky test report
110+
if: ${{ !cancelled() }}
111+
env:
112+
FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
113+
JOB_URL: ${{ steps.jobs.outputs.result }}
114+
run: |
115+
if [ -s build-scan.txt ]; then
116+
export BUILD_SCAN_URL=$(cat build-scan.txt)
117+
fi
118+
./gradlew :test-report:reportFlakyTests

‎.github/workflows/reusable-test-latest-deps.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,36 @@ jobs:
8585
if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}
8686
run: cat build-scan.txt
8787

88+
- name: Get current job url
89+
id: jobs
90+
if: ${{ !cancelled() }}
91+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
92+
env:
93+
matrix: ${{ toJson(matrix) }}
94+
with:
95+
result-encoding: string
96+
script: |
97+
const { data: workflow_run } = await github.rest.actions.listJobsForWorkflowRun({
98+
owner: context.repo.owner,
99+
repo: context.repo.repo,
100+
run_id: context.runId,
101+
per_page: 100
102+
});
103+
const matrix = JSON.parse(process.env.matrix);
104+
const job_name = `test-latest-deps / testLatestDeps${ matrix['test-partition'] }`;
105+
return workflow_run.jobs.find((job) => job.name === job_name).html_url;
106+
107+
- name: Flaky test report
108+
if: ${{ !cancelled() }}
109+
env:
110+
FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
111+
JOB_URL: ${{ steps.jobs.outputs.result }}
112+
run: |
113+
if [ -s build-scan.txt ]; then
114+
export BUILD_SCAN_URL=$(cat build-scan.txt)
115+
fi
116+
./gradlew :test-report:reportFlakyTests
117+
88118
- name: Upload deadlock detector artifacts if any
89119
if: failure()
90120
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0

0 commit comments

Comments
 (0)