Skip to content

Commit f381c67

Browse files
SylvainJugeSylvainJuge
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-rmi
2 parents 9c251f0 + accd51b commit f381c67

File tree

412 files changed

+7446
-3579
lines changed

Some content is hidden

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

412 files changed

+7446
-3579
lines changed

‎.github/scripts/check-javaagent-suppression-keys.sh‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
#!/bin/bash -e
2+
3+
# shellcheck disable=SC2044
4+
for file in $(find instrumentation -name "*Module.java"); do
5+
6+
if ! grep -q "extends InstrumentationModule" "$file"; then
7+
continue
8+
fi
9+
10+
if [[ "$file" != *"/javaagent/src/"* ]]; then
11+
continue
12+
fi
13+
14+
# shellcheck disable=SC2001
15+
module_name=$(echo "$file" | sed 's#.*/\([^/]*\)/javaagent/src/.*#\1#')
16+
# shellcheck disable=SC2001
17+
simple_module_name=$(echo "$module_name" | sed 's/-[0-9.]*$//')
18+
19+
if [[ "$simple_module_name" == *jaxrs* ]]; then
20+
# TODO these need some work still
21+
continue
22+
fi
23+
if [[ "$simple_module_name" == *jaxws* ]]; then
24+
# TODO these need some work still
25+
continue
26+
fi
27+
if [[ "$simple_module_name" == jdbc ]]; then
28+
# TODO split jdbc-datasource out into separate instrumentation?
29+
continue
30+
fi
31+
if [[ "$simple_module_name" == kafka-clients ]]; then
32+
# TODO split kafka client metrics out into separate instrumentation?
33+
continue
34+
fi
35+
if [[ "$simple_module_name" == quarkus-resteasy-reactive ]]; then
36+
# TODO module is missing a base version
37+
continue
38+
fi
39+
40+
if [ "$module_name" == "$simple_module_name" ]; then
41+
expected="super\(\n? *\"$simple_module_name\""
42+
else
43+
expected="super\(\n? *\"$simple_module_name\",\n? *\"$module_name\""
44+
fi
45+
46+
echo "$module_name"
47+
48+
matches=$(perl -0 -ne "print if /$expected/" "$file" | wc -l)
49+
if [ "$matches" == 0 ]; then
50+
echo "Expected to find $expected in $file"
51+
exit 1
52+
fi
53+
54+
done

‎.github/scripts/check-latest-dep-test-overrides.sh‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash -e
2+
3+
# all missing version coverage should be documented in supported-libraries.md
4+
5+
if grep -r --include build.gradle.kts latestDepTestLibrary instrumentation \
6+
| grep -v :+\" \
7+
| grep -v "// see .* module" \
8+
| grep -v "// see test suite below" \
9+
| grep -v "// no longer applicable" \
10+
| grep -v "// related dependency" \
11+
| grep -v "// native on-by-default instrumentation after this version" \
12+
| grep -v "// documented limitation" \
13+
| grep -v "instrumentation/jaxrs-client/jaxrs-client-2.0-testing/build.gradle.kts"; then
14+
15+
echo
16+
echo "Found an undocumented latestDepTestLibrary (see above)."
17+
echo
18+
echo "See .gith/scripts/check-latest-dep-test-overrides.sh in this repository"
19+
echo "and add one of the required comments."
20+
exit 1
21+
fi

‎.github/scripts/find-instrumentation-with-upper-version-limits.sh‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.github/scripts/get-version.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash -e
22

3-
grep -Po "val stableVersion = \"\K[0-9]+.[0-9]+.[0-9]+" version.gradle.kts
3+
grep "val stableVersion = " version.gradle.kts | grep -Eo "[0-9]+.[0-9]+.[0-9]+"

‎.github/scripts/markdown-link-check-config.json‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎.github/scripts/markdown-link-check-with-retry.sh‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ jobs:
6666
run: .github/scripts/gha-free-disk-space.sh
6767

6868
- name: Set up JDK for running Gradle
69-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
69+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
7070
with:
7171
distribution: temurin
7272
java-version-file: .java-version
7373

7474
- name: Setup Gradle
75-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
75+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
7676

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

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

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ jobs:
3232
run: .github/scripts/gha-free-disk-space.sh
3333

3434
- name: Set up JDK for running Gradle
35-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
35+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
3636
with:
3737
distribution: temurin
3838
java-version-file: .java-version
3939

4040
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
41+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
4242
with:
4343
cache-read-only: ${{ inputs.cache-read-only }}
4444
# gradle enterprise is used for the build cache
@@ -52,7 +52,7 @@ jobs:
5252
steps:
5353
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5454

55-
- uses: gradle/actions/wrapper-validation@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
55+
- uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
5656

5757
license-check:
5858
runs-on: ubuntu-latest
@@ -63,13 +63,13 @@ jobs:
6363
run: .github/scripts/gha-free-disk-space.sh
6464

6565
- name: Set up JDK for running Gradle
66-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
66+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
6767
with:
6868
distribution: temurin
6969
java-version-file: .java-version
7070

7171
- name: Setup Gradle
72-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
72+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
7373
with:
7474
cache-read-only: ${{ inputs.cache-read-only }}
7575
# gradle enterprise is used for the build cache
@@ -119,6 +119,20 @@ jobs:
119119
exit 1
120120
fi
121121
122+
check-javaagent-suppression-keys:
123+
runs-on: ubuntu-latest
124+
steps:
125+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
126+
127+
- run: .github/scripts/check-javaagent-suppression-keys.sh
128+
129+
check-latest-dep-test-overrides:
130+
runs-on: ubuntu-latest
131+
steps:
132+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
133+
134+
- run: .github/scripts/check-latest-dep-test-overrides.sh
135+
122136
build:
123137
runs-on: ubuntu-latest
124138
steps:
@@ -128,7 +142,7 @@ jobs:
128142
run: .github/scripts/gha-free-disk-space.sh
129143

