Skip to content

Commit 524d072

Browse files
authored
Merge branch 'open-telemetry:main' into kafka-client
2 parents 4a8ff50 + 56067c4 commit 524d072

File tree

250 files changed

+4690
-2139
lines changed

Some content is hidden

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

250 files changed

+4690
-2139
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
java-version-file: .java-version
2929

3030
- name: Set up gradle
31-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
31+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
3232
with:
3333
cache-read-only: true
3434

@@ -43,6 +43,7 @@ jobs:
4343
- id: create-patch
4444
name: Create patch file
4545
run: |
46+
git add -N licenses
4647
git diff > patch
4748
if [ -s patch ]; then
4849
echo "exists=true" >> "$GITHUB_OUTPUT"

.github/workflows/auto-spotless.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
java-version-file: .java-version
2929

3030
- name: Set up gradle
31-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
31+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
3232
with:
3333
cache-read-only: true
3434

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

Lines changed: 1 addition & 1 deletion
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@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
75+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
7676

7777
- name: Update license report
7878
run: ./gradlew generateLicenseReport

.github/workflows/build-common.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
java-version-file: .java-version
4242

4343
- name: Setup Gradle
44-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
44+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
4545
with:
4646
cache-read-only: ${{ inputs.cache-read-only }}
4747

@@ -63,7 +63,7 @@ jobs:
6363
java-version-file: .java-version
6464

6565
- name: Setup Gradle
66-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
66+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
6767
with:
6868
cache-read-only: ${{ inputs.cache-read-only }}
6969

@@ -102,7 +102,7 @@ jobs:
102102
java-version-file: .java-version
103103

104104
- name: Setup Gradle
105-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
105+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
106106
with:
107107
cache-read-only: ${{ inputs.cache-read-only }}
108108

@@ -189,7 +189,7 @@ jobs:
189189
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
190190
191191
- name: Setup Gradle
192-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
192+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
193193
with:
194194
cache-read-only: ${{ inputs.cache-read-only }}
195195

@@ -301,7 +301,7 @@ jobs:
301301
run: .github/scripts/deadlock-detector.sh
302302

303303
- name: Setup Gradle
304-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
304+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
305305
with:
306306
# only push cache for one matrix option since github action cache space is limited
307307
cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
@@ -432,7 +432,7 @@ jobs:
432432
java-version-file: .java-version
433433

434434
- name: Set up Gradle cache
435-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
435+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
436436
with:
437437
# only push cache for one matrix option per OS since github action cache space is limited
438438
cache-read-only: ${{ inputs.cache-read-only || matrix.smoke-test-suite != 'tomcat' }}
@@ -445,6 +445,10 @@ jobs:
445445
- name: Test
446446
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }} ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
447447

448+
- name: Build scan
449+
if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}
450+
run: cat build-scan.txt
451+
448452
- name: Upload jvm crash dump files if any
449453
if: failure()
450454
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -480,7 +484,7 @@ jobs:
480484
java-version-file: .java-version
481485

482486
- name: Setup Gradle
483-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
487+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
484488
with:
485489
cache-read-only: ${{ inputs.cache-read-only }}
486490

@@ -503,7 +507,7 @@ jobs:
503507
java-version-file: .java-version
504508

505509
- name: Set up Gradle cache
506-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
510+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
507511
with:
508512
cache-read-only: ${{ inputs.cache-read-only }}
509513

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
java-version-file: .java-version
7777

7878
- name: Setup Gradle
79-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
79+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
8080

8181
- name: Build and publish artifact snapshots
8282
env:

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ jobs:
5252
5353
- name: Set up Gradle
5454
if: matrix.language == 'java'
55-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
55+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
5656
with:
5757
cache-read-only: ${{ github.event_name == 'pull_request' }}
5858

5959
- name: Initialize CodeQL
60-
uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
60+
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
6161
with:
6262
languages: ${{ matrix.language }}
6363
# using "latest" helps to keep up with the latest Kotlin support
@@ -73,6 +73,6 @@ jobs:
7373
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
7474

7575
- name: Perform CodeQL analysis
76-
uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
76+
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
7777
with:
7878
category: "/language:${{matrix.language}}"

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

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

1616
# this needs to be in its own workflow in order to make OSSF scorecard happy
17-
- uses: gradle/actions/wrapper-validation@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
17+
- uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1

.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@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
45+
uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
4646
with:
4747
sarif_file: results.sarif

.github/workflows/overhead-benchmark-daily.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
rsync -avv gh-pages/benchmark-overhead/results/ benchmark-overhead/results/
3030
3131
- name: Setup Gradle
32-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
32+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
3333

3434
- name: Run tests
3535
working-directory: benchmark-overhead

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: |
3131
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
3232
33-
- uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
33+
- uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
3434

3535
- run: ./gradlew :javaagent:dependencyCheckAnalyze
3636
env:

0 commit comments

Comments
 (0)