Skip to content

Commit 6d1f871

Browse files
SylvainJugeSylvainJuge
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-vertx
2 parents 196d7c9 + d2a267a commit 6d1f871

File tree

158 files changed

+1308
-2050
lines changed

Some content is hidden

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

158 files changed

+1308
-2050
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ codenarc {
439439
checkstyle {
440440
configFile = rootProject.file("buildscripts/checkstyle.xml")
441441
// this version should match the version of google_checks.xml used as basis for above configuration
442-
toolVersion = "11.0.0"
442+
toolVersion = "11.0.1"
443443
maxWarnings = 0
444444
}
445445

‎dependencyManagement/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ val DEPENDENCY_BOMS = listOf(
2727
// for some reason boms show up as runtime dependencies in license and vulnerability scans
2828
// even if they are only used by test dependencies, so not using junit bom since it is LGPL
2929

30-
"com.fasterxml.jackson:jackson-bom:2.19.2",
30+
"com.fasterxml.jackson:jackson-bom:2.20.0",
3131
"com.google.guava:guava-bom:33.4.8-jre",
3232
"org.apache.groovy:groovy-bom:${groovyVersion}",
3333
"io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",

‎docs/instrumentation-list.yaml‎

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,21 +1321,21 @@ libraries:
13211321
attributes:
13221322
- name: gen_ai.operation.name
13231323
type: STRING
1324-
- name: gen_ai.request.model
1325-
type: STRING
13261324
- name: gen_ai.provider.name
13271325
type: STRING
1326+
- name: gen_ai.request.model
1327+
type: STRING
13281328
- name: gen_ai.client.token.usage
13291329
description: Measures number of input and output tokens used.
13301330
type: HISTOGRAM
13311331
unit: token
13321332
attributes:
13331333
- name: gen_ai.operation.name
13341334
type: STRING
1335-
- name: gen_ai.request.model
1336-
type: STRING
13371335
- name: gen_ai.provider.name
13381336
type: STRING
1337+
- name: gen_ai.request.model
1338+
type: STRING
13391339
- name: gen_ai.token.type
13401340
type: STRING
13411341
spans:
@@ -1385,6 +1385,8 @@ libraries:
13851385
type: STRING
13861386
- name: gen_ai.operation.name
13871387
type: STRING
1388+
- name: gen_ai.provider.name
1389+
type: STRING
13881390
- name: gen_ai.request.max_tokens
13891391
type: LONG
13901392
- name: gen_ai.request.model
@@ -1397,8 +1399,6 @@ libraries:
13971399
type: DOUBLE
13981400
- name: gen_ai.response.finish_reasons
13991401
type: STRING_ARRAY
1400-
- name: gen_ai.provider.name
1401-
type: STRING
14021402
- name: gen_ai.usage.input_tokens
14031403
type: LONG
14041404
- name: gen_ai.usage.output_tokens
@@ -1433,6 +1433,8 @@ libraries:
14331433
type: LONG
14341434
- name: messaging.destination.name
14351435
type: STRING
1436+
- name: messaging.header.Test_Message_Header
1437+
type: STRING_ARRAY
14361438
- name: messaging.message.id
14371439
type: STRING
14381440
- name: messaging.operation
@@ -1465,6 +1467,8 @@ libraries:
14651467
type: LONG
14661468
- name: messaging.destination.name
14671469
type: STRING
1470+
- name: messaging.header.Test_Message_Header
1471+
type: STRING_ARRAY
14681472
- name: messaging.message.id
14691473
type: STRING
14701474
- name: messaging.operation
@@ -1569,6 +1573,8 @@ libraries:
15691573
type: LONG
15701574
- name: messaging.destination.name
15711575
type: STRING
1576+
- name: messaging.header.Test_Message_Header
1577+
type: STRING_ARRAY
15721578
- name: messaging.message.id
15731579
type: STRING
15741580
- name: messaging.operation
@@ -1601,6 +1607,8 @@ libraries:
16011607
type: LONG
16021608
- name: messaging.destination.name
16031609
type: STRING
1610+
- name: messaging.header.Test_Message_Header
1611+
type: STRING_ARRAY
16041612
- name: messaging.message.id
16051613
type: STRING
16061614
- name: messaging.operation
@@ -4646,46 +4654,48 @@ libraries:
46464654
attributes:
46474655
- name: gen_ai.operation.name
46484656
type: STRING
4657+
- name: gen_ai.provider.name
4658+
type: STRING
46494659
- name: gen_ai.request.model
46504660
type: STRING
46514661
- name: gen_ai.response.model
46524662
type: STRING
4653-
- name: gen_ai.provider.name
4654-
type: STRING
46554663
- name: gen_ai.client.token.usage
46564664
description: Measures number of input and output tokens used.
46574665
type: HISTOGRAM
46584666
unit: token
46594667
attributes:
46604668
- name: gen_ai.operation.name
46614669
type: STRING
4670+
- name: gen_ai.provider.name
4671+
type: STRING
46624672
- name: gen_ai.request.model
46634673
type: STRING
46644674
- name: gen_ai.response.model
46654675
type: STRING
4666-
- name: gen_ai.provider.name
4667-
type: STRING
46684676
- name: gen_ai.token.type
46694677
type: STRING
46704678
spans:
46714679
- span_kind: CLIENT
46724680
attributes:
46734681
- name: gen_ai.operation.name
46744682
type: STRING
4683+
- name: gen_ai.provider.name
4684+
type: STRING
46754685
- name: gen_ai.request.encoding_formats
46764686
type: STRING_ARRAY
46774687
- name: gen_ai.request.model
46784688
type: STRING
46794689
- name: gen_ai.response.model
46804690
type: STRING
4681-
- name: gen_ai.provider.name
4682-
type: STRING
46834691
- name: gen_ai.usage.input_tokens
46844692
type: LONG
46854693
- span_kind: INTERNAL
46864694
attributes:
46874695
- name: gen_ai.operation.name
46884696
type: STRING
4697+
- name: gen_ai.provider.name
4698+
type: STRING
46894699
- name: gen_ai.request.frequency_penalty
46904700
type: DOUBLE
46914701
- name: gen_ai.request.max_tokens
@@ -4708,8 +4718,6 @@ libraries:
47084718
type: STRING
47094719
- name: gen_ai.response.model
47104720
type: STRING
4711-
- name: gen_ai.provider.name
4712-
type: STRING
47134721
- name: gen_ai.usage.input_tokens
47144722
type: LONG
47154723
- name: gen_ai.usage.output_tokens
@@ -5669,6 +5677,8 @@ libraries:
56695677
spans:
56705678
- span_kind: CONSUMER
56715679
attributes:
5680+
- name: messaging.header.Test_Message_Header
5681+
type: STRING_ARRAY
56725682
- name: messaging.operation
56735683
type: STRING
56745684
- when: otel.instrumentation.spring-integration.producer.enabled=true
@@ -5740,6 +5750,10 @@ libraries:
57405750
attributes:
57415751
- name: messaging.destination.name
57425752
type: STRING
5753+
- name: messaging.header.Test_Message_Header
5754+
type: STRING_ARRAY
5755+
- name: messaging.header.Test_Message_Int_Header
5756+
type: STRING_ARRAY
57435757
- name: messaging.message.id
57445758
type: STRING
57455759
- name: messaging.operation
@@ -5878,6 +5892,8 @@ libraries:
58785892
attributes:
58795893
- name: messaging.destination.name
58805894
type: STRING
5895+
- name: messaging.header.Test_Message_Header
5896+
type: STRING_ARRAY
58815897
- name: messaging.message.body.size
58825898
type: LONG
58835899
- name: messaging.operation

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
dependencies {
66
testImplementation("org.testcontainers:testcontainers:1.21.3")
7-
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.19.2")
7+
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
88
testImplementation("com.google.protobuf:protobuf-java-util:4.32.0")
99
testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
1010
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")

‎examples/extension/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ dependencies {
9999

100100
//All dependencies below are only for tests
101101
testImplementation("org.testcontainers:testcontainers:1.21.3")
102-
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.19.2")
102+
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
103103
testImplementation("com.google.protobuf:protobuf-java-util:4.32.0")
104104
testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
105105
testImplementation("io.opentelemetry:opentelemetry-api")

‎instrumentation-api-incubator/build.gradle.kts‎

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,6 @@ dependencies {
2828
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
2929
}
3030

31-
testing {
32-
suites {
33-
val testStableSemconv by registering(JvmTestSuite::class) {
34-
targets {
35-
all {
36-
testTask.configure {
37-
jvmArgs("-Dotel.semconv-stability.opt-in=database,code")
38-
}
39-
}
40-
}
41-
}
42-
43-
val testBothSemconv by registering(JvmTestSuite::class) {
44-
targets {
45-
all {
46-
testTask.configure {
47-
jvmArgs("-Dotel.semconv-stability.opt-in=database/dup,code/dup")
48-
}
49-
}
50-
}
51-
}
52-
}
53-
}
54-
5531
tasks {
5632
// exclude auto-generated code
5733
named<Checkstyle>("checkstyleMain") {
@@ -69,7 +45,19 @@ tasks {
6945
dependsOn("generateJflex")
7046
}
7147

48+
val testStableSemconv by registering(Test::class) {
49+
testClassesDirs = sourceSets.test.get().output.classesDirs
50+
classpath = sourceSets.test.get().runtimeClasspath
51+
jvmArgs("-Dotel.semconv-stability.opt-in=database,code")
52+
}
53+
54+
val testBothSemconv by registering(Test::class) {
55+
testClassesDirs = sourceSets.test.get().output.classesDirs
56+
classpath = sourceSets.test.get().runtimeClasspath
57+
jvmArgs("-Dotel.semconv-stability.opt-in=database/dup,code/dup")
58+
}
59+
7260
check {
73-
dependsOn(testing.suites)
61+
dependsOn(testStableSemconv, testBothSemconv)
7462
}
7563
}

‎instrumentation-docs/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ otelJava {
88
}
99

1010
dependencies {
11-
implementation("org.yaml:snakeyaml:2.4")
12-
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.2")
11+
implementation("org.yaml:snakeyaml:2.5")
12+
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.0")
1313
implementation("io.opentelemetry:opentelemetry-sdk-common")
1414

1515
testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))

‎instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorForkJoinInstrumentationModule.java‎ renamed to ‎instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaforkjoin/AkkaActorForkJoinInstrumentationModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.akkaactor;
6+
package io.opentelemetry.javaagent.instrumentation.akkaforkjoin;
77

88
import static java.util.Arrays.asList;
99

‎instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinPoolInstrumentation.java‎ renamed to ‎instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaforkjoin/AkkaForkJoinPoolInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.akkaactor;
6+
package io.opentelemetry.javaagent.instrumentation.akkaforkjoin;
77

88
import static net.bytebuddy.matcher.ElementMatchers.named;
99
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;

‎instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinTaskInstrumentation.java‎ renamed to ‎instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaforkjoin/AkkaForkJoinTaskInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.akkaactor;
6+
package io.opentelemetry.javaagent.instrumentation.akkaforkjoin;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.extendsClass;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;

0 commit comments

Comments
 (0)