Skip to content

Commit 02f6b75

Browse files
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into jvm-jmx-metrics
2 parents 238862c + 353ec10 commit 02f6b75

File tree

160 files changed

+6354
-614
lines changed

Some content is hidden

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

160 files changed

+6354
-614
lines changed

.fossa.yml

+3
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,9 @@ targets:
895895
- type: gradle
896896
path: ./
897897
target: ':instrumentation:spring:spring-kafka-2.7:library'
898+
- type: gradle
899+
path: ./
900+
target: ':instrumentation:spring:spring-pulsar-1.0:javaagent'
898901
- type: gradle
899902
path: ./
900903
target: ':instrumentation:spring:spring-rabbit-1.0:javaagent'

.github/workflows/build-common.yml

+24-10
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ jobs:
223223
path: "sboms/*.json"
224224

225225
test:
226-
name: test${{ matrix.test-partition }} (${{ matrix.test-java-version }}, ${{ matrix.vm }})
226+
name: test${{ matrix.test-partition }} (${{ matrix.test-java-version }}, ${{ matrix.vm }}, indy ${{ matrix.test-indy }})
227227
runs-on: ubuntu-latest
228228
strategy:
229229
matrix:
@@ -233,6 +233,7 @@ jobs:
233233
- 17
234234
- 21
235235
- 23
236+
- 24-ea
236237
vm:
237238
- hotspot
238239
- openj9
@@ -241,8 +242,13 @@ jobs:
241242
- 1
242243
- 2
243244
- 3
245+
test-indy:
246+
- false
247+
- true
244248
exclude:
245249
- vm: ${{ inputs.skip-openj9-tests && 'openj9' || '' }}
250+
- test-java-version: 24-ea
251+
vm: openj9
246252
fail-fast: false
247253
steps:
248254
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -307,6 +313,7 @@ jobs:
307313
${{ env.test-tasks }}
308314
-PtestJavaVersion=${{ matrix.test-java-version }}
309315
-PtestJavaVM=${{ matrix.vm }}
316+
-PtestIndy=${{ matrix.test-indy }}
310317
-Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
311318
-Porg.gradle.java.installations.auto-download=false
312319
${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
@@ -324,15 +331,22 @@ jobs:
324331
with:
325332
result-encoding: string
326333
script: |
327-
const { data: workflow_run } = await github.rest.actions.listJobsForWorkflowRun({
328-
owner: context.repo.owner,
329-
repo: context.repo.repo,
330-
run_id: context.runId,
331-
per_page: 100
332-
});
333334
const matrix = JSON.parse(process.env.matrix);
334-
const job_name = `common / test${ matrix['test-partition'] } (${ matrix['test-java-version'] }, ${ matrix.vm })`;
335-
return workflow_run.jobs.find((job) => job.name === job_name).html_url;
335+
const job_name = `common / test${ matrix['test-partition'] } (${ matrix['test-java-version'] }, ${ matrix.vm }, indy ${ matrix['test-indy'] })`;
336+
337+
const workflow_jobs_nested = await github.paginate(
338+
github.rest.actions.listJobsForWorkflowRun,
339+
{
340+
owner: context.repo.owner,
341+
repo: context.repo.repo,
342+
run_id: context.runId,
343+
per_page: 100
344+
},
345+
(response) => {
346+
return response.data;
347+
},
348+
);
349+
return workflow_jobs_nested.flat().find((job) => job.name === job_name).html_url;
336350
337351
- name: Flaky test report
338352
if: ${{ !cancelled() }}
@@ -349,7 +363,7 @@ jobs:
349363
if: failure()
350364
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
351365
with:
352-
name: deadlock-detector-test-${{ matrix.test-java-version }}-${{ matrix.vm }}-${{ matrix.test-partition }}
366+
name: deadlock-detector-test-${{ matrix.test-java-version }}-${{ matrix.vm }}-${{ matrix.test-partition }}-indy-${{ matrix.test-indy }}
353367
path: /tmp/deadlock-detector-*
354368
if-no-files-found: ignore
355369

.github/workflows/build-daily-no-build-cache.yml

-7
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@ jobs:
2424
secrets:
2525
FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
2626

27-
test-indy:
28-
uses: ./.github/workflows/reusable-test-indy.yml
29-
with:
30-
no-build-cache: true
31-
secrets:
32-
FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
33-
3427
# muzzle is not included here because it doesn't use gradle cache anyway and so is already covered
3528
# by the normal daily build
3629

.github/workflows/build-daily.yml

-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ jobs:
2020
secrets:
2121
FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
2222

23-
test-indy:
24-
uses: ./.github/workflows/reusable-test-indy.yml
25-
secrets:
26-
FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
27-
2823
muzzle:
2924
uses: ./.github/workflows/reusable-muzzle.yml
3025

.github/workflows/build-pull-request.yml

-5
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ jobs:
2929
with:
3030
cache-read-only: true
3131

32-
test-indy:
33-
uses: ./.github/workflows/reusable-test-indy.yml
34-
with:
35-
cache-read-only: true
36-
3732
test-native:
3833
uses: ./.github/workflows/reusable-native-tests.yml
3934
with:

.github/workflows/codeql.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
contents: read
2626
actions: read # for github/codeql-action/init to get workflow details
2727
security-events: write # for github/codeql-action/analyze to upload SARIF results
28-
runs-on: otel-linux-latest-8-cores
28+
runs-on: oracle-8cpu-32gb-x86-64
2929

3030
steps:
3131
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -50,7 +50,7 @@ jobs:
5050
cache-read-only: ${{ github.event_name == 'pull_request' }}
5151

5252
- name: Initialize CodeQL
53-
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
53+
uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
5454
with:
5555
languages: java, actions
5656
# using "latest" helps to keep up with the latest Kotlin support
@@ -65,4 +65,4 @@ jobs:
6565
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
6666

6767
- name: Perform CodeQL analysis
68-
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
68+
uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11

.github/workflows/ossf-scorecard.yml

+1-1
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@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
45+
uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
4646
with:
4747
sarif_file: results.sarif

.github/workflows/reusable-native-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2222
- id: read-java
2323
run: echo "version=$(cat .java-version)" >> "$GITHUB_OUTPUT"
24-
- uses: graalvm/setup-graalvm@b0cb26a8da53cb3e97cdc0c827d8e3071240e730 # v1.3.1.1
24+
- uses: graalvm/setup-graalvm@01ed653ac833fe80569f1ef9f25585ba2811baab # v1.3.3.1
2525
with:
2626
version: "latest"
2727
java-version: "${{ steps.read-java.outputs.version }}"

.github/workflows/reusable-test-indy.yml

-115
This file was deleted.

benchmark-overhead/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ repositories {
1818
dependencies {
1919
implementation(enforcedPlatform("org.junit:junit-bom:5.12.0"))
2020

21-
testImplementation("org.testcontainers:testcontainers:1.20.5")
22-
testImplementation("org.testcontainers:postgresql:1.20.5")
21+
testImplementation("org.testcontainers:testcontainers:1.20.6")
22+
testImplementation("org.testcontainers:postgresql:1.20.6")
2323
testImplementation("org.junit.jupiter:junit-jupiter-api")
2424
testImplementation("org.junit.jupiter:junit-jupiter-params")
2525
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ codenarc {
431431
checkstyle {
432432
configFile = rootProject.file("buildscripts/checkstyle.xml")
433433
// this version should match the version of google_checks.xml used as basis for above configuration
434-
toolVersion = "10.21.3"
434+
toolVersion = "10.21.4"
435435
maxWarnings = 0
436436
}
437437

dependencyManagement/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
data class DependencySet(val group: String, val version: String, val modules: List<String>)
66

77
// this line is managed by .github/scripts/update-sdk-version.sh
8-
val otelSdkVersion = "1.47.0"
8+
val otelSdkVersion = "1.48.0"
99
val otelContribVersion = "1.44.0-alpha"
1010
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
1111

@@ -33,7 +33,7 @@ val DEPENDENCY_BOMS = listOf(
3333
"org.apache.groovy:groovy-bom:${groovyVersion}",
3434
"io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
3535
"io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",
36-
"org.testcontainers:testcontainers-bom:1.20.5"
36+
"org.testcontainers:testcontainers-bom:1.20.6"
3737
)
3838

3939
val autoServiceVersion = "1.1.1"

0 commit comments

Comments
 (0)