Skip to content

Commit 9857868

Browse files
akats7akats7
authored
Merge branch 'open-telemetry:main' into dynamo-v1_11
2 parents fd2f694 + 11773aa commit 9857868

File tree

576 files changed

+13525
-8743
lines changed

Some content is hidden

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

576 files changed

+13525
-8743
lines changed

‎.github/renovate.json5‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"groupName": "quarkus packages"
4747
},
4848
{
49-
"matchPackagePrefixes": ["com.gradle.enterprise"],
50-
"groupName": "gradle enterprise packages"
49+
"matchPackagePrefixes": ["com.gradle.develocity"],
50+
"groupName": "gradle develocity packages"
5151
},
5252
{
5353
"matchPackagePrefixes": ["org.eclipse.jetty:"],

‎.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@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
75+
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
7676

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

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
java-version-file: .java-version
3939

4040
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
41+
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
4242
with:
4343
cache-read-only: ${{ inputs.cache-read-only }}
4444
# gradle enterprise is used for the build cache
@@ -54,7 +54,7 @@ jobs:
5454
steps:
5555
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5656

57-
- uses: gradle/actions/wrapper-validation@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
57+
- uses: gradle/actions/wrapper-validation@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
5858

5959
license-check:
6060
runs-on: ubuntu-latest
@@ -71,7 +71,7 @@ jobs:
7171
java-version-file: .java-version
7272

7373
- name: Setup Gradle
74-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
74+
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
7575
with:
7676
cache-read-only: ${{ inputs.cache-read-only }}
7777
# gradle enterprise is used for the build cache
@@ -144,7 +144,7 @@ jobs:
144144
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
145145
146146
- name: Setup Gradle
147-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
147+
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
148148
with:
149149
cache-read-only: ${{ inputs.cache-read-only }}
150150
# gradle enterprise is used for the build cache
@@ -247,7 +247,7 @@ jobs:
247247
run: .github/scripts/deadlock-detector.sh
248248

249249
- name: Setup Gradle
250-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
250+
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
251251
with:
252252
# only push cache for one matrix option since github action cache space is limited
253253
cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
@@ -346,7 +346,7 @@ jobs:
346346
java-version-file: .java-version
347347

348348
- name: Set up Gradle cache
349-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
349+
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
350350
with:
351351
# only push cache for one matrix option per OS since github action cache space is limited
352352
cache-read-only: ${{ inputs.cache-read-only || matrix.smoke-test-suite != 'tomcat' }}
@@ -399,7 +399,7 @@ jobs:
399399
java-version-file: .java-version
400400

401401
- name: Setup Gradle
402-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
402+
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
403403
with:
404404
cache-read-only: ${{ inputs.cache-read-only }}
405405

@@ -422,7 +422,7 @@ jobs:
422422
java-version-file: .java-version
423423

424424
- name: Set up Gradle cache
425-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
425+
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
426426
with:
427427
cache-read-only: ${{ inputs.cache-read-only }}
428428

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
java-version-file: .java-version
7474

7575
- name: Setup Gradle
76-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
76+
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
7777
with:
7878
# gradle enterprise is used for the build cache
7979
gradle-home-cache-excludes: caches/build-cache-1

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

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

3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
33+
uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
3434
with:
3535
languages: java
3636
# using "latest" helps to keep up with the latest Kotlin support
3737
# see https://github.com/github/codeql-action/issues/1555#issuecomment-1452228433
3838
tools: latest
3939

4040
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
41+
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
4242

4343
- name: Build
4444
# skipping build cache is needed so that all modules will be analyzed
4545
run: ./gradlew assemble -x javadoc --no-build-cache --no-daemon
4646

4747
- name: Perform CodeQL analysis
48-
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
48+
uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
4949

5050
workflow-notification:
5151
needs:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
rsync -avv gh-pages/benchmark-overhead/results/ benchmark-overhead/results/
2525
2626
- name: Setup Gradle
27-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
27+
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
2828

2929
- name: Run tests
3030
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
@@ -28,7 +28,7 @@ jobs:
2828
run: |
2929
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
3030
31-
- uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
31+
- uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
3232

3333
- run: ./gradlew :javaagent:dependencyCheckAnalyze
3434
env:

‎.github/workflows/pr-smoke-test-early-jdk8-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
java-version-file: .java-version
2626

2727
- name: Setup Gradle
28-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
28+
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
2929
with:
3030
cache-read-only: true
3131
# gradle enterprise is used for the build cache

‎.github/workflows/pr-smoke-test-fake-backend-images.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
java-version-file: .java-version
2626

2727
- name: Setup Gradle
28-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
28+
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
2929
with:
3030
cache-read-only: true
3131
# gradle enterprise is used for the build cache
@@ -52,7 +52,7 @@ jobs:
5252
java-version-file: .java-version
5353

5454
- name: Setup Gradle
55-
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
55+
uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed # v4.2.0
5656
with:
5757
cache-read-only: true
5858

‎.github/workflows/pr-smoke-test-quarkus-images.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ jobs:
1515
with:
1616
project: ":smoke-tests:images:quarkus"
1717
cache-read-only: true
18-
# Quarkus 2.0+ does not support Java 8
18+
# Quarkus 3.7+ requires Java 17+
1919
skip-java-8: true
20+
skip-java-11: true

0 commit comments

Comments
 (0)