Skip to content

Commit 2865b05

Browse files
jaydelucajaydeluca
committed
Merge branch 'main' of github.com:jaydeluca/opentelemetry-java-instrumentation into generate-docs
2 parents c6808f2 + d28aca1 commit 2865b05

File tree

43 files changed

+824
-259
lines changed

Some content is hidden

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

43 files changed

+824
-259
lines changed

‎.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/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

+1-1
Original file line numberDiff line numberDiff line change
@@ -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"

‎examples/distro/smoke-tests/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ plugins {
33
}
44

55
dependencies {
6-
testImplementation("org.testcontainers:testcontainers:1.20.5")
6+
testImplementation("org.testcontainers:testcontainers:1.20.6")
77
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.3")
8-
testImplementation("com.google.protobuf:protobuf-java-util:4.29.3")
8+
testImplementation("com.google.protobuf:protobuf-java-util:4.30.0")
99
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
1010
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha")
1111
testImplementation("io.opentelemetry:opentelemetry-api")

‎examples/extension/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ dependencies {
9797
implementation 'org.apache.commons:commons-lang3:3.17.0'
9898

9999
//All dependencies below are only for tests
100-
testImplementation("org.testcontainers:testcontainers:1.20.5")
100+
testImplementation("org.testcontainers:testcontainers:1.20.6")
101101
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.3")
102-
testImplementation("com.google.protobuf:protobuf-java-util:4.29.3")
102+
testImplementation("com.google.protobuf:protobuf-java-util:4.30.0")
103103
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
104104
testImplementation("io.opentelemetry:opentelemetry-api")
105105
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha")

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/genai/GenAiAttributesExtractor.java

+6-10
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,14 @@ public final class GenAiAttributesExtractor<REQUEST, RESPONSE>
2929
implements AttributesExtractor<REQUEST, RESPONSE> {
3030

3131
// copied from GenAiIncubatingAttributes
32-
private static final AttributeKey<String> GEN_AI_OPERATION_NAME =
33-
stringKey("gen_ai.operation.name");
32+
static final AttributeKey<String> GEN_AI_OPERATION_NAME = stringKey("gen_ai.operation.name");
3433
private static final AttributeKey<List<String>> GEN_AI_REQUEST_ENCODING_FORMATS =
3534
stringArrayKey("gen_ai.request.encoding_formats");
3635
private static final AttributeKey<Double> GEN_AI_REQUEST_FREQUENCY_PENALTY =
3736
doubleKey("gen_ai.request.frequency_penalty");
3837
private static final AttributeKey<Long> GEN_AI_REQUEST_MAX_TOKENS =
3938
longKey("gen_ai.request.max_tokens");
40-
private static final AttributeKey<String> GEN_AI_REQUEST_MODEL =
41-
stringKey("gen_ai.request.model");
39+
static final AttributeKey<String> GEN_AI_REQUEST_MODEL = stringKey("gen_ai.request.model");
4240
private static final AttributeKey<Double> GEN_AI_REQUEST_PRESENCE_PENALTY =
4341
doubleKey("gen_ai.request.presence_penalty");
4442
private static final AttributeKey<Long> GEN_AI_REQUEST_SEED = longKey("gen_ai.request.seed");
@@ -53,12 +51,10 @@ public final class GenAiAttributesExtractor<REQUEST, RESPONSE>
5351
private static final AttributeKey<List<String>> GEN_AI_RESPONSE_FINISH_REASONS =
5452
stringArrayKey("gen_ai.response.finish_reasons");
5553
private static final AttributeKey<String> GEN_AI_RESPONSE_ID = stringKey("gen_ai.response.id");
56-
private static final AttributeKey<String> GEN_AI_RESPONSE_MODEL =
57-
stringKey("gen_ai.response.model");
58-
private static final AttributeKey<String> GEN_AI_SYSTEM = stringKey("gen_ai.system");
59-
private static final AttributeKey<Long> GEN_AI_USAGE_INPUT_TOKENS =
60-
longKey("gen_ai.usage.input_tokens");
61-
private static final AttributeKey<Long> GEN_AI_USAGE_OUTPUT_TOKENS =
54+
static final AttributeKey<String> GEN_AI_RESPONSE_MODEL = stringKey("gen_ai.response.model");
55+
static final AttributeKey<String> GEN_AI_SYSTEM = stringKey("gen_ai.system");
56+
static final AttributeKey<Long> GEN_AI_USAGE_INPUT_TOKENS = longKey("gen_ai.usage.input_tokens");
57+
static final AttributeKey<Long> GEN_AI_USAGE_OUTPUT_TOKENS =
6258
longKey("gen_ai.usage.output_tokens");
6359

6460
/** Creates the GenAI attributes extractor. */

0 commit comments

Comments
 (0)