130144
- name: Set up JDK for running Gradle
131-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
145+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
132146
with:
133147
distribution: temurin
134148
java-version-file: .java-version
@@ -138,7 +152,7 @@ jobs:
138152
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
139153
140154
- name: Setup Gradle
141-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
155+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
142156
with:
143157
cache-read-only: ${{ inputs.cache-read-only }}
144158
# gradle enterprise is used for the build cache
@@ -163,7 +177,7 @@ jobs:
163177
fi
164178
165179
- name: Upload agent jar
166-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
180+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
167181
with:
168182
name: opentelemetry-javaagent.jar
169183
path: javaagent/build/libs/opentelemetry-javaagent-*-SNAPSHOT.jar
@@ -174,7 +188,7 @@ jobs:
174188
mkdir sboms
175189
cp javaagent/build/spdx/*.spdx.json sboms
176190
177-
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
191+
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
178192
name: Upload SBOMs
179193
with:
180194
name: opentelemetry-java-instrumentation-SBOM.zip
@@ -210,14 +224,14 @@ jobs:
210224

211225
- id: setup-test-java
212226
name: Set up JDK ${{ matrix.test-java-version }}-${{ matrix.vm }} for running tests
213-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
227+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
214228
with:
215229
# using zulu because new releases get published quickly
216230
distribution: ${{ matrix.vm == 'hotspot' && 'zulu' || 'adopt-openj9'}}
217231
java-version: ${{ matrix.test-java-version }}
218232

219233
- name: Set up JDK for running Gradle
220-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
234+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
221235
with:
222236
distribution: temurin
223237
java-version-file: .java-version
@@ -239,7 +253,7 @@ jobs:
239253
run: .github/scripts/deadlock-detector.sh
240254

241255
- name: Setup Gradle
242-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
256+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
243257
with:
244258
# only push cache for one matrix option since github action cache space is limited
245259
cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
@@ -278,15 +292,15 @@ jobs:
278292

279293
- name: Upload deadlock detector artifacts if any
280294
if: failure()
281-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
295+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
282296
with:
283297
name: deadlock-detector-test-${{ matrix.test-java-version }}-${{ matrix.vm }}-${{ matrix.test-partition }}
284298
path: /tmp/deadlock-detector-*
285299
if-no-files-found: ignore
286300

287301
- name: Upload jvm crash dump files if any
288302
if: failure()
289-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
303+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
290304
with:
291305
name: javacore-test-${{ matrix.test-java-version }}-${{ matrix.test-partition }}
292306
path: |
@@ -329,13 +343,13 @@ jobs:
329343
run: .github/scripts/gha-free-disk-space.sh
330344

331345
- name: Set up JDK for running Gradle
332-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
346+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
333347
with:
334348
distribution: temurin
335349
java-version-file: .java-version
336350

337351
- name: Set up Gradle cache
338-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
352+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
339353
with:
340354
# only push cache for one matrix option per OS since github action cache space is limited
341355
cache-read-only: ${{ inputs.cache-read-only || matrix.smoke-test-suite != 'tomcat' }}
@@ -351,7 +365,7 @@ jobs:
351365

352366
- name: Upload jvm crash dump files if any
353367
if: failure()
354-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
368+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
355369
with:
356370
name: javacore-smoke-test-${{ matrix.smoke-test-suite }}-${{ matrix.os }}
357371
# we expect crash dumps either in root director or in smoke-tests
@@ -378,13 +392,13 @@ jobs:
378392
run: .github/scripts/gha-free-disk-space.sh
379393

380394
- name: Set up JDK for running Gradle
381-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
395+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
382396
with:
383397
distribution: temurin
384398
java-version-file: .java-version
385399

386400
- name: Setup Gradle
387-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
401+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
388402
with:
389403
cache-read-only: ${{ inputs.cache-read-only }}
390404

@@ -401,13 +415,13 @@ jobs:
401415
run: .github/scripts/gha-free-disk-space.sh
402416

403417
- name: Set up JDK for running Gradle
404-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
418+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
405419
with:
406420
distribution: temurin
407421
java-version-file: .java-version
408422

409423
- name: Set up Gradle cache
410-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
424+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
411425
with:
412426
cache-read-only: ${{ inputs.cache-read-only }}
413427

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ jobs:
6363
run: .github/scripts/gha-free-disk-space.sh
6464

6565
- name: Set up JDK for running Gradle
66-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
66+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
6767
with:
6868
distribution: temurin
6969
java-version-file: .java-version
7070

7171
- name: Setup Gradle
72-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
72+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
7373
with:
7474
# gradle enterprise is used for the build cache
7575
gradle-home-cache-excludes: caches/build-cache-1

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,28 @@ jobs:
2424
run: .github/scripts/gha-free-disk-space.sh
2525

2626
- name: Set up Java 17
27-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
27+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
2828
with:
2929
distribution: temurin
3030
java-version-file: .java-version
3131

3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
33+
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
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@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
41+
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
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@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
48+
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
4949

5050
workflow-notification:
5151
needs:

0 commit comments

Comments
 (0)