Skip to content

Commit 37219a3

Browse files
SylvainJugeSylvainJuge
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-other
2 parents 723b3f7 + 39137d1 commit 37219a3

File tree

335 files changed

+7221
-6657
lines changed

Some content is hidden

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

335 files changed

+7221
-6657
lines changed

‎.github/renovate.json5‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,6 @@
9393
'com.fasterxml.jackson.core:**',
9494
],
9595
},
96-
{
97-
// prevent update to 2.4-groovy-4.0-SNAPSHOT
98-
allowedVersions: '!/\\-SNAPSHOT$/',
99-
matchPackageNames: [
100-
'org.spockframework:**',
101-
],
102-
},
10396
{
10497
// prevent 3.0.1u2 -> 3.0.1
10598
matchPackageNames: [

‎.github/repository-settings.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ private admin repo.
88

99
### Repository secrets
1010

11+
- `FLAKY_TEST_REPORTER_ACCESS_KEY` - owned by [@laurit](https://github.com/laurit)
1112
- `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
1213
- `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
1314
- `GRADLE_PUBLISH_KEY`
@@ -17,14 +18,13 @@ private admin repo.
1718
- Key is associated with [@trask](https://github.com/trask)'s gmail address
1819
- `SONATYPE_KEY` - owned by [@trask](https://github.com/trask)
1920
- `SONATYPE_USER` - owned by [@trask](https://github.com/trask)
20-
- `FLAKY_TEST_REPORTER_ACCESS_KEY` - owned by [@laurit](https://github.com/laurit)
2121

2222
### Organization secrets
2323

24-
- `DEVELOCITY_ACCESS_KEY`
24+
- `DEVELOCITY_ACCESS_KEY` (scoped only to Java repos)
2525
- `FOSSA_API_KEY`
26+
- `OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY` (scoped only to this repo)
2627
- `OTELBOT_PRIVATE_KEY`
27-
- `OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY`
2828

2929
### Organization variables
3030

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
5353
- name: Upload patch file
5454
if: steps.create-patch.outputs.exists == 'true'
55-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
55+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
5656
with:
5757
path: patch
5858
name: patch

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
5252
- name: Upload patch file
5353
if: steps.create-patch.outputs.exists == 'true'
54-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
54+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
5555
with:
5656
path: patch
5757
name: patch

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

Lines changed: 1 addition & 1 deletion
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@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
21+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
2222
with:
2323
run-id: ${{ github.event.workflow_run.id }}
2424
path: ${{ runner.temp }}

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ jobs:
219219
fi
220220
221221
- name: Upload agent jar
222-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
222+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
223223
with:
224224
name: opentelemetry-javaagent.jar
225225
path: javaagent/build/libs/opentelemetry-javaagent-*-SNAPSHOT.jar
@@ -230,7 +230,7 @@ jobs:
230230
mkdir sboms
231231
cp javaagent/build/spdx/*.spdx.json sboms
232232
233-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
233+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
234234
name: Upload SBOMs
235235
with:
236236
name: opentelemetry-java-instrumentation-SBOM.zip
@@ -247,6 +247,7 @@ jobs:
247247
- 17
248248
- 21
249249
- 25 # renovate: datasource=java-version
250+
- 25-deny-unsafe
250251
vm:
251252
- hotspot
252253
- openj9
@@ -260,6 +261,8 @@ jobs:
260261
- true
261262
exclude:
262263
- vm: ${{ inputs.skip-openj9-tests && 'openj9' || '' }}
264+
- test-java-version: 25-deny-unsafe
265+
vm: openj9
263266
fail-fast: false
264267
steps:
265268
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -273,7 +276,7 @@ jobs:
273276
with:
274277
# using zulu because new releases get published quickly
275278
distribution: ${{ matrix.vm == 'hotspot' && 'zulu' || 'adopt-openj9'}}
276-
java-version: ${{ matrix.test-java-version }}
279+
java-version: ${{ matrix.test-java-version != '25-deny-unsafe' && matrix.test-java-version || '25' }}
277280

278281
- name: Set up JDK for running Gradle
279282
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -329,6 +332,7 @@ jobs:
329332
-PtestJavaVersion=${{ matrix.test-java-version }}
330333
-PtestJavaVM=${{ matrix.vm }}
331334
-PtestIndy=${{ matrix.test-indy }}
335+
-PdenyUnsafe=${{ matrix.test-java-version == '25-deny-unsafe' && 'true' || 'false' }}
332336
-Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
333337
-Porg.gradle.java.installations.auto-download=false
334338
${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
@@ -381,15 +385,15 @@ jobs:
381385
382386
- name: Upload deadlock detector artifacts if any
383387
if: failure()
384-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
388+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
385389
with:
386390
name: deadlock-detector-test-${{ matrix.test-java-version }}-${{ matrix.vm }}-${{ matrix.test-partition }}-indy-${{ matrix.test-indy }}
387391
path: /tmp/deadlock-detector-*
388392
if-no-files-found: ignore
389393

390394
- name: Upload jvm crash dump files if any
391395
if: failure()
392-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
396+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
393397
with:
394398
name: javacore-test-${{ matrix.test-java-version }}-${{ matrix.test-partition }}
395399
path: |
@@ -461,7 +465,7 @@ jobs:
461465

462466
- name: Upload jvm crash dump files if any
463467
if: failure()
464-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
468+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
465469
with:
466470
name: javacore-smoke-test-${{ matrix.smoke-test-suite }}-${{ matrix.os }}
467471
# we expect crash dumps either in root director or in smoke-tests

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
cache-read-only: ${{ github.event_name == 'pull_request' }}
6464

6565
- name: Initialize CodeQL
66-
uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
66+
uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
6767
with:
6868
languages: ${{ matrix.language }}
6969
# using "linked" helps to keep up with the linked Kotlin support
@@ -84,6 +84,6 @@ jobs:
8484
--no-build-cache --no-daemon
8585
8686
- name: Perform CodeQL analysis
87-
uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
87+
uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
8888
with:
8989
category: "/language:${{matrix.language}}"

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
# uploads of run results in SARIF format to the repository Actions tab.
3434
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
3535
- name: "Upload artifact"
36-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
36+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
3737
with:
3838
name: SARIF file
3939
path: results.sarif
@@ -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@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
45+
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
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
@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Upload report
4040
if: always()
41-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
41+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
4242
with:
4343
path: javaagent/build/reports
4444

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
cp javaagent/build/spdx/*.spdx.json sboms
124124
zip opentelemetry-java-instrumentation-SBOM.zip sboms/*
125125
126-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
126+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
127127
name: Upload SBOMs
128128
with:
129129
name: opentelemetry-java-instrumentation-SBOM

0 commit comments

Comments
 (0)