Skip to content

Commit 3fb71c2

Browse files
trasktrask
authored
Merge branch 'main' into close-bridged-instruments
2 parents 1d20775 + af832da commit 3fb71c2

356 files changed

Lines changed: 3624 additions & 2134 deletions

File tree

Some content is hidden

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

‎.fossa.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -658,9 +658,6 @@ targets:
658658
- type: gradle
659659
path: ./
660660
target: ':instrumentation:ktor:ktor-1.0:library'
661-
- type: gradle
662-
path: ./
663-
target: ':instrumentation:ktor:ktor-2-common:library'
664661
- type: gradle
665662
path: ./
666663
target: ':instrumentation:ktor:ktor-2.0:javaagent'
@@ -676,6 +673,9 @@ targets:
676673
- type: gradle
677674
path: ./
678675
target: ':instrumentation:ktor:ktor-common:library'
676+
- type: gradle
677+
path: ./
678+
target: ':instrumentation:ktor:ktor-common-2.0:library'
679679
- type: gradle
680680
path: ./
681681
target: ':instrumentation:lettuce:lettuce-4.0:javaagent'

‎.github/config/lychee.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ max_concurrency = 4
1010
include_fragments = true
1111

1212
remap = [
13-
"https://docs.oracle.com/(.*)#.*$ https://docs.oracle.com/$1"
13+
"https://docs.oracle.com/(.*)#.*$ https://docs.oracle.com/$1",
14+
# lychee doesn't understand scroll to text fragment anchors
15+
"https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/examples/extension/build.gradle#:~:text=extendedAgent https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/examples/extension/build.gradle"
1416
]
1517

1618
# excluding links to pull requests and issues is done for performance

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
java-version-file: .java-version
2828

2929
- name: Set up gradle
30-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
30+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
3131
with:
3232
cache-read-only: true
3333

@@ -45,7 +45,7 @@ jobs:
4545
4646
- name: Upload patch file
4747
if: steps.create-patch.outputs.exists == 'true'
48-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
48+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
4949
with:
5050
path: patch
5151
name: patch
@@ -56,7 +56,7 @@ jobs:
5656
needs: generate
5757
steps:
5858
- name: Download patch
59-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
59+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
6060
with:
6161
path: ${{ runner.temp }}
6262

‎.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@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
75+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
7676

7777
- name: Update license report
7878
# with the build cache enabled occasionally produces outdated results

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
java-version-file: .java-version
4141

4242
- name: Setup Gradle
43-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
43+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
4444
with:
4545
cache-read-only: ${{ inputs.cache-read-only }}
4646

@@ -64,7 +64,7 @@ jobs:
6464
java-version-file: .java-version
6565

6666
- name: Setup Gradle
67-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
67+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
6868
with:
6969
cache-read-only: ${{ inputs.cache-read-only }}
7070

@@ -105,7 +105,7 @@ jobs:
105105
java-version-file: .java-version
106106

107107
- name: Setup Gradle
108-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
108+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
109109
with:
110110
cache-read-only: ${{ inputs.cache-read-only }}
111111

@@ -193,7 +193,7 @@ jobs:
193193
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
194194
195195
- name: Setup Gradle
196-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
196+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
197197
with:
198198
cache-read-only: ${{ inputs.cache-read-only }}
199199

@@ -219,7 +219,7 @@ jobs:
219219
fi
220220
221221
- name: Upload agent jar
222-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
222+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.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@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
233+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
234234
name: Upload SBOMs
235235
with:
236236
name: opentelemetry-java-instrumentation-SBOM.zip
@@ -304,7 +304,7 @@ jobs:
304304
run: .github/scripts/deadlock-detector.sh
305305

306306
- name: Setup Gradle
307-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
307+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
308308
with:
309309
# only push cache for one matrix option since github action cache space is limited
310310
cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
@@ -388,15 +388,15 @@ jobs:
388388
389389
- name: Upload deadlock detector artifacts if any
390390
if: failure()
391-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
391+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
392392
with:
393393
name: deadlock-detector-test-${{ matrix.test-java-version }}-${{ matrix.vm }}-${{ matrix.test-partition }}-indy-${{ matrix.test-indy }}
394394
path: /tmp/deadlock-detector-*
395395
if-no-files-found: ignore
396396

397397
- name: Upload jvm crash dump files if any
398398
if: failure()
399-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
399+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
400400
with:
401401
name: javacore-test-${{ matrix.test-java-version }}-${{ matrix.test-partition }}
402402
path: |
@@ -445,7 +445,7 @@ jobs:
445445
java-version-file: .java-version
446446

447447
- name: Set up Gradle cache
448-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
448+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
449449
with:
450450
# only push cache for one matrix option per OS since github action cache space is limited
451451
cache-read-only: ${{ inputs.cache-read-only || matrix.smoke-test-suite != 'tomcat' }}
@@ -468,7 +468,7 @@ jobs:
468468

469469
- name: Upload jvm crash dump files if any
470470
if: failure()
471-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
471+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
472472
with:
473473
name: javacore-smoke-test-${{ matrix.smoke-test-suite }}-${{ matrix.os }}
474474
# we expect crash dumps either in root director or in smoke-tests
@@ -501,7 +501,7 @@ jobs:
501501
java-version-file: .java-version
502502

503503
- name: Setup Gradle
504-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
504+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
505505
with:
506506
cache-read-only: ${{ inputs.cache-read-only }}
507507

@@ -524,7 +524,7 @@ jobs:
524524
java-version-file: .java-version
525525

526526
- name: Set up Gradle cache
527-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
527+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
528528
with:
529529
cache-read-only: ${{ inputs.cache-read-only }}
530530

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
java-version-file: .java-version
4949

5050
- name: Setup Gradle
51-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
51+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
5252

5353
- name: Build and publish artifact snapshots
5454
env:

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
5959
- name: Set up Gradle
6060
if: matrix.language == 'java'
61-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
61+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
6262
with:
6363
cache-read-only: ${{ github.event_name == 'pull_request' }}
6464

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ jobs:
2222
java-version-file: .java-version
2323

2424
- name: Setup Gradle
25-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
25+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
2626
with:
2727
cache-read-only: true

‎.github/workflows/documentation-synchronization-audit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
java-version-file: .java-version
2222

2323
- name: Set up gradle
24-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
24+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
2525

2626
- name: Run instrumentation analyzer (identify any module changes)
2727
run: ./gradlew :instrumentation-docs:runAnalysis

‎.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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1515

1616
# this needs to be in its own workflow in order to make OSSF scorecard happy
17-
- uses: gradle/actions/wrapper-validation@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
17+
- uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2

0 commit comments

Comments
 (0)