From 1b46cf57d1f438748ce80aa46b4989a3096d9f6a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 18:48:55 +0000 Subject: [PATCH 01/52] fix(deps): update dependency io.opentelemetry.semconv:opentelemetry-semconv to v1.24.0-alpha --- dependencyManagement/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 6be655598482..294d8313203b 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -48,7 +48,7 @@ val mockitoVersion = "4.11.0" val slf4jVersion = "2.0.12" val CORE_DEPENDENCIES = listOf( - "io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha", + "io.opentelemetry.semconv:opentelemetry-semconv:1.24.0-alpha", "com.google.auto.service:auto-service:${autoServiceVersion}", "com.google.auto.service:auto-service-annotations:${autoServiceVersion}", "com.google.auto.value:auto-value:${autoValueVersion}", From f2d90cfa507e98f88b340258ce7844b7acc851e6 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Fri, 29 Mar 2024 15:26:31 +0100 Subject: [PATCH 02/52] add semconv migration artifact --- ...rumentation.javaagent-shadowing.gradle.kts | 1 + dependencyManagement/build.gradle.kts | 4 +- examples/distro/gradle/shadow.gradle | 1 + .../build.gradle.kts | 1 + .../build.gradle.kts | 2 + instrumentation-api/build.gradle.kts | 2 + .../network/internal/NetworkAttributes.java | 14 +- .../AddThreadDetailsSpanProcessor.java | 6 +- .../DistroVersionResourceProvider.java | 4 +- javaagent/build.gradle.kts | 1 + licenses/licenses.md | 66 +-- semconv-migration/build.gradle.kts | 12 + .../semconv/ResourceAttributes.java | 305 ++++++++++++ .../semconv/SemanticAttributes.java | 447 ++++++++++++++++++ settings.gradle.kts | 2 + 15 files changed, 824 insertions(+), 44 deletions(-) create mode 100644 semconv-migration/build.gradle.kts create mode 100644 semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java create mode 100644 semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java diff --git a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-shadowing.gradle.kts b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-shadowing.gradle.kts index b5b99a04936d..8cf10f90d7c5 100644 --- a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-shadowing.gradle.kts +++ b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-shadowing.gradle.kts @@ -28,6 +28,7 @@ tasks.withType().configureEach { // relocate(OpenTelemetry API) since these classes live in the bootstrap class loader relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api") relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv") + relocate("io.opentelemetry.semconv.incubating", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv.incubating") relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context") relocate("io.opentelemetry.extension.incubator", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.incubator") } diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 294d8313203b..d1b1259b19a9 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -46,9 +46,11 @@ val asmVersion = "9.7" val jmhVersion = "1.37" val mockitoVersion = "4.11.0" val slf4jVersion = "2.0.12" +val semConvVersion = "1.24.0-alpha" val CORE_DEPENDENCIES = listOf( - "io.opentelemetry.semconv:opentelemetry-semconv:1.24.0-alpha", + "io.opentelemetry.semconv:opentelemetry-semconv:${semConvVersion}", + "io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semConvVersion}", "com.google.auto.service:auto-service:${autoServiceVersion}", "com.google.auto.service:auto-service-annotations:${autoServiceVersion}", "com.google.auto.value:auto-value:${autoValueVersion}", diff --git a/examples/distro/gradle/shadow.gradle b/examples/distro/gradle/shadow.gradle index fa3815cacb76..7eb37e855d76 100644 --- a/examples/distro/gradle/shadow.gradle +++ b/examples/distro/gradle/shadow.gradle @@ -12,6 +12,7 @@ ext.relocatePackages = { shadowJar -> // relocate(OpenTelemetry API) since these classes live in the bootstrap class loader shadowJar.relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api") shadowJar.relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv") + shadowJar.relocate("io.opentelemetry.semconv.incubating", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv.incubating") shadowJar.relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context") shadowJar.relocate("io.opentelemetry.extension.incubator", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.incubator") diff --git a/instrumentation-annotations-support/build.gradle.kts b/instrumentation-annotations-support/build.gradle.kts index 6710e1c19b6c..89851aa23a05 100644 --- a/instrumentation-annotations-support/build.gradle.kts +++ b/instrumentation-annotations-support/build.gradle.kts @@ -12,6 +12,7 @@ dependencies { api("io.opentelemetry:opentelemetry-api") api("io.opentelemetry.semconv:opentelemetry-semconv") + api("io.opentelemetry.semconv:opentelemetry-semconv-incubating") compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") diff --git a/instrumentation-api-incubator/build.gradle.kts b/instrumentation-api-incubator/build.gradle.kts index 8d76a932663a..db660d4adcc0 100644 --- a/instrumentation-api-incubator/build.gradle.kts +++ b/instrumentation-api-incubator/build.gradle.kts @@ -12,6 +12,8 @@ group = "io.opentelemetry.instrumentation" dependencies { api("io.opentelemetry.semconv:opentelemetry-semconv") + api("io.opentelemetry.semconv:opentelemetry-semconv-incubating") + api(project(":semconv-migration")) api(project(":instrumentation-api")) implementation("io.opentelemetry:opentelemetry-extension-incubator") diff --git a/instrumentation-api/build.gradle.kts b/instrumentation-api/build.gradle.kts index e377c61d142b..1107b9f540fd 100644 --- a/instrumentation-api/build.gradle.kts +++ b/instrumentation-api/build.gradle.kts @@ -15,6 +15,8 @@ dependencies { api("io.opentelemetry:opentelemetry-api") implementation("io.opentelemetry:opentelemetry-extension-incubator") implementation("io.opentelemetry.semconv:opentelemetry-semconv") + implementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating") + implementation(project(":semconv-migration")) compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/NetworkAttributes.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/NetworkAttributes.java index 3eec2019daf7..04b223e48576 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/NetworkAttributes.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/NetworkAttributes.java @@ -5,9 +5,6 @@ package io.opentelemetry.instrumentation.api.semconv.network.internal; -import static io.opentelemetry.api.common.AttributeKey.longKey; -import static io.opentelemetry.api.common.AttributeKey.stringKey; - import io.opentelemetry.api.common.AttributeKey; /** @@ -17,13 +14,16 @@ public final class NetworkAttributes { public static final AttributeKey NETWORK_LOCAL_ADDRESS = - stringKey("network.local.address"); + io.opentelemetry.semconv.NetworkAttributes.NETWORK_LOCAL_ADDRESS; - public static final AttributeKey NETWORK_LOCAL_PORT = longKey("network.local.port"); + public static final AttributeKey NETWORK_LOCAL_PORT = + io.opentelemetry.semconv.NetworkAttributes.NETWORK_LOCAL_PORT; - public static final AttributeKey NETWORK_PEER_ADDRESS = stringKey("network.peer.address"); + public static final AttributeKey NETWORK_PEER_ADDRESS = + io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS; - public static final AttributeKey NETWORK_PEER_PORT = longKey("network.peer.port"); + public static final AttributeKey NETWORK_PEER_PORT = + io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_PORT; private NetworkAttributes() {} } diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessor.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessor.java index 44c502b86fff..496d8580ff79 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessor.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessor.java @@ -10,15 +10,15 @@ import io.opentelemetry.sdk.trace.ReadWriteSpan; import io.opentelemetry.sdk.trace.ReadableSpan; import io.opentelemetry.sdk.trace.SpanProcessor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; public class AddThreadDetailsSpanProcessor implements SpanProcessor { @Override public void onStart(Context context, ReadWriteSpan span) { Thread currentThread = Thread.currentThread(); - span.setAttribute(SemanticAttributes.THREAD_ID, currentThread.getId()); - span.setAttribute(SemanticAttributes.THREAD_NAME, currentThread.getName()); + span.setAttribute(ThreadIncubatingAttributes.THREAD_ID, currentThread.getId()); + span.setAttribute(ThreadIncubatingAttributes.THREAD_NAME, currentThread.getName()); } @Override diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/DistroVersionResourceProvider.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/DistroVersionResourceProvider.java index f40eeb88d1b0..53fe1d65a5d1 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/DistroVersionResourceProvider.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/DistroVersionResourceProvider.java @@ -5,8 +5,8 @@ package io.opentelemetry.javaagent.tooling; -import static io.opentelemetry.semconv.ResourceAttributes.TELEMETRY_DISTRO_NAME; -import static io.opentelemetry.semconv.ResourceAttributes.TELEMETRY_DISTRO_VERSION; +import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME; +import static io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION; import com.google.auto.service.AutoService; import io.opentelemetry.api.common.Attributes; diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts index 50477bb1192e..0cad96b3b9a5 100644 --- a/javaagent/build.gradle.kts +++ b/javaagent/build.gradle.kts @@ -36,6 +36,7 @@ listOf(baseJavaagentLibs, javaagentLibs).forEach { exclude("io.opentelemetry", "opentelemetry-api") exclude("io.opentelemetry", "opentelemetry-api-events") exclude("io.opentelemetry.semconv", "opentelemetry-semconv") + exclude("io.opentelemetry.semconv", "opentelemetry-semconv-incubating") // metrics advice API exclude("io.opentelemetry", "opentelemetry-extension-incubator") } diff --git a/licenses/licenses.md b/licenses/licenses.md index 53e42eb696b3..b158ffa1996f 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ # javaagent ## Dependency License Report -_2024-03-28 16:29:02 PDT_ +_2024-04-02 13:45:04 CEST_ ## Apache License, Version 2.0 **1** **Group:** `com.blogspot.mydailyjava` **Name:** `weak-lock-free` **Version:** `0.18` @@ -159,160 +159,164 @@ _2024-03-28 16:29:02 PDT_ > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**36** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv` **Version:** `1.23.1-alpha` +**36** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv` **Version:** `1.24.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/semantic-conventions-java](https://github.com/open-telemetry/semantic-conventions-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**37** **Group:** `io.prometheus` **Name:** `prometheus-metrics-config` **Version:** `1.1.0` +**37** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv-incubating` **Version:** `1.24.0-alpha` +> - **POM Project URL**: [https://github.com/open-telemetry/semantic-conventions-java](https://github.com/open-telemetry/semantic-conventions-java) +> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) + +**38** **Group:** `io.prometheus` **Name:** `prometheus-metrics-config` **Version:** `1.1.0` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**38** **Group:** `io.prometheus` **Name:** `prometheus-metrics-exporter-common` **Version:** `1.1.0` +**39** **Group:** `io.prometheus` **Name:** `prometheus-metrics-exporter-common` **Version:** `1.1.0` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**39** **Group:** `io.prometheus` **Name:** `prometheus-metrics-exporter-httpserver` **Version:** `1.1.0` +**40** **Group:** `io.prometheus` **Name:** `prometheus-metrics-exporter-httpserver` **Version:** `1.1.0` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**40** **Group:** `io.prometheus` **Name:** `prometheus-metrics-exposition-formats` **Version:** `1.1.0` +**41** **Group:** `io.prometheus` **Name:** `prometheus-metrics-exposition-formats` **Version:** `1.1.0` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**41** **Group:** `io.prometheus` **Name:** `prometheus-metrics-model` **Version:** `1.1.0` +**42** **Group:** `io.prometheus` **Name:** `prometheus-metrics-model` **Version:** `1.1.0` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**42** **Group:** `io.prometheus` **Name:** `prometheus-metrics-shaded-protobuf` **Version:** `1.1.0` +**43** **Group:** `io.prometheus` **Name:** `prometheus-metrics-shaded-protobuf` **Version:** `1.1.0` > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**43** **Group:** `io.zipkin.reporter2` **Name:** `zipkin-reporter` **Version:** `3.3.0` +**44** **Group:** `io.zipkin.reporter2` **Name:** `zipkin-reporter` **Version:** `3.3.0` > - **Manifest Project URL**: [https://zipkin.io/](https://zipkin.io/) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **Embedded license files**: [zipkin-reporter-3.3.0.jar/META-INF/LICENSE](zipkin-reporter-3.3.0.jar/META-INF/LICENSE) -**44** **Group:** `io.zipkin.reporter2` **Name:** `zipkin-sender-okhttp3` **Version:** `3.3.0` +**45** **Group:** `io.zipkin.reporter2` **Name:** `zipkin-sender-okhttp3` **Version:** `3.3.0` > - **Manifest Project URL**: [https://zipkin.io/](https://zipkin.io/) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **Embedded license files**: [zipkin-sender-okhttp3-3.3.0.jar/META-INF/LICENSE](zipkin-sender-okhttp3-3.3.0.jar/META-INF/LICENSE) -**45** **Group:** `io.zipkin.zipkin2` **Name:** `zipkin` **Version:** `2.27.1` +**46** **Group:** `io.zipkin.zipkin2` **Name:** `zipkin` **Version:** `2.27.1` > - **Manifest Project URL**: [http://zipkin.io/](http://zipkin.io/) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **Embedded license files**: [zipkin-2.27.1.jar/META-INF/LICENSE](zipkin-2.27.1.jar/META-INF/LICENSE) -**46** **Group:** `net.bytebuddy` **Name:** `byte-buddy-dep` **Version:** `1.14.13` +**47** **Group:** `net.bytebuddy` **Name:** `byte-buddy-dep` **Version:** `1.14.13` > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **Embedded license files**: [byte-buddy-dep-1.14.13.jar/META-INF/LICENSE](byte-buddy-dep-1.14.13.jar/META-INF/LICENSE) - [byte-buddy-dep-1.14.13.jar/META-INF/NOTICE](byte-buddy-dep-1.14.13.jar/META-INF/NOTICE) -**47** **Group:** `org.jetbrains` **Name:** `annotations` **Version:** `13.0` +**48** **Group:** `org.jetbrains` **Name:** `annotations` **Version:** `13.0` > - **POM Project URL**: [http://www.jetbrains.org](http://www.jetbrains.org) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**48** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib` **Version:** `1.9.23` +**49** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib` **Version:** `1.9.23` > - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**49** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk7` **Version:** `1.9.23` +**50** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk7` **Version:** `1.9.23` > - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**50** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk8` **Version:** `1.9.23` +**51** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk8` **Version:** `1.9.23` > - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**51** **Group:** `org.ow2.asm` **Name:** `asm` **Version:** `9.7` +**52** **Group:** `org.ow2.asm` **Name:** `asm` **Version:** `9.7` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**52** **Group:** `org.ow2.asm` **Name:** `asm-analysis` **Version:** `9.7` +**53** **Group:** `org.ow2.asm` **Name:** `asm-analysis` **Version:** `9.7` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**53** **Group:** `org.ow2.asm` **Name:** `asm-commons` **Version:** `9.6` +**54** **Group:** `org.ow2.asm` **Name:** `asm-commons` **Version:** `9.6` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**54** **Group:** `org.ow2.asm` **Name:** `asm-tree` **Version:** `9.7` +**55** **Group:** `org.ow2.asm` **Name:** `asm-tree` **Version:** `9.7` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**55** **Group:** `org.ow2.asm` **Name:** `asm-util` **Version:** `9.7` +**56** **Group:** `org.ow2.asm` **Name:** `asm-util` **Version:** `9.7` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**56** **Group:** `org.snakeyaml` **Name:** `snakeyaml-engine` **Version:** `2.7` +**57** **Group:** `org.snakeyaml` **Name:** `snakeyaml-engine` **Version:** `2.7` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM Project URL**: [https://bitbucket.org/snakeyaml/snakeyaml-engine](https://bitbucket.org/snakeyaml/snakeyaml-engine) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**57** **Group:** `org.yaml` **Name:** `snakeyaml` **Version:** `2.2` +**58** **Group:** `org.yaml` **Name:** `snakeyaml` **Version:** `2.2` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM Project URL**: [https://bitbucket.org/snakeyaml/snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) ## MIT License -**58** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.12` +**59** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.12` > - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) > - **Embedded license files**: [slf4j-api-2.0.12.jar/META-INF/LICENSE.txt](slf4j-api-2.0.12.jar/META-INF/LICENSE.txt) -**59** **Group:** `org.slf4j` **Name:** `slf4j-simple` **Version:** `2.0.12` +**60** **Group:** `org.slf4j` **Name:** `slf4j-simple` **Version:** `2.0.12` > - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) > - **Embedded license files**: [slf4j-simple-2.0.12.jar/META-INF/LICENSE.txt](slf4j-simple-2.0.12.jar/META-INF/LICENSE.txt) ## The 3-Clause BSD License -**60** **Group:** `org.ow2.asm` **Name:** `asm` **Version:** `9.7` +**61** **Group:** `org.ow2.asm` **Name:** `asm` **Version:** `9.7` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**61** **Group:** `org.ow2.asm` **Name:** `asm-analysis` **Version:** `9.7` +**62** **Group:** `org.ow2.asm` **Name:** `asm-analysis` **Version:** `9.7` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**62** **Group:** `org.ow2.asm` **Name:** `asm-commons` **Version:** `9.6` +**63** **Group:** `org.ow2.asm` **Name:** `asm-commons` **Version:** `9.6` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**63** **Group:** `org.ow2.asm` **Name:** `asm-tree` **Version:** `9.7` +**64** **Group:** `org.ow2.asm` **Name:** `asm-tree` **Version:** `9.7` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause) -**64** **Group:** `org.ow2.asm` **Name:** `asm-util` **Version:** `9.7` +**65** **Group:** `org.ow2.asm` **Name:** `asm-util` **Version:** `9.7` > - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org) > - **Manifest License**: The 3-Clause BSD License (Not Packaged) > - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/) @@ -321,4 +325,4 @@ _2024-03-28 16:29:02 PDT_ ## Unknown -**65** **Group:** `com.squareup.okio` **Name:** `okio` **Version:** `3.9.0` +**66** **Group:** `com.squareup.okio` **Name:** `okio` **Version:** `3.9.0` diff --git a/semconv-migration/build.gradle.kts b/semconv-migration/build.gradle.kts new file mode 100644 index 000000000000..4d2b69a08213 --- /dev/null +++ b/semconv-migration/build.gradle.kts @@ -0,0 +1,12 @@ +plugins { + id("otel.java-conventions") + id("otel.publish-conventions") +} + +group = "io.opentelemetry.javaagent" + +dependencies { + implementation("io.opentelemetry.semconv:opentelemetry-semconv") + implementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating") + implementation("io.opentelemetry:opentelemetry-api") +} diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java new file mode 100644 index 000000000000..8c7f629c8ef0 --- /dev/null +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java @@ -0,0 +1,305 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.semconv; + +import io.opentelemetry.api.common.AttributeKey; +import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; +import io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes; +import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; +import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; +import io.opentelemetry.semconv.incubating.OsIncubatingAttributes; +import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes; +import java.util.List; + +public final class ResourceAttributes { + private ResourceAttributes() {} + + public static final String SCHEMA_URL = SchemaUrls.V1_24_0; + + public static final AttributeKey CLOUD_ACCOUNT_ID = + CloudIncubatingAttributes.CLOUD_ACCOUNT_ID; + public static final AttributeKey CLOUD_AVAILABILITY_ZONE = + CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE; + public static final AttributeKey CLOUD_PLATFORM = + CloudIncubatingAttributes.CLOUD_PLATFORM; + public static final AttributeKey CLOUD_PROVIDER = + CloudIncubatingAttributes.CLOUD_PROVIDER; + public static final AttributeKey CLOUD_REGION = CloudIncubatingAttributes.CLOUD_REGION; + public static final AttributeKey CLOUD_RESOURCE_ID = + CloudIncubatingAttributes.CLOUD_RESOURCE_ID; + + public static final class CloudProviderValues { + public static final String ALIBABA_CLOUD = + CloudIncubatingAttributes.CloudProviderValues.ALIBABA_CLOUD; + public static final String AWS = CloudIncubatingAttributes.CloudProviderValues.AWS; + public static final String AZURE = CloudIncubatingAttributes.CloudProviderValues.AZURE; + public static final String GCP = CloudIncubatingAttributes.CloudProviderValues.GCP; + public static final String HEROKU = CloudIncubatingAttributes.CloudProviderValues.HEROKU; + public static final String IBM_CLOUD = CloudIncubatingAttributes.CloudProviderValues.IBM_CLOUD; + public static final String TENCENT_CLOUD = + CloudIncubatingAttributes.CloudProviderValues.TENCENT_CLOUD; + + private CloudProviderValues() {} + } + + public static final class CloudPlatformValues { + public static final String ALIBABA_CLOUD_ECS = + CloudIncubatingAttributes.CloudPlatformValues.ALIBABA_CLOUD_ECS; + public static final String ALIBABA_CLOUD_FC = + CloudIncubatingAttributes.CloudPlatformValues.ALIBABA_CLOUD_FC; + public static final String ALIBABA_CLOUD_OPENSHIFT = + CloudIncubatingAttributes.CloudPlatformValues.ALIBABA_CLOUD_OPENSHIFT; + public static final String AWS_EC2 = CloudIncubatingAttributes.CloudPlatformValues.AWS_EC2; + public static final String AWS_ECS = CloudIncubatingAttributes.CloudPlatformValues.AWS_ECS; + public static final String AWS_EKS = CloudIncubatingAttributes.CloudPlatformValues.AWS_EKS; + public static final String AWS_LAMBDA = + CloudIncubatingAttributes.CloudPlatformValues.AWS_LAMBDA; + public static final String AWS_ELASTIC_BEANSTALK = + CloudIncubatingAttributes.CloudPlatformValues.AWS_ELASTIC_BEANSTALK; + public static final String AWS_APP_RUNNER = + CloudIncubatingAttributes.CloudPlatformValues.AWS_APP_RUNNER; + public static final String AWS_OPENSHIFT = + CloudIncubatingAttributes.CloudPlatformValues.AWS_OPENSHIFT; + public static final String AZURE_VM = CloudIncubatingAttributes.CloudPlatformValues.AZURE_VM; + public static final String AZURE_CONTAINER_INSTANCES = + CloudIncubatingAttributes.CloudPlatformValues.AZURE_CONTAINER_INSTANCES; + public static final String AZURE_AKS = CloudIncubatingAttributes.CloudPlatformValues.AZURE_AKS; + public static final String AZURE_FUNCTIONS = + CloudIncubatingAttributes.CloudPlatformValues.AZURE_FUNCTIONS; + public static final String AZURE_APP_SERVICE = + CloudIncubatingAttributes.CloudPlatformValues.AZURE_APP_SERVICE; + public static final String AZURE_OPENSHIFT = + CloudIncubatingAttributes.CloudPlatformValues.AZURE_OPENSHIFT; + public static final String GCP_BARE_METAL_SOLUTION = + CloudIncubatingAttributes.CloudPlatformValues.GCP_BARE_METAL_SOLUTION; + public static final String GCP_COMPUTE_ENGINE = + CloudIncubatingAttributes.CloudPlatformValues.GCP_COMPUTE_ENGINE; + public static final String GCP_CLOUD_RUN = + CloudIncubatingAttributes.CloudPlatformValues.GCP_CLOUD_RUN; + public static final String GCP_KUBERNETES_ENGINE = + CloudIncubatingAttributes.CloudPlatformValues.GCP_KUBERNETES_ENGINE; + public static final String GCP_CLOUD_FUNCTIONS = + CloudIncubatingAttributes.CloudPlatformValues.GCP_CLOUD_FUNCTIONS; + public static final String GCP_APP_ENGINE = + CloudIncubatingAttributes.CloudPlatformValues.GCP_APP_ENGINE; + public static final String GCP_OPENSHIFT = + CloudIncubatingAttributes.CloudPlatformValues.GCP_OPENSHIFT; + public static final String IBM_CLOUD_OPENSHIFT = + CloudIncubatingAttributes.CloudPlatformValues.IBM_CLOUD_OPENSHIFT; + public static final String TENCENT_CLOUD_CVM = + CloudIncubatingAttributes.CloudPlatformValues.TENCENT_CLOUD_CVM; + public static final String TENCENT_CLOUD_EKS = + CloudIncubatingAttributes.CloudPlatformValues.TENCENT_CLOUD_EKS; + public static final String TENCENT_CLOUD_SCF = + CloudIncubatingAttributes.CloudPlatformValues.TENCENT_CLOUD_SCF; + + private CloudPlatformValues() {} + } + + public static final AttributeKey SERVICE_INSTANCE_ID = + ServiceIncubatingAttributes.SERVICE_INSTANCE_ID; + public static final AttributeKey SERVICE_NAME = ServiceIncubatingAttributes.SERVICE_NAME; + public static final AttributeKey SERVICE_NAMESPACE = + ServiceIncubatingAttributes.SERVICE_NAMESPACE; + public static final AttributeKey SERVICE_VERSION = + ServiceIncubatingAttributes.SERVICE_VERSION; + + public static final AttributeKey OS_BUILD_ID = OsIncubatingAttributes.OS_BUILD_ID; + public static final AttributeKey OS_DESCRIPTION = OsIncubatingAttributes.OS_DESCRIPTION; + public static final AttributeKey OS_NAME = OsIncubatingAttributes.OS_NAME; + public static final AttributeKey OS_TYPE = OsIncubatingAttributes.OS_TYPE; + public static final AttributeKey OS_VERSION = OsIncubatingAttributes.OS_VERSION; + + public static final class OsTypeValues { + public static final String WINDOWS = OsIncubatingAttributes.OsTypeValues.WINDOWS; + public static final String LINUX = OsIncubatingAttributes.OsTypeValues.LINUX; + public static final String DARWIN = OsIncubatingAttributes.OsTypeValues.DARWIN; + public static final String FREEBSD = OsIncubatingAttributes.OsTypeValues.FREEBSD; + public static final String NETBSD = OsIncubatingAttributes.OsTypeValues.NETBSD; + public static final String OPENBSD = OsIncubatingAttributes.OsTypeValues.OPENBSD; + public static final String DRAGONFLYBSD = OsIncubatingAttributes.OsTypeValues.DRAGONFLYBSD; + public static final String HPUX = OsIncubatingAttributes.OsTypeValues.HPUX; + public static final String AIX = OsIncubatingAttributes.OsTypeValues.AIX; + public static final String SOLARIS = OsIncubatingAttributes.OsTypeValues.SOLARIS; + public static final String Z_OS = OsIncubatingAttributes.OsTypeValues.Z_OS; + + private OsTypeValues() {} + } + + public static final AttributeKey TELEMETRY_DISTRO_NAME = + TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME; + public static final AttributeKey TELEMETRY_DISTRO_VERSION = + TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION; + public static final AttributeKey TELEMETRY_SDK_LANGUAGE = + TelemetryIncubatingAttributes.TELEMETRY_SDK_LANGUAGE; + public static final AttributeKey TELEMETRY_SDK_NAME = + TelemetryIncubatingAttributes.TELEMETRY_SDK_NAME; + public static final AttributeKey TELEMETRY_SDK_VERSION = + TelemetryIncubatingAttributes.TELEMETRY_SDK_VERSION; + + public static final class TelemetrySdkLanguageValues { + public static final String CPP = TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.CPP; + public static final String DOTNET = + TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.DOTNET; + public static final String ERLANG = + TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.ERLANG; + public static final String GO = TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.GO; + public static final String JAVA = TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.JAVA; + public static final String NODEJS = + TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.NODEJS; + public static final String PHP = TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.PHP; + public static final String PYTHON = + TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.PYTHON; + public static final String RUBY = TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.RUBY; + public static final String RUST = TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.RUST; + public static final String SWIFT = + TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.SWIFT; + public static final String WEBJS = + TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.WEBJS; + + private TelemetrySdkLanguageValues() {} + } + + public static final AttributeKey CONTAINER_COMMAND = + ContainerIncubatingAttributes.CONTAINER_COMMAND; + public static final AttributeKey> CONTAINER_COMMAND_ARGS = + ContainerIncubatingAttributes.CONTAINER_COMMAND_ARGS; + public static final AttributeKey CONTAINER_COMMAND_LINE = + ContainerIncubatingAttributes.CONTAINER_COMMAND_LINE; + public static final AttributeKey CONTAINER_ID = + ContainerIncubatingAttributes.CONTAINER_ID; + public static final AttributeKey CONTAINER_IMAGE_ID = + ContainerIncubatingAttributes.CONTAINER_IMAGE_ID; + public static final AttributeKey CONTAINER_IMAGE_NAME = + ContainerIncubatingAttributes.CONTAINER_IMAGE_NAME; + public static final AttributeKey> CONTAINER_IMAGE_REPO_DIGESTS = + ContainerIncubatingAttributes.CONTAINER_IMAGE_REPO_DIGESTS; + public static final AttributeKey> CONTAINER_IMAGE_TAGS = + ContainerIncubatingAttributes.CONTAINER_IMAGE_TAGS; + public static final AttributeKeyTemplate CONTAINER_LABELS = + ContainerIncubatingAttributes.CONTAINER_LABELS; + public static final AttributeKey CONTAINER_NAME = + ContainerIncubatingAttributes.CONTAINER_NAME; + public static final AttributeKey CONTAINER_RUNTIME = + ContainerIncubatingAttributes.CONTAINER_RUNTIME; + + public static final AttributeKey PROCESS_COMMAND = + ProcessIncubatingAttributes.PROCESS_COMMAND; + public static final AttributeKey> PROCESS_COMMAND_ARGS = + ProcessIncubatingAttributes.PROCESS_COMMAND_ARGS; + public static final AttributeKey PROCESS_COMMAND_LINE = + ProcessIncubatingAttributes.PROCESS_COMMAND_LINE; + public static final AttributeKey PROCESS_EXECUTABLE_NAME = + ProcessIncubatingAttributes.PROCESS_EXECUTABLE_NAME; + public static final AttributeKey PROCESS_EXECUTABLE_PATH = + ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH; + public static final AttributeKey PROCESS_OWNER = + ProcessIncubatingAttributes.PROCESS_OWNER; + public static final AttributeKey PROCESS_PARENT_PID = + ProcessIncubatingAttributes.PROCESS_PARENT_PID; + public static final AttributeKey PROCESS_PID = ProcessIncubatingAttributes.PROCESS_PID; + public static final AttributeKey PROCESS_RUNTIME_DESCRIPTION = + ProcessIncubatingAttributes.PROCESS_RUNTIME_DESCRIPTION; + public static final AttributeKey PROCESS_RUNTIME_NAME = + ProcessIncubatingAttributes.PROCESS_RUNTIME_NAME; + public static final AttributeKey PROCESS_RUNTIME_VERSION = + ProcessIncubatingAttributes.PROCESS_RUNTIME_VERSION; + + public static final AttributeKey HOST_ARCH = HostIncubatingAttributes.HOST_ARCH; + public static final AttributeKey HOST_CPU_CACHE_L2_SIZE = + HostIncubatingAttributes.HOST_CPU_CACHE_L2_SIZE; + public static final AttributeKey HOST_CPU_FAMILY = + HostIncubatingAttributes.HOST_CPU_FAMILY; + public static final AttributeKey HOST_CPU_MODEL_ID = + HostIncubatingAttributes.HOST_CPU_MODEL_ID; + public static final AttributeKey HOST_CPU_MODEL_NAME = + HostIncubatingAttributes.HOST_CPU_MODEL_NAME; + public static final AttributeKey HOST_CPU_STEPPING = + HostIncubatingAttributes.HOST_CPU_STEPPING; + public static final AttributeKey HOST_CPU_VENDOR_ID = + HostIncubatingAttributes.HOST_CPU_VENDOR_ID; + public static final AttributeKey HOST_ID = HostIncubatingAttributes.HOST_ID; + public static final AttributeKey HOST_IMAGE_ID = HostIncubatingAttributes.HOST_IMAGE_ID; + public static final AttributeKey HOST_IMAGE_NAME = + HostIncubatingAttributes.HOST_IMAGE_NAME; + public static final AttributeKey HOST_IMAGE_VERSION = + HostIncubatingAttributes.HOST_IMAGE_VERSION; + public static final AttributeKey> HOST_IP = HostIncubatingAttributes.HOST_IP; + public static final AttributeKey> HOST_MAC = HostIncubatingAttributes.HOST_MAC; + public static final AttributeKey HOST_NAME = HostIncubatingAttributes.HOST_NAME; + public static final AttributeKey HOST_TYPE = HostIncubatingAttributes.HOST_TYPE; + + public static final class HostArchValues { + public static final String AMD64 = HostIncubatingAttributes.HostArchValues.AMD64; + public static final String ARM32 = HostIncubatingAttributes.HostArchValues.ARM32; + public static final String ARM64 = HostIncubatingAttributes.HostArchValues.ARM64; + public static final String IA64 = HostIncubatingAttributes.HostArchValues.IA64; + public static final String PPC32 = HostIncubatingAttributes.HostArchValues.PPC32; + public static final String PPC64 = HostIncubatingAttributes.HostArchValues.PPC64; + public static final String S390X = HostIncubatingAttributes.HostArchValues.S390X; + public static final String X86 = HostIncubatingAttributes.HostArchValues.X86; + + private HostArchValues() {} + } + + public static final AttributeKey FAAS_COLDSTART = + FaasIncubatingAttributes.FAAS_COLDSTART; + public static final AttributeKey FAAS_CRON = FaasIncubatingAttributes.FAAS_CRON; + public static final AttributeKey FAAS_DOCUMENT_COLLECTION = + FaasIncubatingAttributes.FAAS_DOCUMENT_COLLECTION; + public static final AttributeKey FAAS_DOCUMENT_NAME = + FaasIncubatingAttributes.FAAS_DOCUMENT_NAME; + public static final AttributeKey FAAS_DOCUMENT_OPERATION = + FaasIncubatingAttributes.FAAS_DOCUMENT_OPERATION; + public static final AttributeKey FAAS_DOCUMENT_TIME = + FaasIncubatingAttributes.FAAS_DOCUMENT_TIME; + public static final AttributeKey FAAS_INSTANCE = FaasIncubatingAttributes.FAAS_INSTANCE; + public static final AttributeKey FAAS_INVOCATION_ID = + FaasIncubatingAttributes.FAAS_INVOCATION_ID; + public static final AttributeKey FAAS_INVOKED_NAME = + FaasIncubatingAttributes.FAAS_INVOKED_NAME; + public static final AttributeKey FAAS_INVOKED_PROVIDER = + FaasIncubatingAttributes.FAAS_INVOKED_PROVIDER; + public static final AttributeKey FAAS_INVOKED_REGION = + FaasIncubatingAttributes.FAAS_INVOKED_REGION; + public static final AttributeKey FAAS_MAX_MEMORY = FaasIncubatingAttributes.FAAS_MAX_MEMORY; + public static final AttributeKey FAAS_NAME = FaasIncubatingAttributes.FAAS_NAME; + public static final AttributeKey FAAS_TIME = FaasIncubatingAttributes.FAAS_TIME; + public static final AttributeKey FAAS_TRIGGER = FaasIncubatingAttributes.FAAS_TRIGGER; + public static final AttributeKey FAAS_VERSION = FaasIncubatingAttributes.FAAS_VERSION; + + public static final class FaasTriggerValues { + public static final String DATASOURCE = FaasIncubatingAttributes.FaasTriggerValues.DATASOURCE; + public static final String HTTP = FaasIncubatingAttributes.FaasTriggerValues.HTTP; + public static final String PUBSUB = FaasIncubatingAttributes.FaasTriggerValues.PUBSUB; + public static final String TIMER = FaasIncubatingAttributes.FaasTriggerValues.TIMER; + public static final String OTHER = FaasIncubatingAttributes.FaasTriggerValues.OTHER; + + private FaasTriggerValues() {} + } + + public static final class FaasInvokedProviderValues { + public static final String ALIBABA_CLOUD = + FaasIncubatingAttributes.FaasInvokedProviderValues.ALIBABA_CLOUD; + public static final String AWS = FaasIncubatingAttributes.FaasInvokedProviderValues.AWS; + public static final String AZURE = FaasIncubatingAttributes.FaasInvokedProviderValues.AZURE; + public static final String GCP = FaasIncubatingAttributes.FaasInvokedProviderValues.GCP; + public static final String TENCENT_CLOUD = + FaasIncubatingAttributes.FaasInvokedProviderValues.TENCENT_CLOUD; + + private FaasInvokedProviderValues() {} + } + + public static final class FaasDocumentOperationValues { + public static final String INSERT = FaasIncubatingAttributes.FaasDocumentOperationValues.INSERT; + public static final String EDIT = FaasIncubatingAttributes.FaasDocumentOperationValues.EDIT; + public static final String DELETE = FaasIncubatingAttributes.FaasDocumentOperationValues.DELETE; + + private FaasDocumentOperationValues() {} + } +} diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java new file mode 100644 index 000000000000..10f1158ffbd4 --- /dev/null +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -0,0 +1,447 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.semconv; + +import io.opentelemetry.api.common.AttributeKey; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; +import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; +import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; +import io.opentelemetry.semconv.incubating.PeerIncubatingAttributes; +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; +import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; +import java.util.List; + +public class SemanticAttributes { + + private SemanticAttributes() {} + + public static final AttributeKey URL_FULL = UrlAttributes.URL_FULL; + public static final AttributeKey URL_PATH = UrlAttributes.URL_PATH; + public static final AttributeKey URL_QUERY = UrlAttributes.URL_QUERY; + public static final AttributeKey URL_SCHEME = UrlAttributes.URL_SCHEME; + + public static final AttributeKey NETWORK_LOCAL_ADDRESS = + NetworkAttributes.NETWORK_LOCAL_ADDRESS; + public static final AttributeKey NETWORK_LOCAL_PORT = NetworkAttributes.NETWORK_LOCAL_PORT; + public static final AttributeKey NETWORK_PEER_ADDRESS = + NetworkAttributes.NETWORK_PEER_ADDRESS; + public static final AttributeKey NETWORK_PEER_PORT = NetworkAttributes.NETWORK_PEER_PORT; + public static final AttributeKey NETWORK_PROTOCOL_NAME = + NetworkAttributes.NETWORK_PROTOCOL_NAME; + public static final AttributeKey NETWORK_PROTOCOL_VERSION = + NetworkAttributes.NETWORK_PROTOCOL_VERSION; + public static final AttributeKey NETWORK_TRANSPORT = NetworkAttributes.NETWORK_TRANSPORT; + public static final AttributeKey NETWORK_TYPE = NetworkAttributes.NETWORK_TYPE; + + public static final AttributeKeyTemplate> HTTP_REQUEST_HEADER = + HttpAttributes.HTTP_REQUEST_HEADER; + public static final AttributeKey HTTP_REQUEST_METHOD = HttpAttributes.HTTP_REQUEST_METHOD; + public static final AttributeKey HTTP_REQUEST_METHOD_ORIGINAL = + HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL; + public static final AttributeKey HTTP_REQUEST_RESEND_COUNT = + HttpAttributes.HTTP_REQUEST_RESEND_COUNT; + public static final AttributeKeyTemplate> HTTP_RESPONSE_HEADER = + HttpAttributes.HTTP_RESPONSE_HEADER; + public static final AttributeKey HTTP_RESPONSE_STATUS_CODE = + HttpAttributes.HTTP_RESPONSE_STATUS_CODE; + public static final AttributeKey HTTP_ROUTE = HttpAttributes.HTTP_ROUTE; + + public static final AttributeKey HTTP_REQUEST_BODY_SIZE = + HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE; + public static final AttributeKey HTTP_RESPONSE_BODY_SIZE = + HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE; + + public static final AttributeKey ERROR_TYPE = ErrorAttributes.ERROR_TYPE; + + public static final AttributeKey USER_AGENT_ORIGINAL = + UserAgentAttributes.USER_AGENT_ORIGINAL; + + public static final AttributeKey CLIENT_ADDRESS = ClientAttributes.CLIENT_ADDRESS; + public static final AttributeKey CLIENT_PORT = ClientAttributes.CLIENT_PORT; + + public static final AttributeKey SERVER_ADDRESS = ServerAttributes.SERVER_ADDRESS; + public static final AttributeKey SERVER_PORT = ServerAttributes.SERVER_PORT; + + public static final AttributeKey DB_CASSANDRA_CONSISTENCY_LEVEL = + DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; + public static final AttributeKey DB_CASSANDRA_COORDINATOR_DC = + DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_DC; + public static final AttributeKey DB_CASSANDRA_COORDINATOR_ID = + DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_ID; + public static final AttributeKey DB_CASSANDRA_IDEMPOTENCE = + DbIncubatingAttributes.DB_CASSANDRA_IDEMPOTENCE; + public static final AttributeKey DB_CASSANDRA_PAGE_SIZE = + DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE; + public static final AttributeKey DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT = + DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT; + public static final AttributeKey DB_CASSANDRA_TABLE = + DbIncubatingAttributes.DB_CASSANDRA_TABLE; + public static final AttributeKey DB_CONNECTION_STRING = + DbIncubatingAttributes.DB_CONNECTION_STRING; + public static final AttributeKey DB_ELASTICSEARCH_CLUSTER_NAME = + DbIncubatingAttributes.DB_ELASTICSEARCH_CLUSTER_NAME; + public static final AttributeKey DB_ELASTICSEARCH_NODE_NAME = + DbIncubatingAttributes.DB_ELASTICSEARCH_NODE_NAME; + public static final AttributeKeyTemplate DB_ELASTICSEARCH_PATH_PARTS = + DbIncubatingAttributes.DB_ELASTICSEARCH_PATH_PARTS; + public static final AttributeKey DB_INSTANCE_ID = DbIncubatingAttributes.DB_INSTANCE_ID; + public static final AttributeKey DB_JDBC_DRIVER_CLASSNAME = + DbIncubatingAttributes.DB_JDBC_DRIVER_CLASSNAME; + public static final AttributeKey DB_MSSQL_INSTANCE_NAME = + DbIncubatingAttributes.DB_MSSQL_INSTANCE_NAME; + public static final AttributeKey DB_NAME = DbIncubatingAttributes.DB_NAME; + public static final AttributeKey DB_OPERATION = DbIncubatingAttributes.DB_OPERATION; + public static final AttributeKey DB_REDIS_DATABASE_INDEX = + DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX; + public static final AttributeKey DB_SQL_TABLE = DbIncubatingAttributes.DB_SQL_TABLE; + public static final AttributeKey DB_STATEMENT = DbIncubatingAttributes.DB_STATEMENT; + public static final AttributeKey DB_SYSTEM = DbIncubatingAttributes.DB_SYSTEM; + public static final AttributeKey DB_USER = DbIncubatingAttributes.DB_USER; + + public static final AttributeKey DB_MONGODB_COLLECTION = + DbIncubatingAttributes.DB_MONGODB_COLLECTION; + + public static final class DbSystemValues { + public static final String OTHER_SQL = DbIncubatingAttributes.DbSystemValues.OTHER_SQL; + public static final String MSSQL = DbIncubatingAttributes.DbSystemValues.MSSQL; + public static final String MSSQLCOMPACT = DbIncubatingAttributes.DbSystemValues.MSSQLCOMPACT; + public static final String MYSQL = DbIncubatingAttributes.DbSystemValues.MYSQL; + public static final String ORACLE = DbIncubatingAttributes.DbSystemValues.ORACLE; + public static final String DB2 = DbIncubatingAttributes.DbSystemValues.DB2; + public static final String POSTGRESQL = DbIncubatingAttributes.DbSystemValues.POSTGRESQL; + public static final String REDSHIFT = DbIncubatingAttributes.DbSystemValues.REDSHIFT; + public static final String HIVE = DbIncubatingAttributes.DbSystemValues.HIVE; + public static final String CLOUDSCAPE = DbIncubatingAttributes.DbSystemValues.CLOUDSCAPE; + public static final String HSQLDB = DbIncubatingAttributes.DbSystemValues.HSQLDB; + public static final String PROGRESS = DbIncubatingAttributes.DbSystemValues.PROGRESS; + public static final String MAXDB = DbIncubatingAttributes.DbSystemValues.MAXDB; + public static final String HANADB = DbIncubatingAttributes.DbSystemValues.HANADB; + public static final String INGRES = DbIncubatingAttributes.DbSystemValues.INGRES; + public static final String FIRSTSQL = DbIncubatingAttributes.DbSystemValues.FIRSTSQL; + public static final String EDB = DbIncubatingAttributes.DbSystemValues.EDB; + public static final String CACHE = DbIncubatingAttributes.DbSystemValues.CACHE; + public static final String ADABAS = DbIncubatingAttributes.DbSystemValues.ADABAS; + public static final String FIREBIRD = DbIncubatingAttributes.DbSystemValues.FIREBIRD; + public static final String DERBY = DbIncubatingAttributes.DbSystemValues.DERBY; + public static final String FILEMAKER = DbIncubatingAttributes.DbSystemValues.FILEMAKER; + public static final String INFORMIX = DbIncubatingAttributes.DbSystemValues.INFORMIX; + public static final String INSTANTDB = DbIncubatingAttributes.DbSystemValues.INSTANTDB; + public static final String INTERBASE = DbIncubatingAttributes.DbSystemValues.INTERBASE; + public static final String MARIADB = DbIncubatingAttributes.DbSystemValues.MARIADB; + public static final String NETEZZA = DbIncubatingAttributes.DbSystemValues.NETEZZA; + public static final String PERVASIVE = DbIncubatingAttributes.DbSystemValues.PERVASIVE; + public static final String POINTBASE = DbIncubatingAttributes.DbSystemValues.POINTBASE; + public static final String SQLITE = DbIncubatingAttributes.DbSystemValues.SQLITE; + public static final String SYBASE = DbIncubatingAttributes.DbSystemValues.SYBASE; + public static final String TERADATA = DbIncubatingAttributes.DbSystemValues.TERADATA; + public static final String VERTICA = DbIncubatingAttributes.DbSystemValues.VERTICA; + public static final String H2 = DbIncubatingAttributes.DbSystemValues.H2; + public static final String COLDFUSION = DbIncubatingAttributes.DbSystemValues.COLDFUSION; + public static final String CASSANDRA = DbIncubatingAttributes.DbSystemValues.CASSANDRA; + public static final String HBASE = DbIncubatingAttributes.DbSystemValues.HBASE; + public static final String MONGODB = DbIncubatingAttributes.DbSystemValues.MONGODB; + public static final String REDIS = DbIncubatingAttributes.DbSystemValues.REDIS; + public static final String COUCHBASE = DbIncubatingAttributes.DbSystemValues.COUCHBASE; + public static final String COUCHDB = DbIncubatingAttributes.DbSystemValues.COUCHDB; + public static final String COSMOSDB = DbIncubatingAttributes.DbSystemValues.COSMOSDB; + public static final String DYNAMODB = DbIncubatingAttributes.DbSystemValues.DYNAMODB; + public static final String NEO4J = DbIncubatingAttributes.DbSystemValues.NEO4J; + public static final String GEODE = DbIncubatingAttributes.DbSystemValues.GEODE; + public static final String ELASTICSEARCH = DbIncubatingAttributes.DbSystemValues.ELASTICSEARCH; + public static final String MEMCACHED = DbIncubatingAttributes.DbSystemValues.MEMCACHED; + public static final String COCKROACHDB = DbIncubatingAttributes.DbSystemValues.COCKROACHDB; + public static final String OPENSEARCH = DbIncubatingAttributes.DbSystemValues.OPENSEARCH; + public static final String CLICKHOUSE = DbIncubatingAttributes.DbSystemValues.CLICKHOUSE; + public static final String SPANNER = DbIncubatingAttributes.DbSystemValues.SPANNER; + public static final String TRINO = DbIncubatingAttributes.DbSystemValues.TRINO; + + private DbSystemValues() {} + } + + public static final AttributeKey RPC_CONNECT_RPC_ERROR_CODE = + RpcIncubatingAttributes.RPC_CONNECT_RPC_ERROR_CODE; + public static final AttributeKeyTemplate> RPC_CONNECT_RPC_REQUEST_METADATA = + RpcIncubatingAttributes.RPC_CONNECT_RPC_REQUEST_METADATA; + public static final AttributeKeyTemplate> RPC_CONNECT_RPC_RESPONSE_METADATA = + RpcIncubatingAttributes.RPC_CONNECT_RPC_RESPONSE_METADATA; + public static final AttributeKeyTemplate> RPC_GRPC_REQUEST_METADATA = + RpcIncubatingAttributes.RPC_GRPC_REQUEST_METADATA; + public static final AttributeKeyTemplate> RPC_GRPC_RESPONSE_METADATA = + RpcIncubatingAttributes.RPC_GRPC_RESPONSE_METADATA; + public static final AttributeKey RPC_GRPC_STATUS_CODE = + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE; + public static final AttributeKey RPC_JSONRPC_ERROR_CODE = + RpcIncubatingAttributes.RPC_JSONRPC_ERROR_CODE; + public static final AttributeKey RPC_JSONRPC_ERROR_MESSAGE = + RpcIncubatingAttributes.RPC_JSONRPC_ERROR_MESSAGE; + public static final AttributeKey RPC_JSONRPC_REQUEST_ID = + RpcIncubatingAttributes.RPC_JSONRPC_REQUEST_ID; + public static final AttributeKey RPC_JSONRPC_VERSION = + RpcIncubatingAttributes.RPC_JSONRPC_VERSION; + public static final AttributeKey RPC_METHOD = RpcIncubatingAttributes.RPC_METHOD; + public static final AttributeKey RPC_SERVICE = RpcIncubatingAttributes.RPC_SERVICE; + public static final AttributeKey RPC_SYSTEM = RpcIncubatingAttributes.RPC_SYSTEM; + + public static final class RpcSystemValues { + public static final String GRPC = RpcIncubatingAttributes.RpcSystemValues.GRPC; + public static final String JAVA_RMI = RpcIncubatingAttributes.RpcSystemValues.JAVA_RMI; + public static final String DOTNET_WCF = RpcIncubatingAttributes.RpcSystemValues.DOTNET_WCF; + public static final String APACHE_DUBBO = RpcIncubatingAttributes.RpcSystemValues.APACHE_DUBBO; + public static final String CONNECT_RPC = RpcIncubatingAttributes.RpcSystemValues.CONNECT_RPC; + + private RpcSystemValues() {} + } + + public static final class RpcGrpcStatusCodeValues { + public static final long OK = RpcIncubatingAttributes.RpcGrpcStatusCodeValues.OK; + public static final long CANCELLED = RpcIncubatingAttributes.RpcGrpcStatusCodeValues.CANCELLED; + public static final long UNKNOWN = RpcIncubatingAttributes.RpcGrpcStatusCodeValues.UNKNOWN; + public static final long INVALID_ARGUMENT = + RpcIncubatingAttributes.RpcGrpcStatusCodeValues.INVALID_ARGUMENT; + public static final long DEADLINE_EXCEEDED = + RpcIncubatingAttributes.RpcGrpcStatusCodeValues.DEADLINE_EXCEEDED; + public static final long NOT_FOUND = RpcIncubatingAttributes.RpcGrpcStatusCodeValues.NOT_FOUND; + public static final long ALREADY_EXISTS = + RpcIncubatingAttributes.RpcGrpcStatusCodeValues.ALREADY_EXISTS; + public static final long PERMISSION_DENIED = + RpcIncubatingAttributes.RpcGrpcStatusCodeValues.PERMISSION_DENIED; + public static final long RESOURCE_EXHAUSTED = + RpcIncubatingAttributes.RpcGrpcStatusCodeValues.RESOURCE_EXHAUSTED; + public static final long FAILED_PRECONDITION = + RpcIncubatingAttributes.RpcGrpcStatusCodeValues.FAILED_PRECONDITION; + public static final long ABORTED = RpcIncubatingAttributes.RpcGrpcStatusCodeValues.ABORTED; + public static final long OUT_OF_RANGE = + RpcIncubatingAttributes.RpcGrpcStatusCodeValues.OUT_OF_RANGE; + public static final long UNIMPLEMENTED = + RpcIncubatingAttributes.RpcGrpcStatusCodeValues.UNIMPLEMENTED; + public static final long INTERNAL = RpcIncubatingAttributes.RpcGrpcStatusCodeValues.INTERNAL; + public static final long UNAVAILABLE = + RpcIncubatingAttributes.RpcGrpcStatusCodeValues.UNAVAILABLE; + public static final long DATA_LOSS = RpcIncubatingAttributes.RpcGrpcStatusCodeValues.DATA_LOSS; + public static final long UNAUTHENTICATED = + RpcIncubatingAttributes.RpcGrpcStatusCodeValues.UNAUTHENTICATED; + + private RpcGrpcStatusCodeValues() {} + } + + public static final class RpcConnectRpcErrorCodeValues { + public static final String CANCELLED = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.CANCELLED; + public static final String UNKNOWN = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.UNKNOWN; + public static final String INVALID_ARGUMENT = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.INVALID_ARGUMENT; + public static final String DEADLINE_EXCEEDED = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.DEADLINE_EXCEEDED; + public static final String NOT_FOUND = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.NOT_FOUND; + public static final String ALREADY_EXISTS = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.ALREADY_EXISTS; + public static final String PERMISSION_DENIED = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.PERMISSION_DENIED; + public static final String RESOURCE_EXHAUSTED = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.RESOURCE_EXHAUSTED; + public static final String FAILED_PRECONDITION = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.FAILED_PRECONDITION; + public static final String ABORTED = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.ABORTED; + public static final String OUT_OF_RANGE = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.OUT_OF_RANGE; + public static final String UNIMPLEMENTED = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.UNIMPLEMENTED; + public static final String INTERNAL = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.INTERNAL; + public static final String UNAVAILABLE = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.UNAVAILABLE; + public static final String DATA_LOSS = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.DATA_LOSS; + public static final String UNAUTHENTICATED = + RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.UNAUTHENTICATED; + + private RpcConnectRpcErrorCodeValues() {} + } + + public static final AttributeKey MESSAGING_BATCH_MESSAGE_COUNT = + MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT; + public static final AttributeKey MESSAGING_CLIENT_ID = + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID; + public static final AttributeKey MESSAGING_DESTINATION_ANONYMOUS = + MessagingIncubatingAttributes.MESSAGING_DESTINATION_ANONYMOUS; + + @Deprecated + public static final AttributeKey MESSAGING_DESTINATION = + AttributeKey.stringKey("messaging.destination"); + + public static final AttributeKey MESSAGING_DESTINATION_NAME = + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME; + public static final AttributeKey MESSAGING_DESTINATION_TEMPLATE = + MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPLATE; + public static final AttributeKey MESSAGING_DESTINATION_TEMPORARY = + MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPORARY; + public static final AttributeKey MESSAGING_DESTINATION_PUBLISH_ANONYMOUS = + MessagingIncubatingAttributes.MESSAGING_DESTINATION_PUBLISH_ANONYMOUS; + public static final AttributeKey MESSAGING_DESTINATION_PUBLISH_NAME = + MessagingIncubatingAttributes.MESSAGING_DESTINATION_PUBLISH_NAME; + public static final AttributeKey MESSAGING_GCP_PUBSUB_MESSAGE_ORDERING_KEY = + MessagingIncubatingAttributes.MESSAGING_GCP_PUBSUB_MESSAGE_ORDERING_KEY; + public static final AttributeKey MESSAGING_KAFKA_CONSUMER_GROUP = + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP; + public static final AttributeKey MESSAGING_KAFKA_DESTINATION_PARTITION = + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION; + public static final AttributeKey MESSAGING_KAFKA_MESSAGE_KEY = + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY; + public static final AttributeKey MESSAGING_KAFKA_MESSAGE_OFFSET = + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET; + public static final AttributeKey MESSAGING_KAFKA_MESSAGE_TOMBSTONE = + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE; + public static final AttributeKey MESSAGING_MESSAGE_BODY_SIZE = + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE; + public static final AttributeKey MESSAGING_MESSAGE_CONVERSATION_ID = + MessagingIncubatingAttributes.MESSAGING_MESSAGE_CONVERSATION_ID; + public static final AttributeKey MESSAGING_MESSAGE_ENVELOPE_SIZE = + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ENVELOPE_SIZE; + public static final AttributeKey MESSAGING_MESSAGE_ID = + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID; + public static final AttributeKey MESSAGING_OPERATION = + MessagingIncubatingAttributes.MESSAGING_OPERATION; + public static final AttributeKey MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY = + MessagingIncubatingAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY; + public static final AttributeKey MESSAGING_ROCKETMQ_CLIENT_GROUP = + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_CLIENT_GROUP; + public static final AttributeKey MESSAGING_ROCKETMQ_CONSUMPTION_MODEL = + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_CONSUMPTION_MODEL; + public static final AttributeKey MESSAGING_ROCKETMQ_MESSAGE_DELAY_TIME_LEVEL = + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_DELAY_TIME_LEVEL; + public static final AttributeKey MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP = + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP; + public static final AttributeKey MESSAGING_ROCKETMQ_MESSAGE_GROUP = + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_GROUP; + public static final AttributeKey> MESSAGING_ROCKETMQ_MESSAGE_KEYS = + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_KEYS; + public static final AttributeKey MESSAGING_ROCKETMQ_MESSAGE_TAG = + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG; + public static final AttributeKey MESSAGING_ROCKETMQ_MESSAGE_TYPE = + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TYPE; + public static final AttributeKey MESSAGING_ROCKETMQ_NAMESPACE = + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_NAMESPACE; + public static final AttributeKey MESSAGING_SYSTEM = + MessagingIncubatingAttributes.MESSAGING_SYSTEM; + + public static final class MessagingSystemValues { + public static final String ACTIVEMQ = + MessagingIncubatingAttributes.MessagingSystemValues.ACTIVEMQ; + public static final String AWS_SQS = + MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS; + public static final String AZURE_EVENTGRID = + MessagingIncubatingAttributes.MessagingSystemValues.AZURE_EVENTGRID; + public static final String AZURE_EVENTHUBS = + MessagingIncubatingAttributes.MessagingSystemValues.AZURE_EVENTHUBS; + public static final String AZURE_SERVICEBUS = + MessagingIncubatingAttributes.MessagingSystemValues.AZURE_SERVICEBUS; + public static final String GCP_PUBSUB = + MessagingIncubatingAttributes.MessagingSystemValues.GCP_PUBSUB; + public static final String JMS = MessagingIncubatingAttributes.MessagingSystemValues.JMS; + public static final String KAFKA = MessagingIncubatingAttributes.MessagingSystemValues.KAFKA; + public static final String RABBITMQ = + MessagingIncubatingAttributes.MessagingSystemValues.RABBITMQ; + public static final String ROCKETMQ = + MessagingIncubatingAttributes.MessagingSystemValues.ROCKETMQ; + + private MessagingSystemValues() {} + } + + public static final class MessagingRocketmqMessageTypeValues { + public static final String NORMAL = + MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.NORMAL; + public static final String FIFO = + MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.FIFO; + public static final String DELAY = + MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.DELAY; + public static final String TRANSACTION = + MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.TRANSACTION; + + private MessagingRocketmqMessageTypeValues() {} + } + + public static final class MessagingRocketmqConsumptionModelValues { + public static final String CLUSTERING = + MessagingIncubatingAttributes.MessagingRocketmqConsumptionModelValues.CLUSTERING; + public static final String BROADCASTING = + MessagingIncubatingAttributes.MessagingRocketmqConsumptionModelValues.BROADCASTING; + + private MessagingRocketmqConsumptionModelValues() {} + } + + public static final class MessagingOperationValues { + public static final String PUBLISH = + MessagingIncubatingAttributes.MessagingOperationValues.PUBLISH; + public static final String CREATE = + MessagingIncubatingAttributes.MessagingOperationValues.CREATE; + public static final String RECEIVE = + MessagingIncubatingAttributes.MessagingOperationValues.RECEIVE; + public static final String DELIVER = + MessagingIncubatingAttributes.MessagingOperationValues.DELIVER; + + private MessagingOperationValues() {} + } + + public static final AttributeKey CODE_COLUMN = CodeIncubatingAttributes.CODE_COLUMN; + public static final AttributeKey CODE_FILEPATH = CodeIncubatingAttributes.CODE_FILEPATH; + public static final AttributeKey CODE_FUNCTION = CodeIncubatingAttributes.CODE_FUNCTION; + public static final AttributeKey CODE_LINENO = CodeIncubatingAttributes.CODE_LINENO; + public static final AttributeKey CODE_NAMESPACE = CodeIncubatingAttributes.CODE_NAMESPACE; + public static final AttributeKey CODE_STACKTRACE = + CodeIncubatingAttributes.CODE_STACKTRACE; + + public static final AttributeKey PEER_SERVICE = PeerIncubatingAttributes.PEER_SERVICE; + + public static final AttributeKey MESSAGE_COMPRESSED_SIZE = + MessageIncubatingAttributes.MESSAGE_COMPRESSED_SIZE; + public static final AttributeKey MESSAGE_ID = MessageIncubatingAttributes.MESSAGE_ID; + public static final AttributeKey MESSAGE_TYPE = MessageIncubatingAttributes.MESSAGE_TYPE; + public static final AttributeKey MESSAGE_UNCOMPRESSED_SIZE = + MessageIncubatingAttributes.MESSAGE_UNCOMPRESSED_SIZE; + + public static final class MessageTypeValues { + public static final String SENT = MessageIncubatingAttributes.MessageTypeValues.SENT; + public static final String RECEIVED = MessageIncubatingAttributes.MessageTypeValues.RECEIVED; + + private MessageTypeValues() {} + } + + public static final AttributeKey THREAD_ID = ThreadIncubatingAttributes.THREAD_ID; + public static final AttributeKey THREAD_NAME = ThreadIncubatingAttributes.THREAD_NAME; + + public static final AttributeKey EXCEPTION_ESCAPED = + ExceptionIncubatingAttributes.EXCEPTION_ESCAPED; + public static final AttributeKey EXCEPTION_MESSAGE = + ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; + public static final AttributeKey EXCEPTION_STACKTRACE = + ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; + public static final AttributeKey EXCEPTION_TYPE = + ExceptionIncubatingAttributes.EXCEPTION_TYPE; + + public static final String EXCEPTION_EVENT_NAME = "exception"; + + public static final AttributeKey FAAS_TRIGGER = ResourceAttributes.FAAS_TRIGGER; + public static final AttributeKey FAAS_INVOCATION_ID = + ResourceAttributes.FAAS_INVOCATION_ID; + + public static final class FaasTriggerValues { + private FaasTriggerValues() {} + + public static final String HTTP = ResourceAttributes.FaasTriggerValues.HTTP; + } + + public static final AttributeKey ENDUSER_ID = EnduserIncubatingAttributes.ENDUSER_ID; + public static final AttributeKey ENDUSER_ROLE = EnduserIncubatingAttributes.ENDUSER_ROLE; + public static final AttributeKey ENDUSER_SCOPE = + EnduserIncubatingAttributes.ENDUSER_SCOPE; +} diff --git a/settings.gradle.kts b/settings.gradle.kts index aecfe18ce134..571e7f59c02a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -87,6 +87,8 @@ include(":custom-checks") include(":muzzle") +include(":semconv-migration") + // agent projects include(":opentelemetry-api-shaded-for-instrumenting") include(":opentelemetry-ext-annotations-shaded-for-instrumenting") From a02d25feb108998748a1e96379962c6817c08f99 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:06:39 +0200 Subject: [PATCH 03/52] remove internal NetworkAttributes --- .../HttpClientExperimentalMetricsTest.java | 2 +- .../HttpServerExperimentalMetricsTest.java | 2 +- .../semconv/rpc/RpcServerMetricsTest.java | 2 +- .../InternalNetworkAttributesExtractor.java | 1 + .../network/internal/NetworkAttributes.java | 29 ------------------- .../HttpClientAttributesExtractorTest.java | 2 +- .../semconv/http/HttpClientMetricsTest.java | 2 +- .../HttpServerAttributesExtractorTest.java | 2 +- .../semconv/http/HttpServerMetricsTest.java | 2 +- ...ributesExtractorInetSocketAddressTest.java | 2 +- .../NetworkAttributesExtractorTest.java | 2 +- .../apachedubbo/v2_7/AbstractDubboTest.groovy | 2 +- .../v2_7/AbstractDubboTraceChainTest.groovy | 2 +- .../apachecamel/RestCamelTest.java | 2 +- .../TwoServicesWithDirectClientCamelTest.java | 2 +- .../src/test/java/CassandraClientTest.java | 2 +- .../v4/common/AbstractCassandraTest.java | 2 +- .../v4_4/AbstractCassandra44Test.java | 2 +- .../src/test/groovy/CouchbaseSpanUtil.groovy | 2 +- .../Elasticsearch5TransportClientTest.groovy | 2 +- .../Elasticsearch53TransportClientTest.groovy | 2 +- .../Elasticsearch6TransportClientTest.groovy | 2 +- .../grpc/v1_6/AbstractGrpcStreamingTest.java | 2 +- .../grpc/v1_6/AbstractGrpcTest.java | 2 +- .../src/test/groovy/JaxRsClientTest.groovy | 2 +- .../groovy/AbstractJaxRsHttpServerTest.groovy | 2 +- .../jedis/v3_0/Jedis30ClientTest.java | 2 +- .../jedis/v4_0/Jedis40ClientTest.java | 2 +- .../src/main/groovy/BaseJsfTest.groovy | 2 +- .../src/main/groovy/BaseJsfTest.groovy | 2 +- .../JspInstrumentationBasicTests.groovy | 2 +- .../JspInstrumentationForwardTests.groovy | 2 +- .../v5_1/LettuceReactiveClientTest.java | 2 +- .../v5_1/AbstractLettuceAsyncClientTest.java | 2 +- .../AbstractLettuceReactiveClientTest.java | 2 +- .../AbstractLettuceSyncClientAuthTest.java | 2 +- .../v5_1/AbstractLettuceSyncClientTest.java | 2 +- .../v4_0/client/Netty40ClientSslTest.java | 2 +- .../client/Netty40ConnectionSpanTest.java | 2 +- .../test/groovy/Netty41ClientSslTest.groovy | 2 +- .../groovy/Netty41ConnectionSpanTest.groovy | 2 +- .../rabbitmq/RabbitMqTest.java | 2 +- .../rabbitmq/ReactorRabbitMqTest.java | 2 +- .../server/AbstractRatpackRoutesTest.groovy | 2 +- .../v0_9/ReactorNettyConnectionSpanTest.java | 2 +- .../v1_0/ReactorNettyBaseUrlOnlyTest.java | 2 +- .../v1_0/ReactorNettyClientSslTest.java | 2 +- .../v1_0/ReactorNettyConnectionSpanTest.java | 2 +- .../AbstractRedissonAsyncClientTest.java | 2 +- .../redisson/AbstractRedissonClientTest.java | 2 +- .../sparkjava/SparkJavaBasedTest.java | 2 +- .../SpringIntegrationAndRabbitTest.groovy | 2 +- .../rabbit/v1_0/ContextPropagationTest.java | 2 +- .../v5_0/server/SpringWebfluxTest.java | 2 +- .../src/test/groovy/UndertowServerTest.groovy | 2 +- .../v4_0/redis/VertxRedisClientTest.java | 2 +- .../VertxReactivePropagationTest.groovy | 2 +- .../VertxReactivePropagationTest.groovy | 2 +- .../test/base/HttpServerTest.groovy | 2 +- .../junit/http/AbstractHttpClientTest.java | 2 +- .../junit/http/AbstractHttpServerTest.java | 2 +- 61 files changed, 60 insertions(+), 88 deletions(-) delete mode 100644 instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/NetworkAttributes.java diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java index 28655c16946b..b2a484443623 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import io.opentelemetry.semconv.SemanticAttributes; diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java index c35567a07fc9..28d2ac8eb978 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import io.opentelemetry.semconv.SemanticAttributes; diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java index 1d683180b7b1..d4f31119d85d 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java @@ -15,9 +15,9 @@ import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalNetworkAttributesExtractor.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalNetworkAttributesExtractor.java index f0732827e384..4b1a5e83cecf 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalNetworkAttributesExtractor.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalNetworkAttributesExtractor.java @@ -9,6 +9,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.Locale; import javax.annotation.Nullable; diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/NetworkAttributes.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/NetworkAttributes.java deleted file mode 100644 index 04b223e48576..000000000000 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/NetworkAttributes.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.instrumentation.api.semconv.network.internal; - -import io.opentelemetry.api.common.AttributeKey; - -/** - * This class is internal and is hence not for public use. Its APIs are unstable and can change at - * any time. - */ -public final class NetworkAttributes { - - public static final AttributeKey NETWORK_LOCAL_ADDRESS = - io.opentelemetry.semconv.NetworkAttributes.NETWORK_LOCAL_ADDRESS; - - public static final AttributeKey NETWORK_LOCAL_PORT = - io.opentelemetry.semconv.NetworkAttributes.NETWORK_LOCAL_PORT; - - public static final AttributeKey NETWORK_PEER_ADDRESS = - io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS; - - public static final AttributeKey NETWORK_PEER_PORT = - io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_PORT; - - private NetworkAttributes() {} -} diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java index c3b4f88034ea..599da463bb2e 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java @@ -18,7 +18,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.internal.HttpConstants; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.net.ConnectException; import java.util.HashMap; diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java index d0e67cd5f9e0..88ad2d4144cd 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import io.opentelemetry.semconv.SemanticAttributes; diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java index 298c2a61c945..bcc3d2b4ec6e 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java @@ -18,7 +18,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.internal.HttpConstants; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.net.ConnectException; import java.util.HashMap; diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java index f3c6c2e0f160..7706104eb818 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import io.opentelemetry.semconv.SemanticAttributes; diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorInetSocketAddressTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorInetSocketAddressTest.java index 3be204ebfc46..809d35efa93b 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorInetSocketAddressTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorInetSocketAddressTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.net.InetSocketAddress; import javax.annotation.Nullable; diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorTest.java index d0e643820788..dda595ae0d63 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.HashMap; import java.util.Map; diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy index c994c828cdd5..1cfb37bed950 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy @@ -8,9 +8,9 @@ package io.opentelemetry.instrumentation.apachedubbo.v2_7 import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService import io.opentelemetry.instrumentation.apachedubbo.v2_7.impl.HelloServiceImpl -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.SemanticAttributes import org.apache.dubbo.common.utils.NetUtils import org.apache.dubbo.config.ApplicationConfig diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy index 047f69e6c67e..8e38078d653c 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy @@ -10,7 +10,7 @@ import io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService import io.opentelemetry.instrumentation.apachedubbo.v2_7.api.MiddleService import io.opentelemetry.instrumentation.apachedubbo.v2_7.impl.HelloServiceImpl import io.opentelemetry.instrumentation.apachedubbo.v2_7.impl.MiddleServiceImpl -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java index 09c552ba2628..44fd019101c9 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java @@ -11,7 +11,7 @@ import com.google.common.collect.ImmutableMap; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerUsingTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java index d0001556120f..8a6631ebd50d 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java @@ -11,7 +11,7 @@ import com.google.common.collect.ImmutableMap; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerUsingTest; diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java index 7ea430aca23f..c10d2e04a395 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java @@ -10,7 +10,7 @@ import com.datastax.driver.core.ResultSetFuture; import com.datastax.driver.core.Session; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; diff --git a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java index a8424cd650f5..a83625abbaf2 100644 --- a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java +++ b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java @@ -30,7 +30,7 @@ import com.datastax.oss.driver.api.core.config.DriverConfigLoader; import com.datastax.oss.driver.internal.core.config.typesafe.DefaultDriverConfigLoader; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import java.net.InetSocketAddress; import java.time.Duration; diff --git a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java index f9c1128008f2..cb1b5f984014 100644 --- a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java +++ b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java @@ -27,7 +27,7 @@ import com.datastax.oss.driver.api.core.CqlSession; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.cassandra.v4.common.AbstractCassandraTest; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy index 6d414b8c0a11..3692556530a8 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy index deca421fa638..318370acb794 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.SemanticAttributes import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.common.io.FileSystemUtils diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy index 2c10c11e797e..f9a023cdf91e 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.SemanticAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.transport.TransportClient diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy index 1b911e8c3fbc..e71871ce2631 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.SemanticAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.transport.TransportClient diff --git a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java index ad4e62b93cca..6cc4cdc2734e 100644 --- a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java +++ b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java @@ -20,7 +20,7 @@ import io.grpc.Status; import io.grpc.stub.StreamObserver; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.util.ThrowingRunnable; import io.opentelemetry.sdk.testing.assertj.EventDataAssert; diff --git a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java index a83099ddefec..57839738f4f9 100644 --- a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java +++ b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java @@ -43,7 +43,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.util.ThrowingRunnable; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy index f981a853b875..1e37c9e707da 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy index 8cac640b4360..3a7b75a3069c 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java index 90a9d4293306..5dad7232ec72 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java +++ b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java @@ -10,7 +10,7 @@ import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java b/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java index 224a891cf57f..bc1e8504886a 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java +++ b/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java @@ -9,7 +9,7 @@ import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; diff --git a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy index 2bba6bc689cf..2a5449498ddc 100644 --- a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -4,7 +4,7 @@ */ import io.opentelemetry.api.trace.SpanKind -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait diff --git a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy index f596e745bbd9..e62f0abdf9a5 100644 --- a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -4,7 +4,7 @@ */ import io.opentelemetry.api.trace.SpanKind -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy index 05b1019d157e..d6e780dcb859 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy index 50a7cb69e303..d7ca00614c9d 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java index 243ca4130d52..47e9de6b99c9 100644 --- a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java @@ -10,7 +10,7 @@ import io.lettuce.core.RedisClient; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.lettuce.v5_1.AbstractLettuceReactiveClientTest; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java index be88fb4b5268..a4d42fd2a955 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java @@ -19,7 +19,7 @@ import io.lettuce.core.api.sync.RedisCommands; import io.lettuce.core.codec.StringCodec; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.semconv.SemanticAttributes; diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java index fc52afb9beb0..90136ce0e3cf 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java @@ -12,7 +12,7 @@ import io.lettuce.core.api.sync.RedisCommands; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.Objects; import java.util.concurrent.CompletableFuture; diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java index f33dc129c061..acac2e32ca51 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java @@ -10,7 +10,7 @@ import io.lettuce.core.api.sync.RedisCommands; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java index 615f7c60cb92..3076c85d3631 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java @@ -19,7 +19,7 @@ import io.lettuce.core.api.sync.RedisCommands; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.semconv.SemanticAttributes; import java.util.Base64; diff --git a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java index d083b89b9111..9cb510a17d82 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java @@ -26,7 +26,7 @@ import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpVersion; import io.netty.handler.ssl.SslHandler; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer; diff --git a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java index 5e470d01e8d7..40aed1f8fa04 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java @@ -27,7 +27,7 @@ import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpVersion; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; diff --git a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy index e95a8a4606c9..0f99f82cf5d9 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy +++ b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy @@ -20,7 +20,7 @@ import io.netty.handler.codec.http.HttpVersion import io.netty.handler.ssl.SslContext import io.netty.handler.ssl.SslContextBuilder import io.netty.handler.ssl.SslHandler -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.netty.v4_1.ClientHandler import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer diff --git a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy index df80c8b5418a..52bee7b2c5d9 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy +++ b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy @@ -16,7 +16,7 @@ import io.netty.handler.codec.http.HttpClientCodec import io.netty.handler.codec.http.HttpHeaderNames import io.netty.handler.codec.http.HttpMethod import io.netty.handler.codec.http.HttpVersion -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.netty.v4_1.ClientHandler import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.InstrumentationSpecification diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java index ae0d6cb8c90e..ddd9874468a1 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java @@ -22,7 +22,7 @@ import com.rabbitmq.client.ShutdownSignalException; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java index 203479c1fa88..c9452c36425d 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java @@ -10,7 +10,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; diff --git a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy index ae3b74294da7..23901112f92f 100644 --- a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy +++ b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy @@ -5,7 +5,7 @@ package io.opentelemetry.instrumentation.ratpack.server -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java index fdb7a8053c23..39ee1309b7c5 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java index 114827df2ce2..9c39b93b467f 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java @@ -16,7 +16,7 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.trace.SpanBuilder; import io.opentelemetry.context.Context; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.server.http.RequestContextGetter; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java index ddc9a2f07383..1661ddb500b7 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import io.netty.handler.ssl.SslContextBuilder; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer; diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java index 62068c1bee90..7a8ebaabed29 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java index 40a3955f591a..011d97bd120f 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java @@ -14,7 +14,7 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java index 43c81ecd7226..49dd6ed6d312 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.TraceAssert; diff --git a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java index 101fb80e1104..98d1e849212b 100644 --- a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java +++ b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; diff --git a/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy b/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy index a6bf12fd4322..0d8de7bb0b7b 100644 --- a/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy +++ b/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java index 5d6bf1ca2241..f910c111e54e 100644 --- a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java +++ b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java @@ -13,7 +13,7 @@ import com.rabbitmq.client.ConnectionFactory; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.GlobalTraceUtil; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java index 199724a53983..1aa358321ca5 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java @@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Named.named; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.EventDataAssert; diff --git a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy index 44475872cfb9..e33ed68b0a40 100644 --- a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy +++ b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy @@ -7,7 +7,7 @@ import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.api.trace.Span import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.api.trace.StatusCode -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java index 2207fcf692a4..543d863ea80a 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java @@ -9,7 +9,7 @@ import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy index 441c30f9e69a..6438eafb8cba 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy @@ -7,7 +7,7 @@ import io.opentelemetry.api.GlobalOpenTelemetry import io.opentelemetry.api.trace.Span import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.context.Context -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy index 441c30f9e69a..6438eafb8cba 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy @@ -7,7 +7,7 @@ import io.opentelemetry.api.GlobalOpenTelemetry import io.opentelemetry.api.trace.Span import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.context.Context -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes diff --git a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy index e389dd794bde..0ada963a2693 100644 --- a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy +++ b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy @@ -9,7 +9,7 @@ import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.api.trace.Span import io.opentelemetry.api.trace.SpanId import io.opentelemetry.api.trace.SpanKind -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.api.internal.HttpConstants import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java index 8c193934f940..c6ae482894d5 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java @@ -18,7 +18,7 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.api.internal.HttpConstants; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java index 8f837a40358a..338d7801428e 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java @@ -27,7 +27,7 @@ import io.opentelemetry.context.propagation.TextMapPropagator; import io.opentelemetry.context.propagation.TextMapSetter; import io.opentelemetry.instrumentation.api.internal.HttpConstants; -import io.opentelemetry.instrumentation.api.semconv.network.internal.NetworkAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.GlobalTraceUtil; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.testing.assertj.TraceAssert; From 21b35c066bd4d5e0a13e22c4e0c79f489c9d8210 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:22:35 +0200 Subject: [PATCH 04/52] wip --- .../semconv/SemanticAttributes.java | 216 ------------------ 1 file changed, 216 deletions(-) diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index 10f1158ffbd4..dd68fae837d2 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -27,9 +27,6 @@ private SemanticAttributes() {} public static final AttributeKey URL_QUERY = UrlAttributes.URL_QUERY; public static final AttributeKey URL_SCHEME = UrlAttributes.URL_SCHEME; - public static final AttributeKey NETWORK_LOCAL_ADDRESS = - NetworkAttributes.NETWORK_LOCAL_ADDRESS; - public static final AttributeKey NETWORK_LOCAL_PORT = NetworkAttributes.NETWORK_LOCAL_PORT; public static final AttributeKey NETWORK_PEER_ADDRESS = NetworkAttributes.NETWORK_PEER_ADDRESS; public static final AttributeKey NETWORK_PEER_PORT = NetworkAttributes.NETWORK_PEER_PORT; @@ -47,8 +44,6 @@ private SemanticAttributes() {} HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL; public static final AttributeKey HTTP_REQUEST_RESEND_COUNT = HttpAttributes.HTTP_REQUEST_RESEND_COUNT; - public static final AttributeKeyTemplate> HTTP_RESPONSE_HEADER = - HttpAttributes.HTTP_RESPONSE_HEADER; public static final AttributeKey HTTP_RESPONSE_STATUS_CODE = HttpAttributes.HTTP_RESPONSE_STATUS_CODE; public static final AttributeKey HTTP_ROUTE = HttpAttributes.HTTP_ROUTE; @@ -85,17 +80,6 @@ private SemanticAttributes() {} DbIncubatingAttributes.DB_CASSANDRA_TABLE; public static final AttributeKey DB_CONNECTION_STRING = DbIncubatingAttributes.DB_CONNECTION_STRING; - public static final AttributeKey DB_ELASTICSEARCH_CLUSTER_NAME = - DbIncubatingAttributes.DB_ELASTICSEARCH_CLUSTER_NAME; - public static final AttributeKey DB_ELASTICSEARCH_NODE_NAME = - DbIncubatingAttributes.DB_ELASTICSEARCH_NODE_NAME; - public static final AttributeKeyTemplate DB_ELASTICSEARCH_PATH_PARTS = - DbIncubatingAttributes.DB_ELASTICSEARCH_PATH_PARTS; - public static final AttributeKey DB_INSTANCE_ID = DbIncubatingAttributes.DB_INSTANCE_ID; - public static final AttributeKey DB_JDBC_DRIVER_CLASSNAME = - DbIncubatingAttributes.DB_JDBC_DRIVER_CLASSNAME; - public static final AttributeKey DB_MSSQL_INSTANCE_NAME = - DbIncubatingAttributes.DB_MSSQL_INSTANCE_NAME; public static final AttributeKey DB_NAME = DbIncubatingAttributes.DB_NAME; public static final AttributeKey DB_OPERATION = DbIncubatingAttributes.DB_OPERATION; public static final AttributeKey DB_REDIS_DATABASE_INDEX = @@ -111,163 +95,29 @@ private SemanticAttributes() {} public static final class DbSystemValues { public static final String OTHER_SQL = DbIncubatingAttributes.DbSystemValues.OTHER_SQL; public static final String MSSQL = DbIncubatingAttributes.DbSystemValues.MSSQL; - public static final String MSSQLCOMPACT = DbIncubatingAttributes.DbSystemValues.MSSQLCOMPACT; public static final String MYSQL = DbIncubatingAttributes.DbSystemValues.MYSQL; public static final String ORACLE = DbIncubatingAttributes.DbSystemValues.ORACLE; public static final String DB2 = DbIncubatingAttributes.DbSystemValues.DB2; public static final String POSTGRESQL = DbIncubatingAttributes.DbSystemValues.POSTGRESQL; - public static final String REDSHIFT = DbIncubatingAttributes.DbSystemValues.REDSHIFT; - public static final String HIVE = DbIncubatingAttributes.DbSystemValues.HIVE; - public static final String CLOUDSCAPE = DbIncubatingAttributes.DbSystemValues.CLOUDSCAPE; - public static final String HSQLDB = DbIncubatingAttributes.DbSystemValues.HSQLDB; - public static final String PROGRESS = DbIncubatingAttributes.DbSystemValues.PROGRESS; - public static final String MAXDB = DbIncubatingAttributes.DbSystemValues.MAXDB; public static final String HANADB = DbIncubatingAttributes.DbSystemValues.HANADB; - public static final String INGRES = DbIncubatingAttributes.DbSystemValues.INGRES; - public static final String FIRSTSQL = DbIncubatingAttributes.DbSystemValues.FIRSTSQL; - public static final String EDB = DbIncubatingAttributes.DbSystemValues.EDB; - public static final String CACHE = DbIncubatingAttributes.DbSystemValues.CACHE; - public static final String ADABAS = DbIncubatingAttributes.DbSystemValues.ADABAS; - public static final String FIREBIRD = DbIncubatingAttributes.DbSystemValues.FIREBIRD; public static final String DERBY = DbIncubatingAttributes.DbSystemValues.DERBY; - public static final String FILEMAKER = DbIncubatingAttributes.DbSystemValues.FILEMAKER; - public static final String INFORMIX = DbIncubatingAttributes.DbSystemValues.INFORMIX; - public static final String INSTANTDB = DbIncubatingAttributes.DbSystemValues.INSTANTDB; - public static final String INTERBASE = DbIncubatingAttributes.DbSystemValues.INTERBASE; public static final String MARIADB = DbIncubatingAttributes.DbSystemValues.MARIADB; - public static final String NETEZZA = DbIncubatingAttributes.DbSystemValues.NETEZZA; - public static final String PERVASIVE = DbIncubatingAttributes.DbSystemValues.PERVASIVE; - public static final String POINTBASE = DbIncubatingAttributes.DbSystemValues.POINTBASE; - public static final String SQLITE = DbIncubatingAttributes.DbSystemValues.SQLITE; - public static final String SYBASE = DbIncubatingAttributes.DbSystemValues.SYBASE; - public static final String TERADATA = DbIncubatingAttributes.DbSystemValues.TERADATA; - public static final String VERTICA = DbIncubatingAttributes.DbSystemValues.VERTICA; public static final String H2 = DbIncubatingAttributes.DbSystemValues.H2; - public static final String COLDFUSION = DbIncubatingAttributes.DbSystemValues.COLDFUSION; public static final String CASSANDRA = DbIncubatingAttributes.DbSystemValues.CASSANDRA; - public static final String HBASE = DbIncubatingAttributes.DbSystemValues.HBASE; public static final String MONGODB = DbIncubatingAttributes.DbSystemValues.MONGODB; public static final String REDIS = DbIncubatingAttributes.DbSystemValues.REDIS; public static final String COUCHBASE = DbIncubatingAttributes.DbSystemValues.COUCHBASE; - public static final String COUCHDB = DbIncubatingAttributes.DbSystemValues.COUCHDB; - public static final String COSMOSDB = DbIncubatingAttributes.DbSystemValues.COSMOSDB; - public static final String DYNAMODB = DbIncubatingAttributes.DbSystemValues.DYNAMODB; - public static final String NEO4J = DbIncubatingAttributes.DbSystemValues.NEO4J; public static final String GEODE = DbIncubatingAttributes.DbSystemValues.GEODE; public static final String ELASTICSEARCH = DbIncubatingAttributes.DbSystemValues.ELASTICSEARCH; - public static final String MEMCACHED = DbIncubatingAttributes.DbSystemValues.MEMCACHED; - public static final String COCKROACHDB = DbIncubatingAttributes.DbSystemValues.COCKROACHDB; public static final String OPENSEARCH = DbIncubatingAttributes.DbSystemValues.OPENSEARCH; - public static final String CLICKHOUSE = DbIncubatingAttributes.DbSystemValues.CLICKHOUSE; - public static final String SPANNER = DbIncubatingAttributes.DbSystemValues.SPANNER; - public static final String TRINO = DbIncubatingAttributes.DbSystemValues.TRINO; private DbSystemValues() {} } - public static final AttributeKey RPC_CONNECT_RPC_ERROR_CODE = - RpcIncubatingAttributes.RPC_CONNECT_RPC_ERROR_CODE; - public static final AttributeKeyTemplate> RPC_CONNECT_RPC_REQUEST_METADATA = - RpcIncubatingAttributes.RPC_CONNECT_RPC_REQUEST_METADATA; - public static final AttributeKeyTemplate> RPC_CONNECT_RPC_RESPONSE_METADATA = - RpcIncubatingAttributes.RPC_CONNECT_RPC_RESPONSE_METADATA; - public static final AttributeKeyTemplate> RPC_GRPC_REQUEST_METADATA = - RpcIncubatingAttributes.RPC_GRPC_REQUEST_METADATA; - public static final AttributeKeyTemplate> RPC_GRPC_RESPONSE_METADATA = - RpcIncubatingAttributes.RPC_GRPC_RESPONSE_METADATA; - public static final AttributeKey RPC_GRPC_STATUS_CODE = - RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE; - public static final AttributeKey RPC_JSONRPC_ERROR_CODE = - RpcIncubatingAttributes.RPC_JSONRPC_ERROR_CODE; - public static final AttributeKey RPC_JSONRPC_ERROR_MESSAGE = - RpcIncubatingAttributes.RPC_JSONRPC_ERROR_MESSAGE; - public static final AttributeKey RPC_JSONRPC_REQUEST_ID = - RpcIncubatingAttributes.RPC_JSONRPC_REQUEST_ID; - public static final AttributeKey RPC_JSONRPC_VERSION = - RpcIncubatingAttributes.RPC_JSONRPC_VERSION; public static final AttributeKey RPC_METHOD = RpcIncubatingAttributes.RPC_METHOD; public static final AttributeKey RPC_SERVICE = RpcIncubatingAttributes.RPC_SERVICE; public static final AttributeKey RPC_SYSTEM = RpcIncubatingAttributes.RPC_SYSTEM; - public static final class RpcSystemValues { - public static final String GRPC = RpcIncubatingAttributes.RpcSystemValues.GRPC; - public static final String JAVA_RMI = RpcIncubatingAttributes.RpcSystemValues.JAVA_RMI; - public static final String DOTNET_WCF = RpcIncubatingAttributes.RpcSystemValues.DOTNET_WCF; - public static final String APACHE_DUBBO = RpcIncubatingAttributes.RpcSystemValues.APACHE_DUBBO; - public static final String CONNECT_RPC = RpcIncubatingAttributes.RpcSystemValues.CONNECT_RPC; - - private RpcSystemValues() {} - } - - public static final class RpcGrpcStatusCodeValues { - public static final long OK = RpcIncubatingAttributes.RpcGrpcStatusCodeValues.OK; - public static final long CANCELLED = RpcIncubatingAttributes.RpcGrpcStatusCodeValues.CANCELLED; - public static final long UNKNOWN = RpcIncubatingAttributes.RpcGrpcStatusCodeValues.UNKNOWN; - public static final long INVALID_ARGUMENT = - RpcIncubatingAttributes.RpcGrpcStatusCodeValues.INVALID_ARGUMENT; - public static final long DEADLINE_EXCEEDED = - RpcIncubatingAttributes.RpcGrpcStatusCodeValues.DEADLINE_EXCEEDED; - public static final long NOT_FOUND = RpcIncubatingAttributes.RpcGrpcStatusCodeValues.NOT_FOUND; - public static final long ALREADY_EXISTS = - RpcIncubatingAttributes.RpcGrpcStatusCodeValues.ALREADY_EXISTS; - public static final long PERMISSION_DENIED = - RpcIncubatingAttributes.RpcGrpcStatusCodeValues.PERMISSION_DENIED; - public static final long RESOURCE_EXHAUSTED = - RpcIncubatingAttributes.RpcGrpcStatusCodeValues.RESOURCE_EXHAUSTED; - public static final long FAILED_PRECONDITION = - RpcIncubatingAttributes.RpcGrpcStatusCodeValues.FAILED_PRECONDITION; - public static final long ABORTED = RpcIncubatingAttributes.RpcGrpcStatusCodeValues.ABORTED; - public static final long OUT_OF_RANGE = - RpcIncubatingAttributes.RpcGrpcStatusCodeValues.OUT_OF_RANGE; - public static final long UNIMPLEMENTED = - RpcIncubatingAttributes.RpcGrpcStatusCodeValues.UNIMPLEMENTED; - public static final long INTERNAL = RpcIncubatingAttributes.RpcGrpcStatusCodeValues.INTERNAL; - public static final long UNAVAILABLE = - RpcIncubatingAttributes.RpcGrpcStatusCodeValues.UNAVAILABLE; - public static final long DATA_LOSS = RpcIncubatingAttributes.RpcGrpcStatusCodeValues.DATA_LOSS; - public static final long UNAUTHENTICATED = - RpcIncubatingAttributes.RpcGrpcStatusCodeValues.UNAUTHENTICATED; - - private RpcGrpcStatusCodeValues() {} - } - - public static final class RpcConnectRpcErrorCodeValues { - public static final String CANCELLED = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.CANCELLED; - public static final String UNKNOWN = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.UNKNOWN; - public static final String INVALID_ARGUMENT = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.INVALID_ARGUMENT; - public static final String DEADLINE_EXCEEDED = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.DEADLINE_EXCEEDED; - public static final String NOT_FOUND = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.NOT_FOUND; - public static final String ALREADY_EXISTS = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.ALREADY_EXISTS; - public static final String PERMISSION_DENIED = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.PERMISSION_DENIED; - public static final String RESOURCE_EXHAUSTED = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.RESOURCE_EXHAUSTED; - public static final String FAILED_PRECONDITION = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.FAILED_PRECONDITION; - public static final String ABORTED = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.ABORTED; - public static final String OUT_OF_RANGE = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.OUT_OF_RANGE; - public static final String UNIMPLEMENTED = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.UNIMPLEMENTED; - public static final String INTERNAL = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.INTERNAL; - public static final String UNAVAILABLE = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.UNAVAILABLE; - public static final String DATA_LOSS = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.DATA_LOSS; - public static final String UNAUTHENTICATED = - RpcIncubatingAttributes.RpcConnectRpcErrorCodeValues.UNAUTHENTICATED; - - private RpcConnectRpcErrorCodeValues() {} - } - public static final AttributeKey MESSAGING_BATCH_MESSAGE_COUNT = MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT; public static final AttributeKey MESSAGING_CLIENT_ID = @@ -285,12 +135,6 @@ private RpcConnectRpcErrorCodeValues() {} MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPLATE; public static final AttributeKey MESSAGING_DESTINATION_TEMPORARY = MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPORARY; - public static final AttributeKey MESSAGING_DESTINATION_PUBLISH_ANONYMOUS = - MessagingIncubatingAttributes.MESSAGING_DESTINATION_PUBLISH_ANONYMOUS; - public static final AttributeKey MESSAGING_DESTINATION_PUBLISH_NAME = - MessagingIncubatingAttributes.MESSAGING_DESTINATION_PUBLISH_NAME; - public static final AttributeKey MESSAGING_GCP_PUBSUB_MESSAGE_ORDERING_KEY = - MessagingIncubatingAttributes.MESSAGING_GCP_PUBSUB_MESSAGE_ORDERING_KEY; public static final AttributeKey MESSAGING_KAFKA_CONSUMER_GROUP = MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP; public static final AttributeKey MESSAGING_KAFKA_DESTINATION_PARTITION = @@ -315,10 +159,6 @@ private RpcConnectRpcErrorCodeValues() {} MessagingIncubatingAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY; public static final AttributeKey MESSAGING_ROCKETMQ_CLIENT_GROUP = MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_CLIENT_GROUP; - public static final AttributeKey MESSAGING_ROCKETMQ_CONSUMPTION_MODEL = - MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_CONSUMPTION_MODEL; - public static final AttributeKey MESSAGING_ROCKETMQ_MESSAGE_DELAY_TIME_LEVEL = - MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_DELAY_TIME_LEVEL; public static final AttributeKey MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP = MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP; public static final AttributeKey MESSAGING_ROCKETMQ_MESSAGE_GROUP = @@ -329,34 +169,9 @@ private RpcConnectRpcErrorCodeValues() {} MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG; public static final AttributeKey MESSAGING_ROCKETMQ_MESSAGE_TYPE = MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TYPE; - public static final AttributeKey MESSAGING_ROCKETMQ_NAMESPACE = - MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_NAMESPACE; public static final AttributeKey MESSAGING_SYSTEM = MessagingIncubatingAttributes.MESSAGING_SYSTEM; - public static final class MessagingSystemValues { - public static final String ACTIVEMQ = - MessagingIncubatingAttributes.MessagingSystemValues.ACTIVEMQ; - public static final String AWS_SQS = - MessagingIncubatingAttributes.MessagingSystemValues.AWS_SQS; - public static final String AZURE_EVENTGRID = - MessagingIncubatingAttributes.MessagingSystemValues.AZURE_EVENTGRID; - public static final String AZURE_EVENTHUBS = - MessagingIncubatingAttributes.MessagingSystemValues.AZURE_EVENTHUBS; - public static final String AZURE_SERVICEBUS = - MessagingIncubatingAttributes.MessagingSystemValues.AZURE_SERVICEBUS; - public static final String GCP_PUBSUB = - MessagingIncubatingAttributes.MessagingSystemValues.GCP_PUBSUB; - public static final String JMS = MessagingIncubatingAttributes.MessagingSystemValues.JMS; - public static final String KAFKA = MessagingIncubatingAttributes.MessagingSystemValues.KAFKA; - public static final String RABBITMQ = - MessagingIncubatingAttributes.MessagingSystemValues.RABBITMQ; - public static final String ROCKETMQ = - MessagingIncubatingAttributes.MessagingSystemValues.ROCKETMQ; - - private MessagingSystemValues() {} - } - public static final class MessagingRocketmqMessageTypeValues { public static final String NORMAL = MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.NORMAL; @@ -370,44 +185,15 @@ public static final class MessagingRocketmqMessageTypeValues { private MessagingRocketmqMessageTypeValues() {} } - public static final class MessagingRocketmqConsumptionModelValues { - public static final String CLUSTERING = - MessagingIncubatingAttributes.MessagingRocketmqConsumptionModelValues.CLUSTERING; - public static final String BROADCASTING = - MessagingIncubatingAttributes.MessagingRocketmqConsumptionModelValues.BROADCASTING; - - private MessagingRocketmqConsumptionModelValues() {} - } - - public static final class MessagingOperationValues { - public static final String PUBLISH = - MessagingIncubatingAttributes.MessagingOperationValues.PUBLISH; - public static final String CREATE = - MessagingIncubatingAttributes.MessagingOperationValues.CREATE; - public static final String RECEIVE = - MessagingIncubatingAttributes.MessagingOperationValues.RECEIVE; - public static final String DELIVER = - MessagingIncubatingAttributes.MessagingOperationValues.DELIVER; - - private MessagingOperationValues() {} - } - - public static final AttributeKey CODE_COLUMN = CodeIncubatingAttributes.CODE_COLUMN; public static final AttributeKey CODE_FILEPATH = CodeIncubatingAttributes.CODE_FILEPATH; public static final AttributeKey CODE_FUNCTION = CodeIncubatingAttributes.CODE_FUNCTION; public static final AttributeKey CODE_LINENO = CodeIncubatingAttributes.CODE_LINENO; public static final AttributeKey CODE_NAMESPACE = CodeIncubatingAttributes.CODE_NAMESPACE; - public static final AttributeKey CODE_STACKTRACE = - CodeIncubatingAttributes.CODE_STACKTRACE; public static final AttributeKey PEER_SERVICE = PeerIncubatingAttributes.PEER_SERVICE; - public static final AttributeKey MESSAGE_COMPRESSED_SIZE = - MessageIncubatingAttributes.MESSAGE_COMPRESSED_SIZE; public static final AttributeKey MESSAGE_ID = MessageIncubatingAttributes.MESSAGE_ID; public static final AttributeKey MESSAGE_TYPE = MessageIncubatingAttributes.MESSAGE_TYPE; - public static final AttributeKey MESSAGE_UNCOMPRESSED_SIZE = - MessageIncubatingAttributes.MESSAGE_UNCOMPRESSED_SIZE; public static final class MessageTypeValues { public static final String SENT = MessageIncubatingAttributes.MessageTypeValues.SENT; @@ -419,8 +205,6 @@ private MessageTypeValues() {} public static final AttributeKey THREAD_ID = ThreadIncubatingAttributes.THREAD_ID; public static final AttributeKey THREAD_NAME = ThreadIncubatingAttributes.THREAD_NAME; - public static final AttributeKey EXCEPTION_ESCAPED = - ExceptionIncubatingAttributes.EXCEPTION_ESCAPED; public static final AttributeKey EXCEPTION_MESSAGE = ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; public static final AttributeKey EXCEPTION_STACKTRACE = From db40736f9c65593b8b8d4bd399d8e6707dc56f16 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 16:20:11 +0200 Subject: [PATCH 05/52] URL_* --- .../http/HttpExperimentalMetricsAdvice.java | 5 +- .../HttpClientExperimentalMetricsTest.java | 9 ++-- .../HttpServerExperimentalMetricsTest.java | 19 +++---- .../http/HttpClientAttributesExtractor.java | 3 +- .../api/semconv/http/HttpMetricsAdvice.java | 3 +- .../InternalUrlAttributesExtractor.java | 8 +-- .../HttpClientAttributesExtractorTest.java | 3 +- .../semconv/http/HttpClientMetricsTest.java | 9 ++-- .../HttpServerAttributesExtractorTest.java | 9 ++-- .../semconv/http/HttpServerMetricsTest.java | 15 +++--- .../url/UrlAttributesExtractorTest.java | 8 +-- .../ApiGatewayProxyAttributesExtractor.java | 3 +- .../v2_2/AwsLambdaApiGatewayWrapperTest.java | 4 +- .../src/test/groovy/S3TracingTest.groovy | 51 ++++++++++--------- .../src/test/groovy/SnsTracingTest.groovy | 15 +++--- .../awssdk/v1_11/Aws1ClientTest.groovy | 3 +- .../groovy/Aws0ClientTest.groovy | 9 ++-- .../v1_11/AbstractAws1ClientTest.groovy | 7 +-- .../AbstractSqsSuppressReceiveSpansTest.java | 15 +++--- .../awssdk/v1_11/AbstractSqsTracingTest.java | 25 ++++----- .../v2_2/AbstractAws2ClientCoreTest.groovy | 7 +-- .../awssdk/v2_2/AbstractAws2ClientTest.groovy | 11 ++-- ...ractAws2SqsSuppressReceiveSpansTest.groovy | 15 +++--- .../v2_2/AbstractAws2SqsTracingTest.groovy | 17 ++++--- .../v2_2/AbstractQueryProtocolModelTest.java | 2 +- .../decorators/HttpSpanDecorator.java | 3 +- .../apachecamel/RestCamelTest.java | 9 ++-- .../apachecamel/SingleServiceCamelTest.java | 3 +- .../TwoServicesWithDirectClientCamelTest.java | 15 +++--- .../apachecamel/aws/AwsSpanAssertions.java | 7 +-- .../src/test/java/CassandraClientTest.java | 2 +- .../v4/common/AbstractCassandraTest.java | 2 +- .../apiclient/ElasticsearchClientTest.java | 13 ++--- .../rest/v5_0/ElasticsearchRest5Test.java | 11 ++-- .../rest/v6_4/ElasticsearchRest6Test.java | 11 ++-- .../rest/v7_0/ElasticsearchRest7Test.java | 15 ++---- .../rest/v7_0/ElasticsearchRest7Test.java | 8 ++- ...ElasticsearchClientAttributeExtractor.java | 3 +- .../AbstractGoogleHttpClientTest.java | 3 +- .../grpc/v1_6/AbstractGrpcStreamingTest.java | 2 +- .../grpc/v1_6/AbstractGrpcTest.java | 2 +- .../HttpUrlConnectionTest.java | 11 ++-- .../src/test/groovy/JaxRsClientTest.groovy | 3 +- .../groovy/AbstractJaxRsHttpServerTest.groovy | 6 +-- .../jedis/v3_0/Jedis30ClientTest.java | 2 +- .../jedis/v4_0/Jedis40ClientTest.java | 2 +- .../src/main/groovy/BaseJsfTest.groovy | 5 +- .../src/main/groovy/BaseJsfTest.groovy | 5 +- .../JspInstrumentationBasicTests.groovy | 35 ++++++------- .../JspInstrumentationForwardTests.groovy | 25 ++++----- .../KubernetesClientTest.java | 9 ++-- .../KubernetesClientVer20Test.java | 9 ++-- .../v5_1/LettuceReactiveClientTest.java | 2 +- .../v5_1/AbstractLettuceAsyncClientTest.java | 2 +- .../v5_1/AbstractLettuceSyncClientTest.java | 2 +- .../v4_0/client/Netty40ClientSslTest.java | 2 +- .../client/Netty40ConnectionSpanTest.java | 2 +- .../src/test/java/OpenSearchRestTest.java | 7 ++- .../rabbitmq/RabbitMqTest.java | 2 +- .../rabbitmq/ReactorRabbitMqTest.java | 2 +- .../server/AbstractRatpackRoutesTest.groovy | 7 +-- .../client/InstrumentedHttpClientTest.groovy | 10 ++-- .../RatpackServerApplicationTest.groovy | 2 +- .../v1_7/server/RatpackServerTest.groovy | 7 +-- .../v0_9/ReactorNettyConnectionSpanTest.java | 2 +- .../AbstractReactorNettyHttpClientTest.java | 3 +- .../v1_0/ReactorNettyBaseUrlOnlyTest.java | 5 +- .../v1_0/ReactorNettyClientSslTest.java | 7 +-- .../v1_0/ReactorNettyConnectionSpanTest.java | 7 +-- .../AbstractRedissonAsyncClientTest.java | 2 +- .../redisson/AbstractRedissonClientTest.java | 2 +- .../sparkjava/SparkJavaBasedTest.java | 7 +-- .../rabbit/v1_0/ContextPropagationTest.java | 2 +- .../v5_0/server/SpringWebfluxTest.java | 45 ++++++++-------- ...pringWebfluxClientInstrumentationTest.java | 3 +- .../test/groovy/test/TwilioClientTest.groovy | 11 ++-- .../src/test/groovy/UndertowServerTest.groovy | 9 ++-- .../v4_0/redis/VertxRedisClientTest.java | 2 +- .../VertxReactivePropagationTest.groovy | 11 ++-- .../VertxReactivePropagationTest.groovy | 11 ++-- .../semconv/SemanticAttributes.java | 7 +-- .../smoketest/AppServerTest.groovy | 23 +++++---- .../junit/http/AbstractHttpClientTest.java | 7 +-- .../junit/http/AbstractHttpServerTest.java | 14 ++--- .../junit/http/HttpClientTestOptions.java | 3 +- 85 files changed, 379 insertions(+), 347 deletions(-) diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java index 64dc947a9deb..15e51a44a2b9 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java @@ -12,6 +12,7 @@ import io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder; import io.opentelemetry.extension.incubator.metrics.ExtendedLongUpDownCounterBuilder; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; final class HttpExperimentalMetricsAdvice { @@ -45,7 +46,7 @@ static void applyServerRequestSizeAdvice(LongHistogramBuilder builder) { SemanticAttributes.ERROR_TYPE, SemanticAttributes.NETWORK_PROTOCOL_NAME, SemanticAttributes.NETWORK_PROTOCOL_VERSION, - SemanticAttributes.URL_SCHEME)); + UrlAttributes.URL_SCHEME)); } static void applyServerActiveRequestsAdvice(LongUpDownCounterBuilder builder) { @@ -56,7 +57,7 @@ static void applyServerActiveRequestsAdvice(LongUpDownCounterBuilder builder) { .setAttributesAdvice( asList( // https://github.com/open-telemetry/semantic-conventions/blob/v1.23.0/docs/http/http-metrics.md#metric-httpserveractive_requests - SemanticAttributes.HTTP_REQUEST_METHOD, SemanticAttributes.URL_SCHEME)); + SemanticAttributes.HTTP_REQUEST_METHOD, UrlAttributes.URL_SCHEME)); } private HttpExperimentalMetricsAdvice() {} diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java index b2a484443623..ab22275bb69d 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java @@ -15,10 +15,11 @@ import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -36,9 +37,9 @@ void collectsMetrics() { Attributes requestAttributes = Attributes.builder() .put(SemanticAttributes.HTTP_REQUEST_METHOD, "GET") - .put(SemanticAttributes.URL_FULL, "https://localhost:1234/") - .put(SemanticAttributes.URL_PATH, "/") - .put(SemanticAttributes.URL_QUERY, "q=a") + .put(UrlAttributes.URL_FULL, "https://localhost:1234/") + .put(UrlAttributes.URL_PATH, "/") + .put(UrlAttributes.URL_QUERY, "q=a") .put(SemanticAttributes.SERVER_ADDRESS, "localhost") .put(SemanticAttributes.SERVER_PORT, 1234) .build(); diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java index 28d2ac8eb978..d7a7d70e2721 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java @@ -15,10 +15,11 @@ import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -36,9 +37,9 @@ void collectsMetrics() { Attributes requestAttributes = Attributes.builder() .put(SemanticAttributes.HTTP_REQUEST_METHOD, "GET") - .put(SemanticAttributes.URL_SCHEME, "https") - .put(SemanticAttributes.URL_PATH, "/") - .put(SemanticAttributes.URL_QUERY, "q=a") + .put(UrlAttributes.URL_SCHEME, "https") + .put(UrlAttributes.URL_PATH, "/") + .put(UrlAttributes.URL_QUERY, "q=a") .put(SemanticAttributes.NETWORK_TRANSPORT, "tcp") .put(SemanticAttributes.NETWORK_TYPE, "ipv4") .put(SemanticAttributes.NETWORK_PROTOCOL_NAME, "http") @@ -90,7 +91,7 @@ void collectsMetrics() { .hasValue(1) .hasAttributesSatisfying( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.URL_SCHEME, "https")) + equalTo(UrlAttributes.URL_SCHEME, "https")) .hasExemplarsSatisfying( exemplar -> exemplar @@ -113,7 +114,7 @@ void collectsMetrics() { .hasValue(2) .hasAttributesSatisfying( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.URL_SCHEME, "https")) + equalTo(UrlAttributes.URL_SCHEME, "https")) .hasExemplarsSatisfying( exemplar -> exemplar @@ -135,7 +136,7 @@ void collectsMetrics() { .hasValue(1) .hasAttributesSatisfying( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.URL_SCHEME, "https")) + equalTo(UrlAttributes.URL_SCHEME, "https")) .hasExemplarsSatisfying( exemplar -> exemplar @@ -161,7 +162,7 @@ void collectsMetrics() { SemanticAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( SemanticAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), - equalTo(SemanticAttributes.URL_SCHEME, "https")) + equalTo(UrlAttributes.URL_SCHEME, "https")) .hasExemplarsSatisfying( exemplar -> exemplar @@ -187,7 +188,7 @@ void collectsMetrics() { SemanticAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( SemanticAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), - equalTo(SemanticAttributes.URL_SCHEME, "https")) + equalTo(UrlAttributes.URL_SCHEME, "https")) .hasExemplarsSatisfying( exemplar -> exemplar diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractor.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractor.java index 68b9b6e43fad..a838d1936b02 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractor.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractor.java @@ -16,6 +16,7 @@ import io.opentelemetry.instrumentation.api.semconv.network.internal.InternalNetworkAttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.internal.InternalServerAttributesExtractor; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.util.function.ToIntFunction; import javax.annotation.Nullable; @@ -73,7 +74,7 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST internalServerExtractor.onStart(attributes, request); String fullUrl = stripSensitiveData(getter.getUrlFull(request)); - internalSet(attributes, SemanticAttributes.URL_FULL, fullUrl); + internalSet(attributes, UrlAttributes.URL_FULL, fullUrl); int resendCount = resendCountIncrementer.applyAsInt(parentContext); if (resendCount > 0) { diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java index c279ce02260d..6e2546ba61ce 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java @@ -11,6 +11,7 @@ import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.util.List; final class HttpMetricsAdvice { @@ -48,7 +49,7 @@ static void applyServerDurationAdvice(DoubleHistogramBuilder builder) { SemanticAttributes.ERROR_TYPE, SemanticAttributes.NETWORK_PROTOCOL_NAME, SemanticAttributes.NETWORK_PROTOCOL_VERSION, - SemanticAttributes.URL_SCHEME)); + UrlAttributes.URL_SCHEME)); } private HttpMetricsAdvice() {} diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/url/internal/InternalUrlAttributesExtractor.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/url/internal/InternalUrlAttributesExtractor.java index 80f7135f6d48..37103b0c6983 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/url/internal/InternalUrlAttributesExtractor.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/url/internal/InternalUrlAttributesExtractor.java @@ -9,7 +9,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.instrumentation.api.semconv.url.UrlAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.util.function.Function; /** @@ -32,9 +32,9 @@ public void onStart(AttributesBuilder attributes, REQUEST request) { String urlPath = getter.getUrlPath(request); String urlQuery = getter.getUrlQuery(request); - internalSet(attributes, SemanticAttributes.URL_SCHEME, urlScheme); - internalSet(attributes, SemanticAttributes.URL_PATH, urlPath); - internalSet(attributes, SemanticAttributes.URL_QUERY, urlQuery); + internalSet(attributes, UrlAttributes.URL_SCHEME, urlScheme); + internalSet(attributes, UrlAttributes.URL_PATH, urlPath); + internalSet(attributes, UrlAttributes.URL_QUERY, urlQuery); } private String getUrlScheme(REQUEST request) { diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java index 599da463bb2e..6af61d66ac5e 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java @@ -20,6 +20,7 @@ import io.opentelemetry.instrumentation.api.internal.HttpConstants; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.net.ConnectException; import java.util.HashMap; import java.util.HashSet; @@ -169,7 +170,7 @@ void normal() { assertThat(startAttributes.build()) .containsOnly( entry(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - entry(SemanticAttributes.URL_FULL, "http://github.com"), + entry(UrlAttributes.URL_FULL, "http://github.com"), entry( AttributeKey.stringArrayKey("http.request.header.custom-request-header"), asList("123", "456")), diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java index 88ad2d4144cd..e69bd5f290d7 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java @@ -15,10 +15,11 @@ import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -38,9 +39,9 @@ void collectsMetrics() { Attributes requestAttributes = Attributes.builder() .put(SemanticAttributes.HTTP_REQUEST_METHOD, "GET") - .put(SemanticAttributes.URL_FULL, "https://localhost:1234/") - .put(SemanticAttributes.URL_PATH, "/") - .put(SemanticAttributes.URL_QUERY, "q=a") + .put(UrlAttributes.URL_FULL, "https://localhost:1234/") + .put(UrlAttributes.URL_PATH, "/") + .put(UrlAttributes.URL_QUERY, "q=a") .put(SemanticAttributes.SERVER_ADDRESS, "localhost") .put(SemanticAttributes.SERVER_PORT, 1234) .build(); diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java index bcc3d2b4ec6e..da29d46c7781 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java @@ -20,6 +20,7 @@ import io.opentelemetry.instrumentation.api.internal.HttpConstants; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.net.ConnectException; import java.util.HashMap; import java.util.HashSet; @@ -196,9 +197,9 @@ void normal() { entry(SemanticAttributes.SERVER_ADDRESS, "github.com"), entry(SemanticAttributes.SERVER_PORT, 443L), entry(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - entry(SemanticAttributes.URL_SCHEME, "https"), - entry(SemanticAttributes.URL_PATH, "/repositories/1"), - entry(SemanticAttributes.URL_QUERY, "details=true"), + entry(UrlAttributes.URL_SCHEME, "https"), + entry(UrlAttributes.URL_PATH, "/repositories/1"), + entry(UrlAttributes.URL_QUERY, "details=true"), entry(SemanticAttributes.USER_AGENT_ORIGINAL, "okhttp 3.x"), entry(SemanticAttributes.HTTP_ROUTE, "/repositories/{id}"), entry(SemanticAttributes.CLIENT_ADDRESS, "1.1.1.1"), @@ -388,7 +389,7 @@ void shouldPreferUrlSchemeFromForwardedHeader() { AttributesBuilder startAttributes = Attributes.builder(); extractor.onStart(startAttributes, Context.root(), request); - assertThat(startAttributes.build()).containsOnly(entry(SemanticAttributes.URL_SCHEME, "https")); + assertThat(startAttributes.build()).containsOnly(entry(UrlAttributes.URL_SCHEME, "https")); AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, response, null); diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java index 7706104eb818..120daa8e2750 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java @@ -15,10 +15,11 @@ import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -38,9 +39,9 @@ void collectsMetrics() { Attributes requestAttributes = Attributes.builder() .put(SemanticAttributes.HTTP_REQUEST_METHOD, "GET") - .put(SemanticAttributes.URL_SCHEME, "https") - .put(SemanticAttributes.URL_PATH, "/") - .put(SemanticAttributes.URL_QUERY, "q=a") + .put(UrlAttributes.URL_SCHEME, "https") + .put(UrlAttributes.URL_PATH, "/") + .put(UrlAttributes.URL_QUERY, "q=a") .put(SemanticAttributes.NETWORK_TRANSPORT, "tcp") .put(SemanticAttributes.NETWORK_TYPE, "ipv4") .put(SemanticAttributes.NETWORK_PROTOCOL_NAME, "http") @@ -104,7 +105,7 @@ void collectsMetrics() { SemanticAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( SemanticAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), - equalTo(SemanticAttributes.URL_SCHEME, "https")) + equalTo(UrlAttributes.URL_SCHEME, "https")) .hasExemplarsSatisfying( exemplar -> exemplar @@ -144,7 +145,7 @@ void collectsHttpRouteFromEndAttributes() { Attributes requestAttributes = Attributes.builder() .put(SemanticAttributes.SERVER_ADDRESS, "host") - .put(SemanticAttributes.URL_SCHEME, "https") + .put(UrlAttributes.URL_SCHEME, "https") .build(); Attributes responseAttributes = @@ -170,7 +171,7 @@ void collectsHttpRouteFromEndAttributes() { point .hasSum(0.100 /* seconds */) .hasAttributesSatisfying( - equalTo(SemanticAttributes.URL_SCHEME, "https"), + equalTo(UrlAttributes.URL_SCHEME, "https"), equalTo( SemanticAttributes.HTTP_ROUTE, "/test/{id}"))))); } diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/url/UrlAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/url/UrlAttributesExtractorTest.java index fbc3b21bda0b..41b3d8c9371d 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/url/UrlAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/url/UrlAttributesExtractorTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.util.HashMap; import java.util.Map; import javax.annotation.Nullable; @@ -56,9 +56,9 @@ void allAttributes() { extractor.onStart(startAttributes, Context.root(), request); assertThat(startAttributes.build()) .containsOnly( - entry(SemanticAttributes.URL_SCHEME, "https"), - entry(SemanticAttributes.URL_PATH, "/test"), - entry(SemanticAttributes.URL_QUERY, "q=Java")); + entry(UrlAttributes.URL_SCHEME, "https"), + entry(UrlAttributes.URL_PATH, "/test"), + entry(UrlAttributes.URL_QUERY, "q=Java")); AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, null, null); diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java index 248ff259f6a0..671e6d03d458 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java @@ -20,6 +20,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaRequest; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -60,7 +61,7 @@ void onRequest(AttributesBuilder attributes, APIGatewayProxyRequestEvent request attributes.put(USER_AGENT_ORIGINAL, userAgent); } - internalSet(attributes, SemanticAttributes.URL_FULL, getHttpUrl(request, headers)); + internalSet(attributes, UrlAttributes.URL_FULL, getHttpUrl(request, headers)); } private static String getHttpUrl( diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java index 56d33bc055ff..6ce302bb563e 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java @@ -19,6 +19,7 @@ import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.AfterEach; @@ -105,8 +106,7 @@ void tracedWithHttpPropagation() { equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.USER_AGENT_ORIGINAL, "Test Client"), equalTo( - SemanticAttributes.URL_FULL, - "http://localhost:123/hello/world?a=b&c=d"), + UrlAttributes.URL_FULL, "http://localhost:123/hello/world?a=b&c=d"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy index 37cc1a8b001c..c62a21c19b81 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy @@ -5,6 +5,7 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import spock.lang.Shared import static io.opentelemetry.api.trace.SpanKind.CLIENT @@ -62,7 +63,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSQS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -84,7 +85,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.bucket.name" bucketName "$SemanticAttributes.HTTP_REQUEST_METHOD" "PUT" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -106,7 +107,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSQS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -128,7 +129,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSQS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -150,7 +151,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.bucket.name" bucketName "$SemanticAttributes.HTTP_REQUEST_METHOD" "PUT" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -171,7 +172,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.bucket.name" bucketName "$SemanticAttributes.HTTP_REQUEST_METHOD" "PUT" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -190,7 +191,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSQS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.SERVER_PORT" { it == null || Number } "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" @@ -221,7 +222,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.bucket.name" bucketName "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -242,7 +243,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.bucket.name" bucketName "$SemanticAttributes.HTTP_REQUEST_METHOD" "DELETE" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 204 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -263,7 +264,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.bucket.name" bucketName "$SemanticAttributes.HTTP_REQUEST_METHOD" "DELETE" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 204 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -284,7 +285,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSQS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -338,7 +339,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSQS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -359,7 +360,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSQS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -380,7 +381,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.bucket.name" bucketName "$SemanticAttributes.HTTP_REQUEST_METHOD" "PUT" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -400,7 +401,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSNS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -420,7 +421,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSNS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -442,7 +443,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSQS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -462,7 +463,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSNS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -484,7 +485,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.bucket.name" bucketName "$SemanticAttributes.HTTP_REQUEST_METHOD" "PUT" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -505,7 +506,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.bucket.name" bucketName "$SemanticAttributes.HTTP_REQUEST_METHOD" "PUT" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -526,7 +527,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSQS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.SERVER_PORT" { it == null || Number } "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" @@ -557,7 +558,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.bucket.name" bucketName "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -578,7 +579,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.bucket.name" bucketName "$SemanticAttributes.HTTP_REQUEST_METHOD" "DELETE" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 204 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -599,7 +600,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.bucket.name" bucketName "$SemanticAttributes.HTTP_REQUEST_METHOD" "DELETE" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 204 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -620,7 +621,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSQS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy index 94e25af40d7d..869f5961a0a8 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy @@ -5,6 +5,7 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import spock.lang.Shared import static io.opentelemetry.api.trace.SpanKind.CLIENT @@ -54,7 +55,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSQS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" String + "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -76,7 +77,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSQS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" String + "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -98,7 +99,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSQS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" String + "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -119,7 +120,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSNS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" String + "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -140,7 +141,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSNS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" String + "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -161,7 +162,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "rpc.service" "AmazonSNS" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" String + "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -181,7 +182,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "rpc.method" "ReceiveMessage" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" String + "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.SERVER_PORT" { it == null || Number } "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy index e1e7273edb11..6d3e7aa5317d 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy @@ -20,6 +20,7 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractAws1ClientTest import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import static io.opentelemetry.api.trace.StatusCode.ERROR @@ -99,7 +100,7 @@ class Aws1ClientTest extends AbstractAws1ClientTest implements AgentTestTrait { errorEvent IllegalStateException, "bad handler" hasNoParent() attributes { - "$SemanticAttributes.URL_FULL" "https://s3.amazonaws.com" + "$UrlAttributes.URL_FULL" "https://s3.amazonaws.com" "$SemanticAttributes.HTTP_REQUEST_METHOD" "HEAD" "$SemanticAttributes.SERVER_ADDRESS" "s3.amazonaws.com" "$SemanticAttributes.RPC_SYSTEM" "aws-api" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy index 512f03934c81..f69f1370ac69 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy @@ -25,6 +25,7 @@ import com.amazonaws.services.s3.S3ClientOptions import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.HttpResponse import io.opentelemetry.testing.internal.armeria.common.HttpStatus import io.opentelemetry.testing.internal.armeria.common.MediaType @@ -106,7 +107,7 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { kind CLIENT hasNoParent() attributes { - "$SemanticAttributes.URL_FULL" "${server.httpUri()}" + "$UrlAttributes.URL_FULL" "${server.httpUri()}" "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -168,7 +169,7 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { errorEvent AmazonClientException, ~/Unable to execute HTTP request/ hasNoParent() attributes { - "$SemanticAttributes.URL_FULL" "http://localhost:${UNUSABLE_PORT}" + "$UrlAttributes.URL_FULL" "http://localhost:${UNUSABLE_PORT}" "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" "$SemanticAttributes.SERVER_PORT" 61 "$SemanticAttributes.SERVER_ADDRESS" "localhost" @@ -216,7 +217,7 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { errorEvent IllegalStateException, "bad handler" hasNoParent() attributes { - "$SemanticAttributes.URL_FULL" "https://s3.amazonaws.com" + "$UrlAttributes.URL_FULL" "https://s3.amazonaws.com" "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.SERVER_ADDRESS" "s3.amazonaws.com" "$SemanticAttributes.RPC_SYSTEM" "aws-api" @@ -259,7 +260,7 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { errorEvent AmazonClientException, ~/Unable to execute HTTP request/ hasNoParent() attributes { - "$SemanticAttributes.URL_FULL" "${server.httpUri()}" + "$UrlAttributes.URL_FULL" "${server.httpUri()}" "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.SERVER_PORT" server.httpPort() "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy index 556f732803ad..e603e13332f4 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy @@ -32,6 +32,7 @@ import com.amazonaws.services.sns.model.PublishRequest import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.HttpResponse import io.opentelemetry.testing.internal.armeria.common.HttpStatus import io.opentelemetry.testing.internal.armeria.common.MediaType @@ -104,7 +105,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { kind operation == "SendMessage" ? PRODUCER : CLIENT hasNoParent() attributes { - "$SemanticAttributes.URL_FULL" "${server.httpUri()}" + "$UrlAttributes.URL_FULL" "${server.httpUri()}" "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -201,7 +202,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { errorEvent SdkClientException, ~/Unable to execute HTTP request/ hasNoParent() attributes { - "$SemanticAttributes.URL_FULL" "http://127.0.0.1:${UNUSABLE_PORT}" + "$UrlAttributes.URL_FULL" "http://127.0.0.1:${UNUSABLE_PORT}" "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.SERVER_PORT" 61 @@ -257,7 +258,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { } hasNoParent() attributes { - "$SemanticAttributes.URL_FULL" "${server.httpUri()}" + "$UrlAttributes.URL_FULL" "${server.httpUri()}" "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.SERVER_PORT" server.httpPort() "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java index dbfde22fa6f7..a6bb11a218a1 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java @@ -25,6 +25,7 @@ import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import org.elasticmq.rest.sqs.SQSRestServer; import org.elasticmq.rest.sqs.SQSRestServerBuilder; import org.junit.jupiter.api.AfterEach; @@ -97,7 +98,7 @@ void testSimpleSqsProducerConsumerServices() { equalTo(SemanticAttributes.RPC_METHOD, "CreateQueue"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), + equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), @@ -118,7 +119,7 @@ void testSimpleSqsProducerConsumerServices() { equalTo(SemanticAttributes.RPC_METHOD, "SendMessage"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), + equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), @@ -144,7 +145,7 @@ void testSimpleSqsProducerConsumerServices() { equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), + equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), @@ -198,7 +199,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.RPC_METHOD, "CreateQueue"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), + equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), @@ -219,7 +220,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.RPC_METHOD, "SendMessage"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), + equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), @@ -245,7 +246,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), + equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), @@ -282,7 +283,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), + equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")))); diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java index 02726a49b797..82849f347136 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java @@ -31,6 +31,7 @@ import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -130,7 +131,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(SemanticAttributes.RPC_METHOD, "CreateQueue"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), + equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), @@ -150,8 +151,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(SemanticAttributes.RPC_METHOD, "SendMessage"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo( - SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), + equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), @@ -191,8 +191,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo( - SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), + equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), @@ -228,8 +227,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo( - SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), + equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), @@ -295,7 +293,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.RPC_METHOD, "CreateQueue"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), + equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), @@ -316,7 +314,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.RPC_METHOD, "SendMessage"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.URL_FULL, "http://localhost:" + sqsPort), + equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), @@ -357,8 +355,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo( - SemanticAttributes.URL_FULL, - "http://localhost:" + sqsPort), + UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), @@ -381,8 +378,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo( - SemanticAttributes.URL_FULL, - "http://localhost:" + sqsPort), + UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), @@ -411,8 +407,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo( - SemanticAttributes.URL_FULL, - "http://localhost:" + sqsPort), + UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy index 12ba9c8adbe4..63c103db5f26 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy @@ -8,6 +8,7 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.HttpResponse import io.opentelemetry.testing.internal.armeria.common.HttpStatus import io.opentelemetry.testing.internal.armeria.common.MediaType @@ -135,7 +136,7 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { attributes { "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.SERVER_PORT" server.httpPort() - "$SemanticAttributes.URL_FULL" { it.startsWith("${server.httpUri()}${path}") } + "$UrlAttributes.URL_FULL" { it.startsWith("${server.httpUri()}${path}") } "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.RPC_SYSTEM" "aws-api" @@ -168,7 +169,7 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { attributes { "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.SERVER_PORT" server.httpPort() - "$SemanticAttributes.URL_FULL" { it.startsWith("${server.httpUri()}${path}") } + "$UrlAttributes.URL_FULL" { it.startsWith("${server.httpUri()}${path}") } "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.RPC_SYSTEM" "aws-api" @@ -200,7 +201,7 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { attributes { "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.SERVER_PORT" server.httpPort() - "$SemanticAttributes.URL_FULL" { it.startsWith("${server.httpUri()}${path}") } + "$UrlAttributes.URL_FULL" { it.startsWith("${server.httpUri()}${path}") } "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.RPC_SYSTEM" "aws-api" diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy index 2dd62c549b5c..569105664c52 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy @@ -7,6 +7,7 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.HttpData import io.opentelemetry.testing.internal.armeria.common.HttpResponse import io.opentelemetry.testing.internal.armeria.common.HttpStatus @@ -119,10 +120,10 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { // Previously the sdk was only doing that if endpoint had "s3" as label in the FQDN. // Our test assert both cases so that we don't need to know what version is being tested. "$SemanticAttributes.SERVER_ADDRESS" { it == "somebucket.localhost" || it == "localhost" } - "$SemanticAttributes.URL_FULL" { it.startsWith("http://somebucket.localhost:${server.httpPort()}") || it.startsWith("http://localhost:${server.httpPort()}/somebucket") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://somebucket.localhost:${server.httpPort()}") || it.startsWith("http://localhost:${server.httpPort()}/somebucket") } } else { "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:${server.httpPort()}") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:${server.httpPort()}") } } "$SemanticAttributes.SERVER_PORT" server.httpPort() "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" @@ -279,10 +280,10 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { // Previously the sdk was only doing that if endpoint had "s3" as label in the FQDN. // Our test assert both cases so that we don't need to know what version is being tested. "$SemanticAttributes.SERVER_ADDRESS" { it == "somebucket.localhost" || it == "localhost" } - "$SemanticAttributes.URL_FULL" { it.startsWith("http://somebucket.localhost:${server.httpPort()}") || it.startsWith("http://localhost:${server.httpPort()}") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://somebucket.localhost:${server.httpPort()}") || it.startsWith("http://localhost:${server.httpPort()}") } } else { "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.URL_FULL" { it == "http://localhost:${server.httpPort()}" || it == "http://localhost:${server.httpPort()}/" } + "$UrlAttributes.URL_FULL" { it == "http://localhost:${server.httpPort()}" || it == "http://localhost:${server.httpPort()}/" } } "$SemanticAttributes.SERVER_PORT" server.httpPort() "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" @@ -447,7 +448,7 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { // Previously the sdk was only doing that if endpoint had "s3" as label in the FQDN. // Our test assert both cases so that we don't need to know what version is being tested. "$SemanticAttributes.SERVER_ADDRESS" { it == "somebucket.localhost" || it == "localhost" } - "$SemanticAttributes.URL_FULL" { it == "http://somebucket.localhost:${server.httpPort()}/somekey" || it == "http://localhost:${server.httpPort()}/somebucket/somekey" } + "$UrlAttributes.URL_FULL" { it == "http://somebucket.localhost:${server.httpPort()}/somekey" || it == "http://localhost:${server.httpPort()}/somebucket/somekey" } "$SemanticAttributes.SERVER_PORT" server.httpPort() "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.RPC_SYSTEM" "aws-api" diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy index e9ecb1579819..72576f2e6015 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy @@ -7,6 +7,7 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import org.elasticmq.rest.sqs.SQSRestServerBuilder import software.amazon.awssdk.auth.credentials.AwsBasicCredentials import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider @@ -131,7 +132,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "rpc.method" "CreateQueue" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort } @@ -151,7 +152,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "rpc.service" "Sqs" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" @@ -172,7 +173,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "rpc.service" "Sqs" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" @@ -212,7 +213,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "rpc.service" "Sqs" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort } @@ -323,7 +324,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "rpc.service" "Sqs" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" @@ -345,7 +346,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "rpc.service" "Sqs" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" @@ -373,7 +374,7 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "rpc.service" "Sqs" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy index 3fde2eeaaabc..dbaa2e104495 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy @@ -8,6 +8,7 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import org.elasticmq.rest.sqs.SQSRestServerBuilder import software.amazon.awssdk.auth.credentials.AwsBasicCredentials import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider @@ -133,7 +134,7 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "rpc.method" "CreateQueue" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort } @@ -153,7 +154,7 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "rpc.service" "Sqs" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" @@ -192,7 +193,7 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "rpc.service" "Sqs" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort } @@ -214,7 +215,7 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "rpc.service" "Sqs" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" @@ -238,7 +239,7 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "rpc.service" "Sqs" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" @@ -389,7 +390,7 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "rpc.service" "Sqs" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" @@ -413,7 +414,7 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "rpc.service" "Sqs" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" @@ -452,7 +453,7 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "rpc.service" "Sqs" "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } + "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractQueryProtocolModelTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractQueryProtocolModelTest.java index f13252a3cf40..098e1daf7d7b 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractQueryProtocolModelTest.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractQueryProtocolModelTest.java @@ -6,7 +6,7 @@ package io.opentelemetry.instrumentation.awssdk.v2_2; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; -import static io.opentelemetry.semconv.SemanticAttributes.URL_FULL; +import static io.opentelemetry.semconv.UrlAttributes.URL_FULL; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java index 9b65569375f2..8fcb9d96b078 100644 --- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java @@ -33,6 +33,7 @@ import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.net.MalformedURLException; import java.net.URL; import java.util.Set; @@ -95,7 +96,7 @@ public void pre( CamelDirection camelDirection) { super.pre(attributes, exchange, endpoint, camelDirection); - internalSet(attributes, SemanticAttributes.URL_FULL, getHttpUrl(exchange, endpoint)); + internalSet(attributes, UrlAttributes.URL_FULL, getHttpUrl(exchange, endpoint)); String method = getHttpMethod(exchange, endpoint); if (method == null || knownMethods.contains(method)) { diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java index 44fd019101c9..76c11ecdbab9 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java @@ -11,11 +11,12 @@ import com.google.common.collect.ImmutableMap; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerUsingTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.junit.jupiter.api.AfterAll; @@ -98,8 +99,8 @@ void restComponentServerAndClientCallWithJettyBackend() { .hasKind(SpanKind.SERVER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.URL_SCHEME, "http"), - equalTo(SemanticAttributes.URL_PATH, "/api/firstModule/unit/unitOne"), + equalTo(UrlAttributes.URL_SCHEME, "http"), + equalTo(UrlAttributes.URL_PATH, "/api/firstModule/unit/unitOne"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.HTTP_ROUTE, "/api/{module}/unit/{unitId}"), @@ -121,7 +122,7 @@ void restComponentServerAndClientCallWithJettyBackend() { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo( - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, "http://localhost:" + port + "/api/firstModule/unit/unitOne"), satisfies( stringKey("camel.uri"), val -> val.isInstanceOf(String.class))), diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.java index 9e67da75becf..1447dfadc70e 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.java @@ -14,6 +14,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerUsingTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.net.URI; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -69,7 +70,7 @@ public void singleCamelServiceSpan() { .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.URL_FULL, requestUrl.toString()), + equalTo(UrlAttributes.URL_FULL, requestUrl.toString()), equalTo( stringKey("camel.uri"), requestUrl.toString().replace("localhost", "0.0.0.0"))))); diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java index 8a6631ebd50d..2088e2011168 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java @@ -11,12 +11,13 @@ import com.google.common.collect.ImmutableMap; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerUsingTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; @@ -109,7 +110,7 @@ void twoCamelServiceSpans() throws Exception { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo( - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, "http://localhost:" + portOne + "/serviceOne"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), equalTo( @@ -122,7 +123,7 @@ void twoCamelServiceSpans() throws Exception { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo( - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, "http://localhost:" + portOne + "/serviceOne"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), equalTo( @@ -135,7 +136,7 @@ void twoCamelServiceSpans() throws Exception { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo( - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, "http://127.0.0.1:" + portTwo + "/serviceTwo"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), equalTo( @@ -148,8 +149,8 @@ void twoCamelServiceSpans() throws Exception { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), - equalTo(SemanticAttributes.URL_SCHEME, "http"), - equalTo(SemanticAttributes.URL_PATH, "/serviceTwo"), + equalTo(UrlAttributes.URL_SCHEME, "http"), + equalTo(UrlAttributes.URL_PATH, "/serviceTwo"), equalTo( SemanticAttributes.USER_AGENT_ORIGINAL, "Jakarta Commons-HttpClient/3.1"), @@ -169,7 +170,7 @@ void twoCamelServiceSpans() throws Exception { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo( - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, "http://127.0.0.1:" + portTwo + "/serviceTwo"), equalTo( stringKey("camel.uri"), diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java index 031e46f6a284..ede52b9c209a 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java @@ -15,6 +15,7 @@ import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -67,7 +68,7 @@ static SpanDataAssert sqs( v -> assertThat(v).isEqualTo(queueUrl), v -> assertThat(v).isNull())), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - satisfies(SemanticAttributes.URL_FULL, val -> val.isInstanceOf(String.class)), + satisfies(UrlAttributes.URL_FULL, val -> val.isInstanceOf(String.class)), satisfies( SemanticAttributes.SERVER_ADDRESS, stringAssert -> stringAssert.isInstanceOf(String.class)), @@ -118,7 +119,7 @@ static SpanDataAssert s3(SpanDataAssert span, String spanName, String bucketName equalTo(stringKey("aws.bucket.name"), bucketName), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, method), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - satisfies(SemanticAttributes.URL_FULL, val -> val.isInstanceOf(String.class)), + satisfies(UrlAttributes.URL_FULL, val -> val.isInstanceOf(String.class)), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), satisfies(SemanticAttributes.SERVER_ADDRESS, val -> val.isInstanceOf(String.class)), satisfies( @@ -140,7 +141,7 @@ static SpanDataAssert sns(SpanDataAssert span, String spanName, String topicArn) equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, topicArn), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - satisfies(SemanticAttributes.URL_FULL, val -> val.isInstanceOf(String.class)), + satisfies(UrlAttributes.URL_FULL, val -> val.isInstanceOf(String.class)), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), satisfies(SemanticAttributes.SERVER_ADDRESS, val -> val.isInstanceOf(String.class)), satisfies( diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java index c10d2e04a395..329edd5c5bef 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java @@ -10,9 +10,9 @@ import com.datastax.driver.core.ResultSetFuture; import com.datastax.driver.core.Session; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.net.InetSocketAddress; import java.time.Duration; diff --git a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java index a83625abbaf2..a2454e5bb2d3 100644 --- a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java +++ b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java @@ -30,8 +30,8 @@ import com.datastax.oss.driver.api.core.config.DriverConfigLoader; import com.datastax.oss.driver.internal.core.config.typesafe.DefaultDriverConfigLoader; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import java.net.InetSocketAddress; import java.time.Duration; import java.util.stream.Stream; diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java index c2682af1fe2d..3258e76f23b4 100644 --- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java +++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java @@ -19,6 +19,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -88,7 +89,7 @@ public void elasticsearchStatus() throws IOException { equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), equalTo(SemanticAttributes.DB_OPERATION, "info"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.URL_FULL, httpHost.toURI() + "/"), + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort())), span -> @@ -100,7 +101,7 @@ public void elasticsearchStatus() throws IOException { equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.URL_FULL, httpHost.toURI() + "/"), + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); } @@ -127,7 +128,7 @@ public void elasticsearchIndex() throws IOException { equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "PUT"), equalTo( - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, httpHost.toURI() + "/test-index/_doc/test-id?timeout=10s"), equalTo( AttributeKey.stringKey("db.elasticsearch.path_parts.index"), @@ -145,7 +146,7 @@ public void elasticsearchIndex() throws IOException { equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "PUT"), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo( - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, httpHost.toURI() + "/test-index/_doc/test-id?timeout=10s"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 201L)))); } @@ -187,7 +188,7 @@ public void elasticsearchStatusAsync() throws Exception { equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.URL_FULL, httpHost.toURI() + "/")), + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/")), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) @@ -197,7 +198,7 @@ public void elasticsearchStatusAsync() throws Exception { equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.URL_FULL, httpHost.toURI() + "/"), + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)), span -> span.hasName("callback") diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java index 21b20fadf796..b32a4a6b12b0 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; import java.util.Map; import java.util.concurrent.CountDownLatch; @@ -96,8 +97,7 @@ void elasticsearchStatus() throws IOException { equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo( - SemanticAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); }, span -> { span.hasName("GET") @@ -108,7 +108,7 @@ void elasticsearchStatus() throws IOException { equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200)); }); }); @@ -173,8 +173,7 @@ public void onFailure(Exception e) { equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo( - SemanticAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); }, span -> { span.hasName("GET") @@ -185,7 +184,7 @@ public void onFailure(Exception e) { equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200)); }, span -> { diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java index 665920f2b9fe..26f917772554 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; import java.util.Map; import java.util.concurrent.CountDownLatch; @@ -87,8 +88,7 @@ public void elasticsearchStatus() throws IOException { equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo( - SemanticAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); }, span -> { span.hasName("GET") @@ -99,7 +99,7 @@ public void elasticsearchStatus() throws IOException { equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)); }); }); @@ -163,8 +163,7 @@ public void onFailure(Exception e) { equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo( - SemanticAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); }, span -> { span.hasName("GET") @@ -175,7 +174,7 @@ public void onFailure(Exception e) { equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200)); }, span -> { diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index 668f4c3c55af..3591bc003ce2 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -85,9 +86,7 @@ public void elasticsearchStatus() throws Exception { equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo( - SemanticAttributes.URL_FULL, - httpHost.toURI() + "/_cluster/health")), + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) @@ -97,8 +96,7 @@ public void elasticsearchStatus() throws Exception { equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo( - SemanticAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); } @@ -158,9 +156,7 @@ public void onFailure(Exception e) { equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo( - SemanticAttributes.URL_FULL, - httpHost.toURI() + "/_cluster/health")), + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) @@ -170,8 +166,7 @@ public void onFailure(Exception e) { equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo( - SemanticAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)), span -> span.hasName("callback") diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index ca7c82e0053d..141d231b8c6f 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -87,8 +88,7 @@ public void elasticsearchStatus() throws Exception { equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo( - SemanticAttributes.URL_FULL, - httpHost.toURI() + "/_cluster/health")))); + UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")))); } @Test @@ -147,9 +147,7 @@ public void onFailure(Exception e) { equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo( - SemanticAttributes.URL_FULL, - httpHost.toURI() + "/_cluster/health")), + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) diff --git a/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchClientAttributeExtractor.java b/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchClientAttributeExtractor.java index 899a8ec1b3d0..c127fb3a5166 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchClientAttributeExtractor.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchClientAttributeExtractor.java @@ -14,6 +14,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.util.HashSet; import java.util.Set; import javax.annotation.Nullable; @@ -50,7 +51,7 @@ private static void setUrlAttribute(AttributesBuilder attributes, Response respo uri = uri.startsWith("/") ? uri : "/" + uri; String fullUrl = response.getHost().toURI() + uri; - internalSet(attributes, SemanticAttributes.URL_FULL, fullUrl); + internalSet(attributes, UrlAttributes.URL_FULL, fullUrl); } private static void setPathPartsAttributes( diff --git a/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java b/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java index da67bdc09b57..0e2defccd0e7 100644 --- a/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java +++ b/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java @@ -24,6 +24,7 @@ import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.net.URI; import java.util.ArrayList; import java.util.Arrays; @@ -99,7 +100,7 @@ void errorTracesWhenExceptionIsNotThrown() throws Exception { Arrays.asList( equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), satisfies(SemanticAttributes.SERVER_PORT, AbstractLongAssert::isPositive), - equalTo(SemanticAttributes.URL_FULL, uri.toString()), + equalTo(UrlAttributes.URL_FULL, uri.toString()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 500), equalTo(SemanticAttributes.ERROR_TYPE, "500"))); diff --git a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java index 6cc4cdc2734e..3e4abf30c866 100644 --- a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java +++ b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java @@ -20,10 +20,10 @@ import io.grpc.Status; import io.grpc.stub.StreamObserver; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.util.ThrowingRunnable; import io.opentelemetry.sdk.testing.assertj.EventDataAssert; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.ArrayList; import java.util.List; diff --git a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java index 57839738f4f9..01559c4d9ad7 100644 --- a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java +++ b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java @@ -43,12 +43,12 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.util.ThrowingRunnable; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.ArrayList; import java.util.Arrays; diff --git a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java index cd408b91faf9..7f91253cb592 100644 --- a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java +++ b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java @@ -22,6 +22,7 @@ import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.io.DataOutputStream; import java.io.IOException; import java.io.InputStream; @@ -122,7 +123,7 @@ public void traceRequest(boolean useCache) throws IOException { equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), - equalTo(SemanticAttributes.URL_FULL, url.toString()), + equalTo(UrlAttributes.URL_FULL, url.toString()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); @@ -167,7 +168,7 @@ public void testBrokenApiUsage() throws IOException { equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), - equalTo(SemanticAttributes.URL_FULL, url.toString()), + equalTo(UrlAttributes.URL_FULL, url.toString()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); @@ -218,7 +219,7 @@ public void testPostRequest() throws IOException { equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), - equalTo(SemanticAttributes.URL_FULL, url.toString()), + equalTo(UrlAttributes.URL_FULL, url.toString()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); @@ -271,7 +272,7 @@ public void getOutputStreamShouldTransformGetIntoPost() throws IOException { equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), - equalTo(SemanticAttributes.URL_FULL, url.toString()), + equalTo(UrlAttributes.URL_FULL, url.toString()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); @@ -313,7 +314,7 @@ public void traceRequestWithConnectionFailure(String scheme) { equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), - equalTo(SemanticAttributes.URL_FULL, uri), + equalTo(UrlAttributes.URL_FULL, uri), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.ERROR_TYPE, "java.net.ConnectException"))); diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy index 1e37c9e707da..d65f555c9bac 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy @@ -9,6 +9,7 @@ import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl import org.glassfish.jersey.client.ClientConfig import org.glassfish.jersey.client.ClientProperties @@ -117,7 +118,7 @@ abstract class JaxRsClientTest extends HttpClientTest implem "$SemanticAttributes.SERVER_ADDRESS" uri.host "$SemanticAttributes.SERVER_PORT" uri.port > 0 ? uri.port : { it == null || it == 443 } "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == null } - "$SemanticAttributes.URL_FULL" "${uri}" + "$UrlAttributes.URL_FULL" "${uri}" "$SemanticAttributes.HTTP_REQUEST_METHOD" method "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" statusCode "$SemanticAttributes.ERROR_TYPE" "$statusCode" diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy index 3a7b75a3069c..20e3623adb21 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy @@ -284,9 +284,9 @@ abstract class AbstractJaxRsHttpServerTest extends HttpServerTest implemen "$SemanticAttributes.SERVER_PORT" fullUrl.port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.URL_SCHEME" fullUrl.getScheme() - "$SemanticAttributes.URL_PATH" fullUrl.getPath() - "$SemanticAttributes.URL_QUERY" fullUrl.getQuery() + "$UrlAttributes.URL_SCHEME" fullUrl.getScheme() + "$UrlAttributes.URL_PATH" fullUrl.getPath() + "$UrlAttributes.URL_QUERY" fullUrl.getQuery() "$SemanticAttributes.HTTP_REQUEST_METHOD" method "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" statusCode "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java index 5dad7232ec72..ceeeda7f6532 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java +++ b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java @@ -10,9 +10,9 @@ import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import org.assertj.core.api.AbstractLongAssert; import org.junit.jupiter.api.AfterAll; diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java b/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java index bc1e8504886a..7dbcb2352596 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java +++ b/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java @@ -9,9 +9,9 @@ import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy index 2a5449498ddc..e8b49eb42420 100644 --- a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -10,6 +10,7 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse import io.opentelemetry.testing.internal.armeria.common.HttpData @@ -93,8 +94,8 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" "/jetty-context/" + path + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" "/jetty-context/" + path "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.HTTP_ROUTE" "/jetty-context/" + route diff --git a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy index e62f0abdf9a5..11c4894f0323 100644 --- a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -10,6 +10,7 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse import io.opentelemetry.testing.internal.armeria.common.HttpData @@ -104,8 +105,8 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" "/jetty-context/" + path + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" "/jetty-context/" + path "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.HTTP_ROUTE" "/jetty-context/" + route diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy index d6e780dcb859..a0e3f83fe1ed 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy @@ -7,6 +7,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse import io.opentelemetry.testing.internal.armeria.common.HttpMethod @@ -90,8 +91,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { name "GET $route" kind SERVER attributes { - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" route + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" route "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String @@ -147,9 +148,9 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { name "GET $route" kind SERVER attributes { - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" route - "$SemanticAttributes.URL_QUERY" queryString + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" route + "$UrlAttributes.URL_QUERY" queryString "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String @@ -201,8 +202,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { name "POST $route" kind SERVER attributes { - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" route + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" route "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String @@ -264,8 +265,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { } } attributes { - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" route + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" route "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 500 "$SemanticAttributes.USER_AGENT_ORIGINAL" String @@ -332,8 +333,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { name "GET $route" kind SERVER attributes { - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" route + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" route "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String @@ -380,8 +381,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { name "GET $route" kind SERVER attributes { - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" route + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" route "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String @@ -460,8 +461,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { status ERROR errorEvent(JasperException, String) attributes { - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" route + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" route "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 500 "$SemanticAttributes.USER_AGENT_ORIGINAL" String @@ -510,8 +511,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { name "GET $route" kind SERVER attributes { - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" "/$jspWebappContext/$staticFile" + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" "/$jspWebappContext/$staticFile" "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy index d7ca00614c9d..e80948ed7fd8 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy @@ -7,6 +7,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse import org.apache.catalina.Context @@ -88,8 +89,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { name "GET $route" kind SERVER attributes { - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" route + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" route "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String @@ -157,8 +158,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { name "GET $route" kind SERVER attributes { - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" route + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" route "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String @@ -205,8 +206,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { name "GET $route" kind SERVER attributes { - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" route + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" route "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String @@ -301,8 +302,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { name "GET $route" kind SERVER attributes { - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" route + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" route "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String @@ -383,8 +384,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { status ERROR errorEvent(JasperException, String) attributes { - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" route + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" route "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 500 "$SemanticAttributes.USER_AGENT_ORIGINAL" String @@ -445,8 +446,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { kind SERVER status UNSET attributes { - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" route + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" route "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 404 "$SemanticAttributes.USER_AGENT_ORIGINAL" String diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java b/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java index b594767431a8..2bbbdefc5edc 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java +++ b/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java @@ -19,6 +19,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpResponse; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; import io.opentelemetry.testing.internal.armeria.common.MediaType; @@ -77,7 +78,7 @@ void synchronousCall() throws ApiException { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy?path=path"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), @@ -124,7 +125,7 @@ void handleErrorsInSyncCall() { .hasException(apiException) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy?path=path"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), @@ -178,7 +179,7 @@ public void onSuccess( .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy?path=path"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), @@ -239,7 +240,7 @@ public void onFailure( .hasException(exceptionReference.get()) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy?path=path"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java b/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java index b521d05a2735..0edcd8a36dda 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java +++ b/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java @@ -19,6 +19,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpResponse; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; import io.opentelemetry.testing.internal.armeria.common.MediaType; @@ -81,7 +82,7 @@ void synchronousCall() throws ApiException { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy/path"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), @@ -128,7 +129,7 @@ void handleErrorsInSyncCall() { .hasException(apiException) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy/path"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), @@ -181,7 +182,7 @@ public void onSuccess( .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy/path"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), @@ -241,7 +242,7 @@ public void onFailure( .hasException(exceptionReference.get()) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy/path"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java index 47e9de6b99c9..010ac9eacc96 100644 --- a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java @@ -10,10 +10,10 @@ import io.lettuce.core.RedisClient; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.lettuce.v5_1.AbstractLettuceReactiveClientTest; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java index a4d42fd2a955..3dd44c0e3976 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java @@ -19,9 +19,9 @@ import io.lettuce.core.api.sync.RedisCommands; import io.lettuce.core.codec.StringCodec; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.ArrayList; import java.util.Arrays; diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java index 3076c85d3631..8aa6712ab739 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java @@ -19,8 +19,8 @@ import io.lettuce.core.api.sync.RedisCommands; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.Base64; import java.util.Map; diff --git a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java index 9cb510a17d82..818bc4274bd5 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java @@ -26,11 +26,11 @@ import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpVersion; import io.netty.handler.ssl.SslHandler; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.net.URI; import java.util.Arrays; diff --git a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java index 40aed1f8fa04..2c298c696a3d 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java @@ -27,11 +27,11 @@ import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpVersion; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.net.URI; import java.util.HashMap; diff --git a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java index b94f5e7b483d..a9a85e5b95a9 100644 --- a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java +++ b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java @@ -8,6 +8,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; import java.security.KeyManagementException; import java.security.KeyStoreException; @@ -101,8 +102,7 @@ void shouldGetStatusWithTraces() throws IOException { equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo( - SemanticAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); } @@ -167,8 +167,7 @@ public void onFailure(Exception e) { equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo( - SemanticAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), + equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)), span -> span.hasName("callback") diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java index ddd9874468a1..69f554ae1e26 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java @@ -22,7 +22,6 @@ import com.rabbitmq.client.ShutdownSignalException; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; @@ -30,6 +29,7 @@ import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java index c9452c36425d..9a3df36e5e0e 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java @@ -10,9 +10,9 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy index 23901112f92f..0e29b3af13d6 100644 --- a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy +++ b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy @@ -9,6 +9,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient import ratpack.path.PathBinding import ratpack.server.RatpackServer @@ -104,9 +105,9 @@ abstract class AbstractRatpackRoutesTest extends InstrumentationSpecification { "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.URL_SCHEME" "http" - "$SemanticAttributes.URL_PATH" "/$path" - "$SemanticAttributes.URL_QUERY" { it == "" || it == null } + "$UrlAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_PATH" "/$path" + "$UrlAttributes.URL_QUERY" { it == "" || it == null } "$SemanticAttributes.HTTP_ROUTE" "/$route" } } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/client/InstrumentedHttpClientTest.groovy b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/client/InstrumentedHttpClientTest.groovy index 4b354b1a1199..28da0e0b1202 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/client/InstrumentedHttpClientTest.groovy +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/client/InstrumentedHttpClientTest.groovy @@ -16,7 +16,7 @@ import io.opentelemetry.sdk.OpenTelemetrySdk import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter import io.opentelemetry.sdk.trace.SdkTracerProvider import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor -import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import ratpack.exec.Execution import ratpack.exec.Promise import ratpack.func.Action @@ -105,13 +105,13 @@ class InstrumentedHttpClientTest extends Specification { def attributes = spanData.attributes.asMap() attributes[HTTP_ROUTE] == "/foo" - attributes[SemanticAttributes.URL_PATH] == "/foo" + attributes[UrlAttributes.URL_PATH] == "/foo" attributes[HTTP_REQUEST_METHOD] == "GET" attributes[HTTP_RESPONSE_STATUS_CODE] == 200L def attsApi = spanDataApi.attributes.asMap() attsApi[HTTP_ROUTE] == "/bar" - attsApi[SemanticAttributes.URL_PATH] == "/bar" + attsApi[UrlAttributes.URL_PATH] == "/bar" attsApi[HTTP_REQUEST_METHOD] == "GET" attsApi[HTTP_RESPONSE_STATUS_CODE] == 200L } @@ -176,7 +176,7 @@ class InstrumentedHttpClientTest extends Specification { def attributes = spanData.attributes.asMap() attributes[HTTP_ROUTE] == "/path-name" - attributes[SemanticAttributes.URL_PATH] == "/path-name" + attributes[UrlAttributes.URL_PATH] == "/path-name" attributes[HTTP_REQUEST_METHOD] == "GET" attributes[HTTP_RESPONSE_STATUS_CODE] == 200L } @@ -234,7 +234,7 @@ class InstrumentedHttpClientTest extends Specification { def attributes = spanData.attributes.asMap() attributes[HTTP_ROUTE] == "/path-name" - attributes[SemanticAttributes.URL_PATH] == "/path-name" + attributes[UrlAttributes.URL_PATH] == "/path-name" attributes[HTTP_REQUEST_METHOD] == "GET" attributes[HTTP_RESPONSE_STATUS_CODE] == 200L } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerApplicationTest.groovy b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerApplicationTest.groovy index 11368b6b6111..5f725a86405d 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerApplicationTest.groovy +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerApplicationTest.groovy @@ -31,7 +31,7 @@ import javax.inject.Singleton import static io.opentelemetry.semconv.SemanticAttributes.HTTP_REQUEST_METHOD import static io.opentelemetry.semconv.SemanticAttributes.HTTP_RESPONSE_STATUS_CODE import static io.opentelemetry.semconv.SemanticAttributes.HTTP_ROUTE -import static io.opentelemetry.semconv.SemanticAttributes.URL_PATH +import static io.opentelemetry.semconv.UrlAttributes.URL_PATH class RatpackServerApplicationTest extends Specification { diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.groovy b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.groovy index d7704feda634..31380f78ff0a 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.groovy +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.groovy @@ -14,6 +14,7 @@ import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter import io.opentelemetry.sdk.trace.SdkTracerProvider import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import ratpack.exec.Blocking import ratpack.registry.Registry import ratpack.test.embed.EmbeddedApp @@ -56,7 +57,7 @@ class RatpackServerTest extends Specification { spanData.kind == SpanKind.SERVER attributes[SemanticAttributes.HTTP_ROUTE] == "/foo" - attributes[SemanticAttributes.URL_PATH] == "/foo" + attributes[UrlAttributes.URL_PATH] == "/foo" attributes[SemanticAttributes.HTTP_REQUEST_METHOD] == "GET" attributes[SemanticAttributes.HTTP_RESPONSE_STATUS_CODE] == 200L } @@ -95,7 +96,7 @@ class RatpackServerTest extends Specification { def attributes = spanData.attributes.asMap() attributes[SemanticAttributes.HTTP_ROUTE] == "/foo" - attributes[SemanticAttributes.URL_PATH] == "/foo" + attributes[UrlAttributes.URL_PATH] == "/foo" attributes[SemanticAttributes.HTTP_REQUEST_METHOD] == "GET" attributes[SemanticAttributes.HTTP_RESPONSE_STATUS_CODE] == 200L } @@ -153,7 +154,7 @@ class RatpackServerTest extends Specification { def attributes = spanData.attributes.asMap() attributes[SemanticAttributes.HTTP_ROUTE] == "/foo" - attributes[SemanticAttributes.URL_PATH] == "/foo" + attributes[UrlAttributes.URL_PATH] == "/foo" attributes[SemanticAttributes.HTTP_REQUEST_METHOD] == "GET" attributes[SemanticAttributes.HTTP_RESPONSE_STATUS_CODE] == 200L } diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java index 39ee1309b7c5..a51b5022f86c 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java @@ -13,12 +13,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import org.assertj.core.api.AbstractLongAssert; import org.junit.jupiter.api.AfterAll; diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java index 3788c2b4c087..899be402e181 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java @@ -27,6 +27,7 @@ import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.net.InetSocketAddress; import java.net.URI; import java.time.Duration; @@ -306,7 +307,7 @@ void shouldEndSpanOnMonoTimeout() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.URL_FULL, uri.toString()), + equalTo(UrlAttributes.URL_FULL, uri.toString()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, uri.getPort()), equalTo(SemanticAttributes.ERROR_TYPE, "cancelled")), diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java index 9c39b93b467f..66032bb2758a 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java @@ -16,11 +16,12 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.trace.SpanBuilder; import io.opentelemetry.context.Context; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.server.http.RequestContextGetter; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpData; import io.opentelemetry.testing.internal.armeria.common.HttpResponse; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; @@ -110,7 +111,7 @@ void testSuccessfulRequest() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.URL_FULL, uri + "/"), + equalTo(UrlAttributes.URL_FULL, uri + "/"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java index 1661ddb500b7..00821c751ff9 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java @@ -15,13 +15,14 @@ import static org.assertj.core.api.Assertions.catchThrowable; import io.netty.handler.ssl.SslContextBuilder; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer; import io.opentelemetry.sdk.trace.data.EventData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.util.List; import javax.annotation.Nullable; import javax.net.ssl.SSLException; @@ -91,7 +92,7 @@ void shouldFailSslHandshake() throws SSLException { .hasEventsSatisfying(ReactorNettyClientSslTest::isSslHandshakeException) .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.URL_FULL, uri), + equalTo(UrlAttributes.URL_FULL, uri), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.httpsPort()), equalTo( @@ -189,7 +190,7 @@ void shouldSuccessfullyEstablishSslHandshake() throws SSLException { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.URL_FULL, uri), + equalTo(UrlAttributes.URL_FULL, uri), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java index 7a8ebaabed29..9cb3f53ffd15 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java @@ -14,13 +14,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import org.assertj.core.api.AbstractLongAssert; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -100,7 +101,7 @@ void testSuccessfulRequest() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.URL_FULL, uri), + equalTo(UrlAttributes.URL_FULL, uri), equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -156,7 +157,7 @@ void testFailingRequest() { .hasException(connectException) .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.URL_FULL, uri), + equalTo(UrlAttributes.URL_FULL, uri), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), equalTo( diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java index 011d97bd120f..8dac321317b0 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java @@ -14,9 +14,9 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java index 49dd6ed6d312..3f9a09b6b04d 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java @@ -14,10 +14,10 @@ import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.TraceAssert; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; diff --git a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java index 98d1e849212b..1437f1c82a15 100644 --- a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java +++ b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java @@ -11,11 +11,12 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.testing.internal.armeria.client.WebClient; import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse; import org.junit.jupiter.api.AfterAll; @@ -58,8 +59,8 @@ void generatesSpans() { .hasKind(SpanKind.SERVER) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.URL_SCHEME, "http"), - equalTo(SemanticAttributes.URL_PATH, "/param/asdf1234"), + equalTo(UrlAttributes.URL_SCHEME, "http"), + equalTo(UrlAttributes.URL_PATH, "/param/asdf1234"), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), satisfies( diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java index f910c111e54e..5fed7e227563 100644 --- a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java +++ b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java @@ -13,12 +13,12 @@ import com.rabbitmq.client.ConnectionFactory; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.GlobalTraceUtil; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.SpanData; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.time.Duration; import java.util.ArrayList; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java index 1aa358321ca5..2ab93fdcb388 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java @@ -21,18 +21,17 @@ import static io.opentelemetry.semconv.SemanticAttributes.NETWORK_PROTOCOL_VERSION; import static io.opentelemetry.semconv.SemanticAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.SemanticAttributes.SERVER_PORT; -import static io.opentelemetry.semconv.SemanticAttributes.URL_PATH; -import static io.opentelemetry.semconv.SemanticAttributes.URL_SCHEME; import static io.opentelemetry.semconv.SemanticAttributes.USER_AGENT_ORIGINAL; import static org.junit.jupiter.api.Named.named; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.EventDataAssert; import io.opentelemetry.sdk.testing.assertj.TraceAssert; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.NetworkAttributes; +import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.testing.internal.armeria.client.WebClient; import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; @@ -121,10 +120,10 @@ void basicGetTest(Parameter parameter) { equalTo(SERVER_ADDRESS, "localhost"), satisfies(SERVER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(CLIENT_ADDRESS, "127.0.0.1"), - equalTo(URL_PATH, parameter.urlPath), + equalTo(UrlAttributes.URL_PATH, parameter.urlPath), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(URL_SCHEME, "http"), + equalTo(UrlAttributes.URL_SCHEME, "http"), satisfies(USER_AGENT_ORIGINAL, val -> val.isInstanceOf(String.class)), equalTo(HTTP_ROUTE, parameter.urlPathWithVariables)), span -> { @@ -242,10 +241,10 @@ void getAsyncResponseTest(Parameter parameter) { equalTo(SERVER_ADDRESS, "localhost"), satisfies(SERVER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(CLIENT_ADDRESS, "127.0.0.1"), - equalTo(URL_PATH, parameter.urlPath), + equalTo(UrlAttributes.URL_PATH, parameter.urlPath), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(URL_SCHEME, "http"), + equalTo(UrlAttributes.URL_SCHEME, "http"), satisfies(USER_AGENT_ORIGINAL, val -> val.isInstanceOf(String.class)), equalTo(HTTP_ROUTE, parameter.urlPathWithVariables)), span -> { @@ -350,10 +349,10 @@ void createSpanDuringHandlerFunctionTest(Parameter parameter) { equalTo(SERVER_ADDRESS, "localhost"), satisfies(SERVER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(CLIENT_ADDRESS, "127.0.0.1"), - equalTo(URL_PATH, parameter.urlPath), + equalTo(UrlAttributes.URL_PATH, parameter.urlPath), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(URL_SCHEME, "http"), + equalTo(UrlAttributes.URL_SCHEME, "http"), satisfies(USER_AGENT_ORIGINAL, val -> val.isInstanceOf(String.class)), equalTo(HTTP_ROUTE, parameter.urlPathWithVariables)), span -> { @@ -423,10 +422,10 @@ void get404Test() { equalTo(SERVER_ADDRESS, "localhost"), satisfies(SERVER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(CLIENT_ADDRESS, "127.0.0.1"), - equalTo(URL_PATH, "/notfoundgreet"), + equalTo(UrlAttributes.URL_PATH, "/notfoundgreet"), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(HTTP_RESPONSE_STATUS_CODE, 404), - equalTo(URL_SCHEME, "http"), + equalTo(UrlAttributes.URL_SCHEME, "http"), satisfies(USER_AGENT_ORIGINAL, val -> val.isInstanceOf(String.class)), equalTo(HTTP_ROUTE, "/**")), span -> @@ -484,10 +483,10 @@ void basicPostTest() { equalTo(SERVER_ADDRESS, "localhost"), satisfies(SERVER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(CLIENT_ADDRESS, "127.0.0.1"), - equalTo(URL_PATH, "/echo"), + equalTo(UrlAttributes.URL_PATH, "/echo"), equalTo(HTTP_REQUEST_METHOD, "POST"), equalTo(HTTP_RESPONSE_STATUS_CODE, 202), - equalTo(URL_SCHEME, "http"), + equalTo(UrlAttributes.URL_SCHEME, "http"), satisfies(USER_AGENT_ORIGINAL, val -> val.isInstanceOf(String.class)), equalTo(HTTP_ROUTE, "/echo")), span -> @@ -525,10 +524,10 @@ void getToBadEndpointTest(Parameter parameter) { equalTo(SERVER_ADDRESS, "localhost"), satisfies(SERVER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(CLIENT_ADDRESS, "127.0.0.1"), - equalTo(URL_PATH, parameter.urlPath), + equalTo(UrlAttributes.URL_PATH, parameter.urlPath), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(HTTP_RESPONSE_STATUS_CODE, 500), - equalTo(URL_SCHEME, "http"), + equalTo(UrlAttributes.URL_SCHEME, "http"), satisfies(USER_AGENT_ORIGINAL, val -> val.isInstanceOf(String.class)), equalTo(HTTP_ROUTE, parameter.urlPathWithVariables), equalTo(ERROR_TYPE, "500")), @@ -606,10 +605,10 @@ void redirectTest() { equalTo(SERVER_ADDRESS, "localhost"), satisfies(SERVER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(CLIENT_ADDRESS, "127.0.0.1"), - equalTo(URL_PATH, "/double-greet-redirect"), + equalTo(UrlAttributes.URL_PATH, "/double-greet-redirect"), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(HTTP_RESPONSE_STATUS_CODE, 307), - equalTo(URL_SCHEME, "http"), + equalTo(UrlAttributes.URL_SCHEME, "http"), satisfies(USER_AGENT_ORIGINAL, val -> val.isInstanceOf(String.class)), equalTo(HTTP_ROUTE, "/double-greet-redirect")), span -> @@ -635,10 +634,10 @@ void redirectTest() { equalTo(SERVER_ADDRESS, "localhost"), satisfies(SERVER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(CLIENT_ADDRESS, "127.0.0.1"), - equalTo(URL_PATH, "/double-greet"), + equalTo(UrlAttributes.URL_PATH, "/double-greet"), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(URL_SCHEME, "http"), + equalTo(UrlAttributes.URL_SCHEME, "http"), satisfies(USER_AGENT_ORIGINAL, val -> val.isInstanceOf(String.class)), equalTo(HTTP_ROUTE, "/double-greet")), span -> { @@ -687,10 +686,10 @@ void multipleGetsToDelayingRoute(Parameter parameter) { equalTo(SERVER_ADDRESS, "localhost"), satisfies(SERVER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(CLIENT_ADDRESS, "127.0.0.1"), - equalTo(URL_PATH, parameter.urlPath), + equalTo(UrlAttributes.URL_PATH, parameter.urlPath), equalTo(HTTP_REQUEST_METHOD, "GET"), equalTo(HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(URL_SCHEME, "http"), + equalTo(UrlAttributes.URL_SCHEME, "http"), satisfies(USER_AGENT_ORIGINAL, val -> val.isInstanceOf(String.class)), equalTo(HTTP_ROUTE, parameter.urlPathWithVariables)), span -> { @@ -769,9 +768,9 @@ void cancelRequestTest() throws Exception { equalTo(SERVER_ADDRESS, "localhost"), satisfies(SERVER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(CLIENT_ADDRESS, "127.0.0.1"), - equalTo(URL_PATH, "/slow"), + equalTo(UrlAttributes.URL_PATH, "/slow"), equalTo(HTTP_REQUEST_METHOD, "GET"), - equalTo(URL_SCHEME, "http"), + equalTo(UrlAttributes.URL_SCHEME, "http"), satisfies(USER_AGENT_ORIGINAL, val -> val.isInstanceOf(String.class)), equalTo(HTTP_ROUTE, "/slow"), equalTo(ERROR_TYPE, "_OTHER")), diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java index 5ca5ebb133f9..bdc0d4b8fd21 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -181,7 +182,7 @@ void shouldEndSpanOnMonoTimeout() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.URL_FULL, uri.toString()), + equalTo(UrlAttributes.URL_FULL, uri.toString()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, uri.getPort()), equalTo(SemanticAttributes.ERROR_TYPE, "cancelled")), diff --git a/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy b/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy index 4e8480989330..fccca2d90685 100644 --- a/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy +++ b/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy @@ -18,6 +18,7 @@ import com.twilio.type.PhoneNumber import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import org.apache.http.HttpEntity import org.apache.http.StatusLine import org.apache.http.client.methods.CloseableHttpResponse @@ -252,7 +253,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" "$SemanticAttributes.HTTP_REQUEST_METHOD.key" "POST" - "$SemanticAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" + "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE.key" 200 } } @@ -318,7 +319,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" "$SemanticAttributes.HTTP_REQUEST_METHOD.key" "POST" - "$SemanticAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" + "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE.key" 500 "$SemanticAttributes.ERROR_TYPE" "500" } @@ -331,7 +332,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" "$SemanticAttributes.HTTP_REQUEST_METHOD.key" "POST" - "$SemanticAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" + "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE.key" 200 } } @@ -404,7 +405,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" "$SemanticAttributes.HTTP_REQUEST_METHOD.key" "POST" - "$SemanticAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" + "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE.key" 500 "$SemanticAttributes.ERROR_TYPE" "500" } @@ -417,7 +418,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" "$SemanticAttributes.HTTP_REQUEST_METHOD.key" "POST" - "$SemanticAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" + "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE.key" 200 } } diff --git a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy index e33ed68b0a40..84fa1d202898 100644 --- a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy +++ b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse import io.undertow.Handlers import io.undertow.Undertow @@ -145,8 +146,8 @@ class UndertowServerTest extends HttpServerTest implements AgentTestTr attributes { "$SemanticAttributes.CLIENT_ADDRESS" TEST_CLIENT_IP - "$SemanticAttributes.URL_SCHEME" uri.getScheme() - "$SemanticAttributes.URL_PATH" uri.getPath() + "$UrlAttributes.URL_SCHEME" uri.getScheme() + "$UrlAttributes.URL_PATH" uri.getPath() "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT @@ -194,8 +195,8 @@ class UndertowServerTest extends HttpServerTest implements AgentTestTr attributes { "$SemanticAttributes.CLIENT_ADDRESS" TEST_CLIENT_IP - "$SemanticAttributes.URL_SCHEME" uri.getScheme() - "$SemanticAttributes.URL_PATH" uri.getPath() + "$UrlAttributes.URL_SCHEME" uri.getScheme() + "$UrlAttributes.URL_PATH" uri.getPath() "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java index 543d863ea80a..cd2fb69c3374 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java @@ -9,10 +9,10 @@ import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.vertx.core.Vertx; import io.vertx.redis.client.Redis; diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy index 6438eafb8cba..bfba485f1e8f 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy @@ -11,6 +11,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient import io.opentelemetry.testing.internal.armeria.common.HttpRequest import io.opentelemetry.testing.internal.armeria.common.HttpRequestBuilder @@ -69,10 +70,10 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" Long "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" - "$SemanticAttributes.URL_PATH" "/listProducts" + "$UrlAttributes.URL_PATH" "/listProducts" "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_SCHEME" "http" "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" "/listProducts" } @@ -160,11 +161,11 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" Long "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" - "$SemanticAttributes.URL_PATH" baseUrl - "$SemanticAttributes.URL_QUERY" "$TEST_REQUEST_ID_PARAMETER=$requestId" + "$UrlAttributes.URL_PATH" baseUrl + "$UrlAttributes.URL_QUERY" "$TEST_REQUEST_ID_PARAMETER=$requestId" "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_SCHEME" "http" "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" "/listProducts" "${TEST_REQUEST_ID_ATTRIBUTE}" requestId diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy index 6438eafb8cba..bfba485f1e8f 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy @@ -11,6 +11,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient import io.opentelemetry.testing.internal.armeria.common.HttpRequest import io.opentelemetry.testing.internal.armeria.common.HttpRequestBuilder @@ -69,10 +70,10 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" Long "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" - "$SemanticAttributes.URL_PATH" "/listProducts" + "$UrlAttributes.URL_PATH" "/listProducts" "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_SCHEME" "http" "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" "/listProducts" } @@ -160,11 +161,11 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" Long "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" - "$SemanticAttributes.URL_PATH" baseUrl - "$SemanticAttributes.URL_QUERY" "$TEST_REQUEST_ID_PARAMETER=$requestId" + "$UrlAttributes.URL_PATH" baseUrl + "$UrlAttributes.URL_QUERY" "$TEST_REQUEST_ID_PARAMETER=$requestId" "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.URL_SCHEME" "http" + "$UrlAttributes.URL_SCHEME" "http" "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" "/listProducts" "${TEST_REQUEST_ID_ATTRIBUTE}" requestId diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index dd68fae837d2..98593e847361 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -22,11 +22,6 @@ public class SemanticAttributes { private SemanticAttributes() {} - public static final AttributeKey URL_FULL = UrlAttributes.URL_FULL; - public static final AttributeKey URL_PATH = UrlAttributes.URL_PATH; - public static final AttributeKey URL_QUERY = UrlAttributes.URL_QUERY; - public static final AttributeKey URL_SCHEME = UrlAttributes.URL_SCHEME; - public static final AttributeKey NETWORK_PEER_ADDRESS = NetworkAttributes.NETWORK_PEER_ADDRESS; public static final AttributeKey NETWORK_PEER_PORT = NetworkAttributes.NETWORK_PEER_PORT; @@ -117,6 +112,8 @@ private DbSystemValues() {} public static final AttributeKey RPC_METHOD = RpcIncubatingAttributes.RPC_METHOD; public static final AttributeKey RPC_SERVICE = RpcIncubatingAttributes.RPC_SERVICE; public static final AttributeKey RPC_SYSTEM = RpcIncubatingAttributes.RPC_SYSTEM; + public static final AttributeKey RPC_GRPC_STATUS_CODE = + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE; public static final AttributeKey MESSAGING_BATCH_MESSAGE_COUNT = MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT; diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy index ac9d035e8436..a29eb5171731 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy @@ -7,6 +7,7 @@ package io.opentelemetry.smoketest import io.opentelemetry.proto.trace.v1.Span import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UrlAttributes import spock.lang.Shared import spock.lang.Unroll @@ -119,13 +120,13 @@ abstract class AppServerTest extends SmokeTest { traces.countSpansByName(getSpanName('/app/headers')) == 1 and: "The span for the initial web request" - traces.countFilteredAttributes(SemanticAttributes.URL_PATH.key, "/app/greeting") == 1 + traces.countFilteredAttributes(UrlAttributes.URL_PATH.key, "/app/greeting") == 1 and: "Client span for the remote call" - traces.countFilteredAttributes(SemanticAttributes.URL_FULL.key, "http://localhost:8080/app/headers") == 1 + traces.countFilteredAttributes(UrlAttributes.URL_FULL.key, "http://localhost:8080/app/headers") == 1 and: "Server span for the remote call" - traces.countFilteredAttributes(SemanticAttributes.URL_PATH.key, "/app/headers") == 1 + traces.countFilteredAttributes(UrlAttributes.URL_PATH.key, "/app/headers") == 1 and: "Number of spans with client address" traces.countFilteredAttributes(SemanticAttributes.CLIENT_ADDRESS.key, "127.0.0.1") == 1 @@ -166,7 +167,7 @@ abstract class AppServerTest extends SmokeTest { traces.countSpansByName(getSpanName('/app/hello.txt')) == 1 and: "The span for the initial web request" - traces.countFilteredAttributes(SemanticAttributes.URL_PATH.key, "/app/hello.txt") == 1 + traces.countFilteredAttributes(UrlAttributes.URL_PATH.key, "/app/hello.txt") == 1 and: "Number of spans tagged with current otel library version" traces.countFilteredResourceAttributes(TELEMETRY_DISTRO_VERSION, currentAgentVersion) == 1 @@ -200,7 +201,7 @@ abstract class AppServerTest extends SmokeTest { traces.countSpansByName(getSpanName('/app/file-that-does-not-exist')) == 1 and: "The span for the initial web request" - traces.countFilteredAttributes(SemanticAttributes.URL_PATH.key, "/app/file-that-does-not-exist") == 1 + traces.countFilteredAttributes(UrlAttributes.URL_PATH.key, "/app/file-that-does-not-exist") == 1 and: "Number of spans tagged with current otel library version" traces.countFilteredResourceAttributes(TELEMETRY_DISTRO_VERSION, currentAgentVersion) == traces.countSpans() @@ -236,7 +237,7 @@ abstract class AppServerTest extends SmokeTest { traces.countSpansByName(getSpanName('/app/WEB-INF/web.xml')) == 1 and: "The span for the initial web request" - traces.countFilteredAttributes(SemanticAttributes.URL_PATH.key, "/app/WEB-INF/web.xml") == 1 + traces.countFilteredAttributes(UrlAttributes.URL_PATH.key, "/app/WEB-INF/web.xml") == 1 and: "Number of spans with http protocol version" traces.countFilteredAttributes(SemanticAttributes.NETWORK_PROTOCOL_VERSION.key, "1.1") == 1 @@ -278,7 +279,7 @@ abstract class AppServerTest extends SmokeTest { traces.countFilteredEventAttributes('exception.message', 'This is expected') == 1 and: "The span for the initial web request" - traces.countFilteredAttributes(SemanticAttributes.URL_PATH.key, "/app/exception") == 1 + traces.countFilteredAttributes(UrlAttributes.URL_PATH.key, "/app/exception") == 1 and: "Number of spans tagged with current otel library version" traces.countFilteredResourceAttributes(TELEMETRY_DISTRO_VERSION, currentAgentVersion) == traces.countSpans() @@ -313,7 +314,7 @@ abstract class AppServerTest extends SmokeTest { traces.countSpansByName(getSpanName('/this-is-definitely-not-there-but-there-should-be-a-trace-nevertheless')) == 1 and: "The span for the initial web request" - traces.countFilteredAttributes(SemanticAttributes.URL_PATH.key, "/this-is-definitely-not-there-but-there-should-be-a-trace-nevertheless") == 1 + traces.countFilteredAttributes(UrlAttributes.URL_PATH.key, "/this-is-definitely-not-there-but-there-should-be-a-trace-nevertheless") == 1 and: "Number of spans with http protocol version" traces.countFilteredAttributes(SemanticAttributes.NETWORK_PROTOCOL_VERSION.key, "1.1") == 1 @@ -354,13 +355,13 @@ abstract class AppServerTest extends SmokeTest { traces.countSpansByName(getSpanName('/app/headers')) == 1 and: "The span for the initial web request" - traces.countFilteredAttributes(SemanticAttributes.URL_PATH.key, "/app/asyncgreeting") == 1 + traces.countFilteredAttributes(UrlAttributes.URL_PATH.key, "/app/asyncgreeting") == 1 and: "Client span for the remote call" - traces.countFilteredAttributes(SemanticAttributes.URL_FULL.key, "http://localhost:8080/app/headers") == 1 + traces.countFilteredAttributes(UrlAttributes.URL_FULL.key, "http://localhost:8080/app/headers") == 1 and: "Server span for the remote call" - traces.countFilteredAttributes(SemanticAttributes.URL_PATH.key, "/app/headers") == 1 + traces.countFilteredAttributes(UrlAttributes.URL_PATH.key, "/app/headers") == 1 and: "Number of spans with http protocol version" traces.countFilteredAttributes(SemanticAttributes.NETWORK_PROTOCOL_VERSION.key, "1.1") == 3 diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java index c6ae482894d5..fce959b3f301 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java @@ -18,14 +18,15 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.api.internal.HttpConstants; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.testing.assertj.TraceAssert; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import java.net.URI; import java.time.Duration; import java.util.ArrayList; @@ -1004,8 +1005,8 @@ SpanDataAssert assertClientSpan( } } - if (httpClientAttributes.contains(SemanticAttributes.URL_FULL)) { - assertThat(attrs).containsEntry(SemanticAttributes.URL_FULL, uri.toString()); + if (httpClientAttributes.contains(UrlAttributes.URL_FULL)) { + assertThat(attrs).containsEntry(UrlAttributes.URL_FULL, uri.toString()); } if (httpClientAttributes.contains(SemanticAttributes.HTTP_REQUEST_METHOD)) { assertThat(attrs).containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD, method); diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java index 338d7801428e..afc7cea17948 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java @@ -27,13 +27,14 @@ import io.opentelemetry.context.propagation.TextMapPropagator; import io.opentelemetry.context.propagation.TextMapSetter; import io.opentelemetry.instrumentation.api.internal.HttpConstants; -import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.instrumentation.testing.GlobalTraceUtil; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.testing.assertj.TraceAssert; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest; import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse; import io.opentelemetry.testing.internal.armeria.common.HttpData; @@ -774,13 +775,12 @@ protected SpanDataAssert assertServerSpan( assertThat(attrs).containsEntry(SemanticAttributes.USER_AGENT_ORIGINAL, TEST_USER_AGENT); - assertThat(attrs).containsEntry(SemanticAttributes.URL_SCHEME, "http"); + assertThat(attrs).containsEntry(UrlAttributes.URL_SCHEME, "http"); if (endpoint != INDEXED_CHILD) { assertThat(attrs) - .containsEntry( - SemanticAttributes.URL_PATH, endpoint.resolvePath(address).getPath()); + .containsEntry(UrlAttributes.URL_PATH, endpoint.resolvePath(address).getPath()); if (endpoint.getQuery() != null) { - assertThat(attrs).containsEntry(SemanticAttributes.URL_QUERY, endpoint.getQuery()); + assertThat(attrs).containsEntry(UrlAttributes.URL_QUERY, endpoint.getQuery()); } } @@ -810,8 +810,8 @@ protected SpanDataAssert assertIndexedServerSpan(SpanDataAssert span, int reques String method = "GET"; return assertServerSpan(span, method, endpoint, endpoint.status) .hasAttributesSatisfying( - equalTo(SemanticAttributes.URL_PATH, endpoint.resolvePath(address).getPath()), - equalTo(SemanticAttributes.URL_QUERY, "id=" + requestId)); + equalTo(UrlAttributes.URL_PATH, endpoint.resolvePath(address).getPath()), + equalTo(UrlAttributes.URL_QUERY, "id=" + requestId)); } @CanIgnoreReturnValue diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java index c7fa6006f44e..6fe6f8a3c733 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java @@ -10,6 +10,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.instrumentation.api.internal.HttpConstants; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; import java.net.URI; import java.util.Arrays; @@ -30,7 +31,7 @@ public abstract class HttpClientTestOptions { SemanticAttributes.NETWORK_PROTOCOL_VERSION, SemanticAttributes.SERVER_ADDRESS, SemanticAttributes.SERVER_PORT, - SemanticAttributes.URL_FULL, + UrlAttributes.URL_FULL, SemanticAttributes.HTTP_REQUEST_METHOD))); public static final BiFunction DEFAULT_EXPECTED_CLIENT_SPAN_NAME_MAPPER = From 04a5d10d6cf83e7ea5c2dfa632edf9d91b243d8c Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 16:46:26 +0200 Subject: [PATCH 06/52] NETWORK_* --- .../http/HttpExperimentalMetricsAdvice.java | 9 ++-- .../semconv/rpc/RpcMetricsAdvice.java | 9 ++-- .../HttpClientExperimentalMetricsTest.java | 12 ++--- .../HttpServerExperimentalMetricsTest.java | 16 +++--- .../semconv/rpc/RpcClientMetricsTest.java | 14 ++--- .../semconv/rpc/RpcServerMetricsTest.java | 13 +++-- .../http/HttpCommonAttributesExtractor.java | 5 +- .../api/semconv/http/HttpMetricsAdvice.java | 9 ++-- .../InternalNetworkAttributesExtractor.java | 9 ++-- .../HttpClientAttributesExtractorTest.java | 6 +-- .../semconv/http/HttpClientMetricsTest.java | 8 +-- .../HttpServerAttributesExtractorTest.java | 6 +-- .../semconv/http/HttpServerMetricsTest.java | 12 ++--- ...ributesExtractorInetSocketAddressTest.java | 3 +- .../NetworkAttributesExtractorTest.java | 9 ++-- .../apachedubbo/v2_7/AbstractDubboTest.groovy | 9 ++-- .../v2_7/AbstractDubboTraceChainTest.groovy | 13 ++--- .../v5_0/AbstractApacheHttpClientTest.java | 4 +- .../v1_9/AsyncHttpClientTest.java | 4 +- .../src/test/groovy/S3TracingTest.groovy | 51 ++++++++++--------- .../src/test/groovy/SnsTracingTest.groovy | 15 +++--- .../groovy/Aws0ClientTest.groovy | 3 +- .../v1_11/AbstractAws1ClientTest.groovy | 3 +- .../AbstractSqsSuppressReceiveSpansTest.java | 15 +++--- .../awssdk/v1_11/AbstractSqsTracingTest.java | 19 +++---- .../apachecamel/RestCamelTest.java | 2 +- .../TwoServicesWithDirectClientCamelTest.java | 2 +- .../apachecamel/aws/AwsSpanAssertions.java | 7 +-- .../src/test/java/CassandraClientTest.java | 12 ++--- .../v4/common/AbstractCassandraTest.java | 2 +- .../v4_4/AbstractCassandra44Test.java | 2 +- .../src/test/groovy/CouchbaseSpanUtil.groovy | 3 +- .../apiclient/ElasticsearchClientTest.java | 7 +-- .../rest/v5_0/ElasticsearchRest5Test.java | 5 +- .../rest/v6_4/ElasticsearchRest6Test.java | 5 +- .../rest/v7_0/ElasticsearchRest7Test.java | 5 +- .../Elasticsearch6TransportClientTest.groovy | 11 ++-- .../AbstractGoogleHttpClientTest.java | 3 +- .../grpc/v1_6/AbstractGrpcStreamingTest.java | 2 +- .../grpc/v1_6/AbstractGrpcTest.java | 20 ++++---- .../HttpUrlConnectionTest.java | 11 ++-- .../AbstractJavaHttpClientTest.java | 4 +- .../src/test/groovy/JaxRsClientV1Test.groovy | 3 +- .../src/test/groovy/JaxRsClientTest.groovy | 3 +- .../groovy/AbstractJaxRsHttpServerTest.groovy | 3 +- .../jedis/v3_0/Jedis30ClientTest.java | 10 ++-- .../jedis/v4_0/Jedis40ClientTest.java | 10 ++-- .../src/main/groovy/BaseJsfTest.groovy | 3 +- .../src/main/groovy/BaseJsfTest.groovy | 3 +- .../JspInstrumentationBasicTests.groovy | 17 ++++--- .../JspInstrumentationForwardTests.groovy | 13 ++--- .../v2_0/client/AbstractKtorHttpClientTest.kt | 4 +- .../v5_1/LettuceReactiveClientTest.java | 4 +- .../v5_1/AbstractLettuceAsyncClientTest.java | 12 ++--- .../AbstractLettuceReactiveClientTest.java | 18 +++---- .../AbstractLettuceSyncClientAuthTest.java | 2 +- .../v5_1/AbstractLettuceSyncClientTest.java | 28 +++++----- .../v4_0/client/Netty40ClientSslTest.java | 16 +++--- .../client/Netty40ConnectionSpanTest.java | 9 ++-- .../test/groovy/Netty41ClientSslTest.groovy | 18 ++++--- .../groovy/Netty41ConnectionSpanTest.groovy | 10 ++-- .../okhttp/v2_2/OkHttp2Test.java | 4 +- .../okhttp/v3_0/AbstractOkHttp3Test.java | 4 +- .../src/test/java/OpenSearchRestTest.java | 5 +- .../groovy/client/PlayWsClientTest.groovy | 3 +- .../groovy/PlayWsClientTestBaseBase.groovy | 3 +- .../rabbitmq/RabbitMqTest.java | 2 +- .../rabbitmq/ReactorRabbitMqTest.java | 2 +- .../server/AbstractRatpackRoutesTest.groovy | 3 +- .../v1_7/AbstractRatpackHttpClientTest.java | 4 +- .../v0_9/ReactorNettyConnectionSpanTest.java | 8 +-- .../AbstractReactorNettyHttpClientTest.java | 5 +- .../v1_0/ReactorNettyBaseUrlOnlyTest.java | 2 +- .../v1_0/ReactorNettyClientSslTest.java | 18 +++---- .../v1_0/ReactorNettyConnectionSpanTest.java | 6 +-- .../AbstractRedissonAsyncClientTest.java | 10 ++-- .../redisson/AbstractRedissonClientTest.java | 30 +++++------ .../sparkjava/SparkJavaBasedTest.java | 2 +- .../SpringIntegrationAndRabbitTest.groovy | 9 ++-- .../rabbit/v1_0/ContextPropagationTest.java | 4 +- .../v3_1/SpringWebInstrumentationTest.java | 4 +- .../v5_0/server/SpringWebfluxTest.java | 2 +- ...pringWebfluxClientInstrumentationTest.java | 3 +- .../test/groovy/test/TwilioClientTest.groovy | 11 ++-- .../src/test/groovy/UndertowServerTest.groovy | 5 +- .../v3_0/client/VertxHttpClientTest.java | 3 +- .../VertxReactivePropagationTest.groovy | 5 +- .../VertxReactivePropagationTest.groovy | 5 +- .../VertxRxCircuitBreakerWebClientTest.groovy | 3 +- .../groovy/client/VertxRxWebClientTest.groovy | 3 +- .../semconv/SemanticAttributes.java | 10 ---- .../smoketest/AppServerTest.groovy | 9 ++-- .../junit/http/AbstractHttpClientTest.java | 10 ++-- .../junit/http/AbstractHttpServerTest.java | 10 ++-- .../junit/http/HttpClientTestOptions.java | 3 +- 95 files changed, 404 insertions(+), 371 deletions(-) diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java index 15e51a44a2b9..f33778b46b9f 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java @@ -11,6 +11,7 @@ import io.opentelemetry.api.metrics.LongUpDownCounterBuilder; import io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder; import io.opentelemetry.extension.incubator.metrics.ExtendedLongUpDownCounterBuilder; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -26,8 +27,8 @@ static void applyClientRequestSizeAdvice(LongHistogramBuilder builder) { SemanticAttributes.HTTP_REQUEST_METHOD, SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, SemanticAttributes.ERROR_TYPE, - SemanticAttributes.NETWORK_PROTOCOL_NAME, - SemanticAttributes.NETWORK_PROTOCOL_VERSION, + NetworkAttributes.NETWORK_PROTOCOL_NAME, + NetworkAttributes.NETWORK_PROTOCOL_VERSION, SemanticAttributes.SERVER_ADDRESS, SemanticAttributes.SERVER_PORT)); } @@ -44,8 +45,8 @@ static void applyServerRequestSizeAdvice(LongHistogramBuilder builder) { SemanticAttributes.HTTP_REQUEST_METHOD, SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, SemanticAttributes.ERROR_TYPE, - SemanticAttributes.NETWORK_PROTOCOL_NAME, - SemanticAttributes.NETWORK_PROTOCOL_VERSION, + NetworkAttributes.NETWORK_PROTOCOL_NAME, + NetworkAttributes.NETWORK_PROTOCOL_VERSION, UrlAttributes.URL_SCHEME)); } diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcMetricsAdvice.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcMetricsAdvice.java index dd6acd97cef7..ce2067414967 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcMetricsAdvice.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcMetricsAdvice.java @@ -7,6 +7,7 @@ import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.Arrays; @@ -25,8 +26,8 @@ static void applyClientDurationAdvice(DoubleHistogramBuilder builder) { SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_METHOD, SemanticAttributes.RPC_GRPC_STATUS_CODE, - SemanticAttributes.NETWORK_TYPE, - SemanticAttributes.NETWORK_TRANSPORT, + NetworkAttributes.NETWORK_TYPE, + NetworkAttributes.NETWORK_TRANSPORT, SemanticAttributes.SERVER_ADDRESS, SemanticAttributes.SERVER_PORT)); } @@ -44,8 +45,8 @@ static void applyServerDurationAdvice(DoubleHistogramBuilder builder) { SemanticAttributes.RPC_SERVICE, SemanticAttributes.RPC_METHOD, SemanticAttributes.RPC_GRPC_STATUS_CODE, - SemanticAttributes.NETWORK_TYPE, - SemanticAttributes.NETWORK_TRANSPORT, + NetworkAttributes.NETWORK_TYPE, + NetworkAttributes.NETWORK_TRANSPORT, SemanticAttributes.SERVER_ADDRESS, SemanticAttributes.SERVER_PORT)); } diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java index ab22275bb69d..49e80feec9e7 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java @@ -50,8 +50,8 @@ void collectsMetrics() { .put(SemanticAttributes.ERROR_TYPE, "400") .put(SemanticAttributes.HTTP_REQUEST_BODY_SIZE, 100) .put(SemanticAttributes.HTTP_RESPONSE_BODY_SIZE, 200) - .put(SemanticAttributes.NETWORK_PROTOCOL_NAME, "http") - .put(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "2.0") + .put(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http") + .put(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0") .put(NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4") .put(NetworkAttributes.NETWORK_PEER_PORT, 8080) .build(); @@ -95,9 +95,9 @@ void collectsMetrics() { SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.ERROR_TYPE, "400"), equalTo( - SemanticAttributes.NETWORK_PROTOCOL_NAME, "http"), + NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( - SemanticAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), + NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, 1234)) .hasExemplarsSatisfying( @@ -122,9 +122,9 @@ void collectsMetrics() { SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.ERROR_TYPE, "400"), equalTo( - SemanticAttributes.NETWORK_PROTOCOL_NAME, "http"), + NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( - SemanticAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), + NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, 1234)) .hasExemplarsSatisfying( diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java index d7a7d70e2721..3baabf4a9c05 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java @@ -40,10 +40,10 @@ void collectsMetrics() { .put(UrlAttributes.URL_SCHEME, "https") .put(UrlAttributes.URL_PATH, "/") .put(UrlAttributes.URL_QUERY, "q=a") - .put(SemanticAttributes.NETWORK_TRANSPORT, "tcp") - .put(SemanticAttributes.NETWORK_TYPE, "ipv4") - .put(SemanticAttributes.NETWORK_PROTOCOL_NAME, "http") - .put(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "2.0") + .put(NetworkAttributes.NETWORK_TRANSPORT, "tcp") + .put(NetworkAttributes.NETWORK_TYPE, "ipv4") + .put(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http") + .put(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0") .put(SemanticAttributes.SERVER_ADDRESS, "localhost") .put(SemanticAttributes.SERVER_PORT, 1234) .build(); @@ -159,9 +159,9 @@ void collectsMetrics() { SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.ERROR_TYPE, "500"), equalTo( - SemanticAttributes.NETWORK_PROTOCOL_NAME, "http"), + NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( - SemanticAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), + NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), equalTo(UrlAttributes.URL_SCHEME, "https")) .hasExemplarsSatisfying( exemplar -> @@ -185,9 +185,9 @@ void collectsMetrics() { SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.ERROR_TYPE, "500"), equalTo( - SemanticAttributes.NETWORK_PROTOCOL_NAME, "http"), + NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( - SemanticAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), + NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), equalTo(UrlAttributes.URL_SCHEME, "https")) .hasExemplarsSatisfying( exemplar -> diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java index c24e55a9c2bb..343f2f5b521e 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java @@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -42,14 +43,14 @@ void collectsMetrics() { Attributes.builder() .put(SemanticAttributes.SERVER_ADDRESS, "example.com") .put(SemanticAttributes.SERVER_PORT, 8080) - .put(SemanticAttributes.NETWORK_TRANSPORT, "tcp") - .put(SemanticAttributes.NETWORK_TYPE, "ipv4") + .put(NetworkAttributes.NETWORK_TRANSPORT, "tcp") + .put(NetworkAttributes.NETWORK_TYPE, "ipv4") .build(); Attributes responseAttributes2 = Attributes.builder() .put(SemanticAttributes.SERVER_PORT, 8080) - .put(SemanticAttributes.NETWORK_TRANSPORT, "tcp") + .put(NetworkAttributes.NETWORK_TRANSPORT, "tcp") .build(); Context parent = @@ -93,8 +94,8 @@ void collectsMetrics() { equalTo( SemanticAttributes.SERVER_ADDRESS, "example.com"), equalTo(SemanticAttributes.SERVER_PORT, 8080), - equalTo(SemanticAttributes.NETWORK_TRANSPORT, "tcp"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4")) + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4")) .hasExemplarsSatisfying( exemplar -> exemplar @@ -122,8 +123,7 @@ void collectsMetrics() { "myservice.EchoService"), equalTo(SemanticAttributes.RPC_METHOD, "exampleMethod"), equalTo(SemanticAttributes.SERVER_PORT, 8080), - equalTo( - SemanticAttributes.NETWORK_TRANSPORT, "tcp"))))); + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"))))); } private static long nanos(int millis) { diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java index d4f31119d85d..d52be21a3b41 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java @@ -44,15 +44,15 @@ void collectsMetrics() { .put(SemanticAttributes.SERVER_ADDRESS, "example.com") .put(SemanticAttributes.SERVER_PORT, 8080) .put(NetworkAttributes.NETWORK_LOCAL_ADDRESS, "127.0.0.1") - .put(SemanticAttributes.NETWORK_TRANSPORT, "tcp") - .put(SemanticAttributes.NETWORK_TYPE, "ipv4") + .put(NetworkAttributes.NETWORK_TRANSPORT, "tcp") + .put(NetworkAttributes.NETWORK_TYPE, "ipv4") .build(); Attributes responseAttributes2 = Attributes.builder() .put(SemanticAttributes.SERVER_PORT, 8080) .put(NetworkAttributes.NETWORK_LOCAL_ADDRESS, "127.0.0.1") - .put(SemanticAttributes.NETWORK_TRANSPORT, "tcp") + .put(NetworkAttributes.NETWORK_TRANSPORT, "tcp") .build(); Context parent = @@ -95,8 +95,8 @@ void collectsMetrics() { equalTo(SemanticAttributes.RPC_METHOD, "exampleMethod"), equalTo( SemanticAttributes.SERVER_ADDRESS, "example.com"), - equalTo(SemanticAttributes.NETWORK_TRANSPORT, "tcp"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4")) + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4")) .hasExemplarsSatisfying( exemplar -> exemplar @@ -123,8 +123,7 @@ void collectsMetrics() { SemanticAttributes.RPC_SERVICE, "myservice.EchoService"), equalTo(SemanticAttributes.RPC_METHOD, "exampleMethod"), - equalTo( - SemanticAttributes.NETWORK_TRANSPORT, "tcp"))))); + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"))))); } private static long nanos(int millis) { diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpCommonAttributesExtractor.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpCommonAttributesExtractor.java index 5be635f03b0d..d3eb9da8824b 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpCommonAttributesExtractor.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpCommonAttributesExtractor.java @@ -15,6 +15,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.HashSet; import java.util.List; @@ -117,9 +118,9 @@ public void onEnd( if (protocolVersion != null) { if (!"http".equals(protocolName)) { - internalSet(attributes, SemanticAttributes.NETWORK_PROTOCOL_NAME, protocolName); + internalSet(attributes, NetworkAttributes.NETWORK_PROTOCOL_NAME, protocolName); } - internalSet(attributes, SemanticAttributes.NETWORK_PROTOCOL_VERSION, protocolVersion); + internalSet(attributes, NetworkAttributes.NETWORK_PROTOCOL_VERSION, protocolVersion); } } diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java index 6e2546ba61ce..2cf7277d009c 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java @@ -10,6 +10,7 @@ import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.List; @@ -30,8 +31,8 @@ static void applyClientDurationAdvice(DoubleHistogramBuilder builder) { SemanticAttributes.HTTP_REQUEST_METHOD, SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, SemanticAttributes.ERROR_TYPE, - SemanticAttributes.NETWORK_PROTOCOL_NAME, - SemanticAttributes.NETWORK_PROTOCOL_VERSION, + NetworkAttributes.NETWORK_PROTOCOL_NAME, + NetworkAttributes.NETWORK_PROTOCOL_VERSION, SemanticAttributes.SERVER_ADDRESS, SemanticAttributes.SERVER_PORT)); } @@ -47,8 +48,8 @@ static void applyServerDurationAdvice(DoubleHistogramBuilder builder) { SemanticAttributes.HTTP_REQUEST_METHOD, SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, SemanticAttributes.ERROR_TYPE, - SemanticAttributes.NETWORK_PROTOCOL_NAME, - SemanticAttributes.NETWORK_PROTOCOL_VERSION, + NetworkAttributes.NETWORK_PROTOCOL_NAME, + NetworkAttributes.NETWORK_PROTOCOL_VERSION, UrlAttributes.URL_SCHEME)); } diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalNetworkAttributesExtractor.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalNetworkAttributesExtractor.java index 4b1a5e83cecf..7d0cb9eea012 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalNetworkAttributesExtractor.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalNetworkAttributesExtractor.java @@ -10,7 +10,6 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import java.util.Locale; import javax.annotation.Nullable; @@ -39,13 +38,13 @@ public void onEnd(AttributesBuilder attributes, REQUEST request, @Nullable RESPO if (captureProtocolAttributes) { String transport = lowercase(getter.getNetworkTransport(request, response)); - internalSet(attributes, SemanticAttributes.NETWORK_TRANSPORT, transport); + internalSet(attributes, NetworkAttributes.NETWORK_TRANSPORT, transport); internalSet( attributes, - SemanticAttributes.NETWORK_TYPE, + NetworkAttributes.NETWORK_TYPE, lowercase(getter.getNetworkType(request, response))); - internalSet(attributes, SemanticAttributes.NETWORK_PROTOCOL_NAME, protocolName); - internalSet(attributes, SemanticAttributes.NETWORK_PROTOCOL_VERSION, protocolVersion); + internalSet(attributes, NetworkAttributes.NETWORK_PROTOCOL_NAME, protocolName); + internalSet(attributes, NetworkAttributes.NETWORK_PROTOCOL_VERSION, protocolVersion); } if (captureLocalSocketAttributes) { diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java index 6af61d66ac5e..00d056a26a43 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java @@ -186,7 +186,7 @@ void normal() { entry( AttributeKey.stringArrayKey("http.response.header.custom-response-header"), asList("654", "321")), - entry(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + entry(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), entry(NetworkAttributes.NETWORK_PEER_ADDRESS, "4.3.2.1"), entry(NetworkAttributes.NETWORK_PEER_PORT, 456L)); } @@ -420,7 +420,7 @@ void shouldExtractProtocolNameDifferentFromHttp() { assertThat(endAttributes.build()) .containsOnly( entry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), - entry(SemanticAttributes.NETWORK_PROTOCOL_NAME, "spdy"), - entry(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "3.1")); + entry(NetworkAttributes.NETWORK_PROTOCOL_NAME, "spdy"), + entry(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "3.1")); } } diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java index e69bd5f290d7..859253ca3dfd 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java @@ -52,8 +52,8 @@ void collectsMetrics() { .put(SemanticAttributes.ERROR_TYPE, "400") .put(SemanticAttributes.HTTP_REQUEST_BODY_SIZE, 100) .put(SemanticAttributes.HTTP_RESPONSE_BODY_SIZE, 200) - .put(SemanticAttributes.NETWORK_PROTOCOL_NAME, "http") - .put(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "2.0") + .put(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http") + .put(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0") .put(NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4") .put(NetworkAttributes.NETWORK_PEER_PORT, 8080) .build(); @@ -97,9 +97,9 @@ void collectsMetrics() { SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.ERROR_TYPE, "400"), equalTo( - SemanticAttributes.NETWORK_PROTOCOL_NAME, "http"), + NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( - SemanticAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), + NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, 1234)) .hasExemplarsSatisfying( diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java index da29d46c7781..9fd2971f2bd3 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java @@ -211,7 +211,7 @@ void normal() { extractor.onEnd(endAttributes, Context.root(), request, response, null); assertThat(endAttributes.build()) .containsOnly( - entry(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), + entry(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), entry(NetworkAttributes.NETWORK_PEER_ADDRESS, "4.3.2.1"), entry(NetworkAttributes.NETWORK_PEER_PORT, 456L), entry(SemanticAttributes.HTTP_ROUTE, "/repositories/{repoId}"), @@ -551,7 +551,7 @@ void shouldExtractProtocolNameDifferentFromHttp() { assertThat(endAttributes.build()) .containsOnly( entry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), - entry(SemanticAttributes.NETWORK_PROTOCOL_NAME, "spdy"), - entry(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "3.1")); + entry(NetworkAttributes.NETWORK_PROTOCOL_NAME, "spdy"), + entry(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "3.1")); } } diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java index 120daa8e2750..cce97e042bd4 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java @@ -42,10 +42,10 @@ void collectsMetrics() { .put(UrlAttributes.URL_SCHEME, "https") .put(UrlAttributes.URL_PATH, "/") .put(UrlAttributes.URL_QUERY, "q=a") - .put(SemanticAttributes.NETWORK_TRANSPORT, "tcp") - .put(SemanticAttributes.NETWORK_TYPE, "ipv4") - .put(SemanticAttributes.NETWORK_PROTOCOL_NAME, "http") - .put(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "2.0") + .put(NetworkAttributes.NETWORK_TRANSPORT, "tcp") + .put(NetworkAttributes.NETWORK_TYPE, "ipv4") + .put(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http") + .put(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0") .put(SemanticAttributes.SERVER_ADDRESS, "localhost") .put(SemanticAttributes.SERVER_PORT, 1234) .build(); @@ -102,9 +102,9 @@ void collectsMetrics() { SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.ERROR_TYPE, "500"), equalTo( - SemanticAttributes.NETWORK_PROTOCOL_NAME, "http"), + NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( - SemanticAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), + NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), equalTo(UrlAttributes.URL_SCHEME, "https")) .hasExemplarsSatisfying( exemplar -> diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorInetSocketAddressTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorInetSocketAddressTest.java index 809d35efa93b..9a96690cbabd 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorInetSocketAddressTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorInetSocketAddressTest.java @@ -13,7 +13,6 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import java.net.InetSocketAddress; import javax.annotation.Nullable; import org.junit.jupiter.api.Test; @@ -54,7 +53,7 @@ void fullAddress() { extractor.onEnd(endAttributes, Context.root(), local, peer, null); assertThat(endAttributes.build()) .containsOnly( - entry(SemanticAttributes.NETWORK_TYPE, "ipv4"), + entry(NetworkAttributes.NETWORK_TYPE, "ipv4"), entry(NetworkAttributes.NETWORK_LOCAL_ADDRESS, "1.2.3.4"), entry(NetworkAttributes.NETWORK_LOCAL_PORT, 8080L), entry(NetworkAttributes.NETWORK_PEER_ADDRESS, "4.3.2.1"), diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorTest.java index dda595ae0d63..5371b2aa8b20 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/NetworkAttributesExtractorTest.java @@ -14,7 +14,6 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import java.util.HashMap; import java.util.Map; import javax.annotation.Nullable; @@ -99,10 +98,10 @@ void allAttributes() { extractor.onEnd(endAttributes, Context.root(), request, null, null); assertThat(endAttributes.build()) .containsOnly( - entry(SemanticAttributes.NETWORK_TRANSPORT, "tcp"), - entry(SemanticAttributes.NETWORK_TYPE, "ipv4"), - entry(SemanticAttributes.NETWORK_PROTOCOL_NAME, "http"), - entry(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + entry(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), + entry(NetworkAttributes.NETWORK_TYPE, "ipv4"), + entry(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), + entry(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), entry(NetworkAttributes.NETWORK_LOCAL_ADDRESS, "1.2.3.4"), entry(NetworkAttributes.NETWORK_LOCAL_PORT, 8080L), entry(NetworkAttributes.NETWORK_PEER_ADDRESS, "4.3.2.1"), diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy index 1cfb37bed950..091d60f37b0c 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import org.apache.dubbo.common.utils.NetUtils import org.apache.dubbo.config.ApplicationConfig import org.apache.dubbo.config.ProtocolConfig @@ -107,7 +108,7 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { "$SemanticAttributes.SERVER_PORT" Long "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == null || it instanceof String} "$NetworkAttributes.NETWORK_PEER_PORT" { it == null || it instanceof Long} - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } } } span(2) { @@ -120,7 +121,7 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { "$SemanticAttributes.RPC_METHOD" "hello" "$NetworkAttributes.NETWORK_PEER_ADDRESS" String "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } } } } @@ -183,7 +184,7 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { "$SemanticAttributes.SERVER_PORT" Long "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == null || it instanceof String} "$NetworkAttributes.NETWORK_PEER_PORT" { it == null || it instanceof Long} - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } } } span(2) { @@ -196,7 +197,7 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { "$SemanticAttributes.RPC_METHOD" "hello" "$NetworkAttributes.NETWORK_PEER_ADDRESS" String "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } } } } diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy index 8e38078d653c..2329eb13fd23 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy @@ -14,6 +14,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import org.apache.dubbo.common.utils.NetUtils import org.apache.dubbo.config.ApplicationConfig import org.apache.dubbo.config.ProtocolConfig @@ -143,7 +144,7 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification "$SemanticAttributes.SERVER_PORT" Long "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == null || it instanceof String} "$NetworkAttributes.NETWORK_PEER_PORT" { it == null || it instanceof Long} - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } } } span(2) { @@ -156,7 +157,7 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification "$SemanticAttributes.RPC_METHOD" "hello" "$NetworkAttributes.NETWORK_PEER_ADDRESS" String "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } } } span(3) { @@ -171,7 +172,7 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification "$SemanticAttributes.SERVER_PORT" Long "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == null || it instanceof String } "$NetworkAttributes.NETWORK_PEER_PORT" { it == null || it instanceof Long } - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } } } span(4) { @@ -184,7 +185,7 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification "$SemanticAttributes.RPC_METHOD" "hello" "$NetworkAttributes.NETWORK_PEER_ADDRESS" String "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } } } } @@ -259,7 +260,7 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification "$SemanticAttributes.SERVER_PORT" Long "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == null || it instanceof String} "$NetworkAttributes.NETWORK_PEER_PORT" { it == null || it instanceof Long} - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } } } span(2) { @@ -272,7 +273,7 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification "$SemanticAttributes.RPC_METHOD" "hello" "$NetworkAttributes.NETWORK_PEER_ADDRESS" String "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } } } } diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/AbstractApacheHttpClientTest.java b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/AbstractApacheHttpClientTest.java index 4741d7c9c74b..cf804e182196 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/AbstractApacheHttpClientTest.java +++ b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/AbstractApacheHttpClientTest.java @@ -9,7 +9,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import java.net.URI; import java.time.Duration; import java.util.HashSet; @@ -40,7 +40,7 @@ protected Set> getHttpAttributes(URI uri) { || "https://192.0.2.1/".equals(uri.toString()) || uri.toString().contains("/read-timeout") || uri.toString().contains("/circular-redirect")) { - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION); + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION); } return attributes; } diff --git a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientTest.java b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientTest.java index ba66f2ca683a..b76ed21d7f4d 100644 --- a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientTest.java +++ b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientTest.java @@ -18,7 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import java.net.URI; import java.util.HashSet; import java.util.Map; @@ -93,7 +93,7 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) { endpoint -> { Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION); + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION); return attributes; }); } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy index c62a21c19b81..cee37350d064 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy @@ -5,6 +5,7 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import spock.lang.Shared @@ -65,7 +66,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -87,7 +88,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -109,7 +110,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -131,7 +132,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -153,7 +154,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -174,7 +175,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -198,7 +199,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "s3ToSqsTestQueue" "$SemanticAttributes.MESSAGING_OPERATION" "process" "$SemanticAttributes.MESSAGING_MESSAGE_ID" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" } } span(2) { @@ -224,7 +225,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -245,7 +246,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 204 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -266,7 +267,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 204 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -287,7 +288,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -341,7 +342,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -362,7 +363,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -383,7 +384,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -403,7 +404,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -423,7 +424,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } "$SemanticAttributes.MESSAGING_DESTINATION_NAME" topicArn } @@ -445,7 +446,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -465,7 +466,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } "$SemanticAttributes.MESSAGING_DESTINATION_NAME" topicArn } @@ -487,7 +488,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -508,7 +509,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -534,7 +535,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "s3ToSnsToSqsTestQueue" "$SemanticAttributes.MESSAGING_OPERATION" "process" "$SemanticAttributes.MESSAGING_MESSAGE_ID" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" } } span(1) { @@ -560,7 +561,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -581,7 +582,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 204 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -602,7 +603,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 204 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -623,7 +624,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy index 869f5961a0a8..faef6d43a016 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy @@ -5,6 +5,7 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import spock.lang.Shared @@ -57,7 +58,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -79,7 +80,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -101,7 +102,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -122,7 +123,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } } } @@ -143,7 +144,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } "$SemanticAttributes.MESSAGING_DESTINATION_NAME" topicArn } @@ -164,7 +165,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" { it == null || Number } "$SemanticAttributes.MESSAGING_DESTINATION_NAME" topicArn } @@ -189,7 +190,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "snsToSqsTestQueue" "$SemanticAttributes.MESSAGING_OPERATION" "process" "$SemanticAttributes.MESSAGING_MESSAGE_ID" String - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" } } span(2) { diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy index f69f1370ac69..5fcebc314907 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy @@ -25,6 +25,7 @@ import com.amazonaws.services.s3.S3ClientOptions import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.HttpResponse import io.opentelemetry.testing.internal.armeria.common.HttpStatus @@ -110,7 +111,7 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { "$UrlAttributes.URL_FULL" "${server.httpUri()}" "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" server.httpPort() "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.RPC_SYSTEM" "aws-api" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy index e603e13332f4..d59c77b3831a 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy @@ -32,6 +32,7 @@ import com.amazonaws.services.sns.model.PublishRequest import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.HttpResponse import io.opentelemetry.testing.internal.armeria.common.HttpStatus @@ -108,7 +109,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { "$UrlAttributes.URL_FULL" "${server.httpUri()}" "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" server.httpPort() "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.RPC_SYSTEM" "aws-api" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java index a6bb11a218a1..87100f382ba8 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java @@ -24,6 +24,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import org.elasticmq.rest.sqs.SQSRestServer; @@ -101,7 +102,7 @@ void testSimpleSqsProducerConsumerServices() { equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), trace -> trace.hasSpansSatisfyingExactly( span -> @@ -129,7 +130,7 @@ void testSimpleSqsProducerConsumerServices() { satisfies( SemanticAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), span -> span.hasName("testSdkSqs process") .hasKind(SpanKind.CONSUMER) @@ -155,7 +156,7 @@ void testSimpleSqsProducerConsumerServices() { satisfies( SemanticAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), span -> span.hasName("process child") .hasParent(trace.getSpan(1)) @@ -202,7 +203,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), trace -> trace.hasSpansSatisfyingExactly( span -> @@ -230,7 +231,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { satisfies( SemanticAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), span -> span.hasName("testSdkSqs process") .hasKind(SpanKind.CONSUMER) @@ -256,7 +257,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { satisfies( SemanticAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), span -> span.hasName("process child") .hasParent(trace.getSpan(1)) @@ -286,7 +287,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")))); + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")))); } @Test diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java index 82849f347136..2562ac1e1277 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java @@ -30,6 +30,7 @@ import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.trace.data.SpanData; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.ArrayList; @@ -134,7 +135,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), trace -> trace.hasSpansSatisfyingExactly( span -> { @@ -161,7 +162,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead satisfies( SemanticAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))); + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))); if (testCaptureHeaders) { attributes.add( @@ -199,7 +200,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))); + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))); if (testCaptureHeaders) { attributes.add( @@ -237,7 +238,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead satisfies( SemanticAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))); + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))); if (testCaptureHeaders) { attributes.add( @@ -296,7 +297,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), trace -> trace.hasSpansSatisfyingExactly( span -> @@ -324,7 +325,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { satisfies( SemanticAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), trace -> { AtomicReference receiveSpan = new AtomicReference<>(); AtomicReference processSpan = new AtomicReference<>(); @@ -358,7 +359,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), span -> span.hasName("testSdkSqs receive") .hasKind(SpanKind.CONSUMER) @@ -387,7 +388,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { "testSdkSqs"), equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), span -> span.hasName("testSdkSqs process") .hasKind(SpanKind.CONSUMER) @@ -418,7 +419,7 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { satisfies( SemanticAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), span -> span.hasName("process child") .hasParent(processSpan.get()) diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java index 76c11ecdbab9..6479a37a8ae6 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java @@ -104,7 +104,7 @@ void restComponentServerAndClientCallWithJettyBackend() { equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.HTTP_ROUTE, "/api/{module}/unit/{unitId}"), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, Long.valueOf(port)), equalTo(SemanticAttributes.CLIENT_ADDRESS, "127.0.0.1"), diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java index 2088e2011168..c44f55641258 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java @@ -155,7 +155,7 @@ void twoCamelServiceSpans() throws Exception { SemanticAttributes.USER_AGENT_ORIGINAL, "Jakarta Commons-HttpClient/3.1"), equalTo(SemanticAttributes.HTTP_ROUTE, "/serviceTwo"), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), equalTo(SemanticAttributes.SERVER_PORT, portTwo), equalTo(SemanticAttributes.CLIENT_ADDRESS, "127.0.0.1"), diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java index ede52b9c209a..1d9a282fac3c 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java @@ -14,6 +14,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.ArrayList; @@ -78,7 +79,7 @@ static SpanDataAssert sqs( val.satisfiesAnyOf( v -> assertThat(v).isNull(), v -> assertThat(v).isInstanceOf(Number.class))), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(stringKey("rpc.system"), "aws-api"), satisfies(stringKey("rpc.method"), stringAssert -> stringAssert.isEqualTo(rpcMethod)), equalTo(stringKey("rpc.service"), "AmazonSQS"))); @@ -120,7 +121,7 @@ static SpanDataAssert s3(SpanDataAssert span, String spanName, String bucketName equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, method), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), satisfies(UrlAttributes.URL_FULL, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), satisfies(SemanticAttributes.SERVER_ADDRESS, val -> val.isInstanceOf(String.class)), satisfies( SemanticAttributes.SERVER_PORT, @@ -142,7 +143,7 @@ static SpanDataAssert sns(SpanDataAssert span, String spanName, String topicArn) equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), satisfies(UrlAttributes.URL_FULL, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), satisfies(SemanticAttributes.SERVER_ADDRESS, val -> val.isInstanceOf(String.class)), satisfies( SemanticAttributes.SERVER_PORT, diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java index 329edd5c5bef..0d362762ca93 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java @@ -85,7 +85,7 @@ void syncTest(Parameter parameter) { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), @@ -100,7 +100,7 @@ void syncTest(Parameter parameter) { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), @@ -119,7 +119,7 @@ void syncTest(Parameter parameter) { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), @@ -158,7 +158,7 @@ void asyncTest(Parameter parameter) { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), @@ -174,7 +174,7 @@ void asyncTest(Parameter parameter) { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), @@ -198,7 +198,7 @@ void asyncTest(Parameter parameter) { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), diff --git a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java index a2454e5bb2d3..67239803bcb4 100644 --- a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java +++ b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java @@ -7,6 +7,7 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE; import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_COORDINATOR_DC; import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_COORDINATOR_ID; @@ -18,7 +19,6 @@ import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION; import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.SemanticAttributes.DB_SYSTEM; -import static io.opentelemetry.semconv.SemanticAttributes.NETWORK_TYPE; import static io.opentelemetry.semconv.SemanticAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.SemanticAttributes.SERVER_PORT; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java index cb1b5f984014..d8d5058113db 100644 --- a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java +++ b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java @@ -7,6 +7,7 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE; import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_COORDINATOR_DC; import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_COORDINATOR_ID; @@ -18,7 +19,6 @@ import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION; import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.SemanticAttributes.DB_SYSTEM; -import static io.opentelemetry.semconv.SemanticAttributes.NETWORK_TYPE; import static io.opentelemetry.semconv.SemanticAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.SemanticAttributes.SERVER_PORT; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy index 3692556530a8..f50e7af2d46e 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy @@ -7,6 +7,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import static io.opentelemetry.api.trace.SpanKind.CLIENT @@ -35,7 +36,7 @@ class CouchbaseSpanUtil { "$SemanticAttributes.DB_OPERATION"(operation ?: spanName) // Because of caching, not all requests hit the server so these attributes may be absent - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == null } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == null } "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == null } "$NetworkAttributes.NETWORK_PEER_PORT" { it instanceof Number || it == null } diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java index 3258e76f23b4..2c863b656e42 100644 --- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java +++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; @@ -100,7 +101,7 @@ public void elasticsearchStatus() throws IOException { equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); } @@ -144,7 +145,7 @@ public void elasticsearchIndex() throws IOException { equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "PUT"), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo( UrlAttributes.URL_FULL, httpHost.toURI() + "/test-index/_doc/test-id?timeout=10s"), @@ -197,7 +198,7 @@ public void elasticsearchStatusAsync() throws Exception { equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)), span -> diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java index b32a4a6b12b0..bb1d1a59cf9b 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java @@ -11,6 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; @@ -107,7 +108,7 @@ void elasticsearchStatus() throws IOException { equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200)); }); @@ -183,7 +184,7 @@ public void onFailure(Exception e) { equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200)); }, diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java index 26f917772554..2e4818c2c3e6 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java @@ -11,6 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; @@ -98,7 +99,7 @@ public void elasticsearchStatus() throws IOException { equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)); }); @@ -173,7 +174,7 @@ public void onFailure(Exception e) { equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200)); }, diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index 3591bc003ce2..09e1954c62bb 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -11,6 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.Map; @@ -95,7 +96,7 @@ public void elasticsearchStatus() throws Exception { equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); } @@ -165,7 +166,7 @@ public void onFailure(Exception e) { equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)), span -> diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy index e71871ce2631..c7077ba96309 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy @@ -5,6 +5,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.common.io.FileSystemUtils @@ -106,7 +107,7 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl kind CLIENT childOf(span(0)) attributes { - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" } "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$SemanticAttributes.DB_SYSTEM" "elasticsearch" @@ -225,7 +226,7 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl name "CreateIndexAction" kind CLIENT attributes { - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" } "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$SemanticAttributes.DB_SYSTEM" "elasticsearch" @@ -241,7 +242,7 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl name "GetAction" kind CLIENT attributes { - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" } "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$SemanticAttributes.DB_SYSTEM" "elasticsearch" @@ -272,7 +273,7 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl name "IndexAction" kind CLIENT attributes { - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" } "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$SemanticAttributes.DB_SYSTEM" "elasticsearch" @@ -294,7 +295,7 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl name "GetAction" kind CLIENT attributes { - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" } "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port "$SemanticAttributes.DB_SYSTEM" "elasticsearch" diff --git a/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java b/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java index 0e2defccd0e7..231a500f0abe 100644 --- a/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java +++ b/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java @@ -23,6 +23,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.net.URI; @@ -133,7 +134,7 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) { uri -> { Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION); + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION); return attributes; }); } diff --git a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java index 3e4abf30c866..09f05268d1ea 100644 --- a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java +++ b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java @@ -201,7 +201,7 @@ public void onCompleted() { (long) Status.Code.OK.value()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, diff --git a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java index 01559c4d9ad7..63eac8b64eaa 100644 --- a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java +++ b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java @@ -169,7 +169,7 @@ public void sayHello( (long) Status.Code.OK.value()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -331,7 +331,7 @@ public void sayHello( (long) Status.Code.OK.value()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -505,7 +505,7 @@ public void onCompleted() { (long) Status.Code.OK.value()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -649,7 +649,7 @@ public void sayHello( (long) status.getCode().value()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -799,7 +799,7 @@ public void sayHello( (long) Status.Code.UNKNOWN.value()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -1050,7 +1050,7 @@ public void onCompleted() { (long) Status.Code.OK.value()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -1170,7 +1170,7 @@ public void onCompleted() { (long) Status.Code.CANCELLED.value()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -1289,7 +1289,7 @@ public void onCompleted() { (long) Status.Code.OK.value()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -1391,7 +1391,7 @@ public void sayHello( (long) Status.Code.OK.value()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -1649,7 +1649,7 @@ static List addExtraClientAttributes(AttributeAssertion... a List result = new ArrayList<>(); result.addAll(Arrays.asList(assertions)); if (Boolean.getBoolean("testLatestDeps")) { - result.add(equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4")); + result.add(equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4")); result.add(equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1")); result.add( satisfies(NetworkAttributes.NETWORK_PEER_PORT, val -> assertThat(val).isNotNull())); diff --git a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java index 7f91253cb592..31112de8f5ee 100644 --- a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java +++ b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java @@ -21,6 +21,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.io.DataOutputStream; @@ -120,7 +121,7 @@ public void traceRequest(boolean useCache) throws IOException { List attributes = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), equalTo(UrlAttributes.URL_FULL, url.toString()), @@ -165,7 +166,7 @@ public void testBrokenApiUsage() throws IOException { List attributes = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), equalTo(UrlAttributes.URL_FULL, url.toString()), @@ -216,7 +217,7 @@ public void testPostRequest() throws IOException { List attributes = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), equalTo(UrlAttributes.URL_FULL, url.toString()), @@ -269,7 +270,7 @@ public void getOutputStreamShouldTransformGetIntoPost() throws IOException { List attributes = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), equalTo(UrlAttributes.URL_FULL, url.toString()), @@ -311,7 +312,7 @@ public void traceRequestWithConnectionFailure(String scheme) { List attributes = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), equalTo(UrlAttributes.URL_FULL, uri), diff --git a/instrumentation/java-http-client/testing/src/main/java/io/opentelemetry/instrumentation/httpclient/AbstractJavaHttpClientTest.java b/instrumentation/java-http-client/testing/src/main/java/io/opentelemetry/instrumentation/httpclient/AbstractJavaHttpClientTest.java index e47bd7f12d19..9541f8a97346 100644 --- a/instrumentation/java-http-client/testing/src/main/java/io/opentelemetry/instrumentation/httpclient/AbstractJavaHttpClientTest.java +++ b/instrumentation/java-http-client/testing/src/main/java/io/opentelemetry/instrumentation/httpclient/AbstractJavaHttpClientTest.java @@ -9,7 +9,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import java.io.IOException; import java.net.URI; import java.net.http.HttpClient; @@ -91,7 +91,7 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) { if ("http://localhost:61/".equals(uri.toString()) || "https://192.0.2.1/".equals(uri.toString()) || uri.toString().contains("/read-timeout")) { - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION); + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION); } return attributes; }); diff --git a/instrumentation/jaxrs-client/jaxrs-client-1.1-testing/src/test/groovy/JaxRsClientV1Test.groovy b/instrumentation/jaxrs-client/jaxrs-client-1.1-testing/src/test/groovy/JaxRsClientV1Test.groovy index 8243a58e73a2..2256145f4164 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-1.1-testing/src/test/groovy/JaxRsClientV1Test.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-1.1-testing/src/test/groovy/JaxRsClientV1Test.groovy @@ -13,6 +13,7 @@ import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import spock.lang.Shared class JaxRsClientV1Test extends HttpClientTest implements AgentTestTrait { @@ -79,7 +80,7 @@ class JaxRsClientV1Test extends HttpClientTest implements A @Override Set> httpAttributes(URI uri) { def attributes = super.httpAttributes(uri) - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION) + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION) return attributes } diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy index d65f555c9bac..30156279a581 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy @@ -9,6 +9,7 @@ import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl import org.glassfish.jersey.client.ClientConfig @@ -114,7 +115,7 @@ abstract class JaxRsClientTest extends HttpClientTest implem kind CLIENT status ERROR attributes { - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" uri.host "$SemanticAttributes.SERVER_PORT" uri.port > 0 ? uri.port : { it == null || it == 443 } "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == null } diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy index 20e3623adb21..d534759ec86a 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy @@ -10,6 +10,7 @@ import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import spock.lang.Unroll import java.util.concurrent.TimeUnit @@ -279,7 +280,7 @@ abstract class AbstractJaxRsHttpServerTest extends HttpServerTest implemen spanId spanID } attributes { - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" fullUrl.host "$SemanticAttributes.SERVER_PORT" fullUrl.port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java index ceeeda7f6532..c2d5e4d47797 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java +++ b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java @@ -69,7 +69,7 @@ void setCommand() { equalTo(SemanticAttributes.DB_OPERATION, "SET"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -95,7 +95,7 @@ void getCommand() { equalTo(SemanticAttributes.DB_OPERATION, "SET"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -111,7 +111,7 @@ void getCommand() { equalTo(SemanticAttributes.DB_OPERATION, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -137,7 +137,7 @@ void commandWithNoArguments() { equalTo(SemanticAttributes.DB_OPERATION, "SET"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -153,7 +153,7 @@ void commandWithNoArguments() { equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java b/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java index 7dbcb2352596..392a8c17bed5 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java +++ b/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java @@ -65,7 +65,7 @@ void setCommand() { equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), equalTo(SemanticAttributes.DB_OPERATION, "SET"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1")))); } @@ -87,7 +87,7 @@ void getCommand() { equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), equalTo(SemanticAttributes.DB_OPERATION, "SET"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"))), trace -> @@ -99,7 +99,7 @@ void getCommand() { equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "GET foo"), equalTo(SemanticAttributes.DB_OPERATION, "GET"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1")))); } @@ -121,7 +121,7 @@ void commandWithNoArguments() { equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), equalTo(SemanticAttributes.DB_OPERATION, "SET"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"))), trace -> @@ -133,7 +133,7 @@ void commandWithNoArguments() { equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY"), equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1")))); } diff --git a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy index e8b49eb42420..45c0ee8ba4e0 100644 --- a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -10,6 +10,7 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse @@ -88,7 +89,7 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements kind SpanKind.SERVER hasNoParent() attributes { - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" diff --git a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy index 11c4894f0323..58a4e6baf431 100644 --- a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -10,6 +10,7 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse @@ -99,7 +100,7 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements kind SpanKind.SERVER hasNoParent() attributes { - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy index a0e3f83fe1ed..e4681cf0b0db 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy @@ -7,6 +7,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse @@ -97,7 +98,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" @@ -155,7 +156,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" @@ -208,7 +209,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" @@ -271,7 +272,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 500 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" @@ -339,7 +340,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" @@ -387,7 +388,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" @@ -467,7 +468,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 500 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" @@ -517,7 +518,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy index e80948ed7fd8..9b8732b5b9ec 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy @@ -7,6 +7,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse @@ -95,7 +96,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" @@ -164,7 +165,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" @@ -212,7 +213,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" @@ -308,7 +309,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" @@ -390,7 +391,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 500 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" @@ -452,7 +453,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 404 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" diff --git a/instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/AbstractKtorHttpClientTest.kt b/instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/AbstractKtorHttpClientTest.kt index 68bfd5c989ee..62e826e9d30d 100644 --- a/instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/AbstractKtorHttpClientTest.kt +++ b/instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/AbstractKtorHttpClientTest.kt @@ -16,7 +16,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTes import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES -import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import kotlinx.coroutines.* import java.net.URI @@ -64,7 +64,7 @@ abstract class AbstractKtorHttpClientTest : AbstractHttpClientTest KtorHttpClientSingleConnection(host, port) { installTracing() } diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java index 010ac9eacc96..3e8e1d8afc50 100644 --- a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java @@ -51,7 +51,7 @@ void testAsyncSubscriberWithSpecificThreadPool() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -66,7 +66,7 @@ void testAsyncSubscriberWithSpecificThreadPool() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java index 3dd44c0e3976..bd63c52e4615 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java @@ -142,7 +142,7 @@ void testSetCommandUsingFutureGetWithTimeout() throws Exception { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -188,7 +188,7 @@ void testGetCommandChainedWithThenAccept() throws Exception { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -266,7 +266,7 @@ void testGetNonExistentKeyCommandWithHandleAsyncAndChainedWithThenApply() throws .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -332,7 +332,7 @@ void testCommandWithNoArgumentsUsingBiconsumer() throws Exception { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -391,7 +391,7 @@ void testHashSetAndThenNestApplyToHashGetall() throws Exception { span.hasName("HMSET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -409,7 +409,7 @@ void testHashSetAndThenNestApplyToHashGetall() throws Exception { span.hasName("HGETALL") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java index 90136ce0e3cf..bde09cc400b7 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java @@ -89,7 +89,7 @@ void testSetCommandWithSubscribeOnDefinedConsumer() throws Exception { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -127,7 +127,7 @@ void testGetCommandWithLambdaFunction() throws Exception { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -176,7 +176,7 @@ void testGetNonExistentKeyCommand() throws Exception { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -213,7 +213,7 @@ void testCommandWithNoArguments() throws Exception { span.hasName("RANDOMKEY") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -237,7 +237,7 @@ void testCommandFluxPublisher() { span.hasName("COMMAND") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -282,7 +282,7 @@ void testBlockingSubscriber() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -297,7 +297,7 @@ void testBlockingSubscriber() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -326,7 +326,7 @@ void testAsyncSubscriber() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -341,7 +341,7 @@ void testAsyncSubscriber() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java index acac2e32ca51..1c0eacea67fc 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java @@ -63,7 +63,7 @@ void testAuthCommand() throws Exception { span.hasName("AUTH") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java index 8aa6712ab739..fabe4a50a2b4 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java @@ -110,7 +110,7 @@ void testSetCommand() { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -142,7 +142,7 @@ void testSetCommandLocalhost() { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -167,7 +167,7 @@ void testGetCommand() { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -192,7 +192,7 @@ void testGetNonExistentKeyCommand() { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -217,7 +217,7 @@ void testCommandWithNoArguments() { span.hasName("RANDOMKEY") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -246,7 +246,7 @@ void testListCommand() { span.hasName("LPUSH") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo( NetworkAttributes.NETWORK_PEER_PORT, containerConnection.port), @@ -272,7 +272,7 @@ void testHashSetCommand() { span.hasName("HMSET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -299,7 +299,7 @@ void testHashGetallCommand() { span.hasName("HGETALL") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -331,7 +331,7 @@ void testEvalCommand() { span.hasName("EVAL") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -359,7 +359,7 @@ void testMsetCommand() { span.hasName("MSET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -388,7 +388,7 @@ void testDebugSegfaultCommandWithNoArgumentProducesNoSpan() { span.hasName("DEBUG") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo( NetworkAttributes.NETWORK_PEER_PORT, containerConnection.port), @@ -402,7 +402,7 @@ void testDebugSegfaultCommandWithNoArgumentProducesNoSpan() { span.hasName("DEBUG") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo( NetworkAttributes.NETWORK_PEER_PORT, containerConnection.port), @@ -437,7 +437,7 @@ void testShutdownCommandProducesNoSpan() { // Seems to only be treated as an error with Lettuce 6+ .hasException(new RedisException("Connection disconnected")) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo( NetworkAttributes.NETWORK_PEER_PORT, containerConnection.port), @@ -452,7 +452,7 @@ void testShutdownCommandProducesNoSpan() { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( equalTo(AttributeKey.stringKey("error"), "Connection disconnected"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo( NetworkAttributes.NETWORK_PEER_PORT, containerConnection.port), diff --git a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java index 818bc4274bd5..9997d72c63e5 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java @@ -90,8 +90,8 @@ public void shouldFailSslHandshake() { span -> { span.hasName("CONNECT").hasKind(INTERNAL).hasParent(trace.getSpan(0)); span.hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TRANSPORT, "tcp"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(SemanticAttributes.SERVER_ADDRESS, uri.getHost()), equalTo(SemanticAttributes.SERVER_PORT, uri.getPort()), equalTo(NetworkAttributes.NETWORK_PEER_PORT, uri.getPort()), @@ -103,8 +103,8 @@ public void shouldFailSslHandshake() { .hasParent(trace.getSpan(0)) .hasStatus(StatusData.error()); span.hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TRANSPORT, "tcp"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, uri.getPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1")); })); @@ -182,8 +182,8 @@ public void shouldSuccessfullyEstablishSslHandshake() throws Exception { span -> { span.hasName("CONNECT").hasKind(INTERNAL).hasParent(trace.getSpan(0)); span.hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TRANSPORT, "tcp"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(SemanticAttributes.SERVER_ADDRESS, uri.getHost()), equalTo(SemanticAttributes.SERVER_PORT, uri.getPort()), equalTo(NetworkAttributes.NETWORK_PEER_PORT, uri.getPort()), @@ -192,8 +192,8 @@ public void shouldSuccessfullyEstablishSslHandshake() throws Exception { span -> { span.hasName("SSL handshake").hasKind(INTERNAL).hasParent(trace.getSpan(0)); span.hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TRANSPORT, "tcp"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, uri.getPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1")); }, diff --git a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java index 2c298c696a3d..9725791b586d 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java @@ -102,8 +102,8 @@ void successfulRequest() throws Exception { span -> { span.hasName("CONNECT").hasKind(INTERNAL).hasParent(trace.getSpan(0)); span.hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TRANSPORT, "tcp"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(SemanticAttributes.SERVER_ADDRESS, uri.getHost()), equalTo(SemanticAttributes.SERVER_PORT, uri.getPort()), equalTo(NetworkAttributes.NETWORK_PEER_PORT, uri.getPort()), @@ -130,10 +130,9 @@ void failedRequest() throws Exception { span -> span.hasName("parent").hasKind(INTERNAL).hasNoParent().hasException(thrown), span -> { span.hasName("CONNECT").hasKind(INTERNAL).hasParent(trace.getSpan(0)); - span.hasAttributesSatisfying( - equalTo(SemanticAttributes.NETWORK_TRANSPORT, "tcp")); + span.hasAttributesSatisfying(equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp")); satisfies( - SemanticAttributes.NETWORK_TYPE, + NetworkAttributes.NETWORK_TYPE, val -> val.satisfiesAnyOf( v -> assertThat(val).isNull(), v -> assertThat(v).isEqualTo("ipv4"))); diff --git a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy index 0f99f82cf5d9..dbb07384408a 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy +++ b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy @@ -25,6 +25,8 @@ import io.opentelemetry.instrumentation.netty.v4_1.ClientHandler import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import spock.lang.Shared import javax.net.ssl.SSLEngine @@ -103,8 +105,8 @@ class Netty41ClientSslTest extends AgentInstrumentationSpecification { kind INTERNAL childOf span(0) attributes { - "$SemanticAttributes.NETWORK_TRANSPORT" "tcp" - "$SemanticAttributes.NETWORK_TYPE" "ipv4" + "$NetworkAttributes.NETWORK_TRANSPORT" "tcp" + "$NetworkAttributes.NETWORK_TYPE" "ipv4" "$SemanticAttributes.SERVER_ADDRESS" uri.host "$SemanticAttributes.SERVER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_PORT" uri.port @@ -119,8 +121,8 @@ class Netty41ClientSslTest extends AgentInstrumentationSpecification { // netty swallows the exception, it doesn't make any sense to hard-code the message errorEventWithAnyMessage(SSLHandshakeException) attributes { - "$SemanticAttributes.NETWORK_TRANSPORT" "tcp" - "$SemanticAttributes.NETWORK_TYPE" "ipv4" + "$NetworkAttributes.NETWORK_TRANSPORT" "tcp" + "$NetworkAttributes.NETWORK_TYPE" "ipv4" "$NetworkAttributes.NETWORK_PEER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" } @@ -172,8 +174,8 @@ class Netty41ClientSslTest extends AgentInstrumentationSpecification { kind INTERNAL childOf span(0) attributes { - "$SemanticAttributes.NETWORK_TRANSPORT" "tcp" - "$SemanticAttributes.NETWORK_TYPE" "ipv4" + "$NetworkAttributes.NETWORK_TRANSPORT" "tcp" + "$NetworkAttributes.NETWORK_TYPE" "ipv4" "$SemanticAttributes.SERVER_ADDRESS" uri.host "$SemanticAttributes.SERVER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_PORT" uri.port @@ -185,8 +187,8 @@ class Netty41ClientSslTest extends AgentInstrumentationSpecification { kind INTERNAL childOf span(0) attributes { - "$SemanticAttributes.NETWORK_TRANSPORT" "tcp" - "$SemanticAttributes.NETWORK_TYPE" "ipv4" + "$NetworkAttributes.NETWORK_TRANSPORT" "tcp" + "$NetworkAttributes.NETWORK_TYPE" "ipv4" "$NetworkAttributes.NETWORK_PEER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" } diff --git a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy index 52bee7b2c5d9..a2cf77005b23 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy +++ b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy @@ -23,6 +23,8 @@ import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes +import io.opentelemetry.semconv.NetworkAttributes import spock.lang.Shared import java.util.concurrent.CompletableFuture @@ -117,8 +119,8 @@ class Netty41ConnectionSpanTest extends InstrumentationSpecification implements kind INTERNAL childOf(span(0)) attributes { - "$SemanticAttributes.NETWORK_TRANSPORT" "tcp" - "$SemanticAttributes.NETWORK_TYPE" "ipv4" + "$NetworkAttributes.NETWORK_TRANSPORT" "tcp" + "$NetworkAttributes.NETWORK_TYPE" "ipv4" "$SemanticAttributes.SERVER_ADDRESS" uri.host "$SemanticAttributes.SERVER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_PORT" uri.port @@ -178,8 +180,8 @@ class Netty41ConnectionSpanTest extends InstrumentationSpecification implements status ERROR errorEvent(thrownException.class, thrownException.message) attributes { - "$SemanticAttributes.NETWORK_TRANSPORT" "tcp" - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == null } + "$NetworkAttributes.NETWORK_TRANSPORT" "tcp" + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == null } "$SemanticAttributes.SERVER_ADDRESS" uri.host "$SemanticAttributes.SERVER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == null } diff --git a/instrumentation/okhttp/okhttp-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2Test.java b/instrumentation/okhttp/okhttp-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2Test.java index 4d3b547611ea..2f2c56c8f1af 100644 --- a/instrumentation/okhttp/okhttp-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2Test.java +++ b/instrumentation/okhttp/okhttp-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2Test.java @@ -18,7 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import java.io.IOException; import java.net.URI; import java.util.HashSet; @@ -104,7 +104,7 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) { if ("http://localhost:61/".equals(uri.toString()) || "https://192.0.2.1/".equals(uri.toString()) || resolveAddress("/read-timeout").toString().equals(uri.toString())) { - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION); + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION); } return attributes; }); diff --git a/instrumentation/okhttp/okhttp-3.0/testing/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/AbstractOkHttp3Test.java b/instrumentation/okhttp/okhttp-3.0/testing/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/AbstractOkHttp3Test.java index 0c2e0e2c4d3d..edeb29439bde 100644 --- a/instrumentation/okhttp/okhttp-3.0/testing/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/AbstractOkHttp3Test.java +++ b/instrumentation/okhttp/okhttp-3.0/testing/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/AbstractOkHttp3Test.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import java.io.IOException; import java.net.URI; import java.util.Collections; @@ -126,7 +126,7 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) { if ("http://localhost:61/".equals(uri.toString()) || "https://192.0.2.1/".equals(uri.toString()) || resolveAddress("/read-timeout").toString().equals(uri.toString())) { - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION); + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION); } return attributes; diff --git a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java index a9a85e5b95a9..7827d9b14fef 100644 --- a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java +++ b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java @@ -7,6 +7,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; @@ -98,7 +99,7 @@ void shouldGetStatusWithTraces() throws IOException { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), @@ -163,7 +164,7 @@ public void onFailure(Exception e) { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/client/PlayWsClientTest.groovy b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/client/PlayWsClientTest.groovy index b6638ea8c555..8ec6d3e7d527 100644 --- a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/client/PlayWsClientTest.groovy +++ b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/client/PlayWsClientTest.groovy @@ -11,6 +11,7 @@ import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import play.libs.ws.WS import play.libs.ws.WSRequest import play.libs.ws.WSResponse @@ -79,7 +80,7 @@ class PlayWsClientTest extends HttpClientTest implements AgentTestTra @Override Set> httpAttributes(URI uri) { def attributes = super.httpAttributes(uri) - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION) + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION) attributes } diff --git a/instrumentation/play/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy b/instrumentation/play/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy index 383f3e016f7e..6c93c7417b7c 100644 --- a/instrumentation/play/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy +++ b/instrumentation/play/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy @@ -10,6 +10,7 @@ import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import play.shaded.ahc.io.netty.resolver.InetNameResolver import play.shaded.ahc.io.netty.util.concurrent.EventExecutor import play.shaded.ahc.io.netty.util.concurrent.ImmediateEventExecutor @@ -85,7 +86,7 @@ abstract class PlayWsClientTestBaseBase extends HttpClientTest @Override Set> httpAttributes(URI uri) { def attributes = super.httpAttributes(uri) - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION) + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION) if (uri.toString().endsWith("/circular-redirect")) { attributes.remove(SemanticAttributes.SERVER_ADDRESS) attributes.remove(SemanticAttributes.SERVER_PORT) diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java index 69f554ae1e26..8a190b3afaf7 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java @@ -873,7 +873,7 @@ private static void verifyNetAttributes(SpanDataAssert span) { || "0:0:0:0:0:0:0:1".equals(peerAddr) || peerAddr == null); - String networkType = attrs.get(SemanticAttributes.NETWORK_TYPE); + String networkType = attrs.get(NetworkAttributes.NETWORK_TYPE); assertThat(networkType).isIn("ipv4", "ipv6", null); assertNotNull(attrs.get(NetworkAttributes.NETWORK_PEER_PORT)); diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java index 9a3df36e5e0e..f51a7717a0c3 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java @@ -56,7 +56,7 @@ void testShouldNotFailDeclaringExchange() { .isIn("127.0.0.1", "0:0:0:0:0:0:0:1", null); String networkType = - attrs.get(SemanticAttributes.NETWORK_TYPE); + attrs.get(NetworkAttributes.NETWORK_TYPE); assertThat(networkType).isIn("ipv4", "ipv6", null); assertNotNull( diff --git a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy index 0e29b3af13d6..ca10ce44822e 100644 --- a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy +++ b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy @@ -9,6 +9,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient import ratpack.path.PathBinding @@ -96,7 +97,7 @@ abstract class AbstractRatpackRoutesTest extends InstrumentationSpecification { kind SERVER hasNoParent() attributes { - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" { it == "localhost" || it == null } "$SemanticAttributes.SERVER_PORT" { it == app.bindPort || it == null } "$SemanticAttributes.CLIENT_ADDRESS" { it == "127.0.0.1" || it == null } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/AbstractRatpackHttpClientTest.java b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/AbstractRatpackHttpClientTest.java index 3eaeba04c04f..f9f2879348b9 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/AbstractRatpackHttpClientTest.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/AbstractRatpackHttpClientTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import java.net.URI; import java.time.Duration; import java.util.HashSet; @@ -156,7 +156,7 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) { protected Set> getHttpAttributes(URI uri) { Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION); + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION); return attributes; } } diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java index a51b5022f86c..db27881041bc 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java @@ -84,8 +84,8 @@ void testSuccessfulRequest() { .hasKind(INTERNAL) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TRANSPORT, "tcp"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.httpPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), @@ -146,9 +146,9 @@ void testFailingRequest() { .hasStatus(StatusData.error()) .hasException(connectException) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TRANSPORT, "tcp"), + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), satisfies( - SemanticAttributes.NETWORK_TYPE, val -> val.isIn(null, "ipv4")), + NetworkAttributes.NETWORK_TYPE, val -> val.isIn(null, "ipv4")), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), satisfies( diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java index 899be402e181..27d765d31561 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java @@ -26,6 +26,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.net.InetSocketAddress; @@ -132,11 +133,11 @@ protected Set> getHttpAttributes(URI uri) { // unopened port or non routable address if ("http://localhost:61/".equals(uri.toString()) || "https://192.0.2.1/".equals(uri.toString())) { - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION); + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION); } if (uri.toString().contains("/read-timeout")) { - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION); + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION); attributes.remove(SemanticAttributes.SERVER_ADDRESS); attributes.remove(SemanticAttributes.SERVER_PORT); } diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java index 66032bb2758a..75df8ae88004 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java @@ -113,7 +113,7 @@ void testSuccessfulRequest() { equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, uri + "/"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.httpPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java index 00821c751ff9..4999bd108dd0 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java @@ -110,8 +110,8 @@ void shouldFailSslHandshake() throws SSLException { .hasKind(INTERNAL) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TRANSPORT, "tcp"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.httpsPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), @@ -127,8 +127,8 @@ void shouldFailSslHandshake() throws SSLException { // message .hasEventsSatisfying(ReactorNettyClientSslTest::isSslHandshakeException) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TRANSPORT, "tcp"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, server.httpsPort())))); } @@ -167,8 +167,8 @@ void shouldSuccessfullyEstablishSslHandshake() throws SSLException { .hasKind(INTERNAL) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TRANSPORT, "tcp"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.httpsPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), @@ -180,8 +180,8 @@ void shouldSuccessfullyEstablishSslHandshake() throws SSLException { .hasKind(INTERNAL) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TRANSPORT, "tcp"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, server.httpsPort())), span -> @@ -191,7 +191,7 @@ void shouldSuccessfullyEstablishSslHandshake() throws SSLException { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, uri), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.httpsPort()), diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java index 9cb3f53ffd15..0a06286b17b6 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java @@ -87,8 +87,8 @@ void testSuccessfulRequest() { .hasKind(INTERNAL) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TRANSPORT, "tcp"), - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.httpPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), @@ -102,7 +102,7 @@ void testSuccessfulRequest() { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, uri), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.httpPort()), diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java index 8dac321317b0..6cec382329e6 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java @@ -109,7 +109,7 @@ void futureSet() throws ExecutionException, InterruptedException, TimeoutExcepti span.hasName("SET") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -142,7 +142,7 @@ void futureWhenComplete() throws ExecutionException, InterruptedException, Timeo span.hasName("SADD") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -216,7 +216,7 @@ void atomicBatchCommand() throws ExecutionException, InterruptedException, Timeo span.hasName("DB Query") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -226,7 +226,7 @@ void atomicBatchCommand() throws ExecutionException, InterruptedException, Timeo span.hasName("SET") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -237,7 +237,7 @@ void atomicBatchCommand() throws ExecutionException, InterruptedException, Timeo span.hasName("EXEC") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java index 3f9a09b6b04d..bb8c0daad941 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java @@ -112,7 +112,7 @@ void stringCommand() { span.hasName("SET") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -124,7 +124,7 @@ void stringCommand() { span.hasName("GET") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -150,7 +150,7 @@ void batchCommand() span.hasName("DB Query") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -191,7 +191,7 @@ void atomicBatchCommand() { span.hasName("DB Query") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -201,7 +201,7 @@ void atomicBatchCommand() { span.hasName("SET") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -212,7 +212,7 @@ void atomicBatchCommand() { span.hasName("EXEC") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -234,7 +234,7 @@ void listCommand() { span.hasName("RPUSH") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -259,7 +259,7 @@ void hashCommand() { span.hasName("EVAL") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -273,7 +273,7 @@ void hashCommand() { span.hasName("HGET") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -294,7 +294,7 @@ void setCommand() { span.hasName("SADD") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -322,7 +322,7 @@ void sortedSetCommand() span.hasName("ZADD") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -348,7 +348,7 @@ void atomicLongCommand() { span.hasName("INCR") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -374,7 +374,7 @@ void lockCommand() { span.hasName("EVAL") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -389,7 +389,7 @@ void lockCommand() { span.hasName("EVAL") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), @@ -405,7 +405,7 @@ void lockCommand() { span.hasName("DEL") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), diff --git a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java index 1437f1c82a15..4792f2fcd4d0 100644 --- a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java +++ b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java @@ -67,7 +67,7 @@ void generatesSpans() { SemanticAttributes.USER_AGENT_ORIGINAL, val -> val.isInstanceOf(String.class)), equalTo(SemanticAttributes.HTTP_ROUTE, "/param/:param"), - equalTo(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.CLIENT_ADDRESS, "127.0.0.1"), diff --git a/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy b/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy index 0d8de7bb0b7b..a3cb814c9fb4 100644 --- a/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy +++ b/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy @@ -6,6 +6,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.CONSUMER @@ -46,7 +47,7 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i attributes { "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null } "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } "$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq" } } @@ -58,7 +59,7 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i attributes { "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null } "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } "$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testTopic" "$SemanticAttributes.MESSAGING_OPERATION" "publish" @@ -76,7 +77,7 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i attributes { "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null } "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } "$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testTopic" "$SemanticAttributes.MESSAGING_OPERATION" "process" @@ -113,7 +114,7 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i attributes { "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null } "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } + "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } "$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq" } } diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java index 5fed7e227563..0312a6b9a1d4 100644 --- a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java +++ b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java @@ -106,7 +106,7 @@ private static List getAssertions( assertions.add(equalTo(SemanticAttributes.MESSAGING_OPERATION, operation)); } if (peerAddress != null) { - assertions.add(equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4")); + assertions.add(equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4")); assertions.add(equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, peerAddress)); assertions.add( satisfies(NetworkAttributes.NETWORK_PEER_PORT, AbstractLongAssert::isNotNegative)); @@ -207,7 +207,7 @@ public void test(boolean testHeaders) throws Exception { span.hasName("basic.ack") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.NETWORK_TYPE, "ipv4"), + equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, diff --git a/instrumentation/spring/spring-web/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebInstrumentationTest.java b/instrumentation/spring/spring-web/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebInstrumentationTest.java index 2b161492f2db..6b40a8745475 100644 --- a/instrumentation/spring/spring-web/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebInstrumentationTest.java +++ b/instrumentation/spring/spring-web/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebInstrumentationTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.NetworkAttributes; import java.net.URI; import java.util.Collections; import java.util.HashSet; @@ -105,7 +105,7 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) { uri -> { Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION); + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION); return attributes; }); } diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java index 2ab93fdcb388..63fc5b5c180f 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java @@ -9,6 +9,7 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PROTOCOL_VERSION; import static io.opentelemetry.semconv.SemanticAttributes.CLIENT_ADDRESS; import static io.opentelemetry.semconv.SemanticAttributes.ERROR_TYPE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; @@ -18,7 +19,6 @@ import static io.opentelemetry.semconv.SemanticAttributes.HTTP_REQUEST_METHOD; import static io.opentelemetry.semconv.SemanticAttributes.HTTP_RESPONSE_STATUS_CODE; import static io.opentelemetry.semconv.SemanticAttributes.HTTP_ROUTE; -import static io.opentelemetry.semconv.SemanticAttributes.NETWORK_PROTOCOL_VERSION; import static io.opentelemetry.semconv.SemanticAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.SemanticAttributes.SERVER_PORT; import static io.opentelemetry.semconv.SemanticAttributes.USER_AGENT_ORIGINAL; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java index bdc0d4b8fd21..6d470d710cce 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java @@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.lang.invoke.MethodHandle; @@ -86,7 +87,7 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) { uri -> { Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION); + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION); return attributes; }); diff --git a/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy b/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy index fccca2d90685..664acd570dba 100644 --- a/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy +++ b/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy @@ -18,6 +18,7 @@ import com.twilio.type.PhoneNumber import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import org.apache.http.HttpEntity import org.apache.http.StatusLine @@ -250,7 +251,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(1) attributes { - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" "$SemanticAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" @@ -316,7 +317,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { childOf span(1) status ERROR attributes { - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" "$SemanticAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" @@ -329,7 +330,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(1) attributes { - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" "$SemanticAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" @@ -402,7 +403,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { childOf span(1) status ERROR attributes { - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" "$SemanticAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" @@ -415,7 +416,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(1) attributes { - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" "$SemanticAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" diff --git a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy index 84fa1d202898..d9a77499b03d 100644 --- a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy +++ b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse import io.undertow.Handlers @@ -151,7 +152,7 @@ class UndertowServerTest extends HttpServerTest implements AgentTestTr "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" uri.host "$SemanticAttributes.SERVER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" @@ -200,7 +201,7 @@ class UndertowServerTest extends HttpServerTest implements AgentTestTr "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" uri.host "$SemanticAttributes.SERVER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxHttpClientTest.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxHttpClientTest.java index 3c1ba1360a6e..54893634325f 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxHttpClientTest.java +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxHttpClientTest.java @@ -13,6 +13,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.vertx.core.Vertx; import io.vertx.core.VertxOptions; @@ -89,7 +90,7 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) { uri -> { Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION); + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION); attributes.remove(SemanticAttributes.SERVER_ADDRESS); attributes.remove(SemanticAttributes.SERVER_PORT); return attributes; diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy index bfba485f1e8f..c8274b0993d6 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy @@ -11,6 +11,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient import io.opentelemetry.testing.internal.armeria.common.HttpRequest @@ -64,7 +65,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { kind SERVER hasNoParent() attributes { - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long "$SemanticAttributes.SERVER_ADDRESS" "localhost" @@ -155,7 +156,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { kind SERVER childOf(span(0)) attributes { - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long "$SemanticAttributes.SERVER_ADDRESS" "localhost" diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy index bfba485f1e8f..c8274b0993d6 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy @@ -11,6 +11,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient import io.opentelemetry.testing.internal.armeria.common.HttpRequest @@ -64,7 +65,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { kind SERVER hasNoParent() attributes { - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long "$SemanticAttributes.SERVER_ADDRESS" "localhost" @@ -155,7 +156,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { kind SERVER childOf(span(0)) attributes { - "$SemanticAttributes.NETWORK_PROTOCOL_VERSION" "1.1" + "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long "$SemanticAttributes.SERVER_ADDRESS" "localhost" diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy index eb48b67e07b4..9368c62b252b 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy @@ -11,6 +11,7 @@ import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.vertx.circuitbreaker.CircuitBreakerOptions import io.vertx.core.AsyncResult import io.vertx.core.VertxOptions @@ -107,7 +108,7 @@ class VertxRxCircuitBreakerWebClientTest extends HttpClientTest> @Override Set> httpAttributes(URI uri) { def attributes = super.httpAttributes(uri) - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION) + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION) attributes.remove(SemanticAttributes.SERVER_ADDRESS) attributes.remove(SemanticAttributes.SERVER_PORT) return attributes diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy index b8711f5d38bf..c27763997ee9 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy @@ -11,6 +11,7 @@ import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.vertx.core.VertxOptions import io.vertx.core.http.HttpMethod import io.vertx.ext.web.client.WebClientOptions @@ -93,7 +94,7 @@ class VertxRxWebClientTest extends HttpClientTest> implement @Override Set> httpAttributes(URI uri) { def attributes = super.httpAttributes(uri) - attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION) + attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION) attributes.remove(SemanticAttributes.SERVER_ADDRESS) attributes.remove(SemanticAttributes.SERVER_PORT) return attributes diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index 98593e847361..88c5f52bfb65 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -22,16 +22,6 @@ public class SemanticAttributes { private SemanticAttributes() {} - public static final AttributeKey NETWORK_PEER_ADDRESS = - NetworkAttributes.NETWORK_PEER_ADDRESS; - public static final AttributeKey NETWORK_PEER_PORT = NetworkAttributes.NETWORK_PEER_PORT; - public static final AttributeKey NETWORK_PROTOCOL_NAME = - NetworkAttributes.NETWORK_PROTOCOL_NAME; - public static final AttributeKey NETWORK_PROTOCOL_VERSION = - NetworkAttributes.NETWORK_PROTOCOL_VERSION; - public static final AttributeKey NETWORK_TRANSPORT = NetworkAttributes.NETWORK_TRANSPORT; - public static final AttributeKey NETWORK_TYPE = NetworkAttributes.NETWORK_TYPE; - public static final AttributeKeyTemplate> HTTP_REQUEST_HEADER = HttpAttributes.HTTP_REQUEST_HEADER; public static final AttributeKey HTTP_REQUEST_METHOD = HttpAttributes.HTTP_REQUEST_METHOD; diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy index a29eb5171731..5be8e4e0dab0 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy @@ -7,6 +7,7 @@ package io.opentelemetry.smoketest import io.opentelemetry.proto.trace.v1.Span import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import spock.lang.Shared import spock.lang.Unroll @@ -132,7 +133,7 @@ abstract class AppServerTest extends SmokeTest { traces.countFilteredAttributes(SemanticAttributes.CLIENT_ADDRESS.key, "127.0.0.1") == 1 and: "Number of spans with http protocol version" - traces.countFilteredAttributes(SemanticAttributes.NETWORK_PROTOCOL_VERSION.key, "1.1") == 3 + traces.countFilteredAttributes(NetworkAttributes.NETWORK_PROTOCOL_VERSION.key, "1.1") == 3 and: "Number of spans tagged with current otel library version" traces.countFilteredResourceAttributes(TELEMETRY_DISTRO_VERSION, currentAgentVersion) == 3 @@ -240,7 +241,7 @@ abstract class AppServerTest extends SmokeTest { traces.countFilteredAttributes(UrlAttributes.URL_PATH.key, "/app/WEB-INF/web.xml") == 1 and: "Number of spans with http protocol version" - traces.countFilteredAttributes(SemanticAttributes.NETWORK_PROTOCOL_VERSION.key, "1.1") == 1 + traces.countFilteredAttributes(NetworkAttributes.NETWORK_PROTOCOL_VERSION.key, "1.1") == 1 and: "Number of spans tagged with current otel library version" traces.countFilteredResourceAttributes(TELEMETRY_DISTRO_VERSION, currentAgentVersion) == traces.countSpans() @@ -317,7 +318,7 @@ abstract class AppServerTest extends SmokeTest { traces.countFilteredAttributes(UrlAttributes.URL_PATH.key, "/this-is-definitely-not-there-but-there-should-be-a-trace-nevertheless") == 1 and: "Number of spans with http protocol version" - traces.countFilteredAttributes(SemanticAttributes.NETWORK_PROTOCOL_VERSION.key, "1.1") == 1 + traces.countFilteredAttributes(NetworkAttributes.NETWORK_PROTOCOL_VERSION.key, "1.1") == 1 and: "Number of spans tagged with current otel library version" traces.countFilteredResourceAttributes(TELEMETRY_DISTRO_VERSION, currentAgentVersion) == traces.countSpans() @@ -364,7 +365,7 @@ abstract class AppServerTest extends SmokeTest { traces.countFilteredAttributes(UrlAttributes.URL_PATH.key, "/app/headers") == 1 and: "Number of spans with http protocol version" - traces.countFilteredAttributes(SemanticAttributes.NETWORK_PROTOCOL_VERSION.key, "1.1") == 3 + traces.countFilteredAttributes(NetworkAttributes.NETWORK_PROTOCOL_VERSION.key, "1.1") == 3 and: "Number of spans tagged with current otel library version" traces.countFilteredResourceAttributes(TELEMETRY_DISTRO_VERSION, currentAgentVersion) == 3 diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java index fce959b3f301..826967df0679 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java @@ -965,12 +965,12 @@ SpanDataAssert assertClientSpan( attrs -> { // we're opting out of these attributes in the new semconv assertThat(attrs) - .doesNotContainKey(SemanticAttributes.NETWORK_TRANSPORT) - .doesNotContainKey(SemanticAttributes.NETWORK_TYPE) - .doesNotContainKey(SemanticAttributes.NETWORK_PROTOCOL_NAME); - if (httpClientAttributes.contains(SemanticAttributes.NETWORK_PROTOCOL_VERSION)) { + .doesNotContainKey(NetworkAttributes.NETWORK_TRANSPORT) + .doesNotContainKey(NetworkAttributes.NETWORK_TYPE) + .doesNotContainKey(NetworkAttributes.NETWORK_PROTOCOL_NAME); + if (httpClientAttributes.contains(NetworkAttributes.NETWORK_PROTOCOL_VERSION)) { // TODO(anuraaga): Support HTTP/2 - assertThat(attrs).containsEntry(SemanticAttributes.NETWORK_PROTOCOL_VERSION, "1.1"); + assertThat(attrs).containsEntry(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"); } if (httpClientAttributes.contains(SemanticAttributes.SERVER_ADDRESS)) { diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java index afc7cea17948..1df66a7cde9e 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java @@ -728,14 +728,14 @@ protected SpanDataAssert assertServerSpan( attrs -> { // we're opting out of these attributes in the new semconv assertThat(attrs) - .doesNotContainKey(SemanticAttributes.NETWORK_TRANSPORT) - .doesNotContainKey(SemanticAttributes.NETWORK_TYPE) - .doesNotContainKey(SemanticAttributes.NETWORK_PROTOCOL_NAME); + .doesNotContainKey(NetworkAttributes.NETWORK_TRANSPORT) + .doesNotContainKey(NetworkAttributes.NETWORK_TYPE) + .doesNotContainKey(NetworkAttributes.NETWORK_PROTOCOL_NAME); - if (attrs.get(SemanticAttributes.NETWORK_PROTOCOL_VERSION) != null) { + if (attrs.get(NetworkAttributes.NETWORK_PROTOCOL_VERSION) != null) { assertThat(attrs) .hasEntrySatisfying( - SemanticAttributes.NETWORK_PROTOCOL_VERSION, + NetworkAttributes.NETWORK_PROTOCOL_VERSION, entry -> assertThat(entry).isIn("1.1", "2.0")); } diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java index 6fe6f8a3c733..73a25082eba6 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java @@ -9,6 +9,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.instrumentation.api.internal.HttpConstants; +import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; @@ -28,7 +29,7 @@ public abstract class HttpClientTestOptions { Collections.unmodifiableSet( new HashSet<>( Arrays.asList( - SemanticAttributes.NETWORK_PROTOCOL_VERSION, + NetworkAttributes.NETWORK_PROTOCOL_VERSION, SemanticAttributes.SERVER_ADDRESS, SemanticAttributes.SERVER_PORT, UrlAttributes.URL_FULL, From b64932d9622fabdf92fc3f8715a6a58e2eafd32e Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 16:58:06 +0200 Subject: [PATCH 07/52] HTTP_* --- .../HttpExperimentalAttributesExtractor.java | 6 +- .../http/HttpExperimentalMetricsAdvice.java | 13 +-- .../semconv/http/HttpMessageBodySizeUtil.java | 6 +- .../HttpClientExperimentalMetricsTest.java | 20 ++-- ...tpExperimentalAttributesExtractorTest.java | 6 +- .../HttpServerExperimentalMetricsTest.java | 26 ++--- .../http/HttpClientAttributesExtractor.java | 4 +- .../http/HttpCommonAttributesExtractor.java | 9 +- .../api/semconv/http/HttpMetricsAdvice.java | 11 +- .../http/HttpServerAttributesExtractor.java | 5 +- .../HttpClientAttributesExtractorTest.java | 35 +++--- .../semconv/http/HttpClientMetricsTest.java | 15 +-- .../HttpServerAttributesExtractorTest.java | 45 ++++---- .../semconv/http/HttpServerMetricsTest.java | 20 ++-- ...bstractHttpServerInstrumentationTest.scala | 3 +- .../ApiGatewayProxyAttributesExtractor.java | 9 +- .../v2_2/AwsLambdaApiGatewayWrapperTest.java | 5 +- .../src/test/groovy/S3TracingTest.groovy | 102 +++++++++--------- .../src/test/groovy/SnsTracingTest.groovy | 30 +++--- .../awssdk/v1_11/Aws1ClientTest.groovy | 3 +- .../groovy/Aws0ClientTest.groovy | 12 ++- .../v1_11/AbstractAws1ClientTest.groovy | 10 +- .../AbstractSqsSuppressReceiveSpansTest.java | 29 ++--- .../awssdk/v1_11/AbstractSqsTracingTest.java | 37 +++---- .../v2_2/TracingExecutionInterceptor.java | 3 +- .../v2_2/AbstractAws2ClientCoreTest.groovy | 14 +-- .../awssdk/v2_2/AbstractAws2ClientTest.groovy | 12 ++- ...ractAws2SqsSuppressReceiveSpansTest.groovy | 30 +++--- .../v2_2/AbstractAws2SqsTracingTest.groovy | 34 +++--- ...AbstractAws2ClientRecordHttpErrorTest.java | 9 +- .../decorators/HttpSpanDecorator.java | 10 +- .../apachecamel/RestCamelTest.java | 13 +-- .../apachecamel/SingleServiceCamelTest.java | 4 +- .../TwoServicesWithDirectClientCamelTest.java | 21 ++-- .../apachecamel/aws/AwsSpanAssertions.java | 13 +-- .../apiclient/ElasticsearchClientTest.java | 19 ++-- .../rest/v5_0/ElasticsearchRest5Test.java | 13 +-- .../rest/v6_4/ElasticsearchRest6Test.java | 13 +-- .../rest/v7_0/ElasticsearchRest7Test.java | 13 +-- .../rest/v7_0/ElasticsearchRest7Test.java | 5 +- ...ElasticsearchClientAttributeExtractor.java | 7 +- .../v23_11/AbstractServerTest.java | 4 +- .../AbstractGoogleHttpClientTest.java | 5 +- .../GrizzlyFilterchainServerTest.groovy | 3 +- .../src/test/groovy/GrizzlyTest.groovy | 3 +- .../HttpMethodAttributeExtractor.java | 10 +- .../HttpUrlConnectionTest.java | 19 ++-- .../src/test/groovy/JaxRsClientTest.groovy | 6 +- ...axRsAnnotations1InstrumentationTest.groovy | 8 +- .../src/test/groovy/JerseyTest.groovy | 10 +- ...JaxrsAnnotationsInstrumentationTest.groovy | 8 +- ...JaxrsAnnotationsInstrumentationTest.groovy | 8 +- .../groovy/AbstractJaxRsFilterTest.groovy | 6 +- .../groovy/AbstractJaxRsHttpServerTest.groovy | 9 +- .../jetty/v11_0/JettyHandlerTest.java | 4 +- .../jetty/v12_0/Jetty12HandlerTest.java | 4 +- .../jetty/v8_0/JettyHandlerTest.java | 4 +- .../src/main/groovy/BaseJsfTest.groovy | 9 +- .../src/main/groovy/BaseJsfTest.groovy | 9 +- .../JspInstrumentationBasicTests.groovy | 51 ++++----- .../JspInstrumentationForwardTests.groovy | 39 +++---- .../KubernetesClientTest.java | 17 +-- .../KubernetesClientVer20Test.java | 17 +-- .../netty/v3_8/server/Netty38ServerTest.java | 4 +- .../netty/v4_0/server/Netty40ServerTest.java | 4 +- .../netty/v4_1/AbstractNetty41ServerTest.java | 4 +- .../src/test/java/OpenSearchRestTest.java | 9 +- .../instrumentationapi/ContextBridgeTest.java | 9 +- ...bstractHttpServerInstrumentationTest.scala | 3 +- .../groovy/server/PlayServerTest.groovy | 3 +- .../test/groovy/server/PlayServerTest.groovy | 3 +- .../server/AbstractRatpackRoutesTest.groovy | 9 +- .../ratpack/v1_7/OpenTelemetryHttpClient.java | 4 +- .../client/InstrumentedHttpClientTest.groovy | 6 +- .../RatpackServerApplicationTest.groovy | 6 +- .../v1_7/server/RatpackServerTest.groovy | 21 ++-- .../AbstractReactorNettyHttpClientTest.java | 3 +- .../v1_0/ReactorNettyBaseUrlOnlyTest.java | 5 +- .../v1_0/ReactorNettyClientSslTest.java | 7 +- .../v1_0/ReactorNettyConnectionSpanTest.java | 7 +- ...et2HttpServletResponseInstrumentation.java | 4 +- .../test/groovy/AbstractServlet3Test.groovy | 3 +- .../groovy/JettyServletHandlerTest.groovy | 3 +- .../groovy/JettyServletHandlerTest.groovy | 3 +- .../groovy/test/AbstractServlet5Test.groovy | 3 +- .../sparkjava/SparkJavaBasedTest.java | 7 +- .../v5_0/server/SpringWebfluxTest.java | 6 +- ...pringWebfluxClientInstrumentationTest.java | 3 +- .../test/groovy/test/TwilioClientTest.groovy | 22 ++-- .../groovy/UndertowServerDispatchTest.groovy | 3 +- .../src/test/groovy/UndertowServerTest.groovy | 13 ++- .../VertxReactivePropagationTest.groovy | 15 +-- .../VertxReactivePropagationTest.groovy | 15 +-- .../semconv/SemanticAttributes.java | 17 --- .../smoketest/OtelSpringStarterSmokeTest.java | 7 +- .../smoketest/PlaySmokeTest.groovy | 3 +- .../test/base/HttpServerTest.groovy | 5 +- .../junit/http/AbstractHttpClientTest.java | 25 +++-- .../junit/http/AbstractHttpServerTest.java | 13 +-- .../junit/http/HttpClientTestOptions.java | 3 +- .../junit/http/HttpServerTestOptions.java | 4 +- 101 files changed, 662 insertions(+), 569 deletions(-) diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalAttributesExtractor.java index 8b0d847bb932..18e0634dddfe 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalAttributesExtractor.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter; import io.opentelemetry.instrumentation.api.semconv.http.HttpCommonAttributesGetter; import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import java.util.List; import javax.annotation.Nullable; @@ -49,11 +49,11 @@ public void onEnd( @Nullable Throwable error) { Long requestBodySize = requestBodySize(request); - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_BODY_SIZE, requestBodySize); + internalSet(attributes, HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE, requestBodySize); if (response != null) { Long responseBodySize = responseBodySize(request, response); - internalSet(attributes, SemanticAttributes.HTTP_RESPONSE_BODY_SIZE, responseBodySize); + internalSet(attributes, HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE, responseBodySize); } } diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java index f33778b46b9f..7aab3bc04dca 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java @@ -11,6 +11,7 @@ import io.opentelemetry.api.metrics.LongUpDownCounterBuilder; import io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder; import io.opentelemetry.extension.incubator.metrics.ExtendedLongUpDownCounterBuilder; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -24,8 +25,8 @@ static void applyClientRequestSizeAdvice(LongHistogramBuilder builder) { ((ExtendedLongHistogramBuilder) builder) .setAttributesAdvice( asList( - SemanticAttributes.HTTP_REQUEST_METHOD, - SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, + HttpAttributes.HTTP_REQUEST_METHOD, + HttpAttributes.HTTP_RESPONSE_STATUS_CODE, SemanticAttributes.ERROR_TYPE, NetworkAttributes.NETWORK_PROTOCOL_NAME, NetworkAttributes.NETWORK_PROTOCOL_VERSION, @@ -41,9 +42,9 @@ static void applyServerRequestSizeAdvice(LongHistogramBuilder builder) { .setAttributesAdvice( asList( // stable attributes - SemanticAttributes.HTTP_ROUTE, - SemanticAttributes.HTTP_REQUEST_METHOD, - SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, + HttpAttributes.HTTP_ROUTE, + HttpAttributes.HTTP_REQUEST_METHOD, + HttpAttributes.HTTP_RESPONSE_STATUS_CODE, SemanticAttributes.ERROR_TYPE, NetworkAttributes.NETWORK_PROTOCOL_NAME, NetworkAttributes.NETWORK_PROTOCOL_VERSION, @@ -58,7 +59,7 @@ static void applyServerActiveRequestsAdvice(LongUpDownCounterBuilder builder) { .setAttributesAdvice( asList( // https://github.com/open-telemetry/semantic-conventions/blob/v1.23.0/docs/http/http-metrics.md#metric-httpserveractive_requests - SemanticAttributes.HTTP_REQUEST_METHOD, UrlAttributes.URL_SCHEME)); + HttpAttributes.HTTP_REQUEST_METHOD, UrlAttributes.URL_SCHEME)); } private HttpExperimentalMetricsAdvice() {} diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpMessageBodySizeUtil.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpMessageBodySizeUtil.java index 11ebeb9873c1..61aa7cc3850d 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpMessageBodySizeUtil.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpMessageBodySizeUtil.java @@ -7,19 +7,19 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import javax.annotation.Nullable; final class HttpMessageBodySizeUtil { @Nullable static Long getHttpRequestBodySize(Attributes... attributesList) { - return getAttribute(SemanticAttributes.HTTP_REQUEST_BODY_SIZE, attributesList); + return getAttribute(HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE, attributesList); } @Nullable static Long getHttpResponseBodySize(Attributes... attributesList) { - return getAttribute(SemanticAttributes.HTTP_RESPONSE_BODY_SIZE, attributesList); + return getAttribute(HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE, attributesList); } @Nullable diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java index 49e80feec9e7..7c91f1a631e0 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java @@ -17,6 +17,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; +import io.opentelemetry.semconv.HttpAttributes; +import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -36,7 +38,7 @@ void collectsMetrics() { Attributes requestAttributes = Attributes.builder() - .put(SemanticAttributes.HTTP_REQUEST_METHOD, "GET") + .put(HttpAttributes.HTTP_REQUEST_METHOD, "GET") .put(UrlAttributes.URL_FULL, "https://localhost:1234/") .put(UrlAttributes.URL_PATH, "/") .put(UrlAttributes.URL_QUERY, "q=a") @@ -46,10 +48,10 @@ void collectsMetrics() { Attributes responseAttributes = Attributes.builder() - .put(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200) + .put(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200) .put(SemanticAttributes.ERROR_TYPE, "400") - .put(SemanticAttributes.HTTP_REQUEST_BODY_SIZE, 100) - .put(SemanticAttributes.HTTP_RESPONSE_BODY_SIZE, 200) + .put(HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE, 100) + .put(HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE, 200) .put(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http") .put(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0") .put(NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4") @@ -90,9 +92,8 @@ void collectsMetrics() { point .hasSum(100 /* bytes */) .hasAttributesSatisfying( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo( - SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.ERROR_TYPE, "400"), equalTo( NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), @@ -117,9 +118,8 @@ void collectsMetrics() { point .hasSum(200 /* bytes */) .hasAttributesSatisfying( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo( - SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.ERROR_TYPE, "400"), equalTo( NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalAttributesExtractorTest.java index c3677aefd2f9..29d3f92b0cc1 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalAttributesExtractorTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalAttributesExtractorTest.java @@ -17,7 +17,7 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter; import io.opentelemetry.instrumentation.api.semconv.http.HttpCommonAttributesGetter; import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -55,7 +55,7 @@ void runTest( extractor.onEnd(attributes, Context.root(), "request", "response", null); assertThat(attributes.build()) .containsOnly( - entry(SemanticAttributes.HTTP_REQUEST_BODY_SIZE, 123L), - entry(SemanticAttributes.HTTP_RESPONSE_BODY_SIZE, 42L)); + entry(HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE, 123L), + entry(HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE, 42L)); } } diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java index 3baabf4a9c05..d11be89388b1 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java @@ -17,6 +17,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; +import io.opentelemetry.semconv.HttpAttributes; +import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -36,7 +38,7 @@ void collectsMetrics() { Attributes requestAttributes = Attributes.builder() - .put(SemanticAttributes.HTTP_REQUEST_METHOD, "GET") + .put(HttpAttributes.HTTP_REQUEST_METHOD, "GET") .put(UrlAttributes.URL_SCHEME, "https") .put(UrlAttributes.URL_PATH, "/") .put(UrlAttributes.URL_QUERY, "q=a") @@ -50,10 +52,10 @@ void collectsMetrics() { Attributes responseAttributes = Attributes.builder() - .put(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200) + .put(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200) .put(SemanticAttributes.ERROR_TYPE, "500") - .put(SemanticAttributes.HTTP_REQUEST_BODY_SIZE, 100) - .put(SemanticAttributes.HTTP_RESPONSE_BODY_SIZE, 200) + .put(HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE, 100) + .put(HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE, 200) .put(NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4") .put(NetworkAttributes.NETWORK_PEER_PORT, 8080) .put(NetworkAttributes.NETWORK_LOCAL_ADDRESS, "4.3.2.1") @@ -90,7 +92,7 @@ void collectsMetrics() { point .hasValue(1) .hasAttributesSatisfying( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_SCHEME, "https")) .hasExemplarsSatisfying( exemplar -> @@ -113,7 +115,7 @@ void collectsMetrics() { point .hasValue(2) .hasAttributesSatisfying( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_SCHEME, "https")) .hasExemplarsSatisfying( exemplar -> @@ -135,7 +137,7 @@ void collectsMetrics() { point .hasValue(1) .hasAttributesSatisfying( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_SCHEME, "https")) .hasExemplarsSatisfying( exemplar -> @@ -154,9 +156,8 @@ void collectsMetrics() { point .hasSum(100 /* bytes */) .hasAttributesSatisfying( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo( - SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.ERROR_TYPE, "500"), equalTo( NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), @@ -180,9 +181,8 @@ void collectsMetrics() { point .hasSum(200 /* bytes */) .hasAttributesSatisfying( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo( - SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.ERROR_TYPE, "500"), equalTo( NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractor.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractor.java index a838d1936b02..5769d1169c3f 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractor.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractor.java @@ -15,7 +15,7 @@ import io.opentelemetry.instrumentation.api.internal.SpanKeyProvider; import io.opentelemetry.instrumentation.api.semconv.network.internal.InternalNetworkAttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.internal.InternalServerAttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.function.ToIntFunction; import javax.annotation.Nullable; @@ -78,7 +78,7 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST int resendCount = resendCountIncrementer.applyAsInt(parentContext); if (resendCount > 0) { - attributes.put(SemanticAttributes.HTTP_REQUEST_RESEND_COUNT, resendCount); + attributes.put(HttpAttributes.HTTP_REQUEST_RESEND_COUNT, resendCount); } } diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpCommonAttributesExtractor.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpCommonAttributesExtractor.java index d3eb9da8824b..1bc5a8aa9e5f 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpCommonAttributesExtractor.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpCommonAttributesExtractor.java @@ -15,6 +15,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.HashSet; @@ -59,10 +60,10 @@ abstract class HttpCommonAttributesExtractor< public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) { String method = getter.getHttpRequestMethod(request); if (method == null || knownMethods.contains(method)) { - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_METHOD, method); + internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD, method); } else { - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_METHOD, _OTHER); - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL, method); + internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD, _OTHER); + internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL, method); } for (String name : capturedRequestHeaders) { @@ -85,7 +86,7 @@ public void onEnd( if (response != null) { statusCode = getter.getHttpResponseStatusCode(request, response, error); if (statusCode != null && statusCode > 0) { - internalSet(attributes, SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, (long) statusCode); + internalSet(attributes, HttpAttributes.HTTP_RESPONSE_STATUS_CODE, (long) statusCode); } for (String name : capturedResponseHeaders) { diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java index 2cf7277d009c..d68ca64aa3d3 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java @@ -10,6 +10,7 @@ import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -28,8 +29,8 @@ static void applyClientDurationAdvice(DoubleHistogramBuilder builder) { ((ExtendedDoubleHistogramBuilder) builder) .setAttributesAdvice( asList( - SemanticAttributes.HTTP_REQUEST_METHOD, - SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, + HttpAttributes.HTTP_REQUEST_METHOD, + HttpAttributes.HTTP_RESPONSE_STATUS_CODE, SemanticAttributes.ERROR_TYPE, NetworkAttributes.NETWORK_PROTOCOL_NAME, NetworkAttributes.NETWORK_PROTOCOL_VERSION, @@ -44,9 +45,9 @@ static void applyServerDurationAdvice(DoubleHistogramBuilder builder) { ((ExtendedDoubleHistogramBuilder) builder) .setAttributesAdvice( asList( - SemanticAttributes.HTTP_ROUTE, - SemanticAttributes.HTTP_REQUEST_METHOD, - SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, + HttpAttributes.HTTP_ROUTE, + HttpAttributes.HTTP_REQUEST_METHOD, + HttpAttributes.HTTP_RESPONSE_STATUS_CODE, SemanticAttributes.ERROR_TYPE, NetworkAttributes.NETWORK_PROTOCOL_NAME, NetworkAttributes.NETWORK_PROTOCOL_VERSION, diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractor.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractor.java index a63ba43221f3..4e1517e1e441 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractor.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractor.java @@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.api.semconv.network.internal.InternalNetworkAttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.internal.InternalServerAttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.url.internal.InternalUrlAttributesExtractor; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.function.Function; import javax.annotation.Nullable; @@ -80,7 +81,7 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST internalServerExtractor.onStart(attributes, request); internalClientExtractor.onStart(attributes, request); - internalSet(attributes, SemanticAttributes.HTTP_ROUTE, getter.getHttpRoute(request)); + internalSet(attributes, HttpAttributes.HTTP_ROUTE, getter.getHttpRoute(request)); internalSet(attributes, SemanticAttributes.USER_AGENT_ORIGINAL, userAgent(request)); } @@ -96,7 +97,7 @@ public void onEnd( internalNetworkExtractor.onEnd(attributes, request, response); - internalSet(attributes, SemanticAttributes.HTTP_ROUTE, httpRouteGetter.apply(context)); + internalSet(attributes, HttpAttributes.HTTP_ROUTE, httpRouteGetter.apply(context)); } /** diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java index 00d056a26a43..005cdd33994f 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.internal.HttpConstants; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -169,20 +170,20 @@ void normal() { extractor.onStart(startAttributes, Context.root(), request); assertThat(startAttributes.build()) .containsOnly( - entry(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), + entry(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), entry(UrlAttributes.URL_FULL, "http://github.com"), entry( AttributeKey.stringArrayKey("http.request.header.custom-request-header"), asList("123", "456")), entry(SemanticAttributes.SERVER_ADDRESS, "github.com"), entry(SemanticAttributes.SERVER_PORT, 80L), - entry(SemanticAttributes.HTTP_REQUEST_RESEND_COUNT, 2L)); + entry(HttpAttributes.HTTP_REQUEST_RESEND_COUNT, 2L)); AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, response, null); assertThat(endAttributes.build()) .containsOnly( - entry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 202L), + entry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 202L), entry( AttributeKey.stringArrayKey("http.response.header.custom-response-header"), asList("654", "321")), @@ -205,8 +206,8 @@ void shouldExtractKnownMethods(String requestMethod) { extractor.onEnd(attributes, Context.root(), request, emptyMap(), null); assertThat(attributes.build()) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD, requestMethod) - .doesNotContainKey(SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL); + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, requestMethod) + .doesNotContainKey(HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL); } @ParameterizedTest @@ -223,8 +224,8 @@ void shouldTreatMethodsAsCaseSensitive(String requestMethod) { extractor.onEnd(attributes, Context.root(), request, emptyMap(), null); assertThat(attributes.build()) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD, HttpConstants._OTHER) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL, requestMethod); + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, HttpConstants._OTHER) + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL, requestMethod); } @ParameterizedTest @@ -241,8 +242,8 @@ void shouldUseOtherForUnknownMethods(String requestMethod) { extractor.onEnd(attributes, Context.root(), request, emptyMap(), null); assertThat(attributes.build()) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD, HttpConstants._OTHER) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL, requestMethod); + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, HttpConstants._OTHER) + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL, requestMethod); } @ParameterizedTest @@ -261,8 +262,8 @@ void shouldExtractKnownMethods_override(String requestMethod) { extractor.onEnd(attributes, Context.root(), request, emptyMap(), null); assertThat(attributes.build()) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD, requestMethod) - .doesNotContainKey(SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL); + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, requestMethod) + .doesNotContainKey(HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL); } @ParameterizedTest @@ -281,8 +282,8 @@ void shouldUseOtherForUnknownMethods_override(String requestMethod) { extractor.onEnd(attributes, Context.root(), request, emptyMap(), null); assertThat(attributes.build()) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD, HttpConstants._OTHER) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL, requestMethod); + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, HttpConstants._OTHER) + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL, requestMethod); } @Test @@ -298,7 +299,7 @@ void shouldExtractErrorType_httpStatusCode() { extractor.onEnd(attributes, Context.root(), emptyMap(), response, null); assertThat(attributes.build()) - .containsEntry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 400) + .containsEntry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 400) .containsEntry(SemanticAttributes.ERROR_TYPE, "400"); } @@ -366,7 +367,7 @@ void shouldExtractServerAddressAndPortFromHostHeader() { AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, response, null); assertThat(endAttributes.build()) - .containsOnly(entry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)); + .containsOnly(entry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)); } @Test @@ -394,7 +395,7 @@ void shouldExtractPeerAddressEvenIfItDuplicatesServerAddress() { extractor.onEnd(endAttributes, Context.root(), request, response, null); assertThat(endAttributes.build()) .containsOnly( - entry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), + entry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), entry(NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4"), entry(NetworkAttributes.NETWORK_PEER_PORT, 456L)); } @@ -419,7 +420,7 @@ void shouldExtractProtocolNameDifferentFromHttp() { extractor.onEnd(endAttributes, Context.root(), request, response, null); assertThat(endAttributes.build()) .containsOnly( - entry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), + entry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), entry(NetworkAttributes.NETWORK_PROTOCOL_NAME, "spdy"), entry(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "3.1")); } diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java index 859253ca3dfd..bde17eb38538 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java @@ -17,6 +17,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; +import io.opentelemetry.semconv.HttpAttributes; +import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -38,7 +40,7 @@ void collectsMetrics() { Attributes requestAttributes = Attributes.builder() - .put(SemanticAttributes.HTTP_REQUEST_METHOD, "GET") + .put(HttpAttributes.HTTP_REQUEST_METHOD, "GET") .put(UrlAttributes.URL_FULL, "https://localhost:1234/") .put(UrlAttributes.URL_PATH, "/") .put(UrlAttributes.URL_QUERY, "q=a") @@ -48,10 +50,10 @@ void collectsMetrics() { Attributes responseAttributes = Attributes.builder() - .put(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200) + .put(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200) .put(SemanticAttributes.ERROR_TYPE, "400") - .put(SemanticAttributes.HTTP_REQUEST_BODY_SIZE, 100) - .put(SemanticAttributes.HTTP_RESPONSE_BODY_SIZE, 200) + .put(HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE, 100) + .put(HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE, 200) .put(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http") .put(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0") .put(NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4") @@ -92,9 +94,8 @@ void collectsMetrics() { point .hasSum(0.15 /* seconds */) .hasAttributesSatisfying( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo( - SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.ERROR_TYPE, "400"), equalTo( NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java index 9fd2971f2bd3..51d8ddd9ede0 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.internal.HttpConstants; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -196,12 +197,12 @@ void normal() { .containsOnly( entry(SemanticAttributes.SERVER_ADDRESS, "github.com"), entry(SemanticAttributes.SERVER_PORT, 443L), - entry(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), + entry(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), entry(UrlAttributes.URL_SCHEME, "https"), entry(UrlAttributes.URL_PATH, "/repositories/1"), entry(UrlAttributes.URL_QUERY, "details=true"), entry(SemanticAttributes.USER_AGENT_ORIGINAL, "okhttp 3.x"), - entry(SemanticAttributes.HTTP_ROUTE, "/repositories/{id}"), + entry(HttpAttributes.HTTP_ROUTE, "/repositories/{id}"), entry(SemanticAttributes.CLIENT_ADDRESS, "1.1.1.1"), entry( AttributeKey.stringArrayKey("http.request.header.custom-request-header"), @@ -214,8 +215,8 @@ void normal() { entry(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), entry(NetworkAttributes.NETWORK_PEER_ADDRESS, "4.3.2.1"), entry(NetworkAttributes.NETWORK_PEER_PORT, 456L), - entry(SemanticAttributes.HTTP_ROUTE, "/repositories/{repoId}"), - entry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 202L), + entry(HttpAttributes.HTTP_ROUTE, "/repositories/{repoId}"), + entry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 202L), entry( AttributeKey.stringArrayKey("http.response.header.custom-response-header"), asList("654", "321"))); @@ -235,8 +236,8 @@ void shouldExtractKnownMethods(String requestMethod) { extractor.onEnd(attributes, Context.root(), request, emptyMap(), null); assertThat(attributes.build()) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD, requestMethod) - .doesNotContainKey(SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL); + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, requestMethod) + .doesNotContainKey(HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL); } @ParameterizedTest @@ -253,8 +254,8 @@ void shouldTreatMethodsAsCaseSensitive(String requestMethod) { extractor.onEnd(attributes, Context.root(), request, emptyMap(), null); assertThat(attributes.build()) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD, HttpConstants._OTHER) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL, requestMethod); + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, HttpConstants._OTHER) + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL, requestMethod); } @ParameterizedTest @@ -271,8 +272,8 @@ void shouldUseOtherForUnknownMethods(String requestMethod) { extractor.onEnd(attributes, Context.root(), request, emptyMap(), null); assertThat(attributes.build()) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD, HttpConstants._OTHER) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL, requestMethod); + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, HttpConstants._OTHER) + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL, requestMethod); } @ParameterizedTest @@ -291,8 +292,8 @@ void shouldExtractKnownMethods_override(String requestMethod) { extractor.onEnd(attributes, Context.root(), request, emptyMap(), null); assertThat(attributes.build()) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD, requestMethod) - .doesNotContainKey(SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL); + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, requestMethod) + .doesNotContainKey(HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL); } @ParameterizedTest @@ -311,8 +312,8 @@ void shouldUseOtherForUnknownMethods_override(String requestMethod) { extractor.onEnd(attributes, Context.root(), request, emptyMap(), null); assertThat(attributes.build()) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD, HttpConstants._OTHER) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL, requestMethod); + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, HttpConstants._OTHER) + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL, requestMethod); } @Test @@ -328,7 +329,7 @@ void shouldExtractErrorType_httpStatusCode() { extractor.onEnd(attributes, Context.root(), emptyMap(), response, null); assertThat(attributes.build()) - .containsEntry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 500) + .containsEntry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 500) .containsEntry(SemanticAttributes.ERROR_TYPE, "500"); } @@ -394,7 +395,7 @@ void shouldPreferUrlSchemeFromForwardedHeader() { AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, response, null); assertThat(endAttributes.build()) - .containsOnly(entry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 202L)); + .containsOnly(entry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 202L)); } @Test @@ -422,7 +423,7 @@ void shouldExtractServerAddressAndPortFromForwardedHeader() { AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, response, null); assertThat(endAttributes.build()) - .containsOnly(entry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)); + .containsOnly(entry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)); } @Test @@ -449,7 +450,7 @@ void shouldExtractServerAddressAndPortFromForwardedHostHeader() { AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, response, null); assertThat(endAttributes.build()) - .containsOnly(entry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)); + .containsOnly(entry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)); } @Test @@ -475,7 +476,7 @@ void shouldExtractServerAddressAndPortFromAuthorityPseudoHeader() { AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, response, null); assertThat(endAttributes.build()) - .containsOnly(entry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)); + .containsOnly(entry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)); } @Test @@ -500,7 +501,7 @@ void shouldExtractServerAddressAndPortFromHostHeader() { AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, response, null); assertThat(endAttributes.build()) - .containsOnly(entry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)); + .containsOnly(entry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)); } @Test @@ -525,7 +526,7 @@ void shouldExtractPeerAddressEvenIfItDuplicatesClientAddress() { extractor.onEnd(endAttributes, Context.root(), request, response, null); assertThat(endAttributes.build()) .containsOnly( - entry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), + entry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), entry(NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4"), entry(NetworkAttributes.NETWORK_PEER_PORT, 456L)); } @@ -550,7 +551,7 @@ void shouldExtractProtocolNameDifferentFromHttp() { extractor.onEnd(endAttributes, Context.root(), request, response, null); assertThat(endAttributes.build()) .containsOnly( - entry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), + entry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), entry(NetworkAttributes.NETWORK_PROTOCOL_NAME, "spdy"), entry(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "3.1")); } diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java index cce97e042bd4..6a3fd0c6cf11 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java @@ -17,6 +17,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; +import io.opentelemetry.semconv.HttpAttributes; +import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -38,7 +40,7 @@ void collectsMetrics() { Attributes requestAttributes = Attributes.builder() - .put(SemanticAttributes.HTTP_REQUEST_METHOD, "GET") + .put(HttpAttributes.HTTP_REQUEST_METHOD, "GET") .put(UrlAttributes.URL_SCHEME, "https") .put(UrlAttributes.URL_PATH, "/") .put(UrlAttributes.URL_QUERY, "q=a") @@ -52,10 +54,10 @@ void collectsMetrics() { Attributes responseAttributes = Attributes.builder() - .put(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200) + .put(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200) .put(SemanticAttributes.ERROR_TYPE, "500") - .put(SemanticAttributes.HTTP_REQUEST_BODY_SIZE, 100) - .put(SemanticAttributes.HTTP_RESPONSE_BODY_SIZE, 200) + .put(HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE, 100) + .put(HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE, 200) .put(NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4") .put(NetworkAttributes.NETWORK_PEER_PORT, 8080) .put(NetworkAttributes.NETWORK_LOCAL_ADDRESS, "4.3.2.1") @@ -97,9 +99,8 @@ void collectsMetrics() { point .hasSum(0.15 /* seconds */) .hasAttributesSatisfying( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo( - SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.ERROR_TYPE, "500"), equalTo( NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), @@ -149,7 +150,7 @@ void collectsHttpRouteFromEndAttributes() { .build(); Attributes responseAttributes = - Attributes.builder().put(SemanticAttributes.HTTP_ROUTE, "/test/{id}").build(); + Attributes.builder().put(HttpAttributes.HTTP_ROUTE, "/test/{id}").build(); Context parentContext = Context.root(); @@ -172,8 +173,7 @@ void collectsHttpRouteFromEndAttributes() { .hasSum(0.100 /* seconds */) .hasAttributesSatisfying( equalTo(UrlAttributes.URL_SCHEME, "https"), - equalTo( - SemanticAttributes.HTTP_ROUTE, "/test/{id}"))))); + equalTo(HttpAttributes.HTTP_ROUTE, "/test/{id}"))))); } private static long nanos(int millis) { diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AbstractHttpServerInstrumentationTest.scala b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AbstractHttpServerInstrumentationTest.scala index 28d79b823ca0..afc72c2b3ec6 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AbstractHttpServerInstrumentationTest.scala +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AbstractHttpServerInstrumentationTest.scala @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.{ ServerEndpoint } import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes import java.util import java.util.function.{Function, Predicate} @@ -29,7 +30,7 @@ abstract class AbstractHttpServerInstrumentationTest val set = new util.HashSet[AttributeKey[_]]( HttpServerTestOptions.DEFAULT_HTTP_ATTRIBUTES ) - set.remove(SemanticAttributes.HTTP_ROUTE) + set.remove(HttpAttributes.HTTP_ROUTE) set } } diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java index 671e6d03d458..f678703bebab 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java @@ -9,8 +9,8 @@ import static io.opentelemetry.instrumentation.api.internal.HttpConstants._OTHER; import static io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.MapUtils.emptyIfNull; import static io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.MapUtils.lowercaseMap; +import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; import static io.opentelemetry.semconv.SemanticAttributes.FAAS_TRIGGER; -import static io.opentelemetry.semconv.SemanticAttributes.HTTP_RESPONSE_STATUS_CODE; import static io.opentelemetry.semconv.SemanticAttributes.USER_AGENT_ORIGINAL; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent; @@ -19,6 +19,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaRequest; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.io.UnsupportedEncodingException; @@ -49,10 +50,10 @@ public void onStart( void onRequest(AttributesBuilder attributes, APIGatewayProxyRequestEvent request) { String method = request.getHttpMethod(); if (method == null || knownMethods.contains(method)) { - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_METHOD, method); + internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD, method); } else { - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_METHOD, _OTHER); - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL, method); + internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD, _OTHER); + internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL, method); } Map headers = lowercaseMap(request.getHeaders()); diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java index 6ce302bb563e..e8d13fe89725 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java @@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.WrappedLambda; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -103,11 +104,11 @@ void tracedWithHttpPropagation() { equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"), equalTo(SemanticAttributes.FAAS_TRIGGER, "http"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.USER_AGENT_ORIGINAL, "Test Client"), equalTo( UrlAttributes.URL_FULL, "http://localhost:123/hello/world?a=b&c=d"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); } @Test diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy index cee37350d064..bea449238474 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy @@ -5,6 +5,8 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import spock.lang.Shared @@ -62,8 +64,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.queue.name" queueName "rpc.system" "aws-api" "rpc.service" "AmazonSQS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -84,8 +86,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.system" "aws-api" "rpc.service" "Amazon S3" "aws.bucket.name" bucketName - "$SemanticAttributes.HTTP_REQUEST_METHOD" "PUT" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "PUT" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -106,8 +108,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.queue.url" queueUrl "rpc.system" "aws-api" "rpc.service" "AmazonSQS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -128,8 +130,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.queue.url" queueUrl "rpc.system" "aws-api" "rpc.service" "AmazonSQS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -150,8 +152,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.system" "aws-api" "rpc.service" "Amazon S3" "aws.bucket.name" bucketName - "$SemanticAttributes.HTTP_REQUEST_METHOD" "PUT" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "PUT" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -171,8 +173,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.system" "aws-api" "rpc.service" "Amazon S3" "aws.bucket.name" bucketName - "$SemanticAttributes.HTTP_REQUEST_METHOD" "PUT" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "PUT" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -190,8 +192,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.queue.url" queueUrl "rpc.system" "aws-api" "rpc.service" "AmazonSQS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -221,8 +223,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.system" "aws-api" "rpc.service" "Amazon S3" "aws.bucket.name" bucketName - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -242,8 +244,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.system" "aws-api" "rpc.service" "Amazon S3" "aws.bucket.name" bucketName - "$SemanticAttributes.HTTP_REQUEST_METHOD" "DELETE" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 204 + "$HttpAttributes.HTTP_REQUEST_METHOD" "DELETE" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 204 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -263,8 +265,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.system" "aws-api" "rpc.service" "Amazon S3" "aws.bucket.name" bucketName - "$SemanticAttributes.HTTP_REQUEST_METHOD" "DELETE" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 204 + "$HttpAttributes.HTTP_REQUEST_METHOD" "DELETE" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 204 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -284,8 +286,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.queue.url" queueUrl "rpc.system" "aws-api" "rpc.service" "AmazonSQS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -338,8 +340,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.queue.name" queueName "rpc.system" "aws-api" "rpc.service" "AmazonSQS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -359,8 +361,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.queue.url" queueUrl "rpc.system" "aws-api" "rpc.service" "AmazonSQS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -380,8 +382,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.system" "aws-api" "rpc.service" "Amazon S3" "aws.bucket.name" bucketName - "$SemanticAttributes.HTTP_REQUEST_METHOD" "PUT" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "PUT" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -400,8 +402,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.method" "CreateTopic" "rpc.system" "aws-api" "rpc.service" "AmazonSNS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -420,8 +422,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.method" "Subscribe" "rpc.system" "aws-api" "rpc.service" "AmazonSNS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -442,8 +444,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.queue.url" queueUrl "rpc.system" "aws-api" "rpc.service" "AmazonSQS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -462,8 +464,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.method" "SetTopicAttributes" "rpc.system" "aws-api" "rpc.service" "AmazonSNS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -484,8 +486,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.system" "aws-api" "rpc.service" "Amazon S3" "aws.bucket.name" bucketName - "$SemanticAttributes.HTTP_REQUEST_METHOD" "PUT" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "PUT" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -505,8 +507,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.system" "aws-api" "rpc.service" "Amazon S3" "aws.bucket.name" bucketName - "$SemanticAttributes.HTTP_REQUEST_METHOD" "PUT" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "PUT" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -526,8 +528,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.queue.url" queueUrl "rpc.system" "aws-api" "rpc.service" "AmazonSQS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.SERVER_PORT" { it == null || Number } @@ -557,8 +559,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.system" "aws-api" "rpc.service" "Amazon S3" "aws.bucket.name" bucketName - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -578,8 +580,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.system" "aws-api" "rpc.service" "Amazon S3" "aws.bucket.name" bucketName - "$SemanticAttributes.HTTP_REQUEST_METHOD" "DELETE" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 204 + "$HttpAttributes.HTTP_REQUEST_METHOD" "DELETE" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 204 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -599,8 +601,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "rpc.system" "aws-api" "rpc.service" "Amazon S3" "aws.bucket.name" bucketName - "$SemanticAttributes.HTTP_REQUEST_METHOD" "DELETE" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 204 + "$HttpAttributes.HTTP_REQUEST_METHOD" "DELETE" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 204 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -620,8 +622,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "aws.queue.url" queueUrl "rpc.system" "aws-api" "rpc.service" "AmazonSQS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy index faef6d43a016..1e07c1d52692 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy @@ -5,6 +5,8 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import spock.lang.Shared @@ -54,8 +56,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "aws.queue.name" queueName "rpc.system" "aws-api" "rpc.service" "AmazonSQS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -76,8 +78,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "aws.queue.url" queueUrl "rpc.system" "aws-api" "rpc.service" "AmazonSQS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -98,8 +100,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "aws.queue.url" queueUrl "rpc.system" "aws-api" "rpc.service" "AmazonSQS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -119,8 +121,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "rpc.method" "CreateTopic" "rpc.system" "aws-api" "rpc.service" "AmazonSNS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -140,8 +142,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "rpc.method" "Subscribe" "rpc.system" "aws-api" "rpc.service" "AmazonSNS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -161,8 +163,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "rpc.method" "Publish" "rpc.system" "aws-api" "rpc.service" "AmazonSNS" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" @@ -181,8 +183,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "rpc.system" "aws-api" "rpc.service" "AmazonSQS" "rpc.method" "ReceiveMessage" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String "$SemanticAttributes.SERVER_ADDRESS" String "$SemanticAttributes.SERVER_PORT" { it == null || Number } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy index 6d3e7aa5317d..0e048330fde5 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy @@ -20,6 +20,7 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractAws1ClientTest import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes import static io.opentelemetry.api.trace.StatusCode.ERROR @@ -101,7 +102,7 @@ class Aws1ClientTest extends AbstractAws1ClientTest implements AgentTestTrait { hasNoParent() attributes { "$UrlAttributes.URL_FULL" "https://s3.amazonaws.com" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "HEAD" + "$HttpAttributes.HTTP_REQUEST_METHOD" "HEAD" "$SemanticAttributes.SERVER_ADDRESS" "s3.amazonaws.com" "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" "Amazon S3" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy index 5fcebc314907..c8ad943a5df4 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy @@ -25,6 +25,8 @@ import com.amazonaws.services.s3.S3ClientOptions import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.HttpResponse @@ -109,8 +111,8 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { hasNoParent() attributes { "$UrlAttributes.URL_FULL" "${server.httpUri()}" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" server.httpPort() "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" @@ -171,7 +173,7 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { hasNoParent() attributes { "$UrlAttributes.URL_FULL" "http://localhost:${UNUSABLE_PORT}" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" + "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$SemanticAttributes.SERVER_PORT" 61 "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.RPC_SYSTEM" "aws-api" @@ -219,7 +221,7 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { hasNoParent() attributes { "$UrlAttributes.URL_FULL" "https://s3.amazonaws.com" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.SERVER_ADDRESS" "s3.amazonaws.com" "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" "Amazon S3" @@ -262,7 +264,7 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { hasNoParent() attributes { "$UrlAttributes.URL_FULL" "${server.httpUri()}" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.SERVER_PORT" server.httpPort() "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.RPC_SYSTEM" "aws-api" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy index d59c77b3831a..34eae685a5a3 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy @@ -32,6 +32,8 @@ import com.amazonaws.services.sns.model.PublishRequest import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.HttpResponse @@ -107,8 +109,8 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { hasNoParent() attributes { "$UrlAttributes.URL_FULL" "${server.httpUri()}" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_PORT" server.httpPort() "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" @@ -204,7 +206,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { hasNoParent() attributes { "$UrlAttributes.URL_FULL" "http://127.0.0.1:${UNUSABLE_PORT}" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" + "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.SERVER_PORT" 61 "$SemanticAttributes.RPC_SYSTEM" "aws-api" @@ -260,7 +262,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { hasNoParent() attributes { "$UrlAttributes.URL_FULL" "${server.httpUri()}" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.SERVER_PORT" server.httpPort() "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.RPC_SYSTEM" "aws-api" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java index 87100f382ba8..a86b6ec84a32 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java @@ -24,6 +24,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -97,8 +98,8 @@ void testSimpleSqsProducerConsumerServices() { equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "CreateQueue"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), @@ -118,8 +119,8 @@ void testSimpleSqsProducerConsumerServices() { equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "SendMessage"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), @@ -144,8 +145,8 @@ void testSimpleSqsProducerConsumerServices() { equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), @@ -198,8 +199,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "CreateQueue"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), @@ -219,8 +220,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "SendMessage"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), @@ -245,8 +246,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), @@ -282,8 +283,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java index 2562ac1e1277..0ed23b318286 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java @@ -30,6 +30,7 @@ import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.trace.data.SpanData; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -130,8 +131,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "CreateQueue"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), @@ -150,8 +151,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "SendMessage"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), @@ -190,8 +191,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), @@ -226,8 +227,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), @@ -292,8 +293,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "CreateQueue"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), @@ -313,8 +314,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "SendMessage"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, sqsPort), @@ -353,8 +354,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo( UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -376,8 +377,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo( UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), @@ -405,8 +406,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo( UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java index b2aa73a20816..d351c2c6d39d 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java @@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.internal.InstrumenterUtil; import io.opentelemetry.instrumentation.api.internal.Timer; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -381,7 +382,7 @@ private static String extractHttpErrorAsEvent( .collect(Collectors.joining("\n")); Attributes attributes = Attributes.of( - SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, + HttpAttributes.HTTP_RESPONSE_STATUS_CODE, Long.valueOf(errorCode), HTTP_ERROR_MSG, errorMsg); diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy index 63c103db5f26..a6134ef8a98e 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy @@ -8,6 +8,8 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.HttpResponse import io.opentelemetry.testing.internal.armeria.common.HttpStatus @@ -137,8 +139,8 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.SERVER_PORT" server.httpPort() "$UrlAttributes.URL_FULL" { it.startsWith("${server.httpUri()}${path}") } - "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" "DynamoDb" "$SemanticAttributes.RPC_METHOD" "CreateTable" @@ -170,8 +172,8 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.SERVER_PORT" server.httpPort() "$UrlAttributes.URL_FULL" { it.startsWith("${server.httpUri()}${path}") } - "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" "DynamoDb" "$SemanticAttributes.RPC_METHOD" "Query" @@ -202,8 +204,8 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.SERVER_PORT" server.httpPort() "$UrlAttributes.URL_FULL" { it.startsWith("${server.httpUri()}${path}") } - "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" "$service" "$SemanticAttributes.RPC_METHOD" "${operation}" diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy index 569105664c52..d7072523646c 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy @@ -7,6 +7,8 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.HttpData import io.opentelemetry.testing.internal.armeria.common.HttpResponse @@ -126,8 +128,8 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:${server.httpPort()}") } } "$SemanticAttributes.SERVER_PORT" server.httpPort() - "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" "$service" "$SemanticAttributes.RPC_METHOD" "${operation}" @@ -286,8 +288,8 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { "$UrlAttributes.URL_FULL" { it == "http://localhost:${server.httpPort()}" || it == "http://localhost:${server.httpPort()}/" } } "$SemanticAttributes.SERVER_PORT" server.httpPort() - "$SemanticAttributes.HTTP_REQUEST_METHOD" "$method" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" "$service" "$SemanticAttributes.RPC_METHOD" "${operation}" @@ -450,7 +452,7 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { "$SemanticAttributes.SERVER_ADDRESS" { it == "somebucket.localhost" || it == "localhost" } "$UrlAttributes.URL_FULL" { it == "http://somebucket.localhost:${server.httpPort()}/somekey" || it == "http://localhost:${server.httpPort()}/somebucket/somekey" } "$SemanticAttributes.SERVER_PORT" server.httpPort() - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" "S3" "$SemanticAttributes.RPC_METHOD" "GetObject" diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy index 72576f2e6015..44a66d81787a 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy @@ -7,6 +7,8 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes import org.elasticmq.rest.sqs.SQSRestServerBuilder import software.amazon.awssdk.auth.credentials.AwsBasicCredentials @@ -130,8 +132,8 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "rpc.system" "aws-api" "rpc.service" "Sqs" "rpc.method" "CreateQueue" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort @@ -150,8 +152,8 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "rpc.system" "aws-api" "rpc.method" "SendMessage" "rpc.service" "Sqs" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort @@ -171,8 +173,8 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "rpc.method" "ReceiveMessage" "rpc.system" "aws-api" "rpc.service" "Sqs" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort @@ -211,8 +213,8 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "aws.queue.url" "http://localhost:$sqsPort/000000000000/testSdkSqs" "rpc.system" "aws-api" "rpc.service" "Sqs" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort @@ -322,8 +324,8 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "rpc.system" "aws-api" "rpc.method" "SendMessageBatch" "rpc.service" "Sqs" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort @@ -344,8 +346,8 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "rpc.method" "ReceiveMessage" "rpc.system" "aws-api" "rpc.service" "Sqs" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort @@ -372,8 +374,8 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "rpc.method" "ReceiveMessage" "rpc.system" "aws-api" "rpc.service" "Sqs" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy index dbaa2e104495..f31909f14d0e 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy @@ -8,6 +8,8 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes import org.elasticmq.rest.sqs.SQSRestServerBuilder import software.amazon.awssdk.auth.credentials.AwsBasicCredentials @@ -132,8 +134,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "rpc.system" "aws-api" "rpc.service" "Sqs" "rpc.method" "CreateQueue" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort @@ -152,8 +154,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "rpc.system" "aws-api" "rpc.method" "SendMessage" "rpc.service" "Sqs" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort @@ -191,8 +193,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "aws.queue.url" "http://localhost:$sqsPort/000000000000/testSdkSqs" "rpc.system" "aws-api" "rpc.service" "Sqs" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort @@ -213,8 +215,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "rpc.method" "ReceiveMessage" "rpc.system" "aws-api" "rpc.service" "Sqs" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort @@ -237,8 +239,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "rpc.method" "ReceiveMessage" "rpc.system" "aws-api" "rpc.service" "Sqs" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort @@ -388,8 +390,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "rpc.system" "aws-api" "rpc.method" "SendMessageBatch" "rpc.service" "Sqs" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort @@ -412,8 +414,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "rpc.method" "ReceiveMessage" "rpc.system" "aws-api" "rpc.service" "Sqs" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort @@ -451,8 +453,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "rpc.method" "ReceiveMessage" "rpc.system" "aws-api" "rpc.service" "Sqs" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" sqsPort diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java index c49dc79994e8..946ea2fe615d 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java @@ -12,6 +12,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpResponse; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; @@ -165,8 +166,8 @@ public void testSendDynamoDbRequestWithRetries() { assertThat(attributes) .containsEntry(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1") .containsEntry(SemanticAttributes.SERVER_PORT, server.httpPort()) - .containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD, method) - .containsEntry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200) + .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, method) + .containsEntry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200) .containsEntry(SemanticAttributes.RPC_SYSTEM, "aws-api") .containsEntry(SemanticAttributes.RPC_SERVICE, service) .containsEntry(SemanticAttributes.RPC_METHOD, operation) @@ -182,7 +183,7 @@ public void testSendDynamoDbRequestWithRetries() { event .hasName("HTTP request failure") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 500), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 500), equalTo( AttributeKey.stringKey("aws.http.error_message"), "DynamoDB could not process your request")), @@ -190,7 +191,7 @@ public void testSendDynamoDbRequestWithRetries() { event .hasName("HTTP request failure") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 503), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 503), equalTo( AttributeKey.stringKey("aws.http.error_message"), "DynamoDB is currently unavailable"))); diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java index 8fcb9d96b078..dfa923590d18 100644 --- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/HttpSpanDecorator.java @@ -32,7 +32,7 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.net.MalformedURLException; import java.net.URL; @@ -100,10 +100,10 @@ public void pre( String method = getHttpMethod(exchange, endpoint); if (method == null || knownMethods.contains(method)) { - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_METHOD, method); + internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD, method); } else { - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_METHOD, _OTHER); - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL, method); + internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD, _OTHER); + internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL, method); } } @@ -166,7 +166,7 @@ public void post(AttributesBuilder attributes, Exchange exchange, Endpoint endpo if (exchange.hasOut()) { Object responseCode = exchange.getOut().getHeader(Exchange.HTTP_RESPONSE_CODE); if (responseCode instanceof Integer) { - attributes.put(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, (Integer) responseCode); + attributes.put(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, (Integer) responseCode); } } } diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java index 6479a37a8ae6..f873655681cd 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java @@ -14,6 +14,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerUsingTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -92,8 +93,8 @@ void restComponentServerAndClientCallWithJettyBackend() { equalTo( stringKey("camel.uri"), "rest://get:api/%7Bmodule%7D/unit/%7BunitId%7D"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)), span -> span.hasName("GET /api/{module}/unit/{unitId}") .hasKind(SpanKind.SERVER) @@ -101,9 +102,9 @@ void restComponentServerAndClientCallWithJettyBackend() { .hasAttributesSatisfyingExactly( equalTo(UrlAttributes.URL_SCHEME, "http"), equalTo(UrlAttributes.URL_PATH, "/api/firstModule/unit/unitOne"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.HTTP_ROUTE, "/api/{module}/unit/{unitId}"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_ROUTE, "/api/{module}/unit/{unitId}"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, Long.valueOf(port)), @@ -120,7 +121,7 @@ void restComponentServerAndClientCallWithJettyBackend() { .hasKind(SpanKind.INTERNAL) .hasParent(trace.getSpan(2)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo( UrlAttributes.URL_FULL, "http://localhost:" + port + "/api/firstModule/unit/unitOne"), diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.java index 1447dfadc70e..4bcbfc8c1631 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerUsingTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.net.URI; import org.junit.jupiter.api.AfterAll; @@ -69,7 +69,7 @@ public void singleCamelServiceSpan() { span.hasName("POST /camelService") .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(UrlAttributes.URL_FULL, requestUrl.toString()), equalTo( stringKey("camel.uri"), diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java index c44f55641258..dff9259a76c0 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java @@ -15,6 +15,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerUsingTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -108,11 +109,11 @@ void twoCamelServiceSpans() throws Exception { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo( UrlAttributes.URL_FULL, "http://localhost:" + portOne + "/serviceOne"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), equalTo( stringKey("camel.uri"), "http://localhost:" + portOne + "/serviceOne")), @@ -121,11 +122,11 @@ void twoCamelServiceSpans() throws Exception { .hasKind(SpanKind.SERVER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo( UrlAttributes.URL_FULL, "http://localhost:" + portOne + "/serviceOne"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), equalTo( stringKey("camel.uri"), "http://0.0.0.0:" + portOne + "/serviceOne")), @@ -134,11 +135,11 @@ void twoCamelServiceSpans() throws Exception { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(2)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo( UrlAttributes.URL_FULL, "http://127.0.0.1:" + portTwo + "/serviceTwo"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), equalTo( stringKey("camel.uri"), "http://127.0.0.1:" + portTwo + "/serviceTwo")), @@ -147,14 +148,14 @@ void twoCamelServiceSpans() throws Exception { .hasKind(SpanKind.SERVER) .hasParent(trace.getSpan(3)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L), equalTo(UrlAttributes.URL_SCHEME, "http"), equalTo(UrlAttributes.URL_PATH, "/serviceTwo"), equalTo( SemanticAttributes.USER_AGENT_ORIGINAL, "Jakarta Commons-HttpClient/3.1"), - equalTo(SemanticAttributes.HTTP_ROUTE, "/serviceTwo"), + equalTo(HttpAttributes.HTTP_ROUTE, "/serviceTwo"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), equalTo(SemanticAttributes.SERVER_PORT, portTwo), @@ -168,7 +169,7 @@ void twoCamelServiceSpans() throws Exception { .hasKind(SpanKind.INTERNAL) .hasParent(trace.getSpan(4)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo( UrlAttributes.URL_FULL, "http://127.0.0.1:" + portTwo + "/serviceTwo"), diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java index 1d9a282fac3c..f28069d82dfc 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java @@ -14,6 +14,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -67,8 +68,8 @@ static SpanDataAssert sqs( val -> val.satisfiesAnyOf( v -> assertThat(v).isEqualTo(queueUrl), v -> assertThat(v).isNull())), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), satisfies(UrlAttributes.URL_FULL, val -> val.isInstanceOf(String.class)), satisfies( SemanticAttributes.SERVER_ADDRESS, @@ -118,8 +119,8 @@ static SpanDataAssert s3(SpanDataAssert span, String spanName, String bucketName equalTo(stringKey("rpc.method"), spanName.substring(3)), equalTo(stringKey("rpc.service"), "Amazon S3"), equalTo(stringKey("aws.bucket.name"), bucketName), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, method), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, method), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), satisfies(UrlAttributes.URL_FULL, val -> val.isInstanceOf(String.class)), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), satisfies(SemanticAttributes.SERVER_ADDRESS, val -> val.isInstanceOf(String.class)), @@ -140,8 +141,8 @@ static SpanDataAssert sns(SpanDataAssert span, String spanName, String topicArn) equalTo(stringKey("rpc.method"), spanName.substring(4)), equalTo(stringKey("rpc.service"), "AmazonSNS"), equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, topicArn), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), satisfies(UrlAttributes.URL_FULL, val -> val.isInstanceOf(String.class)), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), satisfies(SemanticAttributes.SERVER_ADDRESS, val -> val.isInstanceOf(String.class)), diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java index 2c863b656e42..2bdb92d1cffc 100644 --- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java +++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -89,7 +90,7 @@ public void elasticsearchStatus() throws IOException { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), equalTo(SemanticAttributes.DB_OPERATION, "info"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort())), @@ -100,10 +101,10 @@ public void elasticsearchStatus() throws IOException { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); } @Test @@ -127,7 +128,7 @@ public void elasticsearchIndex() throws IOException { equalTo(SemanticAttributes.DB_OPERATION, "index"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "PUT"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "PUT"), equalTo( UrlAttributes.URL_FULL, httpHost.toURI() + "/test-index/_doc/test-id?timeout=10s"), @@ -144,12 +145,12 @@ public void elasticsearchIndex() throws IOException { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "PUT"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "PUT"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo( UrlAttributes.URL_FULL, httpHost.toURI() + "/test-index/_doc/test-id?timeout=10s"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 201L)))); + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 201L)))); } @Test @@ -188,7 +189,7 @@ public void elasticsearchStatusAsync() throws Exception { equalTo(SemanticAttributes.DB_OPERATION, "info"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/")), span -> span.hasName("GET") @@ -197,10 +198,10 @@ public void elasticsearchStatusAsync() throws Exception { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java index bb1d1a59cf9b..bd9d14e55091 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java @@ -11,6 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -95,7 +96,7 @@ void elasticsearchStatus() throws IOException { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); @@ -107,10 +108,10 @@ void elasticsearchStatus() throws IOException { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200)); + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200)); }); }); } @@ -171,7 +172,7 @@ public void onFailure(Exception e) { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); @@ -183,10 +184,10 @@ public void onFailure(Exception e) { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200)); + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200)); }, span -> { span.hasName("callback").hasKind(SpanKind.INTERNAL).hasParent(trace.getSpan(0)); diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java index 2e4818c2c3e6..55b39f0aa9d7 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java @@ -11,6 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -86,7 +87,7 @@ public void elasticsearchStatus() throws IOException { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); @@ -98,10 +99,10 @@ public void elasticsearchStatus() throws IOException { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)); + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)); }); }); } @@ -161,7 +162,7 @@ public void onFailure(Exception e) { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); @@ -173,10 +174,10 @@ public void onFailure(Exception e) { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200)); + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200)); }, span -> { span.hasName("callback").hasKind(SpanKind.INTERNAL).hasParent(trace.getSpan(0)); diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index 09e1954c62bb..1ec5e9ac7c76 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -11,6 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -84,7 +85,7 @@ public void elasticsearchStatus() throws Exception { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")), @@ -95,10 +96,10 @@ public void elasticsearchStatus() throws Exception { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); } @Test @@ -154,7 +155,7 @@ public void onFailure(Exception e) { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")), @@ -165,10 +166,10 @@ public void onFailure(Exception e) { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index 141d231b8c6f..eec10ff47e99 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -11,6 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.Map; @@ -84,7 +85,7 @@ public void elasticsearchStatus() throws Exception { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo( @@ -144,7 +145,7 @@ public void onFailure(Exception e) { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")), diff --git a/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchClientAttributeExtractor.java b/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchClientAttributeExtractor.java index c127fb3a5166..6018721b459e 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchClientAttributeExtractor.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchClientAttributeExtractor.java @@ -13,6 +13,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.internal.cache.Cache; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.HashSet; @@ -76,10 +77,10 @@ public void onStart( AttributesBuilder attributes, Context parentContext, ElasticsearchRestRequest request) { String method = request.getMethod(); if (method == null || knownMethods.contains(method)) { - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_METHOD, method); + internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD, method); } else { - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_METHOD, _OTHER); - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL, method); + internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD, _OTHER); + internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL, method); } setPathPartsAttributes(attributes, request); } diff --git a/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/AbstractServerTest.java b/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/AbstractServerTest.java index 89bfaa7cfefb..3b4730a25777 100644 --- a/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/AbstractServerTest.java +++ b/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/AbstractServerTest.java @@ -33,7 +33,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.HttpAttributes; import java.net.URI; import java.util.Collections; import org.junit.jupiter.api.extension.RegisterExtension; @@ -50,7 +50,7 @@ protected void configure(HttpServerTestOptions options) { options.setHttpAttributes( unused -> Sets.difference( - DEFAULT_HTTP_ATTRIBUTES, Collections.singleton(SemanticAttributes.HTTP_ROUTE))); + DEFAULT_HTTP_ATTRIBUTES, Collections.singleton(HttpAttributes.HTTP_ROUTE))); options.setTestCaptureHttpHeaders(true); } diff --git a/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java b/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java index 231a500f0abe..12f67d0b5e7d 100644 --- a/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java +++ b/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java @@ -23,6 +23,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -102,8 +103,8 @@ void errorTracesWhenExceptionIsNotThrown() throws Exception { equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), satisfies(SemanticAttributes.SERVER_PORT, AbstractLongAssert::isPositive), equalTo(UrlAttributes.URL_FULL, uri.toString()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 500), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 500), equalTo(SemanticAttributes.ERROR_TYPE, "500"))); testing.waitAndAssertTraces( diff --git a/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyFilterchainServerTest.groovy b/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyFilterchainServerTest.groovy index d4f0ed2a1b4e..d0eaa74c96e8 100644 --- a/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyFilterchainServerTest.groovy +++ b/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyFilterchainServerTest.groovy @@ -8,6 +8,7 @@ import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes import org.glassfish.grizzly.filterchain.BaseFilter import org.glassfish.grizzly.filterchain.FilterChain import org.glassfish.grizzly.filterchain.FilterChainBuilder @@ -67,7 +68,7 @@ class GrizzlyFilterchainServerTest extends HttpServerTest implements @Override Set> httpAttributes(ServerEndpoint endpoint) { def attributes = super.httpAttributes(endpoint) - attributes.remove(SemanticAttributes.HTTP_ROUTE) + attributes.remove(HttpAttributes.HTTP_ROUTE) attributes } diff --git a/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyTest.groovy b/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyTest.groovy index 3b3d5b224d3a..e6fb782d4fbe 100644 --- a/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyTest.groovy +++ b/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyTest.groovy @@ -8,6 +8,7 @@ import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes import org.glassfish.grizzly.http.server.HttpHandler import org.glassfish.grizzly.http.server.HttpServer import org.glassfish.grizzly.http.server.NetworkListener @@ -79,7 +80,7 @@ class GrizzlyTest extends HttpServerTest implements AgentTestTrait { @Override Set> httpAttributes(ServerEndpoint endpoint) { def attributes = super.httpAttributes(endpoint) - attributes.remove(SemanticAttributes.HTTP_ROUTE) + attributes.remove(HttpAttributes.HTTP_ROUTE) attributes } diff --git a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpMethodAttributeExtractor.java b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpMethodAttributeExtractor.java index 318db6c725b5..83bfe1e46f1f 100644 --- a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpMethodAttributeExtractor.java +++ b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpMethodAttributeExtractor.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.HttpAttributes; import java.net.HttpURLConnection; import java.util.Set; import javax.annotation.Nullable; @@ -50,11 +50,11 @@ public void onEnd( String method = connection.getRequestMethod(); // The getOutputStream() has transformed "GET" into "POST" if (knownMethods.contains(method)) { - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_METHOD, method); - attributes.remove(SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL); + internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD, method); + attributes.remove(HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL); } else { - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_METHOD, _OTHER); - internalSet(attributes, SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL, method); + internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD, _OTHER); + internalSet(attributes, HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL, method); } Span span = Span.fromContext(context); span.updateName(method); diff --git a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java index 31112de8f5ee..465cff10059f 100644 --- a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java +++ b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java @@ -21,6 +21,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -125,8 +126,8 @@ public void traceRequest(boolean useCache) throws IOException { equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), equalTo(UrlAttributes.URL_FULL, url.toString()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); testing.waitAndAssertTraces( trace -> @@ -170,8 +171,8 @@ public void testBrokenApiUsage() throws IOException { equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), equalTo(UrlAttributes.URL_FULL, url.toString()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); testing.waitAndAssertTraces( trace -> @@ -221,8 +222,8 @@ public void testPostRequest() throws IOException { equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), equalTo(UrlAttributes.URL_FULL, url.toString()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); testing.waitAndAssertTraces( trace -> @@ -274,8 +275,8 @@ public void getOutputStreamShouldTransformGetIntoPost() throws IOException { equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), equalTo(UrlAttributes.URL_FULL, url.toString()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "POST"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); testing.waitAndAssertTraces( trace -> @@ -316,7 +317,7 @@ public void traceRequestWithConnectionFailure(String scheme) { equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), equalTo(UrlAttributes.URL_FULL, uri), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(SemanticAttributes.ERROR_TYPE, "java.net.ConnectException"))); testing.waitAndAssertTraces( diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy index 30156279a581..810e2079a8fb 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy @@ -9,6 +9,8 @@ import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl @@ -120,8 +122,8 @@ abstract class JaxRsClientTest extends HttpClientTest implem "$SemanticAttributes.SERVER_PORT" uri.port > 0 ? uri.port : { it == null || it == 443 } "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == null } "$UrlAttributes.URL_FULL" "${uri}" - "$SemanticAttributes.HTTP_REQUEST_METHOD" method - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" statusCode + "$HttpAttributes.HTTP_REQUEST_METHOD" method + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" statusCode "$SemanticAttributes.ERROR_TYPE" "$statusCode" } } diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy index 50a8db65aff5..04e7bbc2641a 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy +++ b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy @@ -5,6 +5,8 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import spock.lang.Unroll import javax.ws.rs.DELETE @@ -35,8 +37,8 @@ class JaxRsAnnotations1InstrumentationTest extends AgentInstrumentationSpecifica kind SERVER hasNoParent() attributes { - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_ROUTE" paramName + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_ROUTE" paramName "$SemanticAttributes.ERROR_TYPE" "_OTHER" } } @@ -125,7 +127,7 @@ class JaxRsAnnotations1InstrumentationTest extends AgentInstrumentationSpecifica name "GET" kind SERVER attributes { - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.ERROR_TYPE" "_OTHER" } } diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy index 8252b15425d6..8317ccc97252 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy +++ b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy @@ -6,6 +6,8 @@ import io.dropwizard.testing.junit.ResourceTestRule import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import org.junit.ClassRule import spock.lang.Shared import spock.lang.Unroll @@ -40,8 +42,8 @@ class JerseyTest extends AgentInstrumentationSpecification { name "GET " + expectedRoute kind SERVER attributes { - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_ROUTE" expectedRoute + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_ROUTE" expectedRoute "$SemanticAttributes.ERROR_TYPE" "_OTHER" } } @@ -81,8 +83,8 @@ class JerseyTest extends AgentInstrumentationSpecification { name "GET " + expectedRoute kind SERVER attributes { - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_ROUTE" expectedRoute + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_ROUTE" expectedRoute "$SemanticAttributes.ERROR_TYPE" "_OTHER" } } diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy index b1b6a85ad8d6..5fb550b2dd9a 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy @@ -5,6 +5,8 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import spock.lang.Unroll import javax.ws.rs.DELETE @@ -35,8 +37,8 @@ class JaxrsAnnotationsInstrumentationTest extends AgentInstrumentationSpecificat kind SERVER hasNoParent() attributes { - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_ROUTE" paramName + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_ROUTE" paramName "$SemanticAttributes.ERROR_TYPE" "_OTHER" } } @@ -125,7 +127,7 @@ class JaxrsAnnotationsInstrumentationTest extends AgentInstrumentationSpecificat name "GET" kind SERVER attributes { - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.ERROR_TYPE" "_OTHER" } } diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy index 60cd02210391..fa4937953187 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy @@ -5,6 +5,8 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import spock.lang.Unroll import jakarta.ws.rs.DELETE @@ -35,8 +37,8 @@ class JaxrsAnnotationsInstrumentationTest extends AgentInstrumentationSpecificat kind SERVER hasNoParent() attributes { - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_ROUTE" paramName + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_ROUTE" paramName "$SemanticAttributes.ERROR_TYPE" "_OTHER" } } @@ -125,7 +127,7 @@ class JaxrsAnnotationsInstrumentationTest extends AgentInstrumentationSpecificat name "GET" kind SERVER attributes { - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.ERROR_TYPE" "_OTHER" } } diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy index 5d5ea8a9a491..fa050645dcf6 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy @@ -5,6 +5,8 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import org.junit.jupiter.api.Assumptions import spock.lang.Unroll @@ -130,8 +132,8 @@ abstract class AbstractJaxRsFilterTest extends AgentInstrumentationSpecification kind SERVER if (!runsOnServer()) { attributes { - "$SemanticAttributes.HTTP_REQUEST_METHOD" method - "$SemanticAttributes.HTTP_ROUTE" route + "$HttpAttributes.HTTP_REQUEST_METHOD" method + "$HttpAttributes.HTTP_ROUTE" route "$SemanticAttributes.ERROR_TYPE" "_OTHER" } } diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy index d534759ec86a..5401e0b1dc96 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy @@ -10,6 +10,9 @@ import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import spock.lang.Unroll @@ -288,12 +291,12 @@ abstract class AbstractJaxRsHttpServerTest extends HttpServerTest implemen "$UrlAttributes.URL_SCHEME" fullUrl.getScheme() "$UrlAttributes.URL_PATH" fullUrl.getPath() "$UrlAttributes.URL_QUERY" fullUrl.getQuery() - "$SemanticAttributes.HTTP_REQUEST_METHOD" method - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" statusCode + "$HttpAttributes.HTTP_REQUEST_METHOD" method + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" statusCode "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$SemanticAttributes.CLIENT_ADDRESS" TEST_CLIENT_IP // Optional - "$SemanticAttributes.HTTP_ROUTE" path + "$HttpAttributes.HTTP_ROUTE" path if (fullUrl.getPath().endsWith(ServerEndpoint.CAPTURE_HEADERS.getPath())) { "http.request.header.x-test-request" { it == ["test"] } "http.response.header.x-test-response" { it == ["test"] } diff --git a/instrumentation/jetty/jetty-11.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/JettyHandlerTest.java b/instrumentation/jetty/jetty-11.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/JettyHandlerTest.java index f8face51649a..4b7fd9f9d3b8 100644 --- a/instrumentation/jetty/jetty-11.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/JettyHandlerTest.java +++ b/instrumentation/jetty/jetty-11.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/JettyHandlerTest.java @@ -25,7 +25,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.HttpAttributes; import jakarta.servlet.DispatcherType; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -80,7 +80,7 @@ protected void configure(HttpServerTestOptions options) { options.setHttpAttributes( unused -> Sets.difference( - DEFAULT_HTTP_ATTRIBUTES, Collections.singleton(SemanticAttributes.HTTP_ROUTE))); + DEFAULT_HTTP_ATTRIBUTES, Collections.singleton(HttpAttributes.HTTP_ROUTE))); options.setHasResponseSpan(endpoint -> endpoint == REDIRECT || endpoint == ERROR); options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setHasResponseCustomizer(endpoint -> true); diff --git a/instrumentation/jetty/jetty-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12HandlerTest.java b/instrumentation/jetty/jetty-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12HandlerTest.java index 7087b84d2d87..46b178e06561 100644 --- a/instrumentation/jetty/jetty-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12HandlerTest.java +++ b/instrumentation/jetty/jetty-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12HandlerTest.java @@ -25,7 +25,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.HttpAttributes; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Collections; @@ -61,7 +61,7 @@ protected void configure(HttpServerTestOptions options) { options.setHttpAttributes( unused -> Sets.difference( - DEFAULT_HTTP_ATTRIBUTES, Collections.singleton(SemanticAttributes.HTTP_ROUTE))); + DEFAULT_HTTP_ATTRIBUTES, Collections.singleton(HttpAttributes.HTTP_ROUTE))); options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setHasResponseCustomizer(endpoint -> endpoint != EXCEPTION); } diff --git a/instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JettyHandlerTest.java b/instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JettyHandlerTest.java index 912875c09cd3..b18f7a292065 100644 --- a/instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JettyHandlerTest.java +++ b/instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JettyHandlerTest.java @@ -25,7 +25,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.HttpAttributes; import java.io.IOException; import java.io.Writer; import java.util.Collections; @@ -80,7 +80,7 @@ protected void configure(HttpServerTestOptions options) { options.setHttpAttributes( unused -> Sets.difference( - DEFAULT_HTTP_ATTRIBUTES, Collections.singleton(SemanticAttributes.HTTP_ROUTE))); + DEFAULT_HTTP_ATTRIBUTES, Collections.singleton(HttpAttributes.HTTP_ROUTE))); options.setHasResponseSpan(endpoint -> endpoint == REDIRECT || endpoint == ERROR); options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setHasResponseCustomizer(endpoint -> endpoint != EXCEPTION); diff --git a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy index 45c0ee8ba4e0..55ae6274ab5e 100644 --- a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -10,6 +10,9 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest @@ -94,12 +97,12 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements "$SemanticAttributes.SERVER_PORT" port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" "/jetty-context/" + path "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.HTTP_ROUTE" "/jetty-context/" + route + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_ROUTE" "/jetty-context/" + route "$SemanticAttributes.CLIENT_ADDRESS" { it == null || it == TEST_CLIENT_IP } } } diff --git a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy index 58a4e6baf431..5982cb8ddff5 100644 --- a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -10,6 +10,9 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest @@ -105,12 +108,12 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements "$SemanticAttributes.SERVER_PORT" port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" "/jetty-context/" + path "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.HTTP_ROUTE" "/jetty-context/" + route + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_ROUTE" "/jetty-context/" + route "$SemanticAttributes.CLIENT_ADDRESS" { it == null || it == TEST_CLIENT_IP } } } diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy index e4681cf0b0db..6cd228dc7d99 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy @@ -7,6 +7,9 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient @@ -94,10 +97,10 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" route - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" route + "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port @@ -152,10 +155,10 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" route "$UrlAttributes.URL_QUERY" queryString - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" route + "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port @@ -205,10 +208,10 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" route - "$SemanticAttributes.HTTP_REQUEST_METHOD" "POST" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" route + "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port @@ -268,10 +271,10 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" route - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 500 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 500 "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" route + "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port @@ -336,10 +339,10 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" route - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" route + "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port @@ -384,10 +387,10 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" route - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" route + "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port @@ -464,10 +467,10 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" route - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 500 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 500 "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" route + "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port @@ -514,10 +517,10 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" "/$jspWebappContext/$staticFile" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" route + "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy index 9b8732b5b9ec..d611d23b7f71 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy @@ -7,6 +7,9 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient @@ -92,10 +95,10 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" route - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" route + "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port @@ -161,10 +164,10 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" route - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" route + "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port @@ -209,10 +212,10 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" route - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" route + "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port @@ -305,10 +308,10 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" route - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" route + "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port @@ -387,10 +390,10 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" route - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 500 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 500 "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" route + "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port @@ -449,10 +452,10 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" route - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 404 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 404 "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" route + "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java b/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java index 2bbbdefc5edc..35009459147a 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java +++ b/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpResponse; @@ -81,8 +82,8 @@ void synchronousCall() throws ApiException { UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy?path=path"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo( @@ -128,8 +129,8 @@ void handleErrorsInSyncCall() { UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy?path=path"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 451), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 451), equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo(SemanticAttributes.ERROR_TYPE, "451"), @@ -182,8 +183,8 @@ public void onSuccess( UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy?path=path"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo( @@ -243,8 +244,8 @@ public void onFailure( UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy?path=path"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 451), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 451), equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo(SemanticAttributes.ERROR_TYPE, "451"), diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java b/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java index 0edcd8a36dda..5d941c5f100f 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java +++ b/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java @@ -18,6 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpResponse; @@ -85,8 +86,8 @@ void synchronousCall() throws ApiException { UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy/path"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo( @@ -132,8 +133,8 @@ void handleErrorsInSyncCall() { UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy/path"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 451), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 451), equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo(SemanticAttributes.ERROR_TYPE, "451"), @@ -185,8 +186,8 @@ public void onSuccess( UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy/path"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo( @@ -245,8 +246,8 @@ public void onFailure( UrlAttributes.URL_FULL, mockWebServer.httpUri() + "/api/v1/namespaces/namespace/pods/name/proxy/path"), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 451), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 451), equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo(SemanticAttributes.ERROR_TYPE, "451"), diff --git a/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/Netty38ServerTest.java b/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/Netty38ServerTest.java index d2445d328ad6..a1809bc80c69 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/Netty38ServerTest.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/Netty38ServerTest.java @@ -25,7 +25,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.HttpAttributes; import java.net.InetSocketAddress; import java.net.URI; import java.util.HashSet; @@ -91,7 +91,7 @@ protected void configure(HttpServerTestOptions options) { serverEndpoint -> { Set> attributes = new HashSet<>(HttpServerTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(SemanticAttributes.HTTP_ROUTE); + attributes.remove(HttpAttributes.HTTP_ROUTE); return attributes; }); diff --git a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/Netty40ServerTest.java b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/Netty40ServerTest.java index dedebca21f89..17cc99260974 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/Netty40ServerTest.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/Netty40ServerTest.java @@ -46,7 +46,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.HttpAttributes; import java.net.URI; import java.util.HashSet; import java.util.Set; @@ -212,7 +212,7 @@ protected void configure(HttpServerTestOptions options) { serverEndpoint -> { Set> attributes = new HashSet<>(HttpServerTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(SemanticAttributes.HTTP_ROUTE); + attributes.remove(HttpAttributes.HTTP_ROUTE); return attributes; }); diff --git a/instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ServerTest.java b/instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ServerTest.java index 326067ad179a..6b4a81db73e3 100644 --- a/instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ServerTest.java +++ b/instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ServerTest.java @@ -44,7 +44,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.HttpAttributes; import java.net.URI; import java.util.Collections; @@ -61,7 +61,7 @@ protected void configure(HttpServerTestOptions options) { options.setHttpAttributes( unused -> Sets.difference( - DEFAULT_HTTP_ATTRIBUTES, Collections.singleton(SemanticAttributes.HTTP_ROUTE))); + DEFAULT_HTTP_ATTRIBUTES, Collections.singleton(HttpAttributes.HTTP_ROUTE))); } @Override diff --git a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java index 7827d9b14fef..f5d06eff212d 100644 --- a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java +++ b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java @@ -7,6 +7,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -102,9 +103,9 @@ void shouldGetStatusWithTraces() throws IOException { equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); } @Test @@ -167,9 +168,9 @@ public void onFailure(Exception e) { equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) diff --git a/instrumentation/opentelemetry-instrumentation-api/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/ContextBridgeTest.java b/instrumentation/opentelemetry-instrumentation-api/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/ContextBridgeTest.java index 85381c8596e2..6516f99456c5 100644 --- a/instrumentation/opentelemetry-instrumentation-api/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/ContextBridgeTest.java +++ b/instrumentation/opentelemetry-instrumentation-api/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/ContextBridgeTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.javaagent.instrumentation.testing.AgentSpanTesting; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.Arrays; import java.util.List; @@ -91,8 +92,8 @@ void testHttpRouteHolder_SameSourceAsServerInstrumentationDoesNotOverrideRoute() .hasKind(SpanKind.SERVER) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.HTTP_ROUTE, "/test/server/*"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_ROUTE, "/test/server/*"), equalTo(SemanticAttributes.ERROR_TYPE, "_OTHER")))); } @@ -112,8 +113,8 @@ void testHttpRouteHolder_SourceWithHigherOrderValueOverridesRoute() { .hasKind(SpanKind.SERVER) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.HTTP_ROUTE, "/test/controller/:id"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_ROUTE, "/test/controller/:id"), equalTo(SemanticAttributes.ERROR_TYPE, "_OTHER")))); } } diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/AbstractHttpServerInstrumentationTest.scala b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/AbstractHttpServerInstrumentationTest.scala index d56c55d9e92f..77e8b482641d 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/AbstractHttpServerInstrumentationTest.scala +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/AbstractHttpServerInstrumentationTest.scala @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.{ ServerEndpoint } import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes import java.util import java.util.Collections @@ -30,7 +31,7 @@ abstract class AbstractHttpServerInstrumentationTest val set = new util.HashSet[AttributeKey[_]]( HttpServerTestOptions.DEFAULT_HTTP_ATTRIBUTES ) - set.remove(SemanticAttributes.HTTP_ROUTE) + set.remove(HttpAttributes.HTTP_ROUTE) set } } diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/server/PlayServerTest.groovy b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/server/PlayServerTest.groovy index 72177ac32a14..2f96ebeac089 100644 --- a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/server/PlayServerTest.groovy +++ b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/server/PlayServerTest.groovy @@ -13,6 +13,7 @@ import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes import play.libs.F.Function0 import play.mvc.Results import play.routing.RoutingDsl @@ -117,7 +118,7 @@ class PlayServerTest extends HttpServerTest implements AgentTestTrait { @Override Set> httpAttributes(ServerEndpoint endpoint) { def attributes = super.httpAttributes(endpoint) - attributes.remove(SemanticAttributes.HTTP_ROUTE) + attributes.remove(HttpAttributes.HTTP_ROUTE) attributes } diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/groovy/server/PlayServerTest.groovy b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/groovy/server/PlayServerTest.groovy index 60896ca8cb07..ea23156a44da 100644 --- a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/groovy/server/PlayServerTest.groovy +++ b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/groovy/server/PlayServerTest.groovy @@ -13,6 +13,7 @@ import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes import play.mvc.Results import play.routing.RoutingDsl import play.server.Server @@ -112,7 +113,7 @@ class PlayServerTest extends HttpServerTest implements AgentTestTrait { @Override Set> httpAttributes(ServerEndpoint endpoint) { def attributes = super.httpAttributes(endpoint) - attributes.remove(SemanticAttributes.HTTP_ROUTE) + attributes.remove(HttpAttributes.HTTP_ROUTE) attributes } diff --git a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy index ca10ce44822e..795190773152 100644 --- a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy +++ b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy @@ -9,6 +9,9 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient @@ -103,13 +106,13 @@ abstract class AbstractRatpackRoutesTest extends InstrumentationSpecification { "$SemanticAttributes.CLIENT_ADDRESS" { it == "127.0.0.1" || it == null } "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == null } "$NetworkAttributes.NETWORK_PEER_PORT" { it instanceof Long || it == null } - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" "/$path" "$UrlAttributes.URL_QUERY" { it == "" || it == null } - "$SemanticAttributes.HTTP_ROUTE" "/$route" + "$HttpAttributes.HTTP_ROUTE" "/$route" } } if (hasHandlerSpan()) { diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/OpenTelemetryHttpClient.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/OpenTelemetryHttpClient.java index 18b1b3132aae..aea5fc96faf6 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/OpenTelemetryHttpClient.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/OpenTelemetryHttpClient.java @@ -9,7 +9,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.ratpack.v1_7.internal.ContextHolder; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.HttpAttributes; import ratpack.exec.Execution; import ratpack.http.client.HttpClient; import ratpack.http.client.HttpResponse; @@ -37,7 +37,7 @@ public HttpClient instrument(HttpClient httpClient) throws Exception { Context otelCtx = instrumenter.start(parentOtelCtx, requestSpec); Span span = Span.fromContext(otelCtx); String path = requestSpec.getUri().getPath(); - span.setAttribute(SemanticAttributes.HTTP_ROUTE, path); + span.setAttribute(HttpAttributes.HTTP_ROUTE, path); Execution.current().add(new ContextHolder(otelCtx, requestSpec)); }); diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/client/InstrumentedHttpClientTest.groovy b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/client/InstrumentedHttpClientTest.groovy index 28da0e0b1202..7a6de6f3d980 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/client/InstrumentedHttpClientTest.groovy +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/client/InstrumentedHttpClientTest.groovy @@ -34,9 +34,9 @@ import java.util.concurrent.TimeUnit import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.api.trace.SpanKind.SERVER -import static io.opentelemetry.semconv.SemanticAttributes.HTTP_REQUEST_METHOD -import static io.opentelemetry.semconv.SemanticAttributes.HTTP_ROUTE -import static io.opentelemetry.semconv.SemanticAttributes.HTTP_RESPONSE_STATUS_CODE +import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD +import static io.opentelemetry.semconv.HttpAttributes.HTTP_ROUTE +import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE class InstrumentedHttpClientTest extends Specification { diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerApplicationTest.groovy b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerApplicationTest.groovy index 5f725a86405d..ced2052acce7 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerApplicationTest.groovy +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerApplicationTest.groovy @@ -28,9 +28,9 @@ import spock.util.concurrent.PollingConditions import javax.inject.Singleton -import static io.opentelemetry.semconv.SemanticAttributes.HTTP_REQUEST_METHOD -import static io.opentelemetry.semconv.SemanticAttributes.HTTP_RESPONSE_STATUS_CODE -import static io.opentelemetry.semconv.SemanticAttributes.HTTP_ROUTE +import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD +import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE +import static io.opentelemetry.semconv.HttpAttributes.HTTP_ROUTE import static io.opentelemetry.semconv.UrlAttributes.URL_PATH class RatpackServerApplicationTest extends Specification { diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.groovy b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.groovy index 31380f78ff0a..72fe5f729030 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.groovy +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.groovy @@ -14,6 +14,9 @@ import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter import io.opentelemetry.sdk.trace.SdkTracerProvider import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes import ratpack.exec.Blocking import ratpack.registry.Registry @@ -56,10 +59,10 @@ class RatpackServerTest extends Specification { def attributes = spanData.attributes.asMap() spanData.kind == SpanKind.SERVER - attributes[SemanticAttributes.HTTP_ROUTE] == "/foo" + attributes[HttpAttributes.HTTP_ROUTE] == "/foo" attributes[UrlAttributes.URL_PATH] == "/foo" - attributes[SemanticAttributes.HTTP_REQUEST_METHOD] == "GET" - attributes[SemanticAttributes.HTTP_RESPONSE_STATUS_CODE] == 200L + attributes[HttpAttributes.HTTP_REQUEST_METHOD] == "GET" + attributes[HttpAttributes.HTTP_RESPONSE_STATUS_CODE] == 200L } } } @@ -95,10 +98,10 @@ class RatpackServerTest extends Specification { spanDataChild.events.any { it.name == "an-event" } def attributes = spanData.attributes.asMap() - attributes[SemanticAttributes.HTTP_ROUTE] == "/foo" + attributes[HttpAttributes.HTTP_ROUTE] == "/foo" attributes[UrlAttributes.URL_PATH] == "/foo" - attributes[SemanticAttributes.HTTP_REQUEST_METHOD] == "GET" - attributes[SemanticAttributes.HTTP_RESPONSE_STATUS_CODE] == 200L + attributes[HttpAttributes.HTTP_REQUEST_METHOD] == "GET" + attributes[HttpAttributes.HTTP_RESPONSE_STATUS_CODE] == 200L } } } @@ -153,10 +156,10 @@ class RatpackServerTest extends Specification { spanDataChild2.events.any { it.name == "an-event" } def attributes = spanData.attributes.asMap() - attributes[SemanticAttributes.HTTP_ROUTE] == "/foo" + attributes[HttpAttributes.HTTP_ROUTE] == "/foo" attributes[UrlAttributes.URL_PATH] == "/foo" - attributes[SemanticAttributes.HTTP_REQUEST_METHOD] == "GET" - attributes[SemanticAttributes.HTTP_RESPONSE_STATUS_CODE] == 200L + attributes[HttpAttributes.HTTP_REQUEST_METHOD] == "GET" + attributes[HttpAttributes.HTTP_RESPONSE_STATUS_CODE] == 200L } } } diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java index 27d765d31561..7a16a9cac77e 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java @@ -26,6 +26,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -307,7 +308,7 @@ void shouldEndSpanOnMonoTimeout() { .hasKind(CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, uri.toString()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, uri.getPort()), diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java index 75df8ae88004..b99dc4d62f34 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java @@ -19,6 +19,7 @@ import io.opentelemetry.instrumentation.test.server.http.RequestContextGetter; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -110,9 +111,9 @@ void testSuccessfulRequest() { .hasKind(CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, uri + "/"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.httpPort()), diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java index 4999bd108dd0..bbbeadde6c6d 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java @@ -20,6 +20,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer; import io.opentelemetry.sdk.trace.data.EventData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -91,7 +92,7 @@ void shouldFailSslHandshake() throws SSLException { // message .hasEventsSatisfying(ReactorNettyClientSslTest::isSslHandshakeException) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, uri), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.httpsPort()), @@ -189,10 +190,10 @@ void shouldSuccessfullyEstablishSslHandshake() throws SSLException { .hasKind(CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, uri), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.httpsPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java index 0a06286b17b6..3eddfce3d1b5 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java @@ -19,6 +19,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -100,10 +101,10 @@ void testSuccessfulRequest() { .hasKind(CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, uri), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200), + equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.httpPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), @@ -156,7 +157,7 @@ void testFailingRequest() { .hasStatus(StatusData.error()) .hasException(connectException) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, uri), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java index fbb68cf35bd9..44b937c5b877 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java @@ -27,8 +27,8 @@ /** * Class javax.servlet.http.HttpServletResponse got method getStatus only * in Servlet specification version 3.0. This means that we cannot set {@link - * io.opentelemetry.semconv.SemanticAttributes#HTTP_RESPONSE_STATUS_CODE} attribute on the created - * span using just response object. + * io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE} attribute on the created span + * using just response object. * *

This instrumentation intercepts status setting methods from Servlet 2.0 specification and * stores that status into context store. Then {@link Servlet2Advice#stopSpan(ServletRequest, diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy index 9e0f5b722809..22308266678e 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy @@ -11,6 +11,7 @@ import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.javaagent.bootstrap.servlet.ExperimentalSnippetHolder import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes import javax.servlet.Servlet @@ -86,7 +87,7 @@ abstract class AbstractServlet3Test extends HttpServerTest> httpAttributes(ServerEndpoint endpoint) { def attributes = super.httpAttributes(endpoint) - attributes.remove(SemanticAttributes.HTTP_ROUTE) + attributes.remove(HttpAttributes.HTTP_ROUTE) attributes } diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy index 98eba9d1ed2c..22512e06286b 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy @@ -6,6 +6,7 @@ import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes import jakarta.servlet.Servlet import jakarta.servlet.ServletException import jakarta.servlet.http.HttpServletRequest @@ -24,7 +25,7 @@ class JettyServletHandlerTest extends AbstractServlet5Test { @Override Set> httpAttributes(ServerEndpoint endpoint) { def attributes = super.httpAttributes(endpoint) - attributes.remove(SemanticAttributes.HTTP_ROUTE) + attributes.remove(HttpAttributes.HTTP_ROUTE) attributes } diff --git a/instrumentation/servlet/servlet-5.0/testing/src/main/groovy/test/AbstractServlet5Test.groovy b/instrumentation/servlet/servlet-5.0/testing/src/main/groovy/test/AbstractServlet5Test.groovy index f3ef78ac9274..9a86a6d57955 100644 --- a/instrumentation/servlet/servlet-5.0/testing/src/main/groovy/test/AbstractServlet5Test.groovy +++ b/instrumentation/servlet/servlet-5.0/testing/src/main/groovy/test/AbstractServlet5Test.groovy @@ -13,6 +13,7 @@ import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.javaagent.bootstrap.servlet.ExperimentalSnippetHolder import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes import jakarta.servlet.Servlet import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.AUTH_REQUIRED @@ -97,7 +98,7 @@ abstract class AbstractServlet5Test extends HttpServerTest val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.HTTP_ROUTE, "/param/:param"), + equalTo(HttpAttributes.HTTP_ROUTE, "/param/:param"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, port), diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java index 63fc5b5c180f..fc8a7c52d8b9 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java @@ -9,6 +9,9 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD; +import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; +import static io.opentelemetry.semconv.HttpAttributes.HTTP_ROUTE; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PROTOCOL_VERSION; import static io.opentelemetry.semconv.SemanticAttributes.CLIENT_ADDRESS; import static io.opentelemetry.semconv.SemanticAttributes.ERROR_TYPE; @@ -16,9 +19,6 @@ import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_MESSAGE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_STACKTRACE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_TYPE; -import static io.opentelemetry.semconv.SemanticAttributes.HTTP_REQUEST_METHOD; -import static io.opentelemetry.semconv.SemanticAttributes.HTTP_RESPONSE_STATUS_CODE; -import static io.opentelemetry.semconv.SemanticAttributes.HTTP_ROUTE; import static io.opentelemetry.semconv.SemanticAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.SemanticAttributes.SERVER_PORT; import static io.opentelemetry.semconv.SemanticAttributes.USER_AGENT_ORIGINAL; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java index 6d470d710cce..40defcbf113e 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java @@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -182,7 +183,7 @@ void shouldEndSpanOnMonoTimeout() { .hasKind(CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.HTTP_REQUEST_METHOD, "GET"), + equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, uri.toString()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, uri.getPort()), diff --git a/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy b/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy index 664acd570dba..85b53114e191 100644 --- a/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy +++ b/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy @@ -18,6 +18,8 @@ import com.twilio.type.PhoneNumber import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import org.apache.http.HttpEntity @@ -253,9 +255,9 @@ class TwilioClientTest extends AgentInstrumentationSpecification { attributes { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" - "$SemanticAttributes.HTTP_REQUEST_METHOD.key" "POST" + "$HttpAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE.key" 200 + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE.key" 200 } } } @@ -319,9 +321,9 @@ class TwilioClientTest extends AgentInstrumentationSpecification { attributes { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" - "$SemanticAttributes.HTTP_REQUEST_METHOD.key" "POST" + "$HttpAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE.key" 500 + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE.key" 500 "$SemanticAttributes.ERROR_TYPE" "500" } } @@ -332,9 +334,9 @@ class TwilioClientTest extends AgentInstrumentationSpecification { attributes { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" - "$SemanticAttributes.HTTP_REQUEST_METHOD.key" "POST" + "$HttpAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE.key" 200 + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE.key" 200 } } } @@ -405,9 +407,9 @@ class TwilioClientTest extends AgentInstrumentationSpecification { attributes { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" - "$SemanticAttributes.HTTP_REQUEST_METHOD.key" "POST" + "$HttpAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE.key" 500 + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE.key" 500 "$SemanticAttributes.ERROR_TYPE" "500" } } @@ -418,9 +420,9 @@ class TwilioClientTest extends AgentInstrumentationSpecification { attributes { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" - "$SemanticAttributes.HTTP_REQUEST_METHOD.key" "POST" + "$HttpAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE.key" 200 + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE.key" 200 } } } diff --git a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerDispatchTest.groovy b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerDispatchTest.groovy index fb2ef3a41083..9d9b4d6940ae 100644 --- a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerDispatchTest.groovy +++ b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerDispatchTest.groovy @@ -8,6 +8,7 @@ import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes import io.undertow.Handlers import io.undertow.Undertow import io.undertow.util.Headers @@ -105,7 +106,7 @@ class UndertowServerDispatchTest extends HttpServerTest implements Age @Override Set> httpAttributes(ServerEndpoint endpoint) { def attributes = super.httpAttributes(endpoint) - attributes.remove(SemanticAttributes.HTTP_ROUTE) + attributes.remove(HttpAttributes.HTTP_ROUTE) attributes } } diff --git a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy index d9a77499b03d..ba4e412e09a8 100644 --- a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy +++ b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy @@ -12,6 +12,9 @@ import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse @@ -112,7 +115,7 @@ class UndertowServerTest extends HttpServerTest implements AgentTestTr @Override Set> httpAttributes(ServerEndpoint endpoint) { def attributes = super.httpAttributes(endpoint) - attributes.remove(SemanticAttributes.HTTP_ROUTE) + attributes.remove(HttpAttributes.HTTP_ROUTE) attributes } @@ -149,8 +152,8 @@ class UndertowServerTest extends HttpServerTest implements AgentTestTr "$SemanticAttributes.CLIENT_ADDRESS" TEST_CLIENT_IP "$UrlAttributes.URL_SCHEME" uri.getScheme() "$UrlAttributes.URL_PATH" uri.getPath() - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" uri.host @@ -198,8 +201,8 @@ class UndertowServerTest extends HttpServerTest implements AgentTestTr "$SemanticAttributes.CLIENT_ADDRESS" TEST_CLIENT_IP "$UrlAttributes.URL_SCHEME" uri.getScheme() "$UrlAttributes.URL_PATH" uri.getPath() - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" uri.host diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy index c8274b0993d6..50b71ef1e951 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy @@ -11,6 +11,9 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient @@ -72,11 +75,11 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$SemanticAttributes.SERVER_PORT" Long "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" "$UrlAttributes.URL_PATH" "/listProducts" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_SCHEME" "http" "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" "/listProducts" + "$HttpAttributes.HTTP_ROUTE" "/listProducts" } } span(1) { @@ -164,11 +167,11 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" "$UrlAttributes.URL_PATH" baseUrl "$UrlAttributes.URL_QUERY" "$TEST_REQUEST_ID_PARAMETER=$requestId" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_SCHEME" "http" "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" "/listProducts" + "$HttpAttributes.HTTP_ROUTE" "/listProducts" "${TEST_REQUEST_ID_ATTRIBUTE}" requestId } } diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy index c8274b0993d6..50b71ef1e951 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy @@ -11,6 +11,9 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient @@ -72,11 +75,11 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$SemanticAttributes.SERVER_PORT" Long "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" "$UrlAttributes.URL_PATH" "/listProducts" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_SCHEME" "http" "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" "/listProducts" + "$HttpAttributes.HTTP_ROUTE" "/listProducts" } } span(1) { @@ -164,11 +167,11 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" "$UrlAttributes.URL_PATH" baseUrl "$UrlAttributes.URL_QUERY" "$TEST_REQUEST_ID_PARAMETER=$requestId" - "$SemanticAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.HTTP_RESPONSE_STATUS_CODE" 200 + "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" + "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_SCHEME" "http" "$SemanticAttributes.USER_AGENT_ORIGINAL" String - "$SemanticAttributes.HTTP_ROUTE" "/listProducts" + "$HttpAttributes.HTTP_ROUTE" "/listProducts" "${TEST_REQUEST_ID_ATTRIBUTE}" requestId } } diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index 88c5f52bfb65..34b587d79c68 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -10,7 +10,6 @@ import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; -import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import io.opentelemetry.semconv.incubating.PeerIncubatingAttributes; @@ -22,22 +21,6 @@ public class SemanticAttributes { private SemanticAttributes() {} - public static final AttributeKeyTemplate> HTTP_REQUEST_HEADER = - HttpAttributes.HTTP_REQUEST_HEADER; - public static final AttributeKey HTTP_REQUEST_METHOD = HttpAttributes.HTTP_REQUEST_METHOD; - public static final AttributeKey HTTP_REQUEST_METHOD_ORIGINAL = - HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL; - public static final AttributeKey HTTP_REQUEST_RESEND_COUNT = - HttpAttributes.HTTP_REQUEST_RESEND_COUNT; - public static final AttributeKey HTTP_RESPONSE_STATUS_CODE = - HttpAttributes.HTTP_RESPONSE_STATUS_CODE; - public static final AttributeKey HTTP_ROUTE = HttpAttributes.HTTP_ROUTE; - - public static final AttributeKey HTTP_REQUEST_BODY_SIZE = - HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE; - public static final AttributeKey HTTP_RESPONSE_BODY_SIZE = - HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE; - public static final AttributeKey ERROR_TYPE = ErrorAttributes.ERROR_TYPE; public static final AttributeKey USER_AGENT_ORIGINAL = diff --git a/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java b/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java index e322746ccad9..f76981fbb0b3 100644 --- a/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java @@ -32,6 +32,7 @@ import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.export.SpanExporter; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.spring.smoketest.OtelSpringStarterSmokeTestApplication; import io.opentelemetry.spring.smoketest.OtelSpringStarterSmokeTestController; @@ -201,9 +202,9 @@ void shouldSendTelemetry() throws InterruptedException { true) .hasAttribute( AttributeKey.stringKey("attributeFromYaml"), "true")) - .hasAttribute(SemanticAttributes.HTTP_REQUEST_METHOD, "GET") - .hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L) - .hasAttribute(SemanticAttributes.HTTP_ROUTE, "/ping"))); + .hasAttribute(HttpAttributes.HTTP_REQUEST_METHOD, "GET") + .hasAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L) + .hasAttribute(HttpAttributes.HTTP_ROUTE, "/ping"))); // Metric List exportedMetrics = METRIC_EXPORTER.getFinishedMetricItems(); diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy index 3e55f86a0d48..8355a0eda8e6 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy @@ -7,6 +7,7 @@ package io.opentelemetry.smoketest import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes import spock.lang.IgnoreIf import java.time.Duration @@ -37,7 +38,7 @@ class PlaySmokeTest extends SmokeTest { countSpansByName(traces, 'GET /welcome') == 1 // SERVER span countSpansByName(traces, '/welcome') == 1 // INTERNAL span - new TraceInspector(traces).countFilteredAttributes(SemanticAttributes.HTTP_ROUTE.key, "/welcome") == 1 + new TraceInspector(traces).countFilteredAttributes(HttpAttributes.HTTP_ROUTE.key, "/welcome") == 1 cleanup: stopTarget() diff --git a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy index 0ada963a2693..979fc37a369d 100644 --- a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy +++ b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy @@ -20,6 +20,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest import io.opentelemetry.testing.internal.armeria.common.HttpMethod import spock.lang.Shared @@ -58,7 +59,7 @@ abstract class HttpServerTest extends InstrumentationSpecification imple String expectedHttpRoute(ServerEndpoint endpoint, String method) { // no need to compute route if we're not expecting it - if (!httpAttributes(endpoint).contains(SemanticAttributes.HTTP_ROUTE)) { + if (!httpAttributes(endpoint).contains(HttpAttributes.HTTP_ROUTE)) { return null } @@ -175,7 +176,7 @@ abstract class HttpServerTest extends InstrumentationSpecification imple /** A list of additional HTTP server span attributes extracted by the instrumentation per URI. */ Set> httpAttributes(ServerEndpoint endpoint) { [ - SemanticAttributes.HTTP_ROUTE, + HttpAttributes.HTTP_ROUTE, NetworkAttributes.NETWORK_PEER_PORT ] as Set } diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java index 826967df0679..c7410de76e17 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java @@ -24,6 +24,7 @@ import io.opentelemetry.sdk.testing.assertj.TraceAssert; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -135,7 +136,7 @@ void requestWithNonStandardHttpMethod() throws Exception { span -> assertClientSpan(span, uri, HttpConstants._OTHER, responseCode, null) .hasNoParent() - .hasAttribute(SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL, method))); + .hasAttribute(HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL, method))); } @ParameterizedTest @@ -254,7 +255,7 @@ void basicRequestWith1Redirect() throws Exception { if (options.isLowLevelInstrumentation()) { testing.waitAndAssertSortedTraces( - comparingRootSpanAttribute(SemanticAttributes.HTTP_REQUEST_RESEND_COUNT), + comparingRootSpanAttribute(HttpAttributes.HTTP_REQUEST_RESEND_COUNT), trace -> { trace.hasSpansSatisfyingExactly( span -> @@ -294,7 +295,7 @@ void basicRequestWith2Redirects() throws Exception { if (options.isLowLevelInstrumentation()) { testing.waitAndAssertSortedTraces( - comparingRootSpanAttribute(SemanticAttributes.HTTP_REQUEST_RESEND_COUNT), + comparingRootSpanAttribute(HttpAttributes.HTTP_REQUEST_RESEND_COUNT), trace -> { trace.hasSpansSatisfyingExactly( span -> @@ -353,7 +354,7 @@ void circularRedirects() { if (options.isLowLevelInstrumentation()) { testing.waitAndAssertSortedTraces( - comparingRootSpanAttribute(SemanticAttributes.HTTP_REQUEST_RESEND_COUNT), + comparingRootSpanAttribute(HttpAttributes.HTTP_REQUEST_RESEND_COUNT), IntStream.range(0, options.getMaxRedirects()) .mapToObj(i -> makeCircularRedirectAssertForLolLevelTrace(uri, method, i)) .collect(Collectors.toList())); @@ -400,7 +401,7 @@ void redirectToSecuredCopiesAuthHeader() throws Exception { if (options.isLowLevelInstrumentation()) { testing.waitAndAssertSortedTraces( - comparingRootSpanAttribute(SemanticAttributes.HTTP_REQUEST_RESEND_COUNT), + comparingRootSpanAttribute(HttpAttributes.HTTP_REQUEST_RESEND_COUNT), trace -> { trace.hasSpansSatisfyingExactly( span -> @@ -1008,8 +1009,8 @@ SpanDataAssert assertClientSpan( if (httpClientAttributes.contains(UrlAttributes.URL_FULL)) { assertThat(attrs).containsEntry(UrlAttributes.URL_FULL, uri.toString()); } - if (httpClientAttributes.contains(SemanticAttributes.HTTP_REQUEST_METHOD)) { - assertThat(attrs).containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD, method); + if (httpClientAttributes.contains(HttpAttributes.HTTP_REQUEST_METHOD)) { + assertThat(attrs).containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, method); } // opt-in, not collected by default @@ -1017,24 +1018,22 @@ SpanDataAssert assertClientSpan( if (responseCode != null) { assertThat(attrs) - .containsEntry( - SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, (long) responseCode); + .containsEntry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, (long) responseCode); if (responseCode >= 400) { assertThat(attrs) .containsEntry(SemanticAttributes.ERROR_TYPE, String.valueOf(responseCode)); } } else { - assertThat(attrs).doesNotContainKey(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE); + assertThat(attrs).doesNotContainKey(HttpAttributes.HTTP_RESPONSE_STATUS_CODE); // TODO: add more detailed assertions, per url assertThat(attrs).containsKey(SemanticAttributes.ERROR_TYPE); } if (resendCount != null) { assertThat(attrs) - .containsEntry( - SemanticAttributes.HTTP_REQUEST_RESEND_COUNT, (long) resendCount); + .containsEntry(HttpAttributes.HTTP_REQUEST_RESEND_COUNT, (long) resendCount); } else { - assertThat(attrs).doesNotContainKey(SemanticAttributes.HTTP_REQUEST_RESEND_COUNT); + assertThat(attrs).doesNotContainKey(HttpAttributes.HTTP_REQUEST_RESEND_COUNT); } }); } diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java index 1df66a7cde9e..c66fb4cfb210 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java @@ -32,6 +32,7 @@ import io.opentelemetry.sdk.testing.assertj.TraceAssert; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -514,7 +515,7 @@ void requestWithNonStandardHttpMethod() throws InterruptedException { HttpConstants._OTHER, SUCCESS, options.responseCodeOnNonStandardHttpMethod) - .hasAttribute(SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL, method))); + .hasAttribute(HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL, method))); } finally { eventLoopGroup.shutdownGracefully().await(10, TimeUnit.SECONDS); } @@ -765,9 +766,9 @@ protected SpanDataAssert assertServerSpan( // client.port is opt-in assertThat(attrs).doesNotContainKey(SemanticAttributes.CLIENT_PORT); - assertThat(attrs).containsEntry(SemanticAttributes.HTTP_REQUEST_METHOD, method); + assertThat(attrs).containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, method); - assertThat(attrs).containsEntry(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, statusCode); + assertThat(attrs).containsEntry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, statusCode); if (statusCode >= 500) { assertThat(attrs) .containsEntry(SemanticAttributes.ERROR_TYPE, String.valueOf(statusCode)); @@ -784,8 +785,8 @@ protected SpanDataAssert assertServerSpan( } } - if (httpAttributes.contains(SemanticAttributes.HTTP_ROUTE) && expectedRoute != null) { - assertThat(attrs).containsEntry(SemanticAttributes.HTTP_ROUTE, expectedRoute); + if (httpAttributes.contains(HttpAttributes.HTTP_ROUTE) && expectedRoute != null) { + assertThat(attrs).containsEntry(HttpAttributes.HTTP_ROUTE, expectedRoute); } if (endpoint == CAPTURE_HEADERS) { @@ -831,7 +832,7 @@ public String expectedServerSpanName( public String expectedHttpRoute(ServerEndpoint endpoint, String method) { // no need to compute route if we're not expecting it - if (!options.httpAttributes.apply(endpoint).contains(SemanticAttributes.HTTP_ROUTE)) { + if (!options.httpAttributes.apply(endpoint).contains(HttpAttributes.HTTP_ROUTE)) { return null; } diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java index 73a25082eba6..4f2c9efab96c 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java @@ -9,6 +9,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.instrumentation.api.internal.HttpConstants; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -33,7 +34,7 @@ public abstract class HttpClientTestOptions { SemanticAttributes.SERVER_ADDRESS, SemanticAttributes.SERVER_PORT, UrlAttributes.URL_FULL, - SemanticAttributes.HTTP_REQUEST_METHOD))); + HttpAttributes.HTTP_REQUEST_METHOD))); public static final BiFunction DEFAULT_EXPECTED_CLIENT_SPAN_NAME_MAPPER = (uri, method) -> HttpConstants._OTHER.equals(method) ? "HTTP" : method; diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpServerTestOptions.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpServerTestOptions.java index 957ff7dae578..a04f94cc393e 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpServerTestOptions.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpServerTestOptions.java @@ -10,6 +10,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.instrumentation.api.internal.HttpConstants; +import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.Arrays; import java.util.Collections; @@ -25,8 +26,7 @@ public final class HttpServerTestOptions { public static final Set> DEFAULT_HTTP_ATTRIBUTES = Collections.unmodifiableSet( - new HashSet<>( - Arrays.asList(SemanticAttributes.HTTP_ROUTE, SemanticAttributes.SERVER_PORT))); + new HashSet<>(Arrays.asList(HttpAttributes.HTTP_ROUTE, SemanticAttributes.SERVER_PORT))); public static final SpanNameMapper DEFAULT_EXPECTED_SERVER_SPAN_NAME_MAPPER = (uri, method, route) -> { From 89e3807474509632bfd9b8a1755d6e9551e88df4 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:00:51 +0200 Subject: [PATCH 08/52] ERROR_* and USER_AGENT_* --- .../http/HttpExperimentalMetricsAdvice.java | 5 +++-- .../HttpClientExperimentalMetricsTest.java | 7 +++--- .../HttpServerExperimentalMetricsTest.java | 7 +++--- .../http/HttpCommonAttributesExtractor.java | 4 ++-- .../api/semconv/http/HttpMetricsAdvice.java | 5 +++-- .../http/HttpServerAttributesExtractor.java | 4 ++-- .../HttpClientAttributesExtractorTest.java | 11 +++++----- .../semconv/http/HttpClientMetricsTest.java | 5 +++-- .../HttpServerAttributesExtractorTest.java | 14 ++++++------ .../semconv/http/HttpServerMetricsTest.java | 5 +++-- .../ApiGatewayProxyAttributesExtractor.java | 2 +- .../v2_2/AwsLambdaApiGatewayWrapperTest.java | 3 ++- .../awssdk/v1_11/Aws1ClientTest.groovy | 3 ++- .../groovy/Aws0ClientTest.groovy | 7 +++--- .../v1_11/AbstractAws1ClientTest.groovy | 5 +++-- .../apachecamel/RestCamelTest.java | 3 ++- .../TwoServicesWithDirectClientCamelTest.java | 3 ++- .../AbstractGoogleHttpClientTest.java | 3 ++- .../HttpUrlConnectionTest.java | 3 ++- .../src/test/groovy/JaxRsClientTest.groovy | 3 ++- ...axRsAnnotations1InstrumentationTest.groovy | 5 +++-- .../src/test/groovy/JerseyTest.groovy | 5 +++-- ...JaxrsAnnotationsInstrumentationTest.groovy | 5 +++-- ...JaxrsAnnotationsInstrumentationTest.groovy | 5 +++-- .../groovy/AbstractJaxRsFilterTest.groovy | 3 ++- .../groovy/AbstractJaxRsHttpServerTest.groovy | 6 +++-- .../src/main/groovy/BaseJsfTest.groovy | 3 ++- .../src/main/groovy/BaseJsfTest.groovy | 3 ++- .../JspInstrumentationBasicTests.groovy | 22 ++++++++++--------- .../JspInstrumentationForwardTests.groovy | 16 ++++++++------ .../KubernetesClientTest.java | 5 +++-- .../KubernetesClientVer20Test.java | 5 +++-- .../instrumentationapi/ContextBridgeTest.java | 6 ++--- .../server/AbstractRatpackRoutesTest.groovy | 3 ++- .../AbstractReactorNettyHttpClientTest.java | 3 ++- .../v1_0/ReactorNettyClientSslTest.java | 3 ++- .../v1_0/ReactorNettyConnectionSpanTest.java | 4 ++-- .../sparkjava/SparkJavaBasedTest.java | 3 ++- .../v5_0/server/SpringWebfluxTest.java | 4 ++-- ...pringWebfluxClientInstrumentationTest.java | 3 ++- .../test/groovy/test/TwilioClientTest.groovy | 5 +++-- .../src/test/groovy/UndertowServerTest.groovy | 5 +++-- .../VertxReactivePropagationTest.groovy | 5 +++-- .../VertxReactivePropagationTest.groovy | 5 +++-- .../semconv/SemanticAttributes.java | 5 ----- .../junit/http/AbstractHttpClientTest.java | 8 ++++--- .../junit/http/AbstractHttpServerTest.java | 7 +++--- 47 files changed, 145 insertions(+), 109 deletions(-) diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java index 7aab3bc04dca..aea78913721c 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java @@ -11,6 +11,7 @@ import io.opentelemetry.api.metrics.LongUpDownCounterBuilder; import io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder; import io.opentelemetry.extension.incubator.metrics.ExtendedLongUpDownCounterBuilder; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; @@ -27,7 +28,7 @@ static void applyClientRequestSizeAdvice(LongHistogramBuilder builder) { asList( HttpAttributes.HTTP_REQUEST_METHOD, HttpAttributes.HTTP_RESPONSE_STATUS_CODE, - SemanticAttributes.ERROR_TYPE, + ErrorAttributes.ERROR_TYPE, NetworkAttributes.NETWORK_PROTOCOL_NAME, NetworkAttributes.NETWORK_PROTOCOL_VERSION, SemanticAttributes.SERVER_ADDRESS, @@ -45,7 +46,7 @@ static void applyServerRequestSizeAdvice(LongHistogramBuilder builder) { HttpAttributes.HTTP_ROUTE, HttpAttributes.HTTP_REQUEST_METHOD, HttpAttributes.HTTP_RESPONSE_STATUS_CODE, - SemanticAttributes.ERROR_TYPE, + ErrorAttributes.ERROR_TYPE, NetworkAttributes.NETWORK_PROTOCOL_NAME, NetworkAttributes.NETWORK_PROTOCOL_VERSION, UrlAttributes.URL_SCHEME)); diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java index 7c91f1a631e0..98d114e6e12a 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java @@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; @@ -49,7 +50,7 @@ void collectsMetrics() { Attributes responseAttributes = Attributes.builder() .put(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200) - .put(SemanticAttributes.ERROR_TYPE, "400") + .put(ErrorAttributes.ERROR_TYPE, "400") .put(HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE, 100) .put(HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE, 200) .put(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http") @@ -94,7 +95,7 @@ void collectsMetrics() { .hasAttributesSatisfying( equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.ERROR_TYPE, "400"), + equalTo(ErrorAttributes.ERROR_TYPE, "400"), equalTo( NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( @@ -120,7 +121,7 @@ void collectsMetrics() { .hasAttributesSatisfying( equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.ERROR_TYPE, "400"), + equalTo(ErrorAttributes.ERROR_TYPE, "400"), equalTo( NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java index d11be89388b1..b1a09c79d8f0 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java @@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; @@ -53,7 +54,7 @@ void collectsMetrics() { Attributes responseAttributes = Attributes.builder() .put(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200) - .put(SemanticAttributes.ERROR_TYPE, "500") + .put(ErrorAttributes.ERROR_TYPE, "500") .put(HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE, 100) .put(HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE, 200) .put(NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4") @@ -158,7 +159,7 @@ void collectsMetrics() { .hasAttributesSatisfying( equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.ERROR_TYPE, "500"), + equalTo(ErrorAttributes.ERROR_TYPE, "500"), equalTo( NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( @@ -183,7 +184,7 @@ void collectsMetrics() { .hasAttributesSatisfying( equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.ERROR_TYPE, "500"), + equalTo(ErrorAttributes.ERROR_TYPE, "500"), equalTo( NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpCommonAttributesExtractor.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpCommonAttributesExtractor.java index 1bc5a8aa9e5f..3748a767cf5c 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpCommonAttributesExtractor.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpCommonAttributesExtractor.java @@ -15,9 +15,9 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import java.util.HashSet; import java.util.List; import java.util.Locale; @@ -112,7 +112,7 @@ public void onEnd( errorType = _OTHER; } } - internalSet(attributes, SemanticAttributes.ERROR_TYPE, errorType); + internalSet(attributes, ErrorAttributes.ERROR_TYPE, errorType); String protocolName = lowercaseStr(getter.getNetworkProtocolName(request, response)); String protocolVersion = lowercaseStr(getter.getNetworkProtocolVersion(request, response)); diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java index d68ca64aa3d3..a2474eda8df3 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java @@ -10,6 +10,7 @@ import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; @@ -31,7 +32,7 @@ static void applyClientDurationAdvice(DoubleHistogramBuilder builder) { asList( HttpAttributes.HTTP_REQUEST_METHOD, HttpAttributes.HTTP_RESPONSE_STATUS_CODE, - SemanticAttributes.ERROR_TYPE, + ErrorAttributes.ERROR_TYPE, NetworkAttributes.NETWORK_PROTOCOL_NAME, NetworkAttributes.NETWORK_PROTOCOL_VERSION, SemanticAttributes.SERVER_ADDRESS, @@ -48,7 +49,7 @@ static void applyServerDurationAdvice(DoubleHistogramBuilder builder) { HttpAttributes.HTTP_ROUTE, HttpAttributes.HTTP_REQUEST_METHOD, HttpAttributes.HTTP_RESPONSE_STATUS_CODE, - SemanticAttributes.ERROR_TYPE, + ErrorAttributes.ERROR_TYPE, NetworkAttributes.NETWORK_PROTOCOL_NAME, NetworkAttributes.NETWORK_PROTOCOL_VERSION, UrlAttributes.URL_SCHEME)); diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractor.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractor.java index 4e1517e1e441..ed6077eab787 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractor.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractor.java @@ -18,7 +18,7 @@ import io.opentelemetry.instrumentation.api.semconv.network.internal.InternalServerAttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.url.internal.InternalUrlAttributesExtractor; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.UserAgentAttributes; import java.util.function.Function; import javax.annotation.Nullable; @@ -82,7 +82,7 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST internalClientExtractor.onStart(attributes, request); internalSet(attributes, HttpAttributes.HTTP_ROUTE, getter.getHttpRoute(request)); - internalSet(attributes, SemanticAttributes.USER_AGENT_ORIGINAL, userAgent(request)); + internalSet(attributes, UserAgentAttributes.USER_AGENT_ORIGINAL, userAgent(request)); } @Override diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java index 005cdd33994f..050654bf286b 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.internal.HttpConstants; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; @@ -300,7 +301,7 @@ void shouldExtractErrorType_httpStatusCode() { assertThat(attributes.build()) .containsEntry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 400) - .containsEntry(SemanticAttributes.ERROR_TYPE, "400"); + .containsEntry(ErrorAttributes.ERROR_TYPE, "400"); } @Test @@ -316,8 +317,7 @@ void shouldExtractErrorType_getter() { extractor.onStart(attributes, Context.root(), emptyMap()); extractor.onEnd(attributes, Context.root(), request, emptyMap(), null); - assertThat(attributes.build()) - .containsEntry(SemanticAttributes.ERROR_TYPE, "custom error type"); + assertThat(attributes.build()).containsEntry(ErrorAttributes.ERROR_TYPE, "custom error type"); } @Test @@ -330,7 +330,7 @@ void shouldExtractErrorType_exceptionClassName() { extractor.onEnd(attributes, Context.root(), emptyMap(), emptyMap(), new ConnectException()); assertThat(attributes.build()) - .containsEntry(SemanticAttributes.ERROR_TYPE, "java.net.ConnectException"); + .containsEntry(ErrorAttributes.ERROR_TYPE, "java.net.ConnectException"); } @Test @@ -342,8 +342,7 @@ void shouldExtractErrorType_other() { extractor.onStart(attributes, Context.root(), emptyMap()); extractor.onEnd(attributes, Context.root(), emptyMap(), emptyMap(), null); - assertThat(attributes.build()) - .containsEntry(SemanticAttributes.ERROR_TYPE, HttpConstants._OTHER); + assertThat(attributes.build()).containsEntry(ErrorAttributes.ERROR_TYPE, HttpConstants._OTHER); } @Test diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java index bde17eb38538..ddfeed1a8a63 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java @@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; @@ -51,7 +52,7 @@ void collectsMetrics() { Attributes responseAttributes = Attributes.builder() .put(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200) - .put(SemanticAttributes.ERROR_TYPE, "400") + .put(ErrorAttributes.ERROR_TYPE, "400") .put(HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE, 100) .put(HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE, 200) .put(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http") @@ -96,7 +97,7 @@ void collectsMetrics() { .hasAttributesSatisfying( equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.ERROR_TYPE, "400"), + equalTo(ErrorAttributes.ERROR_TYPE, "400"), equalTo( NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java index 51d8ddd9ede0..13114189b3de 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java @@ -18,10 +18,12 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.internal.HttpConstants; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.UserAgentAttributes; import java.net.ConnectException; import java.util.HashMap; import java.util.HashSet; @@ -201,7 +203,7 @@ void normal() { entry(UrlAttributes.URL_SCHEME, "https"), entry(UrlAttributes.URL_PATH, "/repositories/1"), entry(UrlAttributes.URL_QUERY, "details=true"), - entry(SemanticAttributes.USER_AGENT_ORIGINAL, "okhttp 3.x"), + entry(UserAgentAttributes.USER_AGENT_ORIGINAL, "okhttp 3.x"), entry(HttpAttributes.HTTP_ROUTE, "/repositories/{id}"), entry(SemanticAttributes.CLIENT_ADDRESS, "1.1.1.1"), entry( @@ -330,7 +332,7 @@ void shouldExtractErrorType_httpStatusCode() { assertThat(attributes.build()) .containsEntry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 500) - .containsEntry(SemanticAttributes.ERROR_TYPE, "500"); + .containsEntry(ErrorAttributes.ERROR_TYPE, "500"); } @Test @@ -346,8 +348,7 @@ void shouldExtractErrorType_getter() { extractor.onStart(attributes, Context.root(), emptyMap()); extractor.onEnd(attributes, Context.root(), request, emptyMap(), null); - assertThat(attributes.build()) - .containsEntry(SemanticAttributes.ERROR_TYPE, "custom error type"); + assertThat(attributes.build()).containsEntry(ErrorAttributes.ERROR_TYPE, "custom error type"); } @Test @@ -360,7 +361,7 @@ void shouldExtractErrorType_exceptionClassName() { extractor.onEnd(attributes, Context.root(), emptyMap(), emptyMap(), new ConnectException()); assertThat(attributes.build()) - .containsEntry(SemanticAttributes.ERROR_TYPE, "java.net.ConnectException"); + .containsEntry(ErrorAttributes.ERROR_TYPE, "java.net.ConnectException"); } @Test @@ -372,8 +373,7 @@ void shouldExtractErrorType_other() { extractor.onStart(attributes, Context.root(), emptyMap()); extractor.onEnd(attributes, Context.root(), emptyMap(), emptyMap(), null); - assertThat(attributes.build()) - .containsEntry(SemanticAttributes.ERROR_TYPE, HttpConstants._OTHER); + assertThat(attributes.build()).containsEntry(ErrorAttributes.ERROR_TYPE, HttpConstants._OTHER); } @Test diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java index 6a3fd0c6cf11..7bc0c709b201 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java @@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; @@ -55,7 +56,7 @@ void collectsMetrics() { Attributes responseAttributes = Attributes.builder() .put(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200) - .put(SemanticAttributes.ERROR_TYPE, "500") + .put(ErrorAttributes.ERROR_TYPE, "500") .put(HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE, 100) .put(HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE, 200) .put(NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4") @@ -101,7 +102,7 @@ void collectsMetrics() { .hasAttributesSatisfying( equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.ERROR_TYPE, "500"), + equalTo(ErrorAttributes.ERROR_TYPE, "500"), equalTo( NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java index f678703bebab..536f80dbbf60 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java @@ -11,7 +11,7 @@ import static io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.MapUtils.lowercaseMap; import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; import static io.opentelemetry.semconv.SemanticAttributes.FAAS_TRIGGER; -import static io.opentelemetry.semconv.SemanticAttributes.USER_AGENT_ORIGINAL; +import static io.opentelemetry.semconv.UserAgentAttributes.USER_AGENT_ORIGINAL; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent; diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java index e8d13fe89725..21b10bd04144 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java @@ -21,6 +21,7 @@ import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.UserAgentAttributes; import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.AfterEach; @@ -105,7 +106,7 @@ void tracedWithHttpPropagation() { equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"), equalTo(SemanticAttributes.FAAS_TRIGGER, "http"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.USER_AGENT_ORIGINAL, "Test Client"), + equalTo(UserAgentAttributes.USER_AGENT_ORIGINAL, "Test Client"), equalTo( UrlAttributes.URL_FULL, "http://localhost:123/hello/world?a=b&c=d"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy index 0e048330fde5..81c947ea248d 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy @@ -20,6 +20,7 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractAws1ClientTest import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes @@ -110,7 +111,7 @@ class Aws1ClientTest extends AbstractAws1ClientTest implements AgentTestTrait { "aws.endpoint" "https://s3.amazonaws.com" "aws.agent" "java-aws-sdk" "aws.bucket.name" "someBucket" - "$SemanticAttributes.ERROR_TYPE" IllegalStateException.name + "$ErrorAttributes.ERROR_TYPE" IllegalStateException.name } } } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy index c8ad943a5df4..e884c142e8c9 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy @@ -25,6 +25,7 @@ import com.amazonaws.services.s3.S3ClientOptions import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes @@ -184,7 +185,7 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { for (def addedTag : additionalAttributes) { "$addedTag.key" "$addedTag.value" } - "$SemanticAttributes.ERROR_TYPE" AmazonClientException.name + "$ErrorAttributes.ERROR_TYPE" AmazonClientException.name } } } @@ -229,7 +230,7 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { "aws.endpoint" "https://s3.amazonaws.com" "aws.agent" "java-aws-sdk" "aws.bucket.name" "someBucket" - "$SemanticAttributes.ERROR_TYPE" IllegalStateException.name + "$ErrorAttributes.ERROR_TYPE" IllegalStateException.name } } } @@ -273,7 +274,7 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { "aws.endpoint" "${server.httpUri()}" "aws.agent" "java-aws-sdk" "aws.bucket.name" "someBucket" - "$SemanticAttributes.ERROR_TYPE" AmazonClientException.name + "$ErrorAttributes.ERROR_TYPE" AmazonClientException.name } } } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy index 34eae685a5a3..8fcd39b823b7 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy @@ -32,6 +32,7 @@ import com.amazonaws.services.sns.model.PublishRequest import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes @@ -217,7 +218,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { for (def addedTag : additionalAttributes) { "$addedTag.key" "$addedTag.value" } - "$SemanticAttributes.ERROR_TYPE" SdkClientException.name + "$ErrorAttributes.ERROR_TYPE" SdkClientException.name } } } @@ -271,7 +272,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { "aws.endpoint" "${server.httpUri()}" "aws.agent" "java-aws-sdk" "aws.bucket.name" "someBucket" - "$SemanticAttributes.ERROR_TYPE" {it == SdkClientException.name || it == AmazonClientException.name } + "$ErrorAttributes.ERROR_TYPE" {it == SdkClientException.name || it == AmazonClientException.name } } } } diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java index f873655681cd..3127ad8a4450 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.UserAgentAttributes; import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.junit.jupiter.api.AfterAll; @@ -111,7 +112,7 @@ void restComponentServerAndClientCallWithJettyBackend() { equalTo(SemanticAttributes.CLIENT_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( - SemanticAttributes.USER_AGENT_ORIGINAL, + UserAgentAttributes.USER_AGENT_ORIGINAL, val -> val.isInstanceOf(String.class)), satisfies( NetworkAttributes.NETWORK_PEER_PORT, diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java index dff9259a76c0..8fc671d89e97 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java @@ -19,6 +19,7 @@ import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.UserAgentAttributes; import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; @@ -153,7 +154,7 @@ void twoCamelServiceSpans() throws Exception { equalTo(UrlAttributes.URL_SCHEME, "http"), equalTo(UrlAttributes.URL_PATH, "/serviceTwo"), equalTo( - SemanticAttributes.USER_AGENT_ORIGINAL, + UserAgentAttributes.USER_AGENT_ORIGINAL, "Jakarta Commons-HttpClient/3.1"), equalTo(HttpAttributes.HTTP_ROUTE, "/serviceTwo"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), diff --git a/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java b/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java index 12f67d0b5e7d..f235b96fc390 100644 --- a/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java +++ b/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java @@ -23,6 +23,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; @@ -105,7 +106,7 @@ void errorTracesWhenExceptionIsNotThrown() throws Exception { equalTo(UrlAttributes.URL_FULL, uri.toString()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 500), - equalTo(SemanticAttributes.ERROR_TYPE, "500"))); + equalTo(ErrorAttributes.ERROR_TYPE, "500"))); testing.waitAndAssertTraces( trace -> diff --git a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java index 465cff10059f..48f58946630d 100644 --- a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java +++ b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java @@ -21,6 +21,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; @@ -318,7 +319,7 @@ public void traceRequestWithConnectionFailure(String scheme) { equalTo(SemanticAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), equalTo(UrlAttributes.URL_FULL, uri), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.ERROR_TYPE, "java.net.ConnectException"))); + equalTo(ErrorAttributes.ERROR_TYPE, "java.net.ConnectException"))); testing.waitAndAssertTraces( trace -> diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy index 810e2079a8fb..d0114d9c2d84 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy @@ -9,6 +9,7 @@ import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes @@ -124,7 +125,7 @@ abstract class JaxRsClientTest extends HttpClientTest implem "$UrlAttributes.URL_FULL" "${uri}" "$HttpAttributes.HTTP_REQUEST_METHOD" method "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" statusCode - "$SemanticAttributes.ERROR_TYPE" "$statusCode" + "$ErrorAttributes.ERROR_TYPE" "$statusCode" } } serverSpan(it, 1, span(0)) diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy index 04e7bbc2641a..b2f48d02cf72 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy +++ b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy @@ -5,6 +5,7 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import spock.lang.Unroll @@ -39,7 +40,7 @@ class JaxRsAnnotations1InstrumentationTest extends AgentInstrumentationSpecifica attributes { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_ROUTE" paramName - "$SemanticAttributes.ERROR_TYPE" "_OTHER" + "$ErrorAttributes.ERROR_TYPE" "_OTHER" } } span(1) { @@ -128,7 +129,7 @@ class JaxRsAnnotations1InstrumentationTest extends AgentInstrumentationSpecifica kind SERVER attributes { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.ERROR_TYPE" "_OTHER" + "$ErrorAttributes.ERROR_TYPE" "_OTHER" } } } diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy index 8317ccc97252..8ec8bf4868e8 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy +++ b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy @@ -6,6 +6,7 @@ import io.dropwizard.testing.junit.ResourceTestRule import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import org.junit.ClassRule @@ -44,7 +45,7 @@ class JerseyTest extends AgentInstrumentationSpecification { attributes { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_ROUTE" expectedRoute - "$SemanticAttributes.ERROR_TYPE" "_OTHER" + "$ErrorAttributes.ERROR_TYPE" "_OTHER" } } @@ -85,7 +86,7 @@ class JerseyTest extends AgentInstrumentationSpecification { attributes { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_ROUTE" expectedRoute - "$SemanticAttributes.ERROR_TYPE" "_OTHER" + "$ErrorAttributes.ERROR_TYPE" "_OTHER" } } span(1) { diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy index 5fb550b2dd9a..dbdc29cb0f39 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy @@ -5,6 +5,7 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import spock.lang.Unroll @@ -39,7 +40,7 @@ class JaxrsAnnotationsInstrumentationTest extends AgentInstrumentationSpecificat attributes { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_ROUTE" paramName - "$SemanticAttributes.ERROR_TYPE" "_OTHER" + "$ErrorAttributes.ERROR_TYPE" "_OTHER" } } span(1) { @@ -128,7 +129,7 @@ class JaxrsAnnotationsInstrumentationTest extends AgentInstrumentationSpecificat kind SERVER attributes { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.ERROR_TYPE" "_OTHER" + "$ErrorAttributes.ERROR_TYPE" "_OTHER" } } } diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy index fa4937953187..ac1965ebc0ad 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy @@ -5,6 +5,7 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import spock.lang.Unroll @@ -39,7 +40,7 @@ class JaxrsAnnotationsInstrumentationTest extends AgentInstrumentationSpecificat attributes { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_ROUTE" paramName - "$SemanticAttributes.ERROR_TYPE" "_OTHER" + "$ErrorAttributes.ERROR_TYPE" "_OTHER" } } span(1) { @@ -128,7 +129,7 @@ class JaxrsAnnotationsInstrumentationTest extends AgentInstrumentationSpecificat kind SERVER attributes { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.ERROR_TYPE" "_OTHER" + "$ErrorAttributes.ERROR_TYPE" "_OTHER" } } } diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy index fa050645dcf6..b7b8e859702e 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy @@ -5,6 +5,7 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import org.junit.jupiter.api.Assumptions @@ -134,7 +135,7 @@ abstract class AbstractJaxRsFilterTest extends AgentInstrumentationSpecification attributes { "$HttpAttributes.HTTP_REQUEST_METHOD" method "$HttpAttributes.HTTP_ROUTE" route - "$SemanticAttributes.ERROR_TYPE" "_OTHER" + "$ErrorAttributes.ERROR_TYPE" "_OTHER" } } } diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy index 5401e0b1dc96..36003f310723 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy @@ -10,6 +10,8 @@ import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UserAgentAttributes +import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -293,7 +295,7 @@ abstract class AbstractJaxRsHttpServerTest extends HttpServerTest implemen "$UrlAttributes.URL_QUERY" fullUrl.getQuery() "$HttpAttributes.HTTP_REQUEST_METHOD" method "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" statusCode - "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT + "$UserAgentAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$SemanticAttributes.CLIENT_ADDRESS" TEST_CLIENT_IP // Optional "$HttpAttributes.HTTP_ROUTE" path @@ -302,7 +304,7 @@ abstract class AbstractJaxRsHttpServerTest extends HttpServerTest implemen "http.response.header.x-test-response" { it == ["test"] } } if (statusCode >= 500) { - "$SemanticAttributes.ERROR_TYPE" "$statusCode" + "$ErrorAttributes.ERROR_TYPE" "$statusCode" } } } diff --git a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy index 55ae6274ab5e..5a88824a665a 100644 --- a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -10,6 +10,7 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -100,7 +101,7 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" "/jetty-context/" + path - "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT + "$UserAgentAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$HttpAttributes.HTTP_ROUTE" "/jetty-context/" + route "$SemanticAttributes.CLIENT_ADDRESS" { it == null || it == TEST_CLIENT_IP } diff --git a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy index 5982cb8ddff5..01648fd225a6 100644 --- a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -10,6 +10,7 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -111,7 +112,7 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" "/jetty-context/" + path - "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT + "$UserAgentAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$HttpAttributes.HTTP_ROUTE" "/jetty-context/" + route "$SemanticAttributes.CLIENT_ADDRESS" { it == null || it == TEST_CLIENT_IP } diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy index 6cd228dc7d99..e8038e583898 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy @@ -7,6 +7,8 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UserAgentAttributes +import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -99,7 +101,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UrlAttributes.URL_PATH" route "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" @@ -157,7 +159,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UrlAttributes.URL_QUERY" queryString "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" @@ -210,7 +212,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UrlAttributes.URL_PATH" route "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" @@ -273,7 +275,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UrlAttributes.URL_PATH" route "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 500 - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" @@ -281,7 +283,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.ERROR_TYPE" "500" + "$ErrorAttributes.ERROR_TYPE" "500" } } span(1) { @@ -341,7 +343,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UrlAttributes.URL_PATH" route "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" @@ -389,7 +391,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UrlAttributes.URL_PATH" route "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" @@ -469,7 +471,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UrlAttributes.URL_PATH" route "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 500 - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" @@ -477,7 +479,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.ERROR_TYPE" "500" + "$ErrorAttributes.ERROR_TYPE" "500" } } span(1) { @@ -519,7 +521,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UrlAttributes.URL_PATH" "/$jspWebappContext/$staticFile" "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy index d611d23b7f71..10fa26e1905f 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy @@ -7,6 +7,8 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UserAgentAttributes +import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -97,7 +99,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$UrlAttributes.URL_PATH" route "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" @@ -166,7 +168,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$UrlAttributes.URL_PATH" route "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" @@ -214,7 +216,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$UrlAttributes.URL_PATH" route "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" @@ -310,7 +312,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$UrlAttributes.URL_PATH" route "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" @@ -392,7 +394,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$UrlAttributes.URL_PATH" route "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 500 - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" @@ -400,7 +402,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.ERROR_TYPE" "500" + "$ErrorAttributes.ERROR_TYPE" "500" } } span(1) { @@ -454,7 +456,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$UrlAttributes.URL_PATH" route "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 404 - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java b/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java index 35009459147a..8d573026fcb9 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java +++ b/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -133,7 +134,7 @@ void handleErrorsInSyncCall() { equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 451), equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), - equalTo(SemanticAttributes.ERROR_TYPE, "451"), + equalTo(ErrorAttributes.ERROR_TYPE, "451"), equalTo( AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"), equalTo(AttributeKey.stringKey("kubernetes-client.name"), "name")))); @@ -248,7 +249,7 @@ public void onFailure( equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 451), equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), - equalTo(SemanticAttributes.ERROR_TYPE, "451"), + equalTo(ErrorAttributes.ERROR_TYPE, "451"), equalTo( AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"), equalTo(AttributeKey.stringKey("kubernetes-client.name"), "name")), diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java b/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java index 5d941c5f100f..7fec9fe857f2 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java +++ b/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java @@ -18,6 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; @@ -137,7 +138,7 @@ void handleErrorsInSyncCall() { equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 451), equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), - equalTo(SemanticAttributes.ERROR_TYPE, "451"), + equalTo(ErrorAttributes.ERROR_TYPE, "451"), equalTo( AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"), equalTo(AttributeKey.stringKey("kubernetes-client.name"), "name")))); @@ -250,7 +251,7 @@ public void onFailure( equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 451), equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), - equalTo(SemanticAttributes.ERROR_TYPE, "451"), + equalTo(ErrorAttributes.ERROR_TYPE, "451"), equalTo( AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"), equalTo(AttributeKey.stringKey("kubernetes-client.name"), "name")), diff --git a/instrumentation/opentelemetry-instrumentation-api/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/ContextBridgeTest.java b/instrumentation/opentelemetry-instrumentation-api/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/ContextBridgeTest.java index 6516f99456c5..cd5078cd2211 100644 --- a/instrumentation/opentelemetry-instrumentation-api/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/ContextBridgeTest.java +++ b/instrumentation/opentelemetry-instrumentation-api/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/instrumentationapi/ContextBridgeTest.java @@ -18,8 +18,8 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.javaagent.instrumentation.testing.AgentSpanTesting; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.Test; @@ -94,7 +94,7 @@ void testHttpRouteHolder_SameSourceAsServerInstrumentationDoesNotOverrideRoute() .hasAttributesSatisfyingExactly( equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_ROUTE, "/test/server/*"), - equalTo(SemanticAttributes.ERROR_TYPE, "_OTHER")))); + equalTo(ErrorAttributes.ERROR_TYPE, "_OTHER")))); } @Test @@ -115,6 +115,6 @@ void testHttpRouteHolder_SourceWithHigherOrderValueOverridesRoute() { .hasAttributesSatisfyingExactly( equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_ROUTE, "/test/controller/:id"), - equalTo(SemanticAttributes.ERROR_TYPE, "_OTHER")))); + equalTo(ErrorAttributes.ERROR_TYPE, "_OTHER")))); } } diff --git a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy index 795190773152..a731bcf5c902 100644 --- a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy +++ b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy @@ -9,6 +9,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -108,7 +109,7 @@ abstract class AbstractRatpackRoutesTest extends InstrumentationSpecification { "$NetworkAttributes.NETWORK_PEER_PORT" { it instanceof Long || it == null } "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$UrlAttributes.URL_SCHEME" "http" "$UrlAttributes.URL_PATH" "/$path" "$UrlAttributes.URL_QUERY" { it == "" || it == null } diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java index 7a16a9cac77e..fa22de91b367 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java @@ -26,6 +26,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; @@ -312,7 +313,7 @@ void shouldEndSpanOnMonoTimeout() { equalTo(UrlAttributes.URL_FULL, uri.toString()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, uri.getPort()), - equalTo(SemanticAttributes.ERROR_TYPE, "cancelled")), + equalTo(ErrorAttributes.ERROR_TYPE, "cancelled")), span -> span.hasName("test-http-server") .hasKind(SpanKind.SERVER) diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java index bbbeadde6c6d..d3a30ddd0578 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java @@ -20,6 +20,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer; import io.opentelemetry.sdk.trace.data.EventData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; @@ -97,7 +98,7 @@ void shouldFailSslHandshake() throws SSLException { equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, server.httpsPort()), equalTo( - SemanticAttributes.ERROR_TYPE, + ErrorAttributes.ERROR_TYPE, SSLHandshakeException.class.getCanonicalName())), span -> span.hasName("RESOLVE") diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java index 3eddfce3d1b5..4bc41156dfb3 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java @@ -19,6 +19,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; @@ -162,8 +163,7 @@ void testFailingRequest() { equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), equalTo( - SemanticAttributes.ERROR_TYPE, - connectException.getClass().getName())), + ErrorAttributes.ERROR_TYPE, connectException.getClass().getName())), span -> span.hasName("RESOLVE") .hasKind(INTERNAL) diff --git a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java index fa006aa22943..c2705ee85cbd 100644 --- a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java +++ b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.UserAgentAttributes; import io.opentelemetry.testing.internal.armeria.client.WebClient; import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse; import org.junit.jupiter.api.AfterAll; @@ -65,7 +66,7 @@ void generatesSpans() { equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), satisfies( - SemanticAttributes.USER_AGENT_ORIGINAL, + UserAgentAttributes.USER_AGENT_ORIGINAL, val -> val.isInstanceOf(String.class)), equalTo(HttpAttributes.HTTP_ROUTE, "/param/:param"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java index fc8a7c52d8b9..4c791a452d8c 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java @@ -9,19 +9,19 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE; import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD; import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; import static io.opentelemetry.semconv.HttpAttributes.HTTP_ROUTE; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PROTOCOL_VERSION; import static io.opentelemetry.semconv.SemanticAttributes.CLIENT_ADDRESS; -import static io.opentelemetry.semconv.SemanticAttributes.ERROR_TYPE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_MESSAGE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_STACKTRACE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.SemanticAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.SemanticAttributes.SERVER_PORT; -import static io.opentelemetry.semconv.SemanticAttributes.USER_AGENT_ORIGINAL; +import static io.opentelemetry.semconv.UserAgentAttributes.USER_AGENT_ORIGINAL; import static org.junit.jupiter.api.Named.named; import io.opentelemetry.api.trace.SpanKind; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java index 40defcbf113e..ef56183e5eb7 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java @@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; @@ -187,7 +188,7 @@ void shouldEndSpanOnMonoTimeout() { equalTo(UrlAttributes.URL_FULL, uri.toString()), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, uri.getPort()), - equalTo(SemanticAttributes.ERROR_TYPE, "cancelled")), + equalTo(ErrorAttributes.ERROR_TYPE, "cancelled")), span -> span.hasName("test-http-server") .hasKind(SpanKind.SERVER) diff --git a/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy b/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy index 85b53114e191..56681c4e421f 100644 --- a/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy +++ b/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy @@ -18,6 +18,7 @@ import com.twilio.type.PhoneNumber import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes @@ -324,7 +325,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE.key" 500 - "$SemanticAttributes.ERROR_TYPE" "500" + "$ErrorAttributes.ERROR_TYPE" "500" } } span(3) { @@ -410,7 +411,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE.key" 500 - "$SemanticAttributes.ERROR_TYPE" "500" + "$ErrorAttributes.ERROR_TYPE" "500" } } span(3) { diff --git a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy index ba4e412e09a8..279588bc64c3 100644 --- a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy +++ b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -154,7 +155,7 @@ class UndertowServerTest extends HttpServerTest implements AgentTestTr "$UrlAttributes.URL_PATH" uri.getPath() "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT + "$UserAgentAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" uri.host "$SemanticAttributes.SERVER_PORT" uri.port @@ -203,7 +204,7 @@ class UndertowServerTest extends HttpServerTest implements AgentTestTr "$UrlAttributes.URL_PATH" uri.getPath() "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT + "$UserAgentAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" uri.host "$SemanticAttributes.SERVER_PORT" uri.port diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy index 50b71ef1e951..88cf7113ea50 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy @@ -11,6 +11,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -78,7 +79,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_SCHEME" "http" - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" "/listProducts" } } @@ -170,7 +171,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_SCHEME" "http" - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" "/listProducts" "${TEST_REQUEST_ID_ATTRIBUTE}" requestId } diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy index 50b71ef1e951..88cf7113ea50 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy @@ -11,6 +11,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -78,7 +79,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_SCHEME" "http" - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" "/listProducts" } } @@ -170,7 +171,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_SCHEME" "http" - "$SemanticAttributes.USER_AGENT_ORIGINAL" String + "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" "/listProducts" "${TEST_REQUEST_ID_ATTRIBUTE}" requestId } diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index 34b587d79c68..b865e62c914f 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -21,11 +21,6 @@ public class SemanticAttributes { private SemanticAttributes() {} - public static final AttributeKey ERROR_TYPE = ErrorAttributes.ERROR_TYPE; - - public static final AttributeKey USER_AGENT_ORIGINAL = - UserAgentAttributes.USER_AGENT_ORIGINAL; - public static final AttributeKey CLIENT_ADDRESS = ClientAttributes.CLIENT_ADDRESS; public static final AttributeKey CLIENT_PORT = ClientAttributes.CLIENT_PORT; diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java index c7410de76e17..5bb74e271728 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java @@ -24,10 +24,12 @@ import io.opentelemetry.sdk.testing.assertj.TraceAssert; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.UserAgentAttributes; import java.net.URI; import java.time.Duration; import java.util.ArrayList; @@ -1014,19 +1016,19 @@ SpanDataAssert assertClientSpan( } // opt-in, not collected by default - assertThat(attrs).doesNotContainKey(SemanticAttributes.USER_AGENT_ORIGINAL); + assertThat(attrs).doesNotContainKey(UserAgentAttributes.USER_AGENT_ORIGINAL); if (responseCode != null) { assertThat(attrs) .containsEntry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, (long) responseCode); if (responseCode >= 400) { assertThat(attrs) - .containsEntry(SemanticAttributes.ERROR_TYPE, String.valueOf(responseCode)); + .containsEntry(ErrorAttributes.ERROR_TYPE, String.valueOf(responseCode)); } } else { assertThat(attrs).doesNotContainKey(HttpAttributes.HTTP_RESPONSE_STATUS_CODE); // TODO: add more detailed assertions, per url - assertThat(attrs).containsKey(SemanticAttributes.ERROR_TYPE); + assertThat(attrs).containsKey(ErrorAttributes.ERROR_TYPE); } if (resendCount != null) { diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java index c66fb4cfb210..5f27034208dc 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java @@ -32,10 +32,12 @@ import io.opentelemetry.sdk.testing.assertj.TraceAssert; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.UserAgentAttributes; import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest; import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse; import io.opentelemetry.testing.internal.armeria.common.HttpData; @@ -770,11 +772,10 @@ protected SpanDataAssert assertServerSpan( assertThat(attrs).containsEntry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, statusCode); if (statusCode >= 500) { - assertThat(attrs) - .containsEntry(SemanticAttributes.ERROR_TYPE, String.valueOf(statusCode)); + assertThat(attrs).containsEntry(ErrorAttributes.ERROR_TYPE, String.valueOf(statusCode)); } - assertThat(attrs).containsEntry(SemanticAttributes.USER_AGENT_ORIGINAL, TEST_USER_AGENT); + assertThat(attrs).containsEntry(UserAgentAttributes.USER_AGENT_ORIGINAL, TEST_USER_AGENT); assertThat(attrs).containsEntry(UrlAttributes.URL_SCHEME, "http"); if (endpoint != INDEXED_CHILD) { From 1d09eafbfd81fe75ed2677805f8e1ebb6990cf7f Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:02:17 +0200 Subject: [PATCH 09/52] CLIENT_* --- .../InternalClientAttributesExtractor.java | 6 +++--- .../http/HttpServerAttributesExtractorTest.java | 5 +++-- .../network/ClientAttributesExtractorTest.java | 6 +++--- .../apachecamel/RestCamelTest.java | 3 ++- .../TwoServicesWithDirectClientCamelTest.java | 3 ++- .../groovy/AbstractJaxRsHttpServerTest.groovy | 3 ++- .../testing/src/main/groovy/BaseJsfTest.groovy | 3 ++- .../testing/src/main/groovy/BaseJsfTest.groovy | 3 ++- .../groovy/JspInstrumentationBasicTests.groovy | 17 +++++++++-------- .../JspInstrumentationForwardTests.groovy | 13 +++++++------ .../server/AbstractRatpackRoutesTest.groovy | 3 ++- .../sparkjava/SparkJavaBasedTest.java | 3 ++- .../webflux/v5_0/server/SpringWebfluxTest.java | 2 +- .../src/test/groovy/UndertowServerTest.groovy | 5 +++-- .../groovy/VertxReactivePropagationTest.groovy | 5 +++-- .../groovy/VertxReactivePropagationTest.groovy | 5 +++-- .../semconv/SemanticAttributes.java | 3 --- .../smoketest/AppServerTest.groovy | 3 ++- .../junit/http/AbstractHttpServerTest.java | 5 +++-- 19 files changed, 54 insertions(+), 42 deletions(-) diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalClientAttributesExtractor.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalClientAttributesExtractor.java index 08749e0e2aae..cdb095e38344 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalClientAttributesExtractor.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalClientAttributesExtractor.java @@ -8,7 +8,7 @@ import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet; import io.opentelemetry.api.common.AttributesBuilder; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ClientAttributes; /** * This class is internal and is hence not for public use. Its APIs are unstable and can change at @@ -29,9 +29,9 @@ public void onStart(AttributesBuilder attributes, REQUEST request) { AddressAndPort clientAddressAndPort = addressAndPortExtractor.extract(request); if (clientAddressAndPort.address != null) { - internalSet(attributes, SemanticAttributes.CLIENT_ADDRESS, clientAddressAndPort.address); + internalSet(attributes, ClientAttributes.CLIENT_ADDRESS, clientAddressAndPort.address); if (capturePort && clientAddressAndPort.port != null && clientAddressAndPort.port > 0) { - internalSet(attributes, SemanticAttributes.CLIENT_PORT, (long) clientAddressAndPort.port); + internalSet(attributes, ClientAttributes.CLIENT_PORT, (long) clientAddressAndPort.port); } } } diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java index 13114189b3de..cef61b8f4ebf 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.internal.HttpConstants; +import io.opentelemetry.semconv.ClientAttributes; import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; @@ -205,7 +206,7 @@ void normal() { entry(UrlAttributes.URL_QUERY, "details=true"), entry(UserAgentAttributes.USER_AGENT_ORIGINAL, "okhttp 3.x"), entry(HttpAttributes.HTTP_ROUTE, "/repositories/{id}"), - entry(SemanticAttributes.CLIENT_ADDRESS, "1.1.1.1"), + entry(ClientAttributes.CLIENT_ADDRESS, "1.1.1.1"), entry( AttributeKey.stringArrayKey("http.request.header.custom-request-header"), asList("123", "456"))); @@ -520,7 +521,7 @@ void shouldExtractPeerAddressEvenIfItDuplicatesClientAddress() { AttributesBuilder startAttributes = Attributes.builder(); extractor.onStart(startAttributes, Context.root(), request); assertThat(startAttributes.build()) - .containsOnly(entry(SemanticAttributes.CLIENT_ADDRESS, "1.2.3.4")); + .containsOnly(entry(ClientAttributes.CLIENT_ADDRESS, "1.2.3.4")); AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, response, null); diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/ClientAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/ClientAttributesExtractorTest.java index 349198d3d0fb..889568efc26c 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/ClientAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/ClientAttributesExtractorTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ClientAttributes; import java.util.HashMap; import java.util.Map; import javax.annotation.Nullable; @@ -50,8 +50,8 @@ void allAttributes() { extractor.onStart(startAttributes, Context.root(), request); assertThat(startAttributes.build()) .containsOnly( - entry(SemanticAttributes.CLIENT_ADDRESS, "opentelemetry.io"), - entry(SemanticAttributes.CLIENT_PORT, 80L)); + entry(ClientAttributes.CLIENT_ADDRESS, "opentelemetry.io"), + entry(ClientAttributes.CLIENT_PORT, 80L)); AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, null, null); diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java index 3127ad8a4450..632a3eaf9064 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java @@ -14,6 +14,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerUsingTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; +import io.opentelemetry.semconv.ClientAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; @@ -109,7 +110,7 @@ void restComponentServerAndClientCallWithJettyBackend() { equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, Long.valueOf(port)), - equalTo(SemanticAttributes.CLIENT_ADDRESS, "127.0.0.1"), + equalTo(ClientAttributes.CLIENT_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( UserAgentAttributes.USER_AGENT_ORIGINAL, diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java index 8fc671d89e97..aa307bf2dbc1 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java @@ -15,6 +15,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerUsingTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; +import io.opentelemetry.semconv.ClientAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; @@ -160,7 +161,7 @@ void twoCamelServiceSpans() throws Exception { equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), equalTo(SemanticAttributes.SERVER_PORT, portTwo), - equalTo(SemanticAttributes.CLIENT_ADDRESS, "127.0.0.1"), + equalTo(ClientAttributes.CLIENT_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy index 36003f310723..4d17ed9315ca 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy @@ -10,6 +10,7 @@ import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes @@ -296,7 +297,7 @@ abstract class AbstractJaxRsHttpServerTest extends HttpServerTest implemen "$HttpAttributes.HTTP_REQUEST_METHOD" method "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" statusCode "$UserAgentAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT - "$SemanticAttributes.CLIENT_ADDRESS" TEST_CLIENT_IP + "$ClientAttributes.CLIENT_ADDRESS" TEST_CLIENT_IP // Optional "$HttpAttributes.HTTP_ROUTE" path if (fullUrl.getPath().endsWith(ServerEndpoint.CAPTURE_HEADERS.getPath())) { diff --git a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy index 5a88824a665a..dc4f3e791e68 100644 --- a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -10,6 +10,7 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -104,7 +105,7 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements "$UserAgentAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$HttpAttributes.HTTP_ROUTE" "/jetty-context/" + route - "$SemanticAttributes.CLIENT_ADDRESS" { it == null || it == TEST_CLIENT_IP } + "$ClientAttributes.CLIENT_ADDRESS" { it == null || it == TEST_CLIENT_IP } } } } diff --git a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy index 01648fd225a6..41b8da524363 100644 --- a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -10,6 +10,7 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -115,7 +116,7 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements "$UserAgentAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$HttpAttributes.HTTP_ROUTE" "/jetty-context/" + route - "$SemanticAttributes.CLIENT_ADDRESS" { it == null || it == TEST_CLIENT_IP } + "$ClientAttributes.CLIENT_ADDRESS" { it == null || it == TEST_CLIENT_IP } } } } diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy index e8038e583898..7fcba9a6aafd 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy @@ -7,6 +7,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes @@ -106,7 +107,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long } @@ -164,7 +165,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long } @@ -217,7 +218,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long @@ -280,7 +281,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long "$ErrorAttributes.ERROR_TYPE" "500" @@ -348,7 +349,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long } @@ -396,7 +397,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long } @@ -476,7 +477,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long "$ErrorAttributes.ERROR_TYPE" "500" @@ -526,7 +527,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long } diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy index 10fa26e1905f..69ec5cdd7d7f 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy @@ -7,6 +7,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes @@ -104,7 +105,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long } @@ -173,7 +174,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long } @@ -221,7 +222,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long } @@ -317,7 +318,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long } @@ -399,7 +400,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long "$ErrorAttributes.ERROR_TYPE" "500" @@ -461,7 +462,7 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" port - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long } diff --git a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy index a731bcf5c902..70be5d614474 100644 --- a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy +++ b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy @@ -9,6 +9,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -104,7 +105,7 @@ abstract class AbstractRatpackRoutesTest extends InstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.SERVER_ADDRESS" { it == "localhost" || it == null } "$SemanticAttributes.SERVER_PORT" { it == app.bindPort || it == null } - "$SemanticAttributes.CLIENT_ADDRESS" { it == "127.0.0.1" || it == null } + "$ClientAttributes.CLIENT_ADDRESS" { it == "127.0.0.1" || it == null } "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == null } "$NetworkAttributes.NETWORK_PEER_PORT" { it instanceof Long || it == null } "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" diff --git a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java index c2705ee85cbd..c6557e6d9c36 100644 --- a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java +++ b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java @@ -14,6 +14,7 @@ import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.ClientAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; @@ -72,7 +73,7 @@ void generatesSpans() { equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.CLIENT_ADDRESS, "127.0.0.1"), + equalTo(ClientAttributes.CLIENT_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java index 4c791a452d8c..507f2f42fa07 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java @@ -9,12 +9,12 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +import static io.opentelemetry.semconv.ClientAttributes.CLIENT_ADDRESS; import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE; import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD; import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; import static io.opentelemetry.semconv.HttpAttributes.HTTP_ROUTE; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PROTOCOL_VERSION; -import static io.opentelemetry.semconv.SemanticAttributes.CLIENT_ADDRESS; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_MESSAGE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_STACKTRACE; diff --git a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy index 279588bc64c3..a95e1f1073c2 100644 --- a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy +++ b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -150,7 +151,7 @@ class UndertowServerTest extends HttpServerTest implements AgentTestTr } attributes { - "$SemanticAttributes.CLIENT_ADDRESS" TEST_CLIENT_IP + "$ClientAttributes.CLIENT_ADDRESS" TEST_CLIENT_IP "$UrlAttributes.URL_SCHEME" uri.getScheme() "$UrlAttributes.URL_PATH" uri.getPath() "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" @@ -199,7 +200,7 @@ class UndertowServerTest extends HttpServerTest implements AgentTestTr errorEvent(Exception, "exception after sending response", 2) attributes { - "$SemanticAttributes.CLIENT_ADDRESS" TEST_CLIENT_IP + "$ClientAttributes.CLIENT_ADDRESS" TEST_CLIENT_IP "$UrlAttributes.URL_SCHEME" uri.getScheme() "$UrlAttributes.URL_PATH" uri.getPath() "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy index 88cf7113ea50..e30cd1dfc3de 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy @@ -11,6 +11,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -74,7 +75,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PEER_PORT" Long "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" Long - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$UrlAttributes.URL_PATH" "/listProducts" "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 @@ -165,7 +166,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PEER_PORT" Long "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" Long - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$UrlAttributes.URL_PATH" baseUrl "$UrlAttributes.URL_QUERY" "$TEST_REQUEST_ID_PARAMETER=$requestId" "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy index 88cf7113ea50..e30cd1dfc3de 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy @@ -11,6 +11,7 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -74,7 +75,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PEER_PORT" Long "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" Long - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$UrlAttributes.URL_PATH" "/listProducts" "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 @@ -165,7 +166,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PEER_PORT" Long "$SemanticAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.SERVER_PORT" Long - "$SemanticAttributes.CLIENT_ADDRESS" "127.0.0.1" + "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$UrlAttributes.URL_PATH" baseUrl "$UrlAttributes.URL_QUERY" "$TEST_REQUEST_ID_PARAMETER=$requestId" "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index b865e62c914f..63cbf9a31e30 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -21,9 +21,6 @@ public class SemanticAttributes { private SemanticAttributes() {} - public static final AttributeKey CLIENT_ADDRESS = ClientAttributes.CLIENT_ADDRESS; - public static final AttributeKey CLIENT_PORT = ClientAttributes.CLIENT_PORT; - public static final AttributeKey SERVER_ADDRESS = ServerAttributes.SERVER_ADDRESS; public static final AttributeKey SERVER_PORT = ServerAttributes.SERVER_PORT; diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy index 5be8e4e0dab0..1c46719889c0 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy @@ -7,6 +7,7 @@ package io.opentelemetry.smoketest import io.opentelemetry.proto.trace.v1.Span import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import spock.lang.Shared @@ -130,7 +131,7 @@ abstract class AppServerTest extends SmokeTest { traces.countFilteredAttributes(UrlAttributes.URL_PATH.key, "/app/headers") == 1 and: "Number of spans with client address" - traces.countFilteredAttributes(SemanticAttributes.CLIENT_ADDRESS.key, "127.0.0.1") == 1 + traces.countFilteredAttributes(ClientAttributes.CLIENT_ADDRESS.key, "127.0.0.1") == 1 and: "Number of spans with http protocol version" traces.countFilteredAttributes(NetworkAttributes.NETWORK_PROTOCOL_VERSION.key, "1.1") == 3 diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java index 5f27034208dc..6424b668f260 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java @@ -32,6 +32,7 @@ import io.opentelemetry.sdk.testing.assertj.TraceAssert; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.ClientAttributes; import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; @@ -764,9 +765,9 @@ protected SpanDataAssert assertServerSpan( .isNotEqualTo(Long.valueOf(port))); } - assertThat(attrs).containsEntry(SemanticAttributes.CLIENT_ADDRESS, TEST_CLIENT_IP); + assertThat(attrs).containsEntry(ClientAttributes.CLIENT_ADDRESS, TEST_CLIENT_IP); // client.port is opt-in - assertThat(attrs).doesNotContainKey(SemanticAttributes.CLIENT_PORT); + assertThat(attrs).doesNotContainKey(ClientAttributes.CLIENT_PORT); assertThat(attrs).containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, method); From beaff4fef872d712456ca054d0e7c74ebde7bea5 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:03:41 +0200 Subject: [PATCH 10/52] SERVER_* --- .../http/HttpExperimentalMetricsAdvice.java | 6 +- .../semconv/rpc/RpcMetricsAdvice.java | 9 +- .../HttpClientExperimentalMetricsTest.java | 14 +-- .../HttpServerExperimentalMetricsTest.java | 6 +- .../semconv/rpc/RpcClientMetricsTest.java | 14 +-- .../semconv/rpc/RpcServerMetricsTest.java | 10 +- .../api/semconv/http/HttpMetricsAdvice.java | 6 +- .../InternalServerAttributesExtractor.java | 6 +- .../HttpClientAttributesExtractorTest.java | 14 +-- .../semconv/http/HttpClientMetricsTest.java | 10 +- .../HttpServerAttributesExtractorTest.java | 22 ++-- .../semconv/http/HttpServerMetricsTest.java | 8 +- .../ServerAttributesExtractorTest.java | 8 +- .../apachedubbo/v2_7/AbstractDubboTest.groovy | 10 +- .../v2_7/AbstractDubboTraceChainTest.groovy | 14 ++- .../src/test/groovy/S3TracingTest.groovy | 102 +++++++-------- .../src/test/groovy/SnsTracingTest.groovy | 30 ++--- .../awssdk/v1_11/Aws1ClientTest.groovy | 3 +- .../groovy/Aws0ClientTest.groovy | 16 +-- .../v1_11/AbstractAws1ClientTest.groovy | 14 ++- .../AbstractSqsSuppressReceiveSpansTest.java | 29 ++--- .../awssdk/v1_11/AbstractSqsTracingTest.java | 37 +++--- .../v2_2/AbstractAws2ClientCoreTest.groovy | 14 ++- .../awssdk/v2_2/AbstractAws2ClientTest.groovy | 18 +-- ...ractAws2SqsSuppressReceiveSpansTest.groovy | 30 ++--- .../v2_2/AbstractAws2SqsTracingTest.groovy | 34 ++--- ...AbstractAws2ClientRecordHttpErrorTest.java | 5 +- .../apachecamel/RestCamelTest.java | 6 +- .../TwoServicesWithDirectClientCamelTest.java | 6 +- .../apachecamel/aws/AwsSpanAssertions.java | 13 +- .../v3_0/CassandraAttributesExtractor.java | 7 +- .../src/test/java/CassandraClientTest.java | 25 ++-- .../v4/common/AbstractCassandraTest.java | 4 +- .../v4_0/CassandraAttributesExtractor.java | 5 +- .../v4_4/CassandraAttributesExtractor.java | 9 +- .../v4_4/AbstractCassandra44Test.java | 4 +- .../apiclient/ElasticsearchClientTest.java | 25 ++-- .../rest/v5_0/ElasticsearchRest5Test.java | 17 +-- .../rest/v6_4/ElasticsearchRest6Test.java | 17 +-- .../rest/v7_0/ElasticsearchRest7Test.java | 17 +-- .../rest/v7_0/ElasticsearchRest7Test.java | 9 +- ...ElasticsearchClientAttributeExtractor.java | 6 +- .../finaglehttp/v23_11/ClientTest.java | 6 +- .../AbstractGoogleHttpClientTest.java | 6 +- .../grpc/v1_6/AbstractGrpcStreamingTest.java | 17 ++- .../grpc/v1_6/AbstractGrpcTest.java | 117 ++++++++---------- .../reactive/v1_0/HibernateReactiveTest.java | 4 +- .../reactive/v2_0/HibernateReactiveTest.java | 4 +- .../HttpUrlConnectionTest.java | 22 ++-- .../src/test/groovy/JaxRsClientTest.groovy | 6 +- .../groovy/AbstractJaxRsHttpServerTest.groovy | 6 +- .../groovy/JdbcInstrumentationTest.groovy | 7 +- .../jdbc/OpenTelemetryConnectionTest.groovy | 14 ++- .../jedis/v1_4/JedisClientTest.java | 21 ++-- .../jedis/v3_0/Jedis30ClientTest.java | 21 ++-- .../src/main/groovy/BaseJsfTest.groovy | 6 +- .../src/main/groovy/BaseJsfTest.groovy | 6 +- .../JspInstrumentationBasicTests.groovy | 34 ++--- .../JspInstrumentationForwardTests.groovy | 26 ++-- .../ktor/v1_0/KtorHttpServerTest.kt | 4 +- .../v2_0/server/AbstractKtorHttpServerTest.kt | 4 +- .../KubernetesClientTest.java | 18 +-- .../KubernetesClientVer20Test.java | 18 +-- .../lettuce/v4_0/LettuceAsyncClientTest.java | 9 +- .../lettuce/v4_0/LettuceSyncClientTest.java | 9 +- .../lettuce/v5_0/LettuceAsyncClientTest.java | 9 +- .../lettuce/v5_0/LettuceSyncClientTest.java | 9 +- .../v5_1/LettuceReactiveClientTest.java | 9 +- .../v5_1/AbstractLettuceAsyncClientTest.java | 25 ++-- .../AbstractLettuceReactiveClientTest.java | 37 +++--- .../AbstractLettuceSyncClientAuthTest.java | 5 +- .../v5_1/AbstractLettuceSyncClientTest.java | 57 ++++----- .../testing/AbstractMongoClientTest.groovy | 6 +- .../netty/v3_8/client/Netty38ClientTest.java | 6 +- .../v4_0/client/Netty40ClientSslTest.java | 10 +- .../netty/v4_0/client/Netty40ClientTest.java | 6 +- .../client/Netty40ConnectionSpanTest.java | 10 +- .../test/groovy/Netty41ClientSslTest.groovy | 18 +-- .../groovy/Netty41ConnectionSpanTest.groovy | 18 +-- .../netty/v4_1/AbstractNetty41ClientTest.java | 6 +- .../src/test/java/OpenSearchRestTest.java | 9 +- .../groovy/PlayWsClientTestBaseBase.groovy | 6 +- .../pulsar/v2_8/PulsarClientTest.java | 9 +- .../v1_0/AbstractR2dbcStatementTest.java | 4 +- .../ratpack/RatpackForkedHttpClientTest.java | 6 +- .../ratpack/RatpackHttpClientTest.java | 6 +- .../ratpack/RatpackPooledHttpClientTest.java | 6 +- .../server/AbstractRatpackRoutesTest.groovy | 6 +- .../AbstractReactorNettyHttpClientTest.java | 6 +- .../v0_9/ReactorNettyConnectionSpanTest.java | 18 +-- .../AbstractReactorNettyHttpClientTest.java | 10 +- .../v1_0/ReactorNettyBaseUrlOnlyTest.java | 6 +- .../v1_0/ReactorNettyClientSslTest.java | 25 ++-- .../v1_0/ReactorNettyConnectionSpanTest.java | 26 ++-- .../v1_0/ReactorNettyHttpClientTest.java | 6 +- .../sparkjava/SparkJavaBasedTest.java | 6 +- .../data/v3_0/ReactiveSpringDataTest.java | 2 +- .../v5_0/server/SpringWebfluxTest.java | 4 +- ...pringWebfluxClientInstrumentationTest.java | 6 +- .../test/groovy/test/TwilioClientTest.groovy | 11 +- .../src/test/groovy/UndertowServerTest.groovy | 10 +- .../v3_0/client/VertxHttpClientTest.java | 6 +- .../v4_0/redis/VertxRedisClientTest.java | 5 +- .../VertxReactivePropagationTest.groovy | 10 +- .../VertxReactivePropagationTest.groovy | 10 +- .../VertxRxCircuitBreakerWebClientTest.groovy | 6 +- .../groovy/client/VertxRxWebClientTest.groovy | 6 +- .../vertx/v4_0/sql/VertxSqlClientTest.java | 4 +- .../semconv/SemanticAttributes.java | 3 - .../junit/http/AbstractHttpClientTest.java | 14 +-- .../junit/http/AbstractHttpServerTest.java | 8 +- .../junit/http/HttpClientTestOptions.java | 6 +- .../junit/http/HttpServerTestOptions.java | 4 +- 113 files changed, 806 insertions(+), 739 deletions(-) diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java index aea78913721c..a23dbd6fe519 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalMetricsAdvice.java @@ -14,7 +14,7 @@ import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; final class HttpExperimentalMetricsAdvice { @@ -31,8 +31,8 @@ static void applyClientRequestSizeAdvice(LongHistogramBuilder builder) { ErrorAttributes.ERROR_TYPE, NetworkAttributes.NETWORK_PROTOCOL_NAME, NetworkAttributes.NETWORK_PROTOCOL_VERSION, - SemanticAttributes.SERVER_ADDRESS, - SemanticAttributes.SERVER_PORT)); + ServerAttributes.SERVER_ADDRESS, + ServerAttributes.SERVER_PORT)); } static void applyServerRequestSizeAdvice(LongHistogramBuilder builder) { diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcMetricsAdvice.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcMetricsAdvice.java index ce2067414967..ccb501655381 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcMetricsAdvice.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcMetricsAdvice.java @@ -9,6 +9,7 @@ import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.util.Arrays; final class RpcMetricsAdvice { @@ -28,8 +29,8 @@ static void applyClientDurationAdvice(DoubleHistogramBuilder builder) { SemanticAttributes.RPC_GRPC_STATUS_CODE, NetworkAttributes.NETWORK_TYPE, NetworkAttributes.NETWORK_TRANSPORT, - SemanticAttributes.SERVER_ADDRESS, - SemanticAttributes.SERVER_PORT)); + ServerAttributes.SERVER_ADDRESS, + ServerAttributes.SERVER_PORT)); } static void applyServerDurationAdvice(DoubleHistogramBuilder builder) { @@ -47,8 +48,8 @@ static void applyServerDurationAdvice(DoubleHistogramBuilder builder) { SemanticAttributes.RPC_GRPC_STATUS_CODE, NetworkAttributes.NETWORK_TYPE, NetworkAttributes.NETWORK_TRANSPORT, - SemanticAttributes.SERVER_ADDRESS, - SemanticAttributes.SERVER_PORT)); + ServerAttributes.SERVER_ADDRESS, + ServerAttributes.SERVER_PORT)); } private RpcMetricsAdvice() {} diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java index 98d114e6e12a..1b5355641572 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java @@ -21,7 +21,7 @@ import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -43,8 +43,8 @@ void collectsMetrics() { .put(UrlAttributes.URL_FULL, "https://localhost:1234/") .put(UrlAttributes.URL_PATH, "/") .put(UrlAttributes.URL_QUERY, "q=a") - .put(SemanticAttributes.SERVER_ADDRESS, "localhost") - .put(SemanticAttributes.SERVER_PORT, 1234) + .put(ServerAttributes.SERVER_ADDRESS, "localhost") + .put(ServerAttributes.SERVER_PORT, 1234) .build(); Attributes responseAttributes = @@ -100,8 +100,8 @@ void collectsMetrics() { NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, 1234)) + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, 1234)) .hasExemplarsSatisfying( exemplar -> exemplar @@ -126,8 +126,8 @@ void collectsMetrics() { NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, 1234)) + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, 1234)) .hasExemplarsSatisfying( exemplar -> exemplar diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java index b1a09c79d8f0..f59a3d70a22e 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java @@ -21,7 +21,7 @@ import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -47,8 +47,8 @@ void collectsMetrics() { .put(NetworkAttributes.NETWORK_TYPE, "ipv4") .put(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http") .put(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0") - .put(SemanticAttributes.SERVER_ADDRESS, "localhost") - .put(SemanticAttributes.SERVER_PORT, 1234) + .put(ServerAttributes.SERVER_ADDRESS, "localhost") + .put(ServerAttributes.SERVER_PORT, 1234) .build(); Attributes responseAttributes = diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java index 343f2f5b521e..aac9de7713e2 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java @@ -19,6 +19,7 @@ import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -41,15 +42,15 @@ void collectsMetrics() { Attributes responseAttributes1 = Attributes.builder() - .put(SemanticAttributes.SERVER_ADDRESS, "example.com") - .put(SemanticAttributes.SERVER_PORT, 8080) + .put(ServerAttributes.SERVER_ADDRESS, "example.com") + .put(ServerAttributes.SERVER_PORT, 8080) .put(NetworkAttributes.NETWORK_TRANSPORT, "tcp") .put(NetworkAttributes.NETWORK_TYPE, "ipv4") .build(); Attributes responseAttributes2 = Attributes.builder() - .put(SemanticAttributes.SERVER_PORT, 8080) + .put(ServerAttributes.SERVER_PORT, 8080) .put(NetworkAttributes.NETWORK_TRANSPORT, "tcp") .build(); @@ -91,9 +92,8 @@ void collectsMetrics() { SemanticAttributes.RPC_SERVICE, "myservice.EchoService"), equalTo(SemanticAttributes.RPC_METHOD, "exampleMethod"), - equalTo( - SemanticAttributes.SERVER_ADDRESS, "example.com"), - equalTo(SemanticAttributes.SERVER_PORT, 8080), + equalTo(ServerAttributes.SERVER_ADDRESS, "example.com"), + equalTo(ServerAttributes.SERVER_PORT, 8080), equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4")) .hasExemplarsSatisfying( @@ -122,7 +122,7 @@ void collectsMetrics() { SemanticAttributes.RPC_SERVICE, "myservice.EchoService"), equalTo(SemanticAttributes.RPC_METHOD, "exampleMethod"), - equalTo(SemanticAttributes.SERVER_PORT, 8080), + equalTo(ServerAttributes.SERVER_PORT, 8080), equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"))))); } diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java index d52be21a3b41..c2c8fd6091e6 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java @@ -19,6 +19,7 @@ import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -41,8 +42,8 @@ void collectsMetrics() { Attributes responseAttributes1 = Attributes.builder() - .put(SemanticAttributes.SERVER_ADDRESS, "example.com") - .put(SemanticAttributes.SERVER_PORT, 8080) + .put(ServerAttributes.SERVER_ADDRESS, "example.com") + .put(ServerAttributes.SERVER_PORT, 8080) .put(NetworkAttributes.NETWORK_LOCAL_ADDRESS, "127.0.0.1") .put(NetworkAttributes.NETWORK_TRANSPORT, "tcp") .put(NetworkAttributes.NETWORK_TYPE, "ipv4") @@ -50,7 +51,7 @@ void collectsMetrics() { Attributes responseAttributes2 = Attributes.builder() - .put(SemanticAttributes.SERVER_PORT, 8080) + .put(ServerAttributes.SERVER_PORT, 8080) .put(NetworkAttributes.NETWORK_LOCAL_ADDRESS, "127.0.0.1") .put(NetworkAttributes.NETWORK_TRANSPORT, "tcp") .build(); @@ -93,8 +94,7 @@ void collectsMetrics() { SemanticAttributes.RPC_SERVICE, "myservice.EchoService"), equalTo(SemanticAttributes.RPC_METHOD, "exampleMethod"), - equalTo( - SemanticAttributes.SERVER_ADDRESS, "example.com"), + equalTo(ServerAttributes.SERVER_ADDRESS, "example.com"), equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4")) .hasExemplarsSatisfying( diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java index a2474eda8df3..985d2474ab94 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpMetricsAdvice.java @@ -13,7 +13,7 @@ import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.List; @@ -35,8 +35,8 @@ static void applyClientDurationAdvice(DoubleHistogramBuilder builder) { ErrorAttributes.ERROR_TYPE, NetworkAttributes.NETWORK_PROTOCOL_NAME, NetworkAttributes.NETWORK_PROTOCOL_VERSION, - SemanticAttributes.SERVER_ADDRESS, - SemanticAttributes.SERVER_PORT)); + ServerAttributes.SERVER_ADDRESS, + ServerAttributes.SERVER_PORT)); } static void applyServerDurationAdvice(DoubleHistogramBuilder builder) { diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalServerAttributesExtractor.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalServerAttributesExtractor.java index e1d6611c65c0..1c23d093143e 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalServerAttributesExtractor.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/network/internal/InternalServerAttributesExtractor.java @@ -8,7 +8,7 @@ import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet; import io.opentelemetry.api.common.AttributesBuilder; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; /** * This class is internal and is hence not for public use. Its APIs are unstable and can change at @@ -27,10 +27,10 @@ public void onStart(AttributesBuilder attributes, REQUEST request) { AddressAndPort serverAddressAndPort = addressAndPortExtractor.extract(request); if (serverAddressAndPort.address != null) { - internalSet(attributes, SemanticAttributes.SERVER_ADDRESS, serverAddressAndPort.address); + internalSet(attributes, ServerAttributes.SERVER_ADDRESS, serverAddressAndPort.address); if (serverAddressAndPort.port != null && serverAddressAndPort.port > 0) { - internalSet(attributes, SemanticAttributes.SERVER_PORT, (long) serverAddressAndPort.port); + internalSet(attributes, ServerAttributes.SERVER_PORT, (long) serverAddressAndPort.port); } } } diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java index 050654bf286b..280292bb088a 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java @@ -21,7 +21,7 @@ import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.net.ConnectException; import java.util.HashMap; @@ -176,8 +176,8 @@ void normal() { entry( AttributeKey.stringArrayKey("http.request.header.custom-request-header"), asList("123", "456")), - entry(SemanticAttributes.SERVER_ADDRESS, "github.com"), - entry(SemanticAttributes.SERVER_PORT, 80L), + entry(ServerAttributes.SERVER_ADDRESS, "github.com"), + entry(ServerAttributes.SERVER_PORT, 80L), entry(HttpAttributes.HTTP_REQUEST_RESEND_COUNT, 2L)); AttributesBuilder endAttributes = Attributes.builder(); @@ -360,8 +360,8 @@ void shouldExtractServerAddressAndPortFromHostHeader() { extractor.onStart(startAttributes, Context.root(), request); assertThat(startAttributes.build()) .containsOnly( - entry(SemanticAttributes.SERVER_ADDRESS, "github.com"), - entry(SemanticAttributes.SERVER_PORT, 123L)); + entry(ServerAttributes.SERVER_ADDRESS, "github.com"), + entry(ServerAttributes.SERVER_PORT, 123L)); AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, response, null); @@ -387,8 +387,8 @@ void shouldExtractPeerAddressEvenIfItDuplicatesServerAddress() { extractor.onStart(startAttributes, Context.root(), request); assertThat(startAttributes.build()) .containsOnly( - entry(SemanticAttributes.SERVER_ADDRESS, "1.2.3.4"), - entry(SemanticAttributes.SERVER_PORT, 123L)); + entry(ServerAttributes.SERVER_ADDRESS, "1.2.3.4"), + entry(ServerAttributes.SERVER_PORT, 123L)); AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, response, null); diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java index ddfeed1a8a63..f03f419a81c1 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java @@ -21,7 +21,7 @@ import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -45,8 +45,8 @@ void collectsMetrics() { .put(UrlAttributes.URL_FULL, "https://localhost:1234/") .put(UrlAttributes.URL_PATH, "/") .put(UrlAttributes.URL_QUERY, "q=a") - .put(SemanticAttributes.SERVER_ADDRESS, "localhost") - .put(SemanticAttributes.SERVER_PORT, 1234) + .put(ServerAttributes.SERVER_ADDRESS, "localhost") + .put(ServerAttributes.SERVER_PORT, 1234) .build(); Attributes responseAttributes = @@ -102,8 +102,8 @@ void collectsMetrics() { NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), equalTo( NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, 1234)) + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, 1234)) .hasExemplarsSatisfying( exemplar -> exemplar diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java index cef61b8f4ebf..8526d9e04f29 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java @@ -22,7 +22,7 @@ import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.semconv.UserAgentAttributes; import java.net.ConnectException; @@ -198,8 +198,8 @@ void normal() { extractor.onStart(startAttributes, Context.root(), request); assertThat(startAttributes.build()) .containsOnly( - entry(SemanticAttributes.SERVER_ADDRESS, "github.com"), - entry(SemanticAttributes.SERVER_PORT, 443L), + entry(ServerAttributes.SERVER_ADDRESS, "github.com"), + entry(ServerAttributes.SERVER_PORT, 443L), entry(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), entry(UrlAttributes.URL_SCHEME, "https"), entry(UrlAttributes.URL_PATH, "/repositories/1"), @@ -418,8 +418,8 @@ void shouldExtractServerAddressAndPortFromForwardedHeader() { assertThat(startAttributes.build()) .containsOnly( - entry(SemanticAttributes.SERVER_ADDRESS, "example.com"), - entry(SemanticAttributes.SERVER_PORT, 42L)); + entry(ServerAttributes.SERVER_ADDRESS, "example.com"), + entry(ServerAttributes.SERVER_PORT, 42L)); AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, response, null); @@ -445,8 +445,8 @@ void shouldExtractServerAddressAndPortFromForwardedHostHeader() { assertThat(startAttributes.build()) .containsOnly( - entry(SemanticAttributes.SERVER_ADDRESS, "opentelemetry.io"), - entry(SemanticAttributes.SERVER_PORT, 987L)); + entry(ServerAttributes.SERVER_ADDRESS, "opentelemetry.io"), + entry(ServerAttributes.SERVER_PORT, 987L)); AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, response, null); @@ -471,8 +471,8 @@ void shouldExtractServerAddressAndPortFromAuthorityPseudoHeader() { assertThat(startAttributes.build()) .containsOnly( - entry(SemanticAttributes.SERVER_ADDRESS, "opentelemetry.io"), - entry(SemanticAttributes.SERVER_PORT, 42L)); + entry(ServerAttributes.SERVER_ADDRESS, "opentelemetry.io"), + entry(ServerAttributes.SERVER_PORT, 42L)); AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, response, null); @@ -496,8 +496,8 @@ void shouldExtractServerAddressAndPortFromHostHeader() { assertThat(startAttributes.build()) .containsOnly( - entry(SemanticAttributes.SERVER_ADDRESS, "github.com"), - entry(SemanticAttributes.SERVER_PORT, 123L)); + entry(ServerAttributes.SERVER_ADDRESS, "github.com"), + entry(ServerAttributes.SERVER_PORT, 123L)); AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, response, null); diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java index 7bc0c709b201..45441d45c45b 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java @@ -21,7 +21,7 @@ import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -49,8 +49,8 @@ void collectsMetrics() { .put(NetworkAttributes.NETWORK_TYPE, "ipv4") .put(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http") .put(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0") - .put(SemanticAttributes.SERVER_ADDRESS, "localhost") - .put(SemanticAttributes.SERVER_PORT, 1234) + .put(ServerAttributes.SERVER_ADDRESS, "localhost") + .put(ServerAttributes.SERVER_PORT, 1234) .build(); Attributes responseAttributes = @@ -146,7 +146,7 @@ void collectsHttpRouteFromEndAttributes() { Attributes requestAttributes = Attributes.builder() - .put(SemanticAttributes.SERVER_ADDRESS, "host") + .put(ServerAttributes.SERVER_ADDRESS, "host") .put(UrlAttributes.URL_SCHEME, "https") .build(); diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/ServerAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/ServerAttributesExtractorTest.java index 7901a1fe3daf..9cea5e06e361 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/ServerAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/network/ServerAttributesExtractorTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.util.HashMap; import java.util.Map; import javax.annotation.Nullable; @@ -50,8 +50,8 @@ void allAttributes() { extractor.onStart(startAttributes, Context.root(), request); assertThat(startAttributes.build()) .containsOnly( - entry(SemanticAttributes.SERVER_ADDRESS, "opentelemetry.io"), - entry(SemanticAttributes.SERVER_PORT, 80L)); + entry(ServerAttributes.SERVER_ADDRESS, "opentelemetry.io"), + entry(ServerAttributes.SERVER_PORT, 80L)); AttributesBuilder endAttributes = Attributes.builder(); extractor.onEnd(endAttributes, Context.root(), request, null, null); @@ -84,7 +84,7 @@ void doesNotSetNegativePortValue() { AttributesBuilder startAttributes = Attributes.builder(); extractor.onStart(startAttributes, Context.root(), request); assertThat(startAttributes.build()) - .containsOnly(entry(SemanticAttributes.SERVER_ADDRESS, "opentelemetry.io")); + .containsOnly(entry(ServerAttributes.SERVER_ADDRESS, "opentelemetry.io")); } @Test diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy index 091d60f37b0c..36c1d91d734c 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy @@ -12,6 +12,8 @@ import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes import org.apache.dubbo.common.utils.NetUtils import org.apache.dubbo.config.ApplicationConfig @@ -104,8 +106,8 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" "$SemanticAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" "$SemanticAttributes.RPC_METHOD" "\$invoke" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" Long + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" Long "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == null || it instanceof String} "$NetworkAttributes.NETWORK_PEER_PORT" { it == null || it instanceof Long} "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } @@ -180,8 +182,8 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" "$SemanticAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" "$SemanticAttributes.RPC_METHOD" "\$invokeAsync" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" Long + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" Long "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == null || it instanceof String} "$NetworkAttributes.NETWORK_PEER_PORT" { it == null || it instanceof Long} "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy index 2329eb13fd23..ae887afcf5db 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy @@ -14,6 +14,8 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes import org.apache.dubbo.common.utils.NetUtils import org.apache.dubbo.config.ApplicationConfig @@ -140,8 +142,8 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" "$SemanticAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" "$SemanticAttributes.RPC_METHOD" "\$invoke" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" Long + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" Long "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == null || it instanceof String} "$NetworkAttributes.NETWORK_PEER_PORT" { it == null || it instanceof Long} "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } @@ -168,8 +170,8 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" "$SemanticAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" "$SemanticAttributes.RPC_METHOD" "\$invoke" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" Long + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" Long "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == null || it instanceof String } "$NetworkAttributes.NETWORK_PEER_PORT" { it == null || it instanceof Long } "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } @@ -256,8 +258,8 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" "$SemanticAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" "$SemanticAttributes.RPC_METHOD" "\$invoke" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" Long + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" Long "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == null || it instanceof String} "$NetworkAttributes.NETWORK_PEER_PORT" { it == null || it instanceof Long} "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy index bea449238474..f10b5b1bb8a7 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy @@ -5,6 +5,8 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes @@ -67,9 +69,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -89,9 +91,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "PUT" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -111,9 +113,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -133,9 +135,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -155,9 +157,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "PUT" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -176,9 +178,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "PUT" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } span(1) { @@ -195,8 +197,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_PORT" { it == null || Number } "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "s3ToSqsTestQueue" "$SemanticAttributes.MESSAGING_OPERATION" "process" @@ -226,9 +228,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -247,9 +249,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "DELETE" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 204 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -268,9 +270,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "DELETE" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 204 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -289,9 +291,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -343,9 +345,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -364,9 +366,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -385,9 +387,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "PUT" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -405,9 +407,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -425,9 +427,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } "$SemanticAttributes.MESSAGING_DESTINATION_NAME" topicArn } } @@ -447,9 +449,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -467,9 +469,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } "$SemanticAttributes.MESSAGING_DESTINATION_NAME" topicArn } } @@ -489,9 +491,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "PUT" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -510,9 +512,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "PUT" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -531,8 +533,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_PORT" { it == null || Number } "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "s3ToSnsToSqsTestQueue" "$SemanticAttributes.MESSAGING_OPERATION" "process" @@ -562,9 +564,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -583,9 +585,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "DELETE" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 204 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -604,9 +606,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "DELETE" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 204 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -625,9 +627,9 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://") } - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy index 1e07c1d52692..73591b372c07 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy @@ -5,6 +5,8 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes @@ -59,9 +61,9 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -81,9 +83,9 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -103,9 +105,9 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -124,9 +126,9 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } } } } @@ -145,9 +147,9 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } "$SemanticAttributes.MESSAGING_DESTINATION_NAME" topicArn } } @@ -166,9 +168,9 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String - "$SemanticAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_PORT" { it == null || Number } "$SemanticAttributes.MESSAGING_DESTINATION_NAME" topicArn } } @@ -186,8 +188,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" String - "$SemanticAttributes.SERVER_ADDRESS" String - "$SemanticAttributes.SERVER_PORT" { it == null || Number } + "$ServerAttributes.SERVER_ADDRESS" String + "$ServerAttributes.SERVER_PORT" { it == null || Number } "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "snsToSqsTestQueue" "$SemanticAttributes.MESSAGING_OPERATION" "process" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy index 81c947ea248d..7fce58535ab4 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy @@ -20,6 +20,7 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractAws1ClientTest import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes @@ -104,7 +105,7 @@ class Aws1ClientTest extends AbstractAws1ClientTest implements AgentTestTrait { attributes { "$UrlAttributes.URL_FULL" "https://s3.amazonaws.com" "$HttpAttributes.HTTP_REQUEST_METHOD" "HEAD" - "$SemanticAttributes.SERVER_ADDRESS" "s3.amazonaws.com" + "$ServerAttributes.SERVER_ADDRESS" "s3.amazonaws.com" "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" "Amazon S3" "$SemanticAttributes.RPC_METHOD" "HeadBucket" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy index e884c142e8c9..012da31e17ca 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy @@ -25,6 +25,8 @@ import com.amazonaws.services.s3.S3ClientOptions import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -115,8 +117,8 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" server.httpPort() - "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" + "$ServerAttributes.SERVER_PORT" server.httpPort() + "$ServerAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" { it.contains(service) } "$SemanticAttributes.RPC_METHOD" "${operation}" @@ -175,8 +177,8 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_FULL" "http://localhost:${UNUSABLE_PORT}" "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" - "$SemanticAttributes.SERVER_PORT" 61 - "$SemanticAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" 61 + "$ServerAttributes.SERVER_ADDRESS" "localhost" "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" { it.contains(service) } "$SemanticAttributes.RPC_METHOD" "${operation}" @@ -223,7 +225,7 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_FULL" "https://s3.amazonaws.com" "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.SERVER_ADDRESS" "s3.amazonaws.com" + "$ServerAttributes.SERVER_ADDRESS" "s3.amazonaws.com" "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" "Amazon S3" "$SemanticAttributes.RPC_METHOD" "GetObject" @@ -266,8 +268,8 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { attributes { "$UrlAttributes.URL_FULL" "${server.httpUri()}" "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.SERVER_PORT" server.httpPort() - "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" + "$ServerAttributes.SERVER_PORT" server.httpPort() + "$ServerAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" "Amazon S3" "$SemanticAttributes.RPC_METHOD" "GetObject" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy index 8fcd39b823b7..bf24198d3ec7 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy @@ -32,6 +32,8 @@ import com.amazonaws.services.sns.model.PublishRequest import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -113,8 +115,8 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_PORT" server.httpPort() - "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" + "$ServerAttributes.SERVER_PORT" server.httpPort() + "$ServerAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" { it.contains(service) } "$SemanticAttributes.RPC_METHOD" "${operation}" @@ -208,8 +210,8 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { attributes { "$UrlAttributes.URL_FULL" "http://127.0.0.1:${UNUSABLE_PORT}" "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" - "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" - "$SemanticAttributes.SERVER_PORT" 61 + "$ServerAttributes.SERVER_ADDRESS" "127.0.0.1" + "$ServerAttributes.SERVER_PORT" 61 "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" { it.contains(service) } "$SemanticAttributes.RPC_METHOD" "${operation}" @@ -264,8 +266,8 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { attributes { "$UrlAttributes.URL_FULL" "${server.httpUri()}" "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.SERVER_PORT" server.httpPort() - "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" + "$ServerAttributes.SERVER_PORT" server.httpPort() + "$ServerAttributes.SERVER_ADDRESS" "127.0.0.1" "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" "Amazon S3" "$SemanticAttributes.RPC_METHOD" "GetObject" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java index a86b6ec84a32..bdc85aacdd33 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java @@ -27,6 +27,7 @@ import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import org.elasticmq.rest.sqs.SQSRestServer; import org.elasticmq.rest.sqs.SQSRestServerBuilder; @@ -101,8 +102,8 @@ void testSimpleSqsProducerConsumerServices() { equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), trace -> trace.hasSpansSatisfyingExactly( @@ -122,8 +123,8 @@ void testSimpleSqsProducerConsumerServices() { equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), @@ -148,8 +149,8 @@ void testSimpleSqsProducerConsumerServices() { equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), @@ -202,8 +203,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), trace -> trace.hasSpansSatisfyingExactly( @@ -223,8 +224,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), @@ -249,8 +250,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), @@ -286,8 +287,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")))); } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java index 0ed23b318286..7cc5cd1a3a44 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java @@ -33,6 +33,7 @@ import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.ArrayList; import java.util.Arrays; @@ -134,8 +135,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), trace -> trace.hasSpansSatisfyingExactly( @@ -154,8 +155,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), @@ -194,8 +195,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), @@ -230,8 +231,8 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), @@ -296,8 +297,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), trace -> trace.hasSpansSatisfyingExactly( @@ -317,8 +318,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), @@ -358,8 +359,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo( UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), span -> span.hasName("testSdkSqs receive") @@ -381,8 +382,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo( UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( SemanticAttributes.MESSAGING_DESTINATION_NAME, @@ -410,8 +411,8 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo( UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, sqsPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, sqsPort), equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( SemanticAttributes.MESSAGING_DESTINATION_NAME, diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy index a6134ef8a98e..cf9b782c6a67 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy @@ -8,6 +8,8 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes @@ -136,8 +138,8 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { kind CLIENT hasNoParent() attributes { - "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" - "$SemanticAttributes.SERVER_PORT" server.httpPort() + "$ServerAttributes.SERVER_ADDRESS" "127.0.0.1" + "$ServerAttributes.SERVER_PORT" server.httpPort() "$UrlAttributes.URL_FULL" { it.startsWith("${server.httpUri()}${path}") } "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 @@ -169,8 +171,8 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { kind CLIENT hasNoParent() attributes { - "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" - "$SemanticAttributes.SERVER_PORT" server.httpPort() + "$ServerAttributes.SERVER_ADDRESS" "127.0.0.1" + "$ServerAttributes.SERVER_PORT" server.httpPort() "$UrlAttributes.URL_FULL" { it.startsWith("${server.httpUri()}${path}") } "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 @@ -201,8 +203,8 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { kind CLIENT hasNoParent() attributes { - "$SemanticAttributes.SERVER_ADDRESS" "127.0.0.1" - "$SemanticAttributes.SERVER_PORT" server.httpPort() + "$ServerAttributes.SERVER_ADDRESS" "127.0.0.1" + "$ServerAttributes.SERVER_PORT" server.httpPort() "$UrlAttributes.URL_FULL" { it.startsWith("${server.httpUri()}${path}") } "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy index d7072523646c..dfa767caa64e 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy @@ -7,6 +7,8 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes @@ -121,13 +123,13 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { // the bucket name is a valid DNS label, even in the case that we are using an endpoint override. // Previously the sdk was only doing that if endpoint had "s3" as label in the FQDN. // Our test assert both cases so that we don't need to know what version is being tested. - "$SemanticAttributes.SERVER_ADDRESS" { it == "somebucket.localhost" || it == "localhost" } + "$ServerAttributes.SERVER_ADDRESS" { it == "somebucket.localhost" || it == "localhost" } "$UrlAttributes.URL_FULL" { it.startsWith("http://somebucket.localhost:${server.httpPort()}") || it.startsWith("http://localhost:${server.httpPort()}/somebucket") } } else { - "$SemanticAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_ADDRESS" "localhost" "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:${server.httpPort()}") } } - "$SemanticAttributes.SERVER_PORT" server.httpPort() + "$ServerAttributes.SERVER_PORT" server.httpPort() "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.RPC_SYSTEM" "aws-api" @@ -281,13 +283,13 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { // the bucket name is a valid DNS label, even in the case that we are using an endpoint override. // Previously the sdk was only doing that if endpoint had "s3" as label in the FQDN. // Our test assert both cases so that we don't need to know what version is being tested. - "$SemanticAttributes.SERVER_ADDRESS" { it == "somebucket.localhost" || it == "localhost" } + "$ServerAttributes.SERVER_ADDRESS" { it == "somebucket.localhost" || it == "localhost" } "$UrlAttributes.URL_FULL" { it.startsWith("http://somebucket.localhost:${server.httpPort()}") || it.startsWith("http://localhost:${server.httpPort()}") } } else { - "$SemanticAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_ADDRESS" "localhost" "$UrlAttributes.URL_FULL" { it == "http://localhost:${server.httpPort()}" || it == "http://localhost:${server.httpPort()}/" } } - "$SemanticAttributes.SERVER_PORT" server.httpPort() + "$ServerAttributes.SERVER_PORT" server.httpPort() "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$SemanticAttributes.RPC_SYSTEM" "aws-api" @@ -449,9 +451,9 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { // the bucket name is a valid DNS label, even in the case that we are using an endpoint override. // Previously the sdk was only doing that if endpoint had "s3" as label in the FQDN. // Our test assert both cases so that we don't need to know what version is being tested. - "$SemanticAttributes.SERVER_ADDRESS" { it == "somebucket.localhost" || it == "localhost" } + "$ServerAttributes.SERVER_ADDRESS" { it == "somebucket.localhost" || it == "localhost" } "$UrlAttributes.URL_FULL" { it == "http://somebucket.localhost:${server.httpPort()}/somekey" || it == "http://localhost:${server.httpPort()}/somebucket/somekey" } - "$SemanticAttributes.SERVER_PORT" server.httpPort() + "$ServerAttributes.SERVER_PORT" server.httpPort() "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$SemanticAttributes.RPC_SYSTEM" "aws-api" "$SemanticAttributes.RPC_SERVICE" "S3" diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy index 44a66d81787a..e1020808725b 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy @@ -7,6 +7,8 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes @@ -135,8 +137,8 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" sqsPort + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" sqsPort } } } @@ -155,8 +157,8 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" sqsPort + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" "$SemanticAttributes.MESSAGING_OPERATION" "publish" @@ -176,8 +178,8 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" sqsPort + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" "$SemanticAttributes.MESSAGING_OPERATION" "process" @@ -216,8 +218,8 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" sqsPort + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" sqsPort } } } @@ -327,8 +329,8 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" sqsPort + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" "$SemanticAttributes.MESSAGING_OPERATION" "publish" @@ -349,8 +351,8 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" sqsPort + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" "$SemanticAttributes.MESSAGING_OPERATION" "process" @@ -377,8 +379,8 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" sqsPort + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" "$SemanticAttributes.MESSAGING_OPERATION" "process" diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy index f31909f14d0e..731f0a6ccd39 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy @@ -8,6 +8,8 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes @@ -137,8 +139,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" sqsPort + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" sqsPort } } } @@ -157,8 +159,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" sqsPort + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" "$SemanticAttributes.MESSAGING_OPERATION" "publish" @@ -196,8 +198,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" sqsPort + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" sqsPort } } } @@ -218,8 +220,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" sqsPort + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" "$SemanticAttributes.MESSAGING_OPERATION" "receive" @@ -242,8 +244,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" sqsPort + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" "$SemanticAttributes.MESSAGING_OPERATION" "process" @@ -393,8 +395,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" sqsPort + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" "$SemanticAttributes.MESSAGING_OPERATION" "publish" @@ -417,8 +419,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" sqsPort + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" "$SemanticAttributes.MESSAGING_OPERATION" "receive" @@ -456,8 +458,8 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "POST" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" sqsPort + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" sqsPort "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" "$SemanticAttributes.MESSAGING_OPERATION" "process" diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java index 946ea2fe615d..7c0396312181 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java @@ -14,6 +14,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpResponse; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; import io.opentelemetry.testing.internal.armeria.common.MediaType; @@ -164,8 +165,8 @@ public void testSendDynamoDbRequestWithRetries() { span.hasAttributesSatisfying( attributes -> { assertThat(attributes) - .containsEntry(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1") - .containsEntry(SemanticAttributes.SERVER_PORT, server.httpPort()) + .containsEntry(ServerAttributes.SERVER_ADDRESS, "127.0.0.1") + .containsEntry(ServerAttributes.SERVER_PORT, server.httpPort()) .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, method) .containsEntry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200) .containsEntry(SemanticAttributes.RPC_SYSTEM, "aws-api") diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java index 632a3eaf9064..feed0b0f1a99 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java @@ -17,7 +17,7 @@ import io.opentelemetry.semconv.ClientAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.semconv.UserAgentAttributes; import org.apache.camel.CamelContext; @@ -108,8 +108,8 @@ void restComponentServerAndClientCallWithJettyBackend() { equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_ROUTE, "/api/{module}/unit/{unitId}"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, Long.valueOf(port)), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, Long.valueOf(port)), equalTo(ClientAttributes.CLIENT_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java index aa307bf2dbc1..e1ecebc6a11c 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java @@ -18,7 +18,7 @@ import io.opentelemetry.semconv.ClientAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.semconv.UserAgentAttributes; import org.apache.camel.CamelContext; @@ -159,8 +159,8 @@ void twoCamelServiceSpans() throws Exception { "Jakarta Commons-HttpClient/3.1"), equalTo(HttpAttributes.HTTP_ROUTE, "/serviceTwo"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), - equalTo(SemanticAttributes.SERVER_PORT, portTwo), + equalTo(ServerAttributes.SERVER_ADDRESS, "127.0.0.1"), + equalTo(ServerAttributes.SERVER_PORT, portTwo), equalTo(ClientAttributes.CLIENT_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java index f28069d82dfc..26b8b09b6cf9 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java @@ -17,6 +17,7 @@ import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.ArrayList; import java.util.Arrays; @@ -72,10 +73,10 @@ static SpanDataAssert sqs( equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), satisfies(UrlAttributes.URL_FULL, val -> val.isInstanceOf(String.class)), satisfies( - SemanticAttributes.SERVER_ADDRESS, + ServerAttributes.SERVER_ADDRESS, stringAssert -> stringAssert.isInstanceOf(String.class)), satisfies( - SemanticAttributes.SERVER_PORT, + ServerAttributes.SERVER_PORT, val -> val.satisfiesAnyOf( v -> assertThat(v).isNull(), @@ -123,9 +124,9 @@ static SpanDataAssert s3(SpanDataAssert span, String spanName, String bucketName equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), satisfies(UrlAttributes.URL_FULL, val -> val.isInstanceOf(String.class)), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - satisfies(SemanticAttributes.SERVER_ADDRESS, val -> val.isInstanceOf(String.class)), + satisfies(ServerAttributes.SERVER_ADDRESS, val -> val.isInstanceOf(String.class)), satisfies( - SemanticAttributes.SERVER_PORT, + ServerAttributes.SERVER_PORT, val -> val.satisfiesAnyOf( v -> val.isInstanceOf(Number.class), v -> assertThat(v).isNull()))); @@ -145,9 +146,9 @@ static SpanDataAssert sns(SpanDataAssert span, String spanName, String topicArn) equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), satisfies(UrlAttributes.URL_FULL, val -> val.isInstanceOf(String.class)), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - satisfies(SemanticAttributes.SERVER_ADDRESS, val -> val.isInstanceOf(String.class)), + satisfies(ServerAttributes.SERVER_ADDRESS, val -> val.isInstanceOf(String.class)), satisfies( - SemanticAttributes.SERVER_PORT, + ServerAttributes.SERVER_PORT, val -> val.satisfiesAnyOf( v -> val.isInstanceOf(Number.class), v -> assertThat(v).isNull()))); diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraAttributesExtractor.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraAttributesExtractor.java index 1c6b616b7f90..6e56a5a58997 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraAttributesExtractor.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraAttributesExtractor.java @@ -9,7 +9,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import javax.annotation.Nullable; public class CassandraAttributesExtractor @@ -28,10 +28,9 @@ public void onEnd( return; } attributes.put( - SemanticAttributes.SERVER_ADDRESS, + ServerAttributes.SERVER_ADDRESS, executionInfo.getQueriedHost().getSocketAddress().getHostString()); attributes.put( - SemanticAttributes.SERVER_PORT, - executionInfo.getQueriedHost().getSocketAddress().getPort()); + ServerAttributes.SERVER_PORT, executionInfo.getQueriedHost().getSocketAddress().getPort()); } } diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java index 0d362762ca93..e5d31344a1e0 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java @@ -14,6 +14,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.net.InetSocketAddress; import java.time.Duration; import java.util.concurrent.Executor; @@ -86,8 +87,8 @@ void syncTest(Parameter parameter) { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, cassandraPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), equalTo(SemanticAttributes.DB_SYSTEM, "cassandra"), @@ -101,8 +102,8 @@ void syncTest(Parameter parameter) { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, cassandraPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), equalTo(SemanticAttributes.DB_SYSTEM, "cassandra"), @@ -120,8 +121,8 @@ void syncTest(Parameter parameter) { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, cassandraPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), equalTo(SemanticAttributes.DB_SYSTEM, "cassandra"), @@ -159,8 +160,8 @@ void asyncTest(Parameter parameter) { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, cassandraPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), equalTo(SemanticAttributes.DB_SYSTEM, "cassandra"), @@ -175,8 +176,8 @@ void asyncTest(Parameter parameter) { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, cassandraPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), equalTo(SemanticAttributes.DB_SYSTEM, "cassandra"), @@ -199,8 +200,8 @@ void asyncTest(Parameter parameter) { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, cassandraPort), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), equalTo(SemanticAttributes.DB_SYSTEM, "cassandra"), diff --git a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java index 67239803bcb4..034d2d42a0b5 100644 --- a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java +++ b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java @@ -19,8 +19,8 @@ import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION; import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.SemanticAttributes.DB_SYSTEM; -import static io.opentelemetry.semconv.SemanticAttributes.SERVER_ADDRESS; -import static io.opentelemetry.semconv.SemanticAttributes.SERVER_PORT; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Named.named; diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java index afcff2f78594..ae1240d112e1 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java @@ -14,6 +14,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.net.InetSocketAddress; import java.net.SocketAddress; import javax.annotation.Nullable; @@ -41,8 +42,8 @@ public void onEnd( SocketAddress address = coordinator.getEndPoint().resolve(); if (address instanceof InetSocketAddress) { attributes.put( - SemanticAttributes.SERVER_ADDRESS, ((InetSocketAddress) address).getHostString()); - attributes.put(SemanticAttributes.SERVER_PORT, ((InetSocketAddress) address).getPort()); + ServerAttributes.SERVER_ADDRESS, ((InetSocketAddress) address).getHostString()); + attributes.put(ServerAttributes.SERVER_PORT, ((InetSocketAddress) address).getPort()); } if (coordinator.getDatacenter() != null) { attributes.put(SemanticAttributes.DB_CASSANDRA_COORDINATOR_DC, coordinator.getDatacenter()); diff --git a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java index b017c352f2b6..603704e13dc8 100644 --- a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java +++ b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java @@ -17,6 +17,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.lang.reflect.Field; import java.net.InetSocketAddress; import java.util.logging.Level; @@ -93,8 +94,8 @@ private static void updateServerAddressAndPort(AttributesBuilder attributes, Nod EndPoint endPoint = coordinator.getEndPoint(); if (endPoint instanceof DefaultEndPoint) { InetSocketAddress address = ((DefaultEndPoint) endPoint).resolve(); - attributes.put(SemanticAttributes.SERVER_ADDRESS, address.getHostString()); - attributes.put(SemanticAttributes.SERVER_PORT, address.getPort()); + attributes.put(ServerAttributes.SERVER_ADDRESS, address.getHostString()); + attributes.put(ServerAttributes.SERVER_PORT, address.getPort()); } else if (endPoint instanceof SniEndPoint && proxyAddressField != null) { SniEndPoint sniEndPoint = (SniEndPoint) endPoint; Object object = null; @@ -108,8 +109,8 @@ private static void updateServerAddressAndPort(AttributesBuilder attributes, Nod } if (object instanceof InetSocketAddress) { InetSocketAddress address = (InetSocketAddress) object; - attributes.put(SemanticAttributes.SERVER_ADDRESS, address.getHostString()); - attributes.put(SemanticAttributes.SERVER_PORT, address.getPort()); + attributes.put(ServerAttributes.SERVER_ADDRESS, address.getHostString()); + attributes.put(ServerAttributes.SERVER_PORT, address.getPort()); } } } diff --git a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java index d8d5058113db..95b075694108 100644 --- a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java +++ b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java @@ -19,8 +19,8 @@ import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION; import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.SemanticAttributes.DB_SYSTEM; -import static io.opentelemetry.semconv.SemanticAttributes.SERVER_ADDRESS; -import static io.opentelemetry.semconv.SemanticAttributes.SERVER_PORT; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Named.named; diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java index 2bdb92d1cffc..574dc3aeaae8 100644 --- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java +++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java @@ -21,6 +21,7 @@ import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; import java.util.concurrent.CountDownLatch; @@ -92,15 +93,15 @@ public void elasticsearchStatus() throws IOException { equalTo(SemanticAttributes.DB_OPERATION, "info"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/"), - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort())), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort())), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/"), @@ -126,8 +127,8 @@ public void elasticsearchIndex() throws IOException { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), equalTo(SemanticAttributes.DB_OPERATION, "index"), - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "PUT"), equalTo( UrlAttributes.URL_FULL, @@ -143,8 +144,8 @@ public void elasticsearchIndex() throws IOException { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "PUT"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo( @@ -187,8 +188,8 @@ public void elasticsearchStatusAsync() throws Exception { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), equalTo(SemanticAttributes.DB_OPERATION, "info"), - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/")), span -> @@ -196,8 +197,8 @@ public void elasticsearchStatusAsync() throws Exception { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/"), diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java index bd9d14e55091..82fb4adbf227 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java @@ -14,6 +14,7 @@ import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; import java.util.Map; @@ -97,8 +98,8 @@ void elasticsearchStatus() throws IOException { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); }, span -> { @@ -106,8 +107,8 @@ void elasticsearchStatus() throws IOException { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), @@ -173,8 +174,8 @@ public void onFailure(Exception e) { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); }, span -> { @@ -182,8 +183,8 @@ public void onFailure(Exception e) { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java index 55b39f0aa9d7..cab760683600 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java @@ -14,6 +14,7 @@ import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; import java.util.Map; @@ -88,8 +89,8 @@ public void elasticsearchStatus() throws IOException { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); }, span -> { @@ -97,8 +98,8 @@ public void elasticsearchStatus() throws IOException { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), @@ -163,8 +164,8 @@ public void onFailure(Exception e) { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")); }, span -> { @@ -172,8 +173,8 @@ public void onFailure(Exception e) { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index 1ec5e9ac7c76..fa10070d526b 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -14,6 +14,7 @@ import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.Map; import java.util.concurrent.CountDownLatch; @@ -86,16 +87,16 @@ public void elasticsearchStatus() throws Exception { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), @@ -156,16 +157,16 @@ public void onFailure(Exception e) { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index eec10ff47e99..5743b7bff3ac 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -13,6 +13,7 @@ import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.Map; import java.util.concurrent.CountDownLatch; @@ -86,8 +87,8 @@ public void elasticsearchStatus() throws Exception { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo( UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")))); } @@ -146,8 +147,8 @@ public void onFailure(Exception e) { .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health")), span -> span.hasName("callback") diff --git a/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchClientAttributeExtractor.java b/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchClientAttributeExtractor.java index 6018721b459e..4218609df6cc 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchClientAttributeExtractor.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchClientAttributeExtractor.java @@ -14,7 +14,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.HashSet; import java.util.Set; @@ -42,8 +42,8 @@ public class ElasticsearchClientAttributeExtractor private static void setServerAttributes(AttributesBuilder attributes, Response response) { HttpHost host = response.getHost(); if (host != null) { - internalSet(attributes, SemanticAttributes.SERVER_ADDRESS, host.getHostName()); - internalSet(attributes, SemanticAttributes.SERVER_PORT, (long) host.getPort()); + internalSet(attributes, ServerAttributes.SERVER_ADDRESS, host.getHostName()); + internalSet(attributes, ServerAttributes.SERVER_PORT, (long) host.getPort()); } } diff --git a/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/ClientTest.java b/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/ClientTest.java index 88c130949997..74ad598f00e3 100644 --- a/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/ClientTest.java +++ b/instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/ClientTest.java @@ -30,7 +30,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.javaagent.instrumentation.finaglehttp.v23_11.Utils.ClientType; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.net.ConnectException; import java.net.URI; import java.util.Collections; @@ -192,8 +192,8 @@ private static Set> getHttpAttributes(URI uri) { return Collections.emptySet(); } Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(SemanticAttributes.SERVER_ADDRESS); - attributes.remove(SemanticAttributes.SERVER_PORT); + attributes.remove(ServerAttributes.SERVER_ADDRESS); + attributes.remove(ServerAttributes.SERVER_PORT); return attributes; } diff --git a/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java b/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java index f235b96fc390..e4a02d6e8ebf 100644 --- a/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java +++ b/instrumentation/google-http-client-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/AbstractGoogleHttpClientTest.java @@ -26,7 +26,7 @@ import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.net.URI; import java.util.ArrayList; @@ -101,8 +101,8 @@ void errorTracesWhenExceptionIsNotThrown() throws Exception { List attributes = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - satisfies(SemanticAttributes.SERVER_PORT, AbstractLongAssert::isPositive), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + satisfies(ServerAttributes.SERVER_PORT, AbstractLongAssert::isPositive), equalTo(UrlAttributes.URL_FULL, uri.toString()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 500), diff --git a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java index 09f05268d1ea..33d4ac17b7ed 100644 --- a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java +++ b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java @@ -25,6 +25,7 @@ import io.opentelemetry.sdk.testing.assertj.EventDataAssert; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.util.ArrayList; import java.util.List; import java.util.Queue; @@ -184,9 +185,8 @@ public void onCompleted() { equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo( - SemanticAttributes.SERVER_PORT, (long) server.getPort()))) + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) .hasEventsSatisfyingExactly(events.toArray(new Consumer[0])), span -> span.hasName("example.Greeter/Conversation") @@ -199,8 +199,8 @@ public void onCompleted() { equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.getPort()), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( @@ -222,7 +222,7 @@ public void onCompleted() { point -> point.hasAttributesSatisfying( equalTo( - SemanticAttributes.SERVER_ADDRESS, "localhost"), + ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo( SemanticAttributes.RPC_METHOD, "Conversation"), equalTo( @@ -247,10 +247,9 @@ public void onCompleted() { point -> point.hasAttributesSatisfying( equalTo( - SemanticAttributes.SERVER_ADDRESS, "localhost"), + ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo( - SemanticAttributes.SERVER_PORT, - server.getPort()), + ServerAttributes.SERVER_PORT, server.getPort()), equalTo( SemanticAttributes.RPC_METHOD, "Conversation"), equalTo( diff --git a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java index 63eac8b64eaa..d5ea9ab472a9 100644 --- a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java +++ b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java @@ -50,6 +50,7 @@ import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -140,9 +141,8 @@ public void sayHello( equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo( - SemanticAttributes.SERVER_PORT, (long) server.getPort()))) + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) .hasEventsSatisfyingExactly( event -> event @@ -167,8 +167,8 @@ public void sayHello( equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.getPort()), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( @@ -202,7 +202,7 @@ public void sayHello( point -> point.hasAttributesSatisfying( equalTo( - SemanticAttributes.SERVER_ADDRESS, "localhost"), + ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( SemanticAttributes.RPC_SERVICE, @@ -226,10 +226,9 @@ public void sayHello( point -> point.hasAttributesSatisfying( equalTo( - SemanticAttributes.SERVER_ADDRESS, "localhost"), + ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo( - SemanticAttributes.SERVER_PORT, - server.getPort()), + ServerAttributes.SERVER_PORT, server.getPort()), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( SemanticAttributes.RPC_SERVICE, @@ -302,9 +301,8 @@ public void sayHello( equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo( - SemanticAttributes.SERVER_PORT, (long) server.getPort()))) + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) .hasEventsSatisfyingExactly( event -> event @@ -329,8 +327,8 @@ public void sayHello( equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.getPort()), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( @@ -368,7 +366,7 @@ public void sayHello( point -> point.hasAttributesSatisfying( equalTo( - SemanticAttributes.SERVER_ADDRESS, "localhost"), + ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( SemanticAttributes.RPC_SERVICE, @@ -392,10 +390,9 @@ public void sayHello( point -> point.hasAttributesSatisfying( equalTo( - SemanticAttributes.SERVER_ADDRESS, "localhost"), + ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo( - SemanticAttributes.SERVER_PORT, - server.getPort()), + ServerAttributes.SERVER_PORT, server.getPort()), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( SemanticAttributes.RPC_SERVICE, @@ -476,9 +473,8 @@ public void onCompleted() { equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo( - SemanticAttributes.SERVER_PORT, (long) server.getPort()))) + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) .hasEventsSatisfyingExactly( event -> event @@ -503,8 +499,8 @@ public void onCompleted() { equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.getPort()), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( @@ -542,7 +538,7 @@ public void onCompleted() { point -> point.hasAttributesSatisfying( equalTo( - SemanticAttributes.SERVER_ADDRESS, "localhost"), + ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( SemanticAttributes.RPC_SERVICE, @@ -566,10 +562,9 @@ public void onCompleted() { point -> point.hasAttributesSatisfying( equalTo( - SemanticAttributes.SERVER_ADDRESS, "localhost"), + ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo( - SemanticAttributes.SERVER_PORT, - server.getPort()), + ServerAttributes.SERVER_PORT, server.getPort()), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( SemanticAttributes.RPC_SERVICE, @@ -625,9 +620,8 @@ public void sayHello( equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) status.getCode().value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo( - SemanticAttributes.SERVER_PORT, (long) server.getPort()))) + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) .hasEventsSatisfyingExactly( event -> event @@ -647,8 +641,8 @@ public void sayHello( equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) status.getCode().value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.getPort()), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( @@ -684,7 +678,7 @@ public void sayHello( point -> point.hasAttributesSatisfying( equalTo( - SemanticAttributes.SERVER_ADDRESS, "localhost"), + ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( SemanticAttributes.RPC_SERVICE, @@ -708,10 +702,9 @@ public void sayHello( point -> point.hasAttributesSatisfying( equalTo( - SemanticAttributes.SERVER_ADDRESS, "localhost"), + ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo( - SemanticAttributes.SERVER_PORT, - server.getPort()), + ServerAttributes.SERVER_PORT, server.getPort()), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( SemanticAttributes.RPC_SERVICE, @@ -775,9 +768,8 @@ public void sayHello( equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.UNKNOWN.getCode().value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo( - SemanticAttributes.SERVER_PORT, (long) server.getPort()))) + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) .hasEventsSatisfyingExactly( event -> event @@ -797,8 +789,8 @@ public void sayHello( equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.UNKNOWN.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.getPort()), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( @@ -829,7 +821,7 @@ public void sayHello( point -> point.hasAttributesSatisfying( equalTo( - SemanticAttributes.SERVER_ADDRESS, "localhost"), + ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( SemanticAttributes.RPC_SERVICE, @@ -853,10 +845,9 @@ public void sayHello( point -> point.hasAttributesSatisfying( equalTo( - SemanticAttributes.SERVER_ADDRESS, "localhost"), + ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo( - SemanticAttributes.SERVER_PORT, - server.getPort()), + ServerAttributes.SERVER_PORT, server.getPort()), equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( SemanticAttributes.RPC_SERVICE, @@ -1021,9 +1012,8 @@ public void onCompleted() { equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo( - SemanticAttributes.SERVER_PORT, (long) server.getPort()))) + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) .hasEventsSatisfyingExactly( event -> event @@ -1048,8 +1038,8 @@ public void onCompleted() { equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.getPort()), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( @@ -1139,9 +1129,8 @@ public void onCompleted() { equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.CANCELLED.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo( - SemanticAttributes.SERVER_PORT, (long) server.getPort()))) + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) .hasEventsSatisfying( events -> { assertThat(events).hasSize(3); @@ -1168,8 +1157,8 @@ public void onCompleted() { equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.CANCELLED.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.getPort()), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( @@ -1257,9 +1246,8 @@ public void onCompleted() { equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo( - SemanticAttributes.SERVER_PORT, (long) server.getPort()))) + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) .hasEventsSatisfyingExactly( event -> event @@ -1287,8 +1275,8 @@ public void onCompleted() { equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.getPort()), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( @@ -1362,9 +1350,8 @@ public void sayHello( equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo( - SemanticAttributes.SERVER_PORT, (long) server.getPort()))) + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) .hasEventsSatisfyingExactly( event -> event @@ -1389,8 +1376,8 @@ public void sayHello( equalTo( SemanticAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.getPort()), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( diff --git a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java index 30db6c73e591..f08b5eeb62cf 100644 --- a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java +++ b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java @@ -11,8 +11,8 @@ import static io.opentelemetry.semconv.SemanticAttributes.DB_SQL_TABLE; import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.SemanticAttributes.DB_USER; -import static io.opentelemetry.semconv.SemanticAttributes.SERVER_ADDRESS; -import static io.opentelemetry.semconv.SemanticAttributes.SERVER_PORT; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanKind; diff --git a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java index 630f1e0fe590..fc223926103c 100644 --- a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java +++ b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java @@ -11,8 +11,8 @@ import static io.opentelemetry.semconv.SemanticAttributes.DB_SQL_TABLE; import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.SemanticAttributes.DB_USER; -import static io.opentelemetry.semconv.SemanticAttributes.SERVER_ADDRESS; -import static io.opentelemetry.semconv.SemanticAttributes.SERVER_PORT; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanKind; diff --git a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java index 48f58946630d..1fcdc8384c55 100644 --- a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java +++ b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java @@ -24,7 +24,7 @@ import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.io.DataOutputStream; import java.io.IOException; @@ -124,8 +124,8 @@ public void traceRequest(boolean useCache) throws IOException { new ArrayList<>( Arrays.asList( equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, url.getPort()), equalTo(UrlAttributes.URL_FULL, url.toString()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); @@ -169,8 +169,8 @@ public void testBrokenApiUsage() throws IOException { new ArrayList<>( Arrays.asList( equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, url.getPort()), equalTo(UrlAttributes.URL_FULL, url.toString()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); @@ -220,8 +220,8 @@ public void testPostRequest() throws IOException { new ArrayList<>( Arrays.asList( equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, url.getPort()), equalTo(UrlAttributes.URL_FULL, url.toString()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); @@ -273,8 +273,8 @@ public void getOutputStreamShouldTransformGetIntoPost() throws IOException { new ArrayList<>( Arrays.asList( equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, url.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, url.getPort()), equalTo(UrlAttributes.URL_FULL, url.toString()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, STATUS))); @@ -315,8 +315,8 @@ public void traceRequestWithConnectionFailure(String scheme) { new ArrayList<>( Arrays.asList( equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), equalTo(UrlAttributes.URL_FULL, uri), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(ErrorAttributes.ERROR_TYPE, "java.net.ConnectException"))); diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy index d0114d9c2d84..486745a5609d 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy @@ -9,6 +9,8 @@ import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -119,8 +121,8 @@ abstract class JaxRsClientTest extends HttpClientTest implem status ERROR attributes { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" uri.host - "$SemanticAttributes.SERVER_PORT" uri.port > 0 ? uri.port : { it == null || it == 443 } + "$ServerAttributes.SERVER_ADDRESS" uri.host + "$ServerAttributes.SERVER_PORT" uri.port > 0 ? uri.port : { it == null || it == 443 } "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == null } "$UrlAttributes.URL_FULL" "${uri}" "$HttpAttributes.HTTP_REQUEST_METHOD" method diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy index 4d17ed9315ca..3d3265491bd8 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy @@ -10,6 +10,8 @@ import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.ErrorAttributes @@ -287,8 +289,8 @@ abstract class AbstractJaxRsHttpServerTest extends HttpServerTest implemen } attributes { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" fullUrl.host - "$SemanticAttributes.SERVER_PORT" fullUrl.port + "$ServerAttributes.SERVER_ADDRESS" fullUrl.host + "$ServerAttributes.SERVER_PORT" fullUrl.port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long "$UrlAttributes.URL_SCHEME" fullUrl.getScheme() diff --git a/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy b/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy index b95a9502b826..90c206a94354 100644 --- a/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy +++ b/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.jdbc.TestDriver import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.javaagent.instrumentation.jdbc.test.ProxyStatementFactory import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes import org.apache.derby.jdbc.EmbeddedDataSource import org.apache.derby.jdbc.EmbeddedDriver import org.h2.Driver @@ -651,7 +652,7 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { "$SemanticAttributes.DB_SYSTEM" "other_sql" "$SemanticAttributes.DB_STATEMENT" "testing ?" "$SemanticAttributes.DB_CONNECTION_STRING" "testdb://localhost" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_ADDRESS" "localhost" } } } @@ -695,7 +696,7 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { "$SemanticAttributes.DB_STATEMENT" sanitizedQuery "$SemanticAttributes.DB_OPERATION" operation "$SemanticAttributes.DB_SQL_TABLE" table - "$SemanticAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_ADDRESS" "localhost" } } } @@ -800,7 +801,7 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { "$SemanticAttributes.DB_STATEMENT" "SELECT * FROM table" "$SemanticAttributes.DB_OPERATION" "SELECT" "$SemanticAttributes.DB_SQL_TABLE" "table" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_ADDRESS" "localhost" } } } diff --git a/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy b/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy index c5f8d5bb0d35..4990cd95b706 100644 --- a/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy +++ b/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy @@ -17,6 +17,8 @@ import io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.LibraryTestTrait import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.instrumentation.jdbc.internal.JdbcInstrumenterFactory.createStatementInstrumenter @@ -51,8 +53,8 @@ class OpenTelemetryConnectionTest extends InstrumentationSpecification implement "$SemanticAttributes.DB_NAME" dbInfo.name "$SemanticAttributes.DB_USER" dbInfo.user "$SemanticAttributes.DB_CONNECTION_STRING" dbInfo.shortUrl - "$SemanticAttributes.SERVER_ADDRESS" dbInfo.host - "$SemanticAttributes.SERVER_PORT" dbInfo.port + "$ServerAttributes.SERVER_ADDRESS" dbInfo.host + "$ServerAttributes.SERVER_PORT" dbInfo.port "$SemanticAttributes.DB_STATEMENT" query "$SemanticAttributes.DB_OPERATION" "SELECT" "$SemanticAttributes.DB_SQL_TABLE" "users" @@ -107,8 +109,8 @@ class OpenTelemetryConnectionTest extends InstrumentationSpecification implement "$SemanticAttributes.DB_NAME" dbInfo.name "$SemanticAttributes.DB_USER" dbInfo.user "$SemanticAttributes.DB_CONNECTION_STRING" dbInfo.shortUrl - "$SemanticAttributes.SERVER_ADDRESS" dbInfo.host - "$SemanticAttributes.SERVER_PORT" dbInfo.port + "$ServerAttributes.SERVER_ADDRESS" dbInfo.host + "$ServerAttributes.SERVER_PORT" dbInfo.port "$SemanticAttributes.DB_STATEMENT" query "$SemanticAttributes.DB_OPERATION" "SELECT" "$SemanticAttributes.DB_SQL_TABLE" "users" @@ -167,8 +169,8 @@ class OpenTelemetryConnectionTest extends InstrumentationSpecification implement "$SemanticAttributes.DB_NAME" dbInfo.name "$SemanticAttributes.DB_USER" dbInfo.user "$SemanticAttributes.DB_CONNECTION_STRING" dbInfo.shortUrl - "$SemanticAttributes.SERVER_ADDRESS" dbInfo.host - "$SemanticAttributes.SERVER_PORT" dbInfo.port + "$ServerAttributes.SERVER_ADDRESS" dbInfo.host + "$ServerAttributes.SERVER_PORT" dbInfo.port "$SemanticAttributes.DB_STATEMENT" query "$SemanticAttributes.DB_OPERATION" "SELECT" "$SemanticAttributes.DB_SQL_TABLE" "users" diff --git a/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java b/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java index 1a4aafef54a1..5930a2562925 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java +++ b/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -63,8 +64,8 @@ void setCommand() { equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), equalTo(SemanticAttributes.DB_OPERATION, "SET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port)))); + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port)))); } @Test @@ -84,8 +85,8 @@ void getCommand() { equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), equalTo(SemanticAttributes.DB_OPERATION, "SET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port))), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port))), trace -> trace.hasSpansSatisfyingExactly( span -> @@ -95,8 +96,8 @@ void getCommand() { equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "GET foo"), equalTo(SemanticAttributes.DB_OPERATION, "GET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port)))); + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port)))); } @Test @@ -116,8 +117,8 @@ void commandWithNoArguments() { equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), equalTo(SemanticAttributes.DB_OPERATION, "SET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port))), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port))), trace -> trace.hasSpansSatisfyingExactly( span -> @@ -127,7 +128,7 @@ void commandWithNoArguments() { equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY"), equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port)))); + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port)))); } } diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java index c2d5e4d47797..e00ac3692462 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java +++ b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java @@ -14,6 +14,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import org.assertj.core.api.AbstractLongAssert; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -67,8 +68,8 @@ void setCommand() { equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), equalTo(SemanticAttributes.DB_OPERATION, "SET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( @@ -93,8 +94,8 @@ void getCommand() { equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), equalTo(SemanticAttributes.DB_OPERATION, "SET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( @@ -109,8 +110,8 @@ void getCommand() { equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "GET foo"), equalTo(SemanticAttributes.DB_OPERATION, "GET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( @@ -135,8 +136,8 @@ void commandWithNoArguments() { equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), equalTo(SemanticAttributes.DB_OPERATION, "SET"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( @@ -151,8 +152,8 @@ void commandWithNoArguments() { equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY"), equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( diff --git a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy index dc4f3e791e68..4c6e3a84e70e 100644 --- a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -10,6 +10,8 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes @@ -95,8 +97,8 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements hasNoParent() attributes { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" diff --git a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy index 41b8da524363..c9e96555e5a4 100644 --- a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -10,6 +10,8 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes @@ -106,8 +108,8 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements hasNoParent() attributes { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy index 7fcba9a6aafd..81c1199a8212 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy @@ -7,6 +7,8 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.ErrorAttributes @@ -105,8 +107,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long @@ -163,8 +165,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long @@ -216,8 +218,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" @@ -279,8 +281,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long @@ -347,8 +349,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long @@ -395,8 +397,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long @@ -475,8 +477,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long @@ -525,8 +527,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy index 69ec5cdd7d7f..7dd358ed62cc 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy @@ -7,6 +7,8 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.ErrorAttributes @@ -103,8 +105,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long @@ -172,8 +174,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long @@ -220,8 +222,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long @@ -316,8 +318,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long @@ -398,8 +400,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long @@ -460,8 +462,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$UserAgentAttributes.USER_AGENT_ORIGINAL" String "$HttpAttributes.HTTP_ROUTE" route "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long diff --git a/instrumentation/ktor/ktor-1.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerTest.kt b/instrumentation/ktor/ktor-1.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerTest.kt index b6d3d4a8f866..a00bb78a9d5b 100644 --- a/instrumentation/ktor/ktor-1.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerTest.kt +++ b/instrumentation/ktor/ktor-1.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerTest.kt @@ -21,7 +21,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTes import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint -import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes import kotlinx.coroutines.withContext import org.junit.jupiter.api.extension.RegisterExtension import java.util.concurrent.ExecutionException @@ -125,7 +125,7 @@ class KtorHttpServerTest : AbstractHttpServerTest() { options.setTestPathParam(true) options.setHttpAttributes { - HttpServerTestOptions.DEFAULT_HTTP_ATTRIBUTES - SemanticAttributes.SERVER_PORT + HttpServerTestOptions.DEFAULT_HTTP_ATTRIBUTES - ServerAttributes.SERVER_PORT } options.setExpectedHttpRoute { endpoint, method -> diff --git a/instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/AbstractKtorHttpServerTest.kt b/instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/AbstractKtorHttpServerTest.kt index f3c00d656f6e..600973a1a29b 100644 --- a/instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/AbstractKtorHttpServerTest.kt +++ b/instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/AbstractKtorHttpServerTest.kt @@ -21,7 +21,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint -import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes import kotlinx.coroutines.withContext import java.util.concurrent.ExecutionException import java.util.concurrent.TimeUnit @@ -122,7 +122,7 @@ abstract class AbstractKtorHttpServerTest : AbstractHttpServerTest diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java b/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java index 8d573026fcb9..61c0919084fd 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java +++ b/instrumentation/kubernetes-client-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTest.java @@ -20,7 +20,7 @@ import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpResponse; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; @@ -85,8 +85,8 @@ void synchronousCall() throws ApiException { + "/api/v1/namespaces/namespace/pods/name/proxy?path=path"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), - equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "127.0.0.1"), + equalTo(ServerAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo( AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"), equalTo(AttributeKey.stringKey("kubernetes-client.name"), "name")))); @@ -132,8 +132,8 @@ void handleErrorsInSyncCall() { + "/api/v1/namespaces/namespace/pods/name/proxy?path=path"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 451), - equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), - equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "127.0.0.1"), + equalTo(ServerAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo(ErrorAttributes.ERROR_TYPE, "451"), equalTo( AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"), @@ -186,8 +186,8 @@ public void onSuccess( + "/api/v1/namespaces/namespace/pods/name/proxy?path=path"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), - equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "127.0.0.1"), + equalTo(ServerAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo( AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"), equalTo(AttributeKey.stringKey("kubernetes-client.name"), "name")), @@ -247,8 +247,8 @@ public void onFailure( + "/api/v1/namespaces/namespace/pods/name/proxy?path=path"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 451), - equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), - equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "127.0.0.1"), + equalTo(ServerAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo(ErrorAttributes.ERROR_TYPE, "451"), equalTo( AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"), diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java b/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java index 7fec9fe857f2..00ef9fea1546 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java +++ b/instrumentation/kubernetes-client-7.0/javaagent/src/version20Test/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientVer20Test.java @@ -20,7 +20,7 @@ import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpResponse; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; @@ -89,8 +89,8 @@ void synchronousCall() throws ApiException { + "/api/v1/namespaces/namespace/pods/name/proxy/path"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), - equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "127.0.0.1"), + equalTo(ServerAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo( AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"), equalTo(AttributeKey.stringKey("kubernetes-client.name"), "name")))); @@ -136,8 +136,8 @@ void handleErrorsInSyncCall() { + "/api/v1/namespaces/namespace/pods/name/proxy/path"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 451), - equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), - equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "127.0.0.1"), + equalTo(ServerAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo(ErrorAttributes.ERROR_TYPE, "451"), equalTo( AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"), @@ -189,8 +189,8 @@ public void onSuccess( + "/api/v1/namespaces/namespace/pods/name/proxy/path"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), - equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "127.0.0.1"), + equalTo(ServerAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo( AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"), equalTo(AttributeKey.stringKey("kubernetes-client.name"), "name")), @@ -249,8 +249,8 @@ public void onFailure( + "/api/v1/namespaces/namespace/pods/name/proxy/path"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 451), - equalTo(SemanticAttributes.SERVER_ADDRESS, "127.0.0.1"), - equalTo(SemanticAttributes.SERVER_PORT, mockWebServer.httpPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "127.0.0.1"), + equalTo(ServerAttributes.SERVER_PORT, mockWebServer.httpPort()), equalTo(ErrorAttributes.ERROR_TYPE, "451"), equalTo( AttributeKey.stringKey("kubernetes-client.namespace"), "namespace"), diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java index 769d2541886a..ec2ae3094d3a 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java @@ -31,6 +31,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.util.Map; import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; @@ -141,8 +142,8 @@ void testConnectUsingGetOnConnectionFuture() { span.hasName("CONNECT") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, host), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, host), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis")))); } @@ -169,8 +170,8 @@ void testExceptionInsideTheConnectionFuture() { .hasStatus(StatusData.error()) .hasException(exception) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, host), - equalTo(SemanticAttributes.SERVER_PORT, incorrectPort), + equalTo(ServerAttributes.SERVER_ADDRESS, host), + equalTo(ServerAttributes.SERVER_PORT, incorrectPort), equalTo(SemanticAttributes.DB_SYSTEM, "redis")))); } diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java index 161ab31558f7..1400bf960416 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java @@ -21,6 +21,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.util.Map; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -119,8 +120,8 @@ void testConnect() { span.hasName("CONNECT") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, host), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, host), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis")))); } @@ -142,8 +143,8 @@ void testConnectException() { .hasKind(SpanKind.CLIENT) .hasException(exception) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, host), - equalTo(SemanticAttributes.SERVER_PORT, incorrectPort), + equalTo(ServerAttributes.SERVER_ADDRESS, host), + equalTo(ServerAttributes.SERVER_PORT, incorrectPort), equalTo(SemanticAttributes.DB_SYSTEM, "redis")))); } diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java index eceba7dfcc08..ddf9e349cdb6 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java @@ -29,6 +29,7 @@ import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.util.Map; import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; @@ -109,8 +110,8 @@ void testConnectUsingGetOnConnectionFuture() throws ExecutionException, Interrup span.hasName("CONNECT") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, host), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, host), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis")))); } @@ -140,8 +141,8 @@ void testConnectExceptionInsideTheConnectionFuture() { .hasKind(SpanKind.CLIENT) .hasStatus(StatusData.error()) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, host), - equalTo(SemanticAttributes.SERVER_PORT, incorrectPort), + equalTo(ServerAttributes.SERVER_ADDRESS, host), + equalTo(ServerAttributes.SERVER_PORT, incorrectPort), equalTo(SemanticAttributes.DB_SYSTEM, "redis")) .hasEventsSatisfyingExactly( event -> diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java index ae440f779dda..fd08a008601b 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java @@ -20,6 +20,7 @@ import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.util.Map; import org.assertj.core.api.AbstractAssert; import org.junit.jupiter.api.AfterAll; @@ -85,8 +86,8 @@ void testConnect() { span.hasName("CONNECT") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, host), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, host), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis")))); } @@ -107,8 +108,8 @@ void testConnectException() { .hasKind(SpanKind.CLIENT) .hasStatus(StatusData.error()) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, host), - equalTo(SemanticAttributes.SERVER_PORT, incorrectPort), + equalTo(ServerAttributes.SERVER_ADDRESS, host), + equalTo(ServerAttributes.SERVER_PORT, incorrectPort), equalTo(SemanticAttributes.DB_SYSTEM, "redis")) .hasEventsSatisfyingExactly( event -> diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java index 3e8e1d8afc50..1f0f5699f36e 100644 --- a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java @@ -15,6 +15,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -54,8 +55,8 @@ void testAsyncSubscriberWithSpecificThreadPool() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET a ?")) .hasEventsSatisfyingExactly( @@ -69,8 +70,8 @@ void testAsyncSubscriberWithSpecificThreadPool() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "GET a")) .hasEventsSatisfyingExactly( diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java index bd63c52e4615..6f3b4e0fcba8 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java @@ -23,6 +23,7 @@ import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -145,8 +146,8 @@ void testSetCommandUsingFutureGetWithTimeout() throws Exception { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET TESTSETKEY ?")) .hasEventsSatisfyingExactly( @@ -191,8 +192,8 @@ void testGetCommandChainedWithThenAccept() throws Exception { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "GET TESTKEY")) .hasEventsSatisfyingExactly( @@ -269,8 +270,8 @@ void testGetNonExistentKeyCommandWithHandleAsyncAndChainedWithThenApply() throws equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo( SemanticAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY")) @@ -335,8 +336,8 @@ void testCommandWithNoArgumentsUsingBiconsumer() throws Exception { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY")) .hasEventsSatisfyingExactly( @@ -394,8 +395,8 @@ void testHashSetAndThenNestApplyToHashGetall() throws Exception { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo( SemanticAttributes.DB_STATEMENT, @@ -412,8 +413,8 @@ void testHashSetAndThenNestApplyToHashGetall() throws Exception { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "HGETALL TESTHM")) .hasEventsSatisfyingExactly( diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java index bde09cc400b7..d3ed5fc9610a 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java @@ -14,6 +14,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; @@ -92,8 +93,8 @@ void testSetCommandWithSubscribeOnDefinedConsumer() throws Exception { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET TESTSETKEY ?")) .hasEventsSatisfyingExactly( @@ -130,8 +131,8 @@ void testGetCommandWithLambdaFunction() throws Exception { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "GET TESTKEY")) .hasEventsSatisfyingExactly( @@ -179,8 +180,8 @@ void testGetNonExistentKeyCommand() throws Exception { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY")) .hasEventsSatisfyingExactly( @@ -216,8 +217,8 @@ void testCommandWithNoArguments() throws Exception { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY")) .hasEventsSatisfyingExactly( @@ -240,8 +241,8 @@ void testCommandFluxPublisher() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "COMMAND")) .hasEventsSatisfyingExactly( @@ -285,8 +286,8 @@ void testBlockingSubscriber() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET a ?")) .hasEventsSatisfyingExactly( @@ -300,8 +301,8 @@ void testBlockingSubscriber() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "GET a")) .hasEventsSatisfyingExactly( @@ -329,8 +330,8 @@ void testAsyncSubscriber() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET a ?")) .hasEventsSatisfyingExactly( @@ -344,8 +345,8 @@ void testAsyncSubscriber() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "GET a")) .hasEventsSatisfyingExactly( diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java index 1c0eacea67fc..b6685ad6bd08 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java @@ -12,6 +12,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -66,8 +67,8 @@ void testAuthCommand() throws Exception { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "AUTH ?")) .hasEventsSatisfyingExactly( diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java index fabe4a50a2b4..1b09cf27fbcf 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java @@ -22,6 +22,7 @@ import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.util.Base64; import java.util.Map; import org.junit.jupiter.api.AfterAll; @@ -113,8 +114,8 @@ void testSetCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET TESTSETKEY ?")) .hasEventsSatisfyingExactly( @@ -145,8 +146,8 @@ void testSetCommandLocalhost() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SET TESTSETKEY ?")) .hasEventsSatisfyingExactly( @@ -170,8 +171,8 @@ void testGetCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "GET TESTKEY")) .hasEventsSatisfyingExactly( @@ -195,8 +196,8 @@ void testGetNonExistentKeyCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY")) .hasEventsSatisfyingExactly( @@ -220,8 +221,8 @@ void testCommandWithNoArguments() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY")) .hasEventsSatisfyingExactly( @@ -250,8 +251,8 @@ void testListCommand() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo( NetworkAttributes.NETWORK_PEER_PORT, containerConnection.port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, containerConnection.port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, containerConnection.port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "LPUSH TESTLIST ?")) .hasEventsSatisfyingExactly( @@ -275,8 +276,8 @@ void testHashSetCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo( SemanticAttributes.DB_STATEMENT, @@ -302,8 +303,8 @@ void testHashGetallCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "HGETALL TESTHM")) .hasEventsSatisfyingExactly( @@ -334,8 +335,8 @@ void testEvalCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo( SemanticAttributes.DB_STATEMENT, @@ -362,8 +363,8 @@ void testMsetCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "MSET key1 ? key2 ?")) .hasEventsSatisfyingExactly( @@ -392,8 +393,8 @@ void testDebugSegfaultCommandWithNoArgumentProducesNoSpan() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo( NetworkAttributes.NETWORK_PEER_PORT, containerConnection.port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, containerConnection.port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, containerConnection.port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "DEBUG SEGFAULT"))); } else { @@ -406,8 +407,8 @@ void testDebugSegfaultCommandWithNoArgumentProducesNoSpan() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo( NetworkAttributes.NETWORK_PEER_PORT, containerConnection.port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, containerConnection.port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, containerConnection.port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "DEBUG SEGFAULT")) // these are no longer recorded since Lettuce 6.1.6 @@ -441,8 +442,8 @@ void testShutdownCommandProducesNoSpan() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo( NetworkAttributes.NETWORK_PEER_PORT, containerConnection.port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, containerConnection.port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, containerConnection.port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE"))); } else { @@ -456,8 +457,8 @@ void testShutdownCommandProducesNoSpan() { equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo( NetworkAttributes.NETWORK_PEER_PORT, containerConnection.port), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, containerConnection.port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, containerConnection.port), equalTo(SemanticAttributes.DB_SYSTEM, "redis"), equalTo(SemanticAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE")) .hasEventsSatisfyingExactly( diff --git a/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy b/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy index 776d2714ca44..2cae6b104a6e 100644 --- a/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy +++ b/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy @@ -10,6 +10,8 @@ import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import org.slf4j.LoggerFactory import org.testcontainers.containers.GenericContainer import org.testcontainers.containers.output.Slf4jLogConsumer @@ -411,8 +413,8 @@ abstract class AbstractMongoClientTest extends InstrumentationSpecification { childOf((SpanData) parentSpan) } attributes { - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" port + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" port "$SemanticAttributes.DB_STATEMENT" { statementEval.call(it.replaceAll(" ", "")) } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/Netty38ClientTest.java b/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/Netty38ClientTest.java index a195bec4219e..30cfa49d7377 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/Netty38ClientTest.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/Netty38ClientTest.java @@ -21,7 +21,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.lang.reflect.Method; import java.net.ConnectException; import java.net.URI; @@ -170,8 +170,8 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) { } Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(SemanticAttributes.SERVER_ADDRESS); - attributes.remove(SemanticAttributes.SERVER_PORT); + attributes.remove(ServerAttributes.SERVER_ADDRESS); + attributes.remove(ServerAttributes.SERVER_PORT); return attributes; }); } diff --git a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java index 9997d72c63e5..5269eb128e5e 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientSslTest.java @@ -31,7 +31,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.net.URI; import java.util.Arrays; import java.util.Collections; @@ -92,8 +92,8 @@ public void shouldFailSslHandshake() { span.hasAttributesSatisfyingExactly( equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), - equalTo(SemanticAttributes.SERVER_ADDRESS, uri.getHost()), - equalTo(SemanticAttributes.SERVER_PORT, uri.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, uri.getHost()), + equalTo(ServerAttributes.SERVER_PORT, uri.getPort()), equalTo(NetworkAttributes.NETWORK_PEER_PORT, uri.getPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1")); }, @@ -184,8 +184,8 @@ public void shouldSuccessfullyEstablishSslHandshake() throws Exception { span.hasAttributesSatisfyingExactly( equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), - equalTo(SemanticAttributes.SERVER_ADDRESS, uri.getHost()), - equalTo(SemanticAttributes.SERVER_PORT, uri.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, uri.getHost()), + equalTo(ServerAttributes.SERVER_PORT, uri.getPort()), equalTo(NetworkAttributes.NETWORK_PEER_PORT, uri.getPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1")); }, diff --git a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientTest.java b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientTest.java index 3daca927a928..2953186c8580 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientTest.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientTest.java @@ -27,7 +27,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.net.URI; import java.util.Collections; import java.util.HashSet; @@ -176,8 +176,8 @@ private static Set> httpAttributes(URI uri) { return Collections.emptySet(); } Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(SemanticAttributes.SERVER_ADDRESS); - attributes.remove(SemanticAttributes.SERVER_PORT); + attributes.remove(ServerAttributes.SERVER_ADDRESS); + attributes.remove(ServerAttributes.SERVER_PORT); return attributes; } } diff --git a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java index 9725791b586d..45c36c980f2f 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java @@ -32,7 +32,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.net.URI; import java.util.HashMap; import java.util.Map; @@ -104,8 +104,8 @@ void successfulRequest() throws Exception { span.hasAttributesSatisfyingExactly( equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), - equalTo(SemanticAttributes.SERVER_ADDRESS, uri.getHost()), - equalTo(SemanticAttributes.SERVER_PORT, uri.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, uri.getHost()), + equalTo(ServerAttributes.SERVER_PORT, uri.getPort()), equalTo(NetworkAttributes.NETWORK_PEER_PORT, uri.getPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1")); }, @@ -137,8 +137,8 @@ void failedRequest() throws Exception { val.satisfiesAnyOf( v -> assertThat(val).isNull(), v -> assertThat(v).isEqualTo("ipv4"))); span.hasAttributesSatisfying( - equalTo(SemanticAttributes.SERVER_ADDRESS, uri.getHost()), - equalTo(SemanticAttributes.SERVER_PORT, uri.getPort())); + equalTo(ServerAttributes.SERVER_ADDRESS, uri.getHost()), + equalTo(ServerAttributes.SERVER_PORT, uri.getPort())); satisfies( NetworkAttributes.NETWORK_PEER_PORT, val -> diff --git a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy index dbb07384408a..ce0039b3dd90 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy +++ b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy @@ -25,6 +25,8 @@ import io.opentelemetry.instrumentation.netty.v4_1.ClientHandler import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.NetworkAttributes import spock.lang.Shared @@ -96,8 +98,8 @@ class Netty41ClientSslTest extends AgentInstrumentationSpecification { kind INTERNAL childOf span(0) attributes { - "$SemanticAttributes.SERVER_ADDRESS" uri.host - "$SemanticAttributes.SERVER_PORT" uri.port + "$ServerAttributes.SERVER_ADDRESS" uri.host + "$ServerAttributes.SERVER_PORT" uri.port } } span(2) { @@ -107,8 +109,8 @@ class Netty41ClientSslTest extends AgentInstrumentationSpecification { attributes { "$NetworkAttributes.NETWORK_TRANSPORT" "tcp" "$NetworkAttributes.NETWORK_TYPE" "ipv4" - "$SemanticAttributes.SERVER_ADDRESS" uri.host - "$SemanticAttributes.SERVER_PORT" uri.port + "$ServerAttributes.SERVER_ADDRESS" uri.host + "$ServerAttributes.SERVER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" } @@ -165,8 +167,8 @@ class Netty41ClientSslTest extends AgentInstrumentationSpecification { kind INTERNAL childOf span(0) attributes { - "$SemanticAttributes.SERVER_ADDRESS" uri.host - "$SemanticAttributes.SERVER_PORT" uri.port + "$ServerAttributes.SERVER_ADDRESS" uri.host + "$ServerAttributes.SERVER_PORT" uri.port } } span(2) { @@ -176,8 +178,8 @@ class Netty41ClientSslTest extends AgentInstrumentationSpecification { attributes { "$NetworkAttributes.NETWORK_TRANSPORT" "tcp" "$NetworkAttributes.NETWORK_TYPE" "ipv4" - "$SemanticAttributes.SERVER_ADDRESS" uri.host - "$SemanticAttributes.SERVER_PORT" uri.port + "$ServerAttributes.SERVER_ADDRESS" uri.host + "$ServerAttributes.SERVER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" } diff --git a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy index a2cf77005b23..9d59b9116af2 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy +++ b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy @@ -23,6 +23,8 @@ import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.NetworkAttributes import spock.lang.Shared @@ -110,8 +112,8 @@ class Netty41ConnectionSpanTest extends InstrumentationSpecification implements kind INTERNAL childOf span(0) attributes { - "$SemanticAttributes.SERVER_ADDRESS" uri.host - "$SemanticAttributes.SERVER_PORT" uri.port + "$ServerAttributes.SERVER_ADDRESS" uri.host + "$ServerAttributes.SERVER_PORT" uri.port } } span(2) { @@ -121,8 +123,8 @@ class Netty41ConnectionSpanTest extends InstrumentationSpecification implements attributes { "$NetworkAttributes.NETWORK_TRANSPORT" "tcp" "$NetworkAttributes.NETWORK_TYPE" "ipv4" - "$SemanticAttributes.SERVER_ADDRESS" uri.host - "$SemanticAttributes.SERVER_PORT" uri.port + "$ServerAttributes.SERVER_ADDRESS" uri.host + "$ServerAttributes.SERVER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" } @@ -169,8 +171,8 @@ class Netty41ConnectionSpanTest extends InstrumentationSpecification implements kind INTERNAL childOf span(0) attributes { - "$SemanticAttributes.SERVER_ADDRESS" uri.host - "$SemanticAttributes.SERVER_PORT" uri.port + "$ServerAttributes.SERVER_ADDRESS" uri.host + "$ServerAttributes.SERVER_PORT" uri.port } } span(2) { @@ -182,8 +184,8 @@ class Netty41ConnectionSpanTest extends InstrumentationSpecification implements attributes { "$NetworkAttributes.NETWORK_TRANSPORT" "tcp" "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == null } - "$SemanticAttributes.SERVER_ADDRESS" uri.host - "$SemanticAttributes.SERVER_PORT" uri.port + "$ServerAttributes.SERVER_ADDRESS" uri.host + "$ServerAttributes.SERVER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == null } "$NetworkAttributes.NETWORK_PEER_PORT" { it == uri.port || it == null } } diff --git a/instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ClientTest.java b/instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ClientTest.java index b925d66510b4..4cfb5435f2cd 100644 --- a/instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ClientTest.java +++ b/instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ClientTest.java @@ -19,7 +19,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.net.URI; import java.util.Collections; import java.util.HashSet; @@ -121,8 +121,8 @@ private static Set> getHttpAttributes(URI uri) { return Collections.emptySet(); } Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(SemanticAttributes.SERVER_ADDRESS); - attributes.remove(SemanticAttributes.SERVER_PORT); + attributes.remove(ServerAttributes.SERVER_ADDRESS); + attributes.remove(ServerAttributes.SERVER_PORT); return attributes; } diff --git a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java index f5d06eff212d..ccaad9074d65 100644 --- a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java +++ b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java @@ -10,6 +10,7 @@ import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; import java.security.KeyManagementException; @@ -101,8 +102,8 @@ void shouldGetStatusWithTraces() throws IOException { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)))); @@ -166,8 +167,8 @@ public void onFailure(Exception e) { .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.SERVER_ADDRESS, httpHost.getHostName()), - equalTo(SemanticAttributes.SERVER_PORT, httpHost.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), + equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/_cluster/health"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L)), diff --git a/instrumentation/play/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy b/instrumentation/play/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy index 6c93c7417b7c..d27970362766 100644 --- a/instrumentation/play/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy +++ b/instrumentation/play/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy @@ -10,6 +10,8 @@ import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes import play.shaded.ahc.io.netty.resolver.InetNameResolver import play.shaded.ahc.io.netty.util.concurrent.EventExecutor @@ -88,8 +90,8 @@ abstract class PlayWsClientTestBaseBase extends HttpClientTest def attributes = super.httpAttributes(uri) attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION) if (uri.toString().endsWith("/circular-redirect")) { - attributes.remove(SemanticAttributes.SERVER_ADDRESS) - attributes.remove(SemanticAttributes.SERVER_PORT) + attributes.remove(ServerAttributes.SERVER_ADDRESS) + attributes.remove(ServerAttributes.SERVER_PORT) } return attributes } diff --git a/instrumentation/pulsar/pulsar-2.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarClientTest.java b/instrumentation/pulsar/pulsar-2.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarClientTest.java index e7050265c84f..267fff87381f 100644 --- a/instrumentation/pulsar/pulsar-2.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarClientTest.java +++ b/instrumentation/pulsar/pulsar-2.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarClientTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; @@ -620,8 +621,8 @@ private static List sendAttributes( new ArrayList<>( Arrays.asList( equalTo(SemanticAttributes.MESSAGING_SYSTEM, "pulsar"), - equalTo(SemanticAttributes.SERVER_ADDRESS, brokerHost), - equalTo(SemanticAttributes.SERVER_PORT, brokerPort), + equalTo(ServerAttributes.SERVER_ADDRESS, brokerHost), + equalTo(ServerAttributes.SERVER_PORT, brokerPort), equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destination), equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), @@ -654,8 +655,8 @@ private static List receiveAttributes( new ArrayList<>( Arrays.asList( equalTo(SemanticAttributes.MESSAGING_SYSTEM, "pulsar"), - equalTo(SemanticAttributes.SERVER_ADDRESS, brokerHost), - equalTo(SemanticAttributes.SERVER_PORT, brokerPort), + equalTo(ServerAttributes.SERVER_ADDRESS, brokerHost), + equalTo(ServerAttributes.SERVER_PORT, brokerPort), equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destination), equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), diff --git a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java index 9d33342b74ad..8ca518af7b31 100644 --- a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java +++ b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java @@ -13,8 +13,8 @@ import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.SemanticAttributes.DB_SYSTEM; import static io.opentelemetry.semconv.SemanticAttributes.DB_USER; -import static io.opentelemetry.semconv.SemanticAttributes.SERVER_ADDRESS; -import static io.opentelemetry.semconv.SemanticAttributes.SERVER_PORT; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.r2dbc.spi.ConnectionFactoryOptions.DATABASE; import static io.r2dbc.spi.ConnectionFactoryOptions.DRIVER; import static io.r2dbc.spi.ConnectionFactoryOptions.HOST; diff --git a/instrumentation/ratpack/ratpack-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackForkedHttpClientTest.java b/instrumentation/ratpack/ratpack-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackForkedHttpClientTest.java index a3141f40651c..c5e646532ea0 100644 --- a/instrumentation/ratpack/ratpack-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackForkedHttpClientTest.java +++ b/instrumentation/ratpack/ratpack-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackForkedHttpClientTest.java @@ -9,7 +9,7 @@ import io.opentelemetry.instrumentation.ratpack.client.AbstractRatpackForkedHttpClientTest; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.net.URI; import java.util.HashSet; import java.util.Set; @@ -24,8 +24,8 @@ class RatpackForkedHttpClientTest extends AbstractRatpackForkedHttpClientTest { protected Set> computeHttpAttributes(URI uri) { Set> attributes = new HashSet<>(super.computeHttpAttributes(uri)); // underlying netty instrumentation does not provide these - attributes.remove(SemanticAttributes.SERVER_ADDRESS); - attributes.remove(SemanticAttributes.SERVER_PORT); + attributes.remove(ServerAttributes.SERVER_ADDRESS); + attributes.remove(ServerAttributes.SERVER_PORT); return attributes; } } diff --git a/instrumentation/ratpack/ratpack-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackHttpClientTest.java b/instrumentation/ratpack/ratpack-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackHttpClientTest.java index 9f6348a16322..c8481f24f7e3 100644 --- a/instrumentation/ratpack/ratpack-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackHttpClientTest.java +++ b/instrumentation/ratpack/ratpack-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackHttpClientTest.java @@ -9,7 +9,7 @@ import io.opentelemetry.instrumentation.ratpack.client.AbstractRatpackHttpClientTest; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.net.URI; import java.util.HashSet; import java.util.Set; @@ -24,8 +24,8 @@ class RatpackHttpClientTest extends AbstractRatpackHttpClientTest { protected Set> computeHttpAttributes(URI uri) { Set> attributes = new HashSet<>(super.computeHttpAttributes(uri)); // underlying netty instrumentation does not provide these - attributes.remove(SemanticAttributes.SERVER_ADDRESS); - attributes.remove(SemanticAttributes.SERVER_PORT); + attributes.remove(ServerAttributes.SERVER_ADDRESS); + attributes.remove(ServerAttributes.SERVER_PORT); return attributes; } } diff --git a/instrumentation/ratpack/ratpack-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackPooledHttpClientTest.java b/instrumentation/ratpack/ratpack-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackPooledHttpClientTest.java index 0223c126edfc..bfc27b42eb0f 100644 --- a/instrumentation/ratpack/ratpack-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackPooledHttpClientTest.java +++ b/instrumentation/ratpack/ratpack-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/ratpack/RatpackPooledHttpClientTest.java @@ -9,7 +9,7 @@ import io.opentelemetry.instrumentation.ratpack.client.AbstractRatpackPooledHttpClientTest; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.net.URI; import java.util.HashSet; import java.util.Set; @@ -24,8 +24,8 @@ class RatpackPooledHttpClientTest extends AbstractRatpackPooledHttpClientTest { protected Set> computeHttpAttributes(URI uri) { Set> attributes = new HashSet<>(super.computeHttpAttributes(uri)); // underlying netty instrumentation does not provide these - attributes.remove(SemanticAttributes.SERVER_ADDRESS); - attributes.remove(SemanticAttributes.SERVER_PORT); + attributes.remove(ServerAttributes.SERVER_ADDRESS); + attributes.remove(ServerAttributes.SERVER_PORT); return attributes; } } diff --git a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy index 70be5d614474..629ec6bb2c90 100644 --- a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy +++ b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy @@ -9,6 +9,8 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes @@ -103,8 +105,8 @@ abstract class AbstractRatpackRoutesTest extends InstrumentationSpecification { hasNoParent() attributes { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" { it == "localhost" || it == null } - "$SemanticAttributes.SERVER_PORT" { it == app.bindPort || it == null } + "$ServerAttributes.SERVER_ADDRESS" { it == "localhost" || it == null } + "$ServerAttributes.SERVER_PORT" { it == app.bindPort || it == null } "$ClientAttributes.CLIENT_ADDRESS" { it == "127.0.0.1" || it == null } "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == null } "$NetworkAttributes.NETWORK_PEER_PORT" { it instanceof Long || it == null } diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.java index ecf08e6b9461..a8f0e2953183 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.java @@ -23,7 +23,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.net.URI; import java.util.HashSet; import java.util.Map; @@ -125,8 +125,8 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) { Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(SemanticAttributes.SERVER_ADDRESS); - attributes.remove(SemanticAttributes.SERVER_PORT); + attributes.remove(ServerAttributes.SERVER_ADDRESS); + attributes.remove(ServerAttributes.SERVER_PORT); return attributes; }); } diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java index db27881041bc..4a1bf05b125a 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/ReactorNettyConnectionSpanTest.java @@ -19,7 +19,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import org.assertj.core.api.AbstractLongAssert; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -77,8 +77,8 @@ void testSuccessfulRequest() { .hasKind(INTERNAL) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.httpPort())), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.httpPort())), span -> span.hasName("CONNECT") .hasKind(INTERNAL) @@ -86,8 +86,8 @@ void testSuccessfulRequest() { .hasAttributesSatisfyingExactly( equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.httpPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.httpPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -137,8 +137,8 @@ void testFailingRequest() { .hasKind(INTERNAL) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT)), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT)), span -> span.hasName("CONNECT") .hasKind(INTERNAL) @@ -149,8 +149,8 @@ void testFailingRequest() { equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), satisfies( NetworkAttributes.NETWORK_TYPE, val -> val.isIn(null, "ipv4")), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), satisfies( NetworkAttributes.NETWORK_PEER_ADDRESS, val -> val.isIn(null, "127.0.0.1")), diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java index fa22de91b367..7e2171e920b5 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.java @@ -29,7 +29,7 @@ import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.net.InetSocketAddress; import java.net.URI; @@ -140,8 +140,8 @@ protected Set> getHttpAttributes(URI uri) { if (uri.toString().contains("/read-timeout")) { attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION); - attributes.remove(SemanticAttributes.SERVER_ADDRESS); - attributes.remove(SemanticAttributes.SERVER_PORT); + attributes.remove(ServerAttributes.SERVER_ADDRESS); + attributes.remove(ServerAttributes.SERVER_PORT); } return attributes; } @@ -311,8 +311,8 @@ void shouldEndSpanOnMonoTimeout() { .hasAttributesSatisfyingExactly( equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, uri.toString()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, uri.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, uri.getPort()), equalTo(ErrorAttributes.ERROR_TYPE, "cancelled")), span -> span.hasName("test-http-server") diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java index b99dc4d62f34..cced686ae905 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java @@ -21,7 +21,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpData; import io.opentelemetry.testing.internal.armeria.common.HttpResponse; @@ -115,8 +115,8 @@ void testSuccessfulRequest() { equalTo(UrlAttributes.URL_FULL, uri + "/"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.httpPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.httpPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java index d3a30ddd0578..4278b56782eb 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java @@ -24,6 +24,7 @@ import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.List; import javax.annotation.Nullable; @@ -95,8 +96,8 @@ void shouldFailSslHandshake() throws SSLException { .hasAttributesSatisfyingExactly( equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, uri), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.httpsPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.httpsPort()), equalTo( ErrorAttributes.ERROR_TYPE, SSLHandshakeException.class.getCanonicalName())), @@ -105,8 +106,8 @@ void shouldFailSslHandshake() throws SSLException { .hasKind(INTERNAL) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.httpsPort())), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.httpsPort())), span -> span.hasName("CONNECT") .hasKind(INTERNAL) @@ -114,8 +115,8 @@ void shouldFailSslHandshake() throws SSLException { .hasAttributesSatisfyingExactly( equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.httpsPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.httpsPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -162,8 +163,8 @@ void shouldSuccessfullyEstablishSslHandshake() throws SSLException { .hasKind(INTERNAL) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.httpsPort())), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.httpsPort())), span -> span.hasName("CONNECT") .hasKind(INTERNAL) @@ -171,8 +172,8 @@ void shouldSuccessfullyEstablishSslHandshake() throws SSLException { .hasAttributesSatisfyingExactly( equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.httpsPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.httpsPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -195,8 +196,8 @@ void shouldSuccessfullyEstablishSslHandshake() throws SSLException { equalTo(UrlAttributes.URL_FULL, uri), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.httpsPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.httpsPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java index 4bc41156dfb3..ce040d4b50ee 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyConnectionSpanTest.java @@ -22,7 +22,7 @@ import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import org.assertj.core.api.AbstractLongAssert; import org.junit.jupiter.api.AfterAll; @@ -82,8 +82,8 @@ void testSuccessfulRequest() { .hasKind(INTERNAL) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.httpPort())), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.httpPort())), span -> span.hasName("CONNECT") .hasKind(INTERNAL) @@ -91,8 +91,8 @@ void testSuccessfulRequest() { .hasAttributesSatisfyingExactly( equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.httpPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.httpPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -106,8 +106,8 @@ void testSuccessfulRequest() { equalTo(UrlAttributes.URL_FULL, uri), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, server.httpPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, server.httpPort()), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( NetworkAttributes.NETWORK_PEER_PORT, @@ -160,8 +160,8 @@ void testFailingRequest() { .hasAttributesSatisfyingExactly( equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, uri), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), equalTo( ErrorAttributes.ERROR_TYPE, connectException.getClass().getName())), span -> @@ -169,8 +169,8 @@ void testFailingRequest() { .hasKind(INTERNAL) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT)), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT)), span -> span.hasName("CONNECT") .hasKind(INTERNAL) @@ -178,8 +178,8 @@ void testFailingRequest() { .hasStatus(StatusData.error()) .hasException(connectException) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, PortUtils.UNUSABLE_PORT), satisfies( NetworkAttributes.NETWORK_PEER_ADDRESS, val -> val.isIn(null, "127.0.0.1"))))); diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientTest.java index f2578e55efad..e4b3a090572c 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientTest.java @@ -8,7 +8,7 @@ import io.netty.channel.ChannelOption; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpHeaderNames; import java.net.URI; import java.util.HashSet; @@ -61,8 +61,8 @@ protected Set> getHttpAttributes(URI uri) { // net.peer.sock.* attributes Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(SemanticAttributes.SERVER_ADDRESS); - attributes.remove(SemanticAttributes.SERVER_PORT); + attributes.remove(ServerAttributes.SERVER_ADDRESS); + attributes.remove(ServerAttributes.SERVER_PORT); return attributes; } return super.getHttpAttributes(uri); diff --git a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java index c6557e6d9c36..e47834f18872 100644 --- a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java +++ b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java @@ -17,7 +17,7 @@ import io.opentelemetry.semconv.ClientAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.semconv.UserAgentAttributes; import io.opentelemetry.testing.internal.armeria.client.WebClient; @@ -71,8 +71,8 @@ void generatesSpans() { val -> val.isInstanceOf(String.class)), equalTo(HttpAttributes.HTTP_ROUTE, "/param/:param"), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(ClientAttributes.CLIENT_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), satisfies( diff --git a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java index 54c8ff2ace9e..ed1ce65834cc 100644 --- a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java +++ b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java @@ -13,7 +13,7 @@ import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.SemanticAttributes.DB_SYSTEM; import static io.opentelemetry.semconv.SemanticAttributes.DB_USER; -import static io.opentelemetry.semconv.SemanticAttributes.SERVER_ADDRESS; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanKind; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java index 507f2f42fa07..2f2be1de9572 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java @@ -19,8 +19,8 @@ import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_MESSAGE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_STACKTRACE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_TYPE; -import static io.opentelemetry.semconv.SemanticAttributes.SERVER_ADDRESS; -import static io.opentelemetry.semconv.SemanticAttributes.SERVER_PORT; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.UserAgentAttributes.USER_AGENT_ORIGINAL; import static org.junit.jupiter.api.Named.named; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java index ef56183e5eb7..d7794f3e4469 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java @@ -20,7 +20,7 @@ import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -186,8 +186,8 @@ void shouldEndSpanOnMonoTimeout() { .hasAttributesSatisfyingExactly( equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, uri.toString()), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, uri.getPort()), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, uri.getPort()), equalTo(ErrorAttributes.ERROR_TYPE, "cancelled")), span -> span.hasName("test-http-server") diff --git a/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy b/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy index 56681c4e421f..646e3ccbabe2 100644 --- a/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy +++ b/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy @@ -18,6 +18,7 @@ import com.twilio.type.PhoneNumber import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -255,7 +256,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { childOf span(1) attributes { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" + "$ServerAttributes.SERVER_ADDRESS.key" "api.twilio.com" "$HttpAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE.key" 200 @@ -321,7 +322,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { status ERROR attributes { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" + "$ServerAttributes.SERVER_ADDRESS.key" "api.twilio.com" "$HttpAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE.key" 500 @@ -334,7 +335,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { childOf span(1) attributes { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" + "$ServerAttributes.SERVER_ADDRESS.key" "api.twilio.com" "$HttpAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE.key" 200 @@ -407,7 +408,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { status ERROR attributes { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" + "$ServerAttributes.SERVER_ADDRESS.key" "api.twilio.com" "$HttpAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE.key" 500 @@ -420,7 +421,7 @@ class TwilioClientTest extends AgentInstrumentationSpecification { childOf span(1) attributes { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS.key" "api.twilio.com" + "$ServerAttributes.SERVER_ADDRESS.key" "api.twilio.com" "$HttpAttributes.HTTP_REQUEST_METHOD.key" "POST" "$UrlAttributes.URL_FULL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE.key" 200 diff --git a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy index a95e1f1073c2..9c80a74482c1 100644 --- a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy +++ b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy @@ -12,6 +12,8 @@ import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes @@ -158,8 +160,8 @@ class UndertowServerTest extends HttpServerTest implements AgentTestTr "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UserAgentAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" uri.host - "$SemanticAttributes.SERVER_PORT" uri.port + "$ServerAttributes.SERVER_ADDRESS" uri.host + "$ServerAttributes.SERVER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long } @@ -207,8 +209,8 @@ class UndertowServerTest extends HttpServerTest implements AgentTestTr "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 "$UserAgentAttributes.USER_AGENT_ORIGINAL" TEST_USER_AGENT "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" - "$SemanticAttributes.SERVER_ADDRESS" uri.host - "$SemanticAttributes.SERVER_PORT" uri.port + "$ServerAttributes.SERVER_ADDRESS" uri.host + "$ServerAttributes.SERVER_PORT" uri.port "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long } diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxHttpClientTest.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxHttpClientTest.java index 54893634325f..6699579bb757 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxHttpClientTest.java +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxHttpClientTest.java @@ -14,7 +14,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions; import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.vertx.core.Vertx; import io.vertx.core.VertxOptions; import io.vertx.core.http.HttpClient; @@ -91,8 +91,8 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) { Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION); - attributes.remove(SemanticAttributes.SERVER_ADDRESS); - attributes.remove(SemanticAttributes.SERVER_PORT); + attributes.remove(ServerAttributes.SERVER_ADDRESS); + attributes.remove(ServerAttributes.SERVER_PORT); return attributes; }); diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java index cd2fb69c3374..ae13f0277561 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java @@ -14,6 +14,7 @@ import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.vertx.core.Vertx; import io.vertx.redis.client.Redis; import io.vertx.redis.client.RedisAPI; @@ -198,8 +199,8 @@ private static AttributeAssertion[] redisSpanAttributes(String operation, String equalTo(SemanticAttributes.DB_STATEMENT, statement), equalTo(SemanticAttributes.DB_OPERATION, operation), equalTo(SemanticAttributes.DB_REDIS_DATABASE_INDEX, 1), - equalTo(SemanticAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.SERVER_PORT, port), + equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), + equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1") }; diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy index e30cd1dfc3de..1d356c723df6 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy @@ -11,6 +11,8 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes @@ -73,8 +75,8 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" Long + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" Long "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$UrlAttributes.URL_PATH" "/listProducts" "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" @@ -164,8 +166,8 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" Long + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" Long "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$UrlAttributes.URL_PATH" baseUrl "$UrlAttributes.URL_QUERY" "$TEST_REQUEST_ID_PARAMETER=$requestId" diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy index e30cd1dfc3de..1d356c723df6 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy @@ -11,6 +11,8 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes @@ -73,8 +75,8 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" Long + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" Long "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$UrlAttributes.URL_PATH" "/listProducts" "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" @@ -164,8 +166,8 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$NetworkAttributes.NETWORK_PEER_ADDRESS" "127.0.0.1" "$NetworkAttributes.NETWORK_PEER_PORT" Long - "$SemanticAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.SERVER_PORT" Long + "$ServerAttributes.SERVER_ADDRESS" "localhost" + "$ServerAttributes.SERVER_PORT" Long "$ClientAttributes.CLIENT_ADDRESS" "127.0.0.1" "$UrlAttributes.URL_PATH" baseUrl "$UrlAttributes.URL_QUERY" "$TEST_REQUEST_ID_PARAMETER=$requestId" diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy index 9368c62b252b..52aae40d28db 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy @@ -11,6 +11,8 @@ import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes import io.vertx.circuitbreaker.CircuitBreakerOptions import io.vertx.core.AsyncResult @@ -109,8 +111,8 @@ class VertxRxCircuitBreakerWebClientTest extends HttpClientTest> Set> httpAttributes(URI uri) { def attributes = super.httpAttributes(uri) attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION) - attributes.remove(SemanticAttributes.SERVER_ADDRESS) - attributes.remove(SemanticAttributes.SERVER_PORT) + attributes.remove(ServerAttributes.SERVER_ADDRESS) + attributes.remove(ServerAttributes.SERVER_PORT) return attributes } diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy index c27763997ee9..87b9dcc334e8 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy @@ -11,6 +11,8 @@ import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes import io.vertx.core.VertxOptions import io.vertx.core.http.HttpMethod @@ -95,8 +97,8 @@ class VertxRxWebClientTest extends HttpClientTest> implement Set> httpAttributes(URI uri) { def attributes = super.httpAttributes(uri) attributes.remove(NetworkAttributes.NETWORK_PROTOCOL_VERSION) - attributes.remove(SemanticAttributes.SERVER_ADDRESS) - attributes.remove(SemanticAttributes.SERVER_PORT) + attributes.remove(ServerAttributes.SERVER_ADDRESS) + attributes.remove(ServerAttributes.SERVER_PORT) return attributes } diff --git a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java index 589533a9bc43..0441ca1250e7 100644 --- a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java +++ b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java @@ -16,8 +16,8 @@ import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_MESSAGE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_STACKTRACE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_TYPE; -import static io.opentelemetry.semconv.SemanticAttributes.SERVER_ADDRESS; -import static io.opentelemetry.semconv.SemanticAttributes.SERVER_PORT; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension; diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index 63cbf9a31e30..8b2ebc686280 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -21,9 +21,6 @@ public class SemanticAttributes { private SemanticAttributes() {} - public static final AttributeKey SERVER_ADDRESS = ServerAttributes.SERVER_ADDRESS; - public static final AttributeKey SERVER_PORT = ServerAttributes.SERVER_PORT; - public static final AttributeKey DB_CASSANDRA_CONSISTENCY_LEVEL = DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; public static final AttributeKey DB_CASSANDRA_COORDINATOR_DC = diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java index 5bb74e271728..c00f90fab716 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java @@ -27,7 +27,7 @@ import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.semconv.UserAgentAttributes; import java.net.URI; @@ -976,19 +976,19 @@ SpanDataAssert assertClientSpan( assertThat(attrs).containsEntry(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"); } - if (httpClientAttributes.contains(SemanticAttributes.SERVER_ADDRESS)) { - assertThat(attrs).containsEntry(SemanticAttributes.SERVER_ADDRESS, uri.getHost()); + if (httpClientAttributes.contains(ServerAttributes.SERVER_ADDRESS)) { + assertThat(attrs).containsEntry(ServerAttributes.SERVER_ADDRESS, uri.getHost()); } - if (httpClientAttributes.contains(SemanticAttributes.SERVER_PORT)) { + if (httpClientAttributes.contains(ServerAttributes.SERVER_PORT)) { int uriPort = uri.getPort(); if (uriPort <= 0) { - if (attrs.get(SemanticAttributes.SERVER_PORT) != null) { + if (attrs.get(ServerAttributes.SERVER_PORT) != null) { int effectivePort = "https".equals(uri.getScheme()) ? 443 : 80; - assertThat(attrs).containsEntry(SemanticAttributes.SERVER_PORT, effectivePort); + assertThat(attrs).containsEntry(ServerAttributes.SERVER_PORT, effectivePort); } // alternatively, peer port is not emitted -- and that's fine too } else { - assertThat(attrs).containsEntry(SemanticAttributes.SERVER_PORT, uriPort); + assertThat(attrs).containsEntry(ServerAttributes.SERVER_PORT, uriPort); } } diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java index 6424b668f260..86efe3412c4a 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java @@ -36,7 +36,7 @@ import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.semconv.UserAgentAttributes; import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest; @@ -743,11 +743,11 @@ protected SpanDataAssert assertServerSpan( entry -> assertThat(entry).isIn("1.1", "2.0")); } - assertThat(attrs).containsEntry(SemanticAttributes.SERVER_ADDRESS, "localhost"); + assertThat(attrs).containsEntry(ServerAttributes.SERVER_ADDRESS, "localhost"); // TODO: Move to test knob rather than always treating as optional // TODO: once httpAttributes test knob is used, verify default port values - if (attrs.get(SemanticAttributes.SERVER_PORT) != null) { - assertThat(attrs).containsEntry(SemanticAttributes.SERVER_PORT, port); + if (attrs.get(ServerAttributes.SERVER_PORT) != null) { + assertThat(attrs).containsEntry(ServerAttributes.SERVER_PORT, port); } if (attrs.get(NetworkAttributes.NETWORK_PEER_ADDRESS) != null) { diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java index 4f2c9efab96c..dd1cb84f4531 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java @@ -11,7 +11,7 @@ import io.opentelemetry.instrumentation.api.internal.HttpConstants; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; import java.net.URI; @@ -31,8 +31,8 @@ public abstract class HttpClientTestOptions { new HashSet<>( Arrays.asList( NetworkAttributes.NETWORK_PROTOCOL_VERSION, - SemanticAttributes.SERVER_ADDRESS, - SemanticAttributes.SERVER_PORT, + ServerAttributes.SERVER_ADDRESS, + ServerAttributes.SERVER_PORT, UrlAttributes.URL_FULL, HttpAttributes.HTTP_REQUEST_METHOD))); diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpServerTestOptions.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpServerTestOptions.java index a04f94cc393e..da5b8c31052f 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpServerTestOptions.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpServerTestOptions.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.instrumentation.api.internal.HttpConstants; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ServerAttributes; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -26,7 +26,7 @@ public final class HttpServerTestOptions { public static final Set> DEFAULT_HTTP_ATTRIBUTES = Collections.unmodifiableSet( - new HashSet<>(Arrays.asList(HttpAttributes.HTTP_ROUTE, SemanticAttributes.SERVER_PORT))); + new HashSet<>(Arrays.asList(HttpAttributes.HTTP_ROUTE, ServerAttributes.SERVER_PORT))); public static final SpanNameMapper DEFAULT_EXPECTED_SERVER_SPAN_NAME_MAPPER = (uri, method, route) -> { From d9f49496eb3bf5a8d2c85166e4f82bd57d5452dd Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:06:16 +0200 Subject: [PATCH 11/52] DB_CASSANDRA_* --- .../db/SqlClientAttributesExtractorTest.java | 5 +++-- .../cassandra/v3_0/CassandraSingletons.java | 4 ++-- .../src/test/java/CassandraClientTest.java | 11 +++++++---- .../v4/common/AbstractCassandraTest.java | 14 +++++++------- .../v4_0/CassandraAttributesExtractor.java | 17 +++++++++-------- .../cassandra/v4_0/CassandraSingletons.java | 4 ++-- .../v4_4/CassandraAttributesExtractor.java | 17 +++++++++-------- .../v4_4/CassandraTelemetryBuilder.java | 4 ++-- .../cassandra/v4_4/AbstractCassandra44Test.java | 14 +++++++------- .../semconv/SemanticAttributes.java | 14 -------------- 10 files changed, 48 insertions(+), 56 deletions(-) diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java index 948e1d452719..9b0a4f9b5c79 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java @@ -12,6 +12,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.Collections; import java.util.HashMap; @@ -117,7 +118,7 @@ void shouldExtractTableToSpecifiedKey() { AttributesExtractor, Void> underTest = SqlClientAttributesExtractor., Void>builder(new TestAttributesGetter()) - .setTableAttribute(SemanticAttributes.DB_CASSANDRA_TABLE) + .setTableAttribute(DbIncubatingAttributes.DB_CASSANDRA_TABLE) .build(); // when @@ -129,7 +130,7 @@ void shouldExtractTableToSpecifiedKey() { .containsOnly( entry(SemanticAttributes.DB_STATEMENT, "SELECT * FROM table"), entry(SemanticAttributes.DB_OPERATION, "SELECT"), - entry(SemanticAttributes.DB_CASSANDRA_TABLE, "table")); + entry(DbIncubatingAttributes.DB_CASSANDRA_TABLE, "table")); } @Test diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java index bb42cefde545..f76af78a8a19 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; public final class CassandraSingletons { private static final String INSTRUMENTATION_NAME = "io.opentelemetry.cassandra-3.0"; @@ -32,7 +32,7 @@ public final class CassandraSingletons { DbClientSpanNameExtractor.create(attributesGetter)) .addAttributesExtractor( SqlClientAttributesExtractor.builder(attributesGetter) - .setTableAttribute(SemanticAttributes.DB_CASSANDRA_TABLE) + .setTableAttribute(DbIncubatingAttributes.DB_CASSANDRA_TABLE) .setStatementSanitizationEnabled( CommonConfig.get().isStatementSanitizationEnabled()) .build()) diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java index e5d31344a1e0..ef1cbb1a6047 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java @@ -12,6 +12,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; @@ -110,7 +111,8 @@ void syncTest(Parameter parameter) { equalTo(SemanticAttributes.DB_NAME, parameter.keyspace), equalTo(SemanticAttributes.DB_STATEMENT, parameter.expectedStatement), equalTo(SemanticAttributes.DB_OPERATION, parameter.operation), - equalTo(SemanticAttributes.DB_CASSANDRA_TABLE, parameter.table)))); + equalTo( + DbIncubatingAttributes.DB_CASSANDRA_TABLE, parameter.table)))); } else { testing.waitAndAssertTraces( trace -> @@ -128,7 +130,8 @@ void syncTest(Parameter parameter) { equalTo(SemanticAttributes.DB_SYSTEM, "cassandra"), equalTo(SemanticAttributes.DB_STATEMENT, parameter.expectedStatement), equalTo(SemanticAttributes.DB_OPERATION, parameter.operation), - equalTo(SemanticAttributes.DB_CASSANDRA_TABLE, parameter.table)))); + equalTo( + DbIncubatingAttributes.DB_CASSANDRA_TABLE, parameter.table)))); } session.close(); @@ -184,7 +187,7 @@ void asyncTest(Parameter parameter) { equalTo(SemanticAttributes.DB_NAME, parameter.keyspace), equalTo(SemanticAttributes.DB_STATEMENT, parameter.expectedStatement), equalTo(SemanticAttributes.DB_OPERATION, parameter.operation), - equalTo(SemanticAttributes.DB_CASSANDRA_TABLE, parameter.table)), + equalTo(DbIncubatingAttributes.DB_CASSANDRA_TABLE, parameter.table)), span -> span.hasName("callbackListener") .hasKind(SpanKind.INTERNAL) @@ -207,7 +210,7 @@ void asyncTest(Parameter parameter) { equalTo(SemanticAttributes.DB_SYSTEM, "cassandra"), equalTo(SemanticAttributes.DB_STATEMENT, parameter.expectedStatement), equalTo(SemanticAttributes.DB_OPERATION, parameter.operation), - equalTo(SemanticAttributes.DB_CASSANDRA_TABLE, parameter.table)), + equalTo(DbIncubatingAttributes.DB_CASSANDRA_TABLE, parameter.table)), span -> span.hasName("callbackListener") .hasKind(SpanKind.INTERNAL) diff --git a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java index 034d2d42a0b5..292dcf8e718c 100644 --- a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java +++ b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java @@ -7,14 +7,14 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_DC; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_ID; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_IDEMPOTENCE; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_TABLE; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_COORDINATOR_DC; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_COORDINATOR_ID; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_IDEMPOTENCE; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_PAGE_SIZE; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_TABLE; import static io.opentelemetry.semconv.SemanticAttributes.DB_NAME; import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION; import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java index ae1240d112e1..eb01ca05aceb 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -46,15 +46,16 @@ public void onEnd( attributes.put(ServerAttributes.SERVER_PORT, ((InetSocketAddress) address).getPort()); } if (coordinator.getDatacenter() != null) { - attributes.put(SemanticAttributes.DB_CASSANDRA_COORDINATOR_DC, coordinator.getDatacenter()); + attributes.put( + DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_DC, coordinator.getDatacenter()); } if (coordinator.getHostId() != null) { attributes.put( - SemanticAttributes.DB_CASSANDRA_COORDINATOR_ID, coordinator.getHostId().toString()); + DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_ID, coordinator.getHostId().toString()); } } attributes.put( - SemanticAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, + DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, executionInfo.getSpeculativeExecutionCount()); Statement statement = executionInfo.getStatement(); @@ -66,14 +67,14 @@ public void onEnd( } else { consistencyLevel = config.getString(DefaultDriverOption.REQUEST_CONSISTENCY); } - attributes.put(SemanticAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL, consistencyLevel); + attributes.put(DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL, consistencyLevel); if (statement.getPageSize() > 0) { - attributes.put(SemanticAttributes.DB_CASSANDRA_PAGE_SIZE, statement.getPageSize()); + attributes.put(DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE, statement.getPageSize()); } else { int pageSize = config.getInt(DefaultDriverOption.REQUEST_PAGE_SIZE); if (pageSize > 0) { - attributes.put(SemanticAttributes.DB_CASSANDRA_PAGE_SIZE, pageSize); + attributes.put(DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE, pageSize); } } @@ -81,6 +82,6 @@ public void onEnd( if (idempotent == null) { idempotent = config.getBoolean(DefaultDriverOption.REQUEST_DEFAULT_IDEMPOTENCE); } - attributes.put(SemanticAttributes.DB_CASSANDRA_IDEMPOTENCE, idempotent); + attributes.put(DbIncubatingAttributes.DB_CASSANDRA_IDEMPOTENCE, idempotent); } } diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java index 78cdf2e8f9d8..80d8696397f3 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; public final class CassandraSingletons { private static final String INSTRUMENTATION_NAME = "io.opentelemetry.cassandra-4.0"; @@ -31,7 +31,7 @@ public final class CassandraSingletons { DbClientSpanNameExtractor.create(attributesGetter)) .addAttributesExtractor( SqlClientAttributesExtractor.builder(attributesGetter) - .setTableAttribute(SemanticAttributes.DB_CASSANDRA_TABLE) + .setTableAttribute(DbIncubatingAttributes.DB_CASSANDRA_TABLE) .setStatementSanitizationEnabled( CommonConfig.get().isStatementSanitizationEnabled()) .build()) diff --git a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java index 603704e13dc8..6c4499e29840 100644 --- a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java +++ b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java @@ -16,7 +16,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.lang.reflect.Field; import java.net.InetSocketAddress; @@ -52,15 +52,16 @@ public void onEnd( updateServerAddressAndPort(attributes, coordinator); if (coordinator.getDatacenter() != null) { - attributes.put(SemanticAttributes.DB_CASSANDRA_COORDINATOR_DC, coordinator.getDatacenter()); + attributes.put( + DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_DC, coordinator.getDatacenter()); } if (coordinator.getHostId() != null) { attributes.put( - SemanticAttributes.DB_CASSANDRA_COORDINATOR_ID, coordinator.getHostId().toString()); + DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_ID, coordinator.getHostId().toString()); } } attributes.put( - SemanticAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, + DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT, executionInfo.getSpeculativeExecutionCount()); Statement statement = (Statement) executionInfo.getRequest(); @@ -72,14 +73,14 @@ public void onEnd( } else { consistencyLevel = config.getString(DefaultDriverOption.REQUEST_CONSISTENCY); } - attributes.put(SemanticAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL, consistencyLevel); + attributes.put(DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL, consistencyLevel); if (statement.getPageSize() > 0) { - attributes.put(SemanticAttributes.DB_CASSANDRA_PAGE_SIZE, statement.getPageSize()); + attributes.put(DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE, statement.getPageSize()); } else { int pageSize = config.getInt(DefaultDriverOption.REQUEST_PAGE_SIZE); if (pageSize > 0) { - attributes.put(SemanticAttributes.DB_CASSANDRA_PAGE_SIZE, pageSize); + attributes.put(DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE, pageSize); } } @@ -87,7 +88,7 @@ public void onEnd( if (idempotent == null) { idempotent = config.getBoolean(DefaultDriverOption.REQUEST_DEFAULT_IDEMPOTENCE); } - attributes.put(SemanticAttributes.DB_CASSANDRA_IDEMPOTENCE, idempotent); + attributes.put(DbIncubatingAttributes.DB_CASSANDRA_IDEMPOTENCE, idempotent); } private static void updateServerAddressAndPort(AttributesBuilder attributes, Node coordinator) { diff --git a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java index c94e7290d6d2..d23e49b8224b 100644 --- a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java +++ b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; /** A builder of {@link CassandraTelemetry}. */ public class CassandraTelemetryBuilder { @@ -55,7 +55,7 @@ protected Instrumenter createInstrumenter( openTelemetry, INSTRUMENTATION_NAME, DbClientSpanNameExtractor.create(attributesGetter)) .addAttributesExtractor( SqlClientAttributesExtractor.builder(attributesGetter) - .setTableAttribute(SemanticAttributes.DB_CASSANDRA_TABLE) + .setTableAttribute(DbIncubatingAttributes.DB_CASSANDRA_TABLE) .setStatementSanitizationEnabled(statementSanitizationEnabled) .build()) .addAttributesExtractor( diff --git a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java index 95b075694108..d5bd578009bc 100644 --- a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java +++ b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java @@ -7,14 +7,14 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_DC; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_ID; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_IDEMPOTENCE; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_TABLE; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_COORDINATOR_DC; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_COORDINATOR_ID; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_IDEMPOTENCE; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_PAGE_SIZE; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CASSANDRA_TABLE; import static io.opentelemetry.semconv.SemanticAttributes.DB_NAME; import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION; import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index 8b2ebc686280..74578d1738bc 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -21,20 +21,6 @@ public class SemanticAttributes { private SemanticAttributes() {} - public static final AttributeKey DB_CASSANDRA_CONSISTENCY_LEVEL = - DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; - public static final AttributeKey DB_CASSANDRA_COORDINATOR_DC = - DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_DC; - public static final AttributeKey DB_CASSANDRA_COORDINATOR_ID = - DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_ID; - public static final AttributeKey DB_CASSANDRA_IDEMPOTENCE = - DbIncubatingAttributes.DB_CASSANDRA_IDEMPOTENCE; - public static final AttributeKey DB_CASSANDRA_PAGE_SIZE = - DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE; - public static final AttributeKey DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT = - DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT; - public static final AttributeKey DB_CASSANDRA_TABLE = - DbIncubatingAttributes.DB_CASSANDRA_TABLE; public static final AttributeKey DB_CONNECTION_STRING = DbIncubatingAttributes.DB_CONNECTION_STRING; public static final AttributeKey DB_NAME = DbIncubatingAttributes.DB_NAME; From d191a086712dac956cfc284b7f109d69de4be330 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:10:37 +0200 Subject: [PATCH 12/52] DB_* --- .../db/DbClientAttributesExtractor.java | 6 +- .../db/DbClientCommonAttributesExtractor.java | 12 +- .../db/SqlClientAttributesExtractor.java | 9 +- .../SqlClientAttributesExtractorBuilder.java | 6 +- .../db/DbClientAttributesExtractorTest.java | 14 +- .../db/SqlClientAttributesExtractorTest.java | 23 ++- .../v2_2/TracingExecutionInterceptor.java | 6 +- .../v2_2/AbstractAws2ClientCoreTest.groovy | 14 +- ...AbstractAws2ClientRecordHttpErrorTest.java | 5 +- .../decorators/DbSpanDecorator.java | 8 +- .../apachecamel/decorators/CassandraTest.java | 8 +- .../src/test/java/CassandraClientTest.java | 43 +++-- .../v4/common/AbstractCassandraTest.java | 8 +- .../v4_4/AbstractCassandra44Test.java | 8 +- .../src/test/groovy/CouchbaseSpanUtil.groovy | 12 +- .../groovy/util/AbstractCouchbaseTest.groovy | 12 +- .../apiclient/ElasticsearchClientTest.java | 14 +- .../rest/v5_0/ElasticsearchRest5Test.java | 6 +- .../rest/v6_4/ElasticsearchRest6Test.java | 6 +- .../rest/v7_0/ElasticsearchRest7Test.java | 6 +- .../rest/v7_0/ElasticsearchRest7Test.java | 6 +- .../Elasticsearch5NodeClientTest.groovy | 30 ++-- .../Elasticsearch5TransportClientTest.groovy | 30 ++-- .../Elasticsearch53NodeClientTest.groovy | 30 ++-- .../Elasticsearch53TransportClientTest.groovy | 30 ++-- ...Elasticsearch53SpringRepositoryTest.groovy | 42 ++--- .../Elasticsearch53SpringTemplateTest.groovy | 34 ++-- .../Elasticsearch6NodeClientTest.groovy | 26 +-- .../Elasticsearch6TransportClientTest.groovy | 30 ++-- .../instrumentation/geode/PutGetTest.java | 22 +-- .../hibernate/v3_3/AbstractHibernateTest.java | 30 ++-- .../hibernate/v4_0/CriteriaTest.java | 16 +- .../hibernate/v4_0/EntityManagerTest.java | 72 ++++---- .../hibernate/v4_0/QueryTest.java | 46 ++--- .../hibernate/v4_0/SessionTest.java | 128 +++++++------- .../test/java/spring/jpa/SpringJpaTest.java | 156 ++++++++--------- .../hibernate/v6_0/CriteriaTest.java | 16 +- .../hibernate/v6_0/EntityManagerTest.java | 44 ++--- .../hibernate/v6_0/ProcedureCallTest.java | 14 +- .../hibernate/v6_0/SessionTest.java | 44 ++--- .../src/test/groovy/SpringJpaTest.groovy | 145 ++++++++-------- .../hibernate/v4_3/ProcedureCallTest.java | 14 +- .../reactive/v1_0/HibernateReactiveTest.java | 10 +- .../reactive/v2_0/HibernateReactiveTest.java | 10 +- .../groovy/JdbcInstrumentationTest.groovy | 163 +++++++++--------- .../scalaexecutors/SlickTest.scala | 30 +++- .../DataSourceDbAttributesExtractor.java | 10 +- .../jdbc/OpenTelemetryConnectionTest.groovy | 49 +++--- .../jdbc/datasource/JdbcTelemetryTest.java | 6 +- .../OpenTelemetryDataSourceTest.java | 7 +- .../jedis/v1_4/JedisClientTest.java | 32 ++-- .../jedis/v3_0/Jedis30ClientTest.java | 32 ++-- .../jedis/v4_0/Jedis40ClientTest.java | 32 ++-- .../src/main/groovy/BaseJsfTest.groovy | 5 - .../LettuceConnectAttributesExtractor.java | 5 +- .../lettuce/v4_0/LettuceAsyncClientTest.java | 46 ++--- .../lettuce/v4_0/LettuceSyncClientTest.java | 42 ++--- .../LettuceConnectAttributesExtractor.java | 5 +- .../lettuce/v5_0/LettuceAsyncClientTest.java | 66 +++---- .../v5_0/LettuceReactiveClientTest.java | 86 ++++----- .../lettuce/v5_0/LettuceSyncClientTest.java | 60 +++---- .../v5_1/LettuceReactiveClientTest.java | 10 +- .../lettuce/v5_1/OpenTelemetryTracing.java | 6 +- .../v5_1/AbstractLettuceAsyncClientTest.java | 27 +-- .../AbstractLettuceReactiveClientTest.java | 39 +++-- .../AbstractLettuceSyncClientAuthTest.java | 6 +- .../v5_1/AbstractLettuceSyncClientTest.java | 59 +++---- .../mongo/v3_1/MongoAttributesExtractor.java | 2 +- .../testing/AbstractMongoClientTest.groovy | 18 +- .../src/test/java/OpenSearchRestTest.java | 14 +- .../v1_0/AbstractR2dbcStatementTest.java | 14 +- .../test/groovy/RediscalaClientTest.groovy | 14 +- .../AbstractRedissonAsyncClientTest.java | 30 ++-- .../redisson/AbstractRedissonClientTest.java | 90 +++++----- .../data/v3_0/ReactiveSpringDataTest.java | 14 +- .../src/main/java/AbstractSpringJpaTest.java | 163 ++++++++++-------- .../src/test/groovy/SpymemcachedTest.groovy | 6 +- .../VertxRedisClientAttributesExtractor.java | 5 +- .../v4_0/redis/VertxRedisClientTest.java | 10 +- .../VertxReactivePropagationTest.groovy | 35 ++-- .../VertxReactivePropagationTest.groovy | 35 ++-- .../vertx/v4_0/sql/VertxSqlClientTest.java | 10 +- .../semconv/SemanticAttributes.java | 14 -- .../smoketest/OtelSpringStarterSmokeTest.java | 3 +- 84 files changed, 1327 insertions(+), 1224 deletions(-) diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java index f02ca91a2221..d46f57cfd35a 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java @@ -10,7 +10,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; /** * Extractor of AttributesExtractor create( public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) { super.onStart(attributes, parentContext, request); - internalSet(attributes, SemanticAttributes.DB_STATEMENT, getter.getStatement(request)); - internalSet(attributes, SemanticAttributes.DB_OPERATION, getter.getOperation(request)); + internalSet(attributes, DbIncubatingAttributes.DB_STATEMENT, getter.getStatement(request)); + internalSet(attributes, DbIncubatingAttributes.DB_OPERATION, getter.getOperation(request)); } } diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java index 7ee4121380da..579a68da3d60 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java @@ -12,7 +12,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.internal.SpanKey; import io.opentelemetry.instrumentation.api.internal.SpanKeyProvider; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import javax.annotation.Nullable; abstract class DbClientCommonAttributesExtractor< @@ -27,11 +27,13 @@ abstract class DbClientCommonAttributesExtractor< @Override public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) { - internalSet(attributes, SemanticAttributes.DB_SYSTEM, getter.getSystem(request)); - internalSet(attributes, SemanticAttributes.DB_USER, getter.getUser(request)); - internalSet(attributes, SemanticAttributes.DB_NAME, getter.getName(request)); + internalSet(attributes, DbIncubatingAttributes.DB_SYSTEM, getter.getSystem(request)); + internalSet(attributes, DbIncubatingAttributes.DB_USER, getter.getUser(request)); + internalSet(attributes, DbIncubatingAttributes.DB_NAME, getter.getName(request)); internalSet( - attributes, SemanticAttributes.DB_CONNECTION_STRING, getter.getConnectionString(request)); + attributes, + DbIncubatingAttributes.DB_CONNECTION_STRING, + getter.getConnectionString(request)); } @Override diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java index be5b449f1da1..7dd9ae09b23f 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; /** * Extractor of . This class is designed with SQL (or SQL-like) database clients in mind. * *

It sets the same set of attributes as {@link DbClientAttributesExtractor} plus an additional - * {@linkplain SemanticAttributes#DB_SQL_TABLE db.sql.table} attribute. The raw SQL + * {@linkplain DbIncubatingAttributes.DB_SQL_TABLE db.sql.table} attribute. The raw SQL * statements returned by the {@link SqlClientAttributesGetter#getRawStatement(Object)} method are * sanitized before use, all statement parameters are removed. */ @@ -62,8 +62,9 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST SqlStatementInfo sanitizedStatement = sanitizer.sanitize(getter.getRawStatement(request)); String operation = sanitizedStatement.getOperation(); - internalSet(attributes, SemanticAttributes.DB_STATEMENT, sanitizedStatement.getFullStatement()); - internalSet(attributes, SemanticAttributes.DB_OPERATION, operation); + internalSet( + attributes, DbIncubatingAttributes.DB_STATEMENT, sanitizedStatement.getFullStatement()); + internalSet(attributes, DbIncubatingAttributes.DB_OPERATION, operation); if (!SQL_CALL.equals(operation)) { internalSet(attributes, dbTableAttribute, sanitizedStatement.getMainIdentifier()); } diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorBuilder.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorBuilder.java index 4cf7ecb1d145..6bbc27cd0253 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorBuilder.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorBuilder.java @@ -10,13 +10,13 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; /** A builder of {@link SqlClientAttributesExtractor}. */ public final class SqlClientAttributesExtractorBuilder { final SqlClientAttributesGetter getter; - AttributeKey dbTableAttribute = SemanticAttributes.DB_SQL_TABLE; + AttributeKey dbTableAttribute = DbIncubatingAttributes.DB_SQL_TABLE; boolean statementSanitizationEnabled = true; SqlClientAttributesExtractorBuilder(SqlClientAttributesGetter getter) { @@ -26,7 +26,7 @@ public final class SqlClientAttributesExtractorBuilder { /** * Configures the extractor to set the table value extracted by the {@link * SqlClientAttributesExtractor} under the {@code dbTableAttribute} key. By default, the - * {@linkplain SemanticAttributes#DB_SQL_TABLE db.sql.table} attribute is used. + * {@linkplain DbIncubatingAttributes.DB_SQL_TABLE db.sql.table} attribute is used. * * @param dbTableAttribute The {@link AttributeKey} under which the table extracted by the {@link * SqlClientAttributesExtractor} will be stored. diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java index ffdcf3f62a96..4c5e5f341e2b 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -78,12 +78,12 @@ void shouldExtractAllAvailableAttributes() { // then assertThat(startAttributes.build()) .containsOnly( - entry(SemanticAttributes.DB_SYSTEM, "myDb"), - entry(SemanticAttributes.DB_USER, "username"), - entry(SemanticAttributes.DB_NAME, "potatoes"), - entry(SemanticAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"), - entry(SemanticAttributes.DB_STATEMENT, "SELECT * FROM potato"), - entry(SemanticAttributes.DB_OPERATION, "SELECT")); + entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"), + entry(DbIncubatingAttributes.DB_USER, "username"), + entry(DbIncubatingAttributes.DB_NAME, "potatoes"), + entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"), + entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM potato"), + entry(DbIncubatingAttributes.DB_OPERATION, "SELECT")); assertThat(endAttributes.build().isEmpty()).isTrue(); } diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java index 9b0a4f9b5c79..a33f370e6cd4 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java @@ -13,7 +13,6 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.semconv.DbIncubatingAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -75,13 +74,13 @@ void shouldExtractAllAttributes() { // then assertThat(startAttributes.build()) .containsOnly( - entry(SemanticAttributes.DB_SYSTEM, "myDb"), - entry(SemanticAttributes.DB_USER, "username"), - entry(SemanticAttributes.DB_NAME, "potatoes"), - entry(SemanticAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"), - entry(SemanticAttributes.DB_STATEMENT, "SELECT * FROM potato WHERE id=?"), - entry(SemanticAttributes.DB_OPERATION, "SELECT"), - entry(SemanticAttributes.DB_SQL_TABLE, "potato")); + entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"), + entry(DbIncubatingAttributes.DB_USER, "username"), + entry(DbIncubatingAttributes.DB_NAME, "potatoes"), + entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"), + entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM potato WHERE id=?"), + entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + entry(DbIncubatingAttributes.DB_SQL_TABLE, "potato")); assertThat(endAttributes.build().isEmpty()).isTrue(); } @@ -104,8 +103,8 @@ void shouldNotExtractTableIfAttributeIsNotSet() { // then assertThat(attributes.build()) .containsOnly( - entry(SemanticAttributes.DB_STATEMENT, "SELECT *"), - entry(SemanticAttributes.DB_OPERATION, "SELECT")); + entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT *"), + entry(DbIncubatingAttributes.DB_OPERATION, "SELECT")); } @Test @@ -128,8 +127,8 @@ void shouldExtractTableToSpecifiedKey() { // then assertThat(attributes.build()) .containsOnly( - entry(SemanticAttributes.DB_STATEMENT, "SELECT * FROM table"), - entry(SemanticAttributes.DB_OPERATION, "SELECT"), + entry(DbIncubatingAttributes.DB_STATEMENT, "SELECT * FROM table"), + entry(DbIncubatingAttributes.DB_OPERATION, "SELECT"), entry(DbIncubatingAttributes.DB_CASSANDRA_TABLE, "table")); } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java index d351c2c6d39d..75d1f6f0c9e1 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java @@ -17,8 +17,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.internal.InstrumenterUtil; import io.opentelemetry.instrumentation.api.internal.Timer; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -312,10 +312,10 @@ private void populateRequestAttributes( fieldMapper.mapToAttributes(sdkRequest, awsSdkRequest, span); if (awsSdkRequest.type() == DYNAMODB) { - span.setAttribute(SemanticAttributes.DB_SYSTEM, "dynamodb"); + span.setAttribute(DbIncubatingAttributes.DB_SYSTEM, "dynamodb"); String operation = attributes.getAttribute(SdkExecutionAttribute.OPERATION_NAME); if (operation != null) { - span.setAttribute(SemanticAttributes.DB_OPERATION, operation); + span.setAttribute(DbIncubatingAttributes.DB_OPERATION, operation); } } } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy index cf9b782c6a67..671d23405d85 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy @@ -8,6 +8,8 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes @@ -149,8 +151,8 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { "aws.agent" "java-aws-sdk" "aws.requestId" "$requestId" "aws.table.name" "sometable" - "$SemanticAttributes.DB_SYSTEM" "dynamodb" - "$SemanticAttributes.DB_OPERATION" "CreateTable" + "$DbIncubatingAttributes.DB_SYSTEM" "dynamodb" + "$DbIncubatingAttributes.DB_OPERATION" "CreateTable" "aws.dynamodb.global_secondary_indexes" "[{\"IndexName\":\"globalIndex\",\"KeySchema\":[{\"AttributeName\":\"attribute\"}],\"ProvisionedThroughput\":{\"ReadCapacityUnits\":10,\"WriteCapacityUnits\":12}},{\"IndexName\":\"globalIndexSecondary\",\"KeySchema\":[{\"AttributeName\":\"attributeSecondary\"}],\"ProvisionedThroughput\":{\"ReadCapacityUnits\":7,\"WriteCapacityUnits\":8}}]" "aws.dynamodb.provisioned_throughput.read_capacity_units" "1" "aws.dynamodb.provisioned_throughput.write_capacity_units" "1" @@ -182,8 +184,8 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { "aws.agent" "java-aws-sdk" "aws.requestId" "$requestId" "aws.table.name" "sometable" - "$SemanticAttributes.DB_SYSTEM" "dynamodb" - "$SemanticAttributes.DB_OPERATION" "Query" + "$DbIncubatingAttributes.DB_SYSTEM" "dynamodb" + "$DbIncubatingAttributes.DB_OPERATION" "Query" "aws.dynamodb.limit" "10" "aws.dynamodb.select" "ALL_ATTRIBUTES" } @@ -214,8 +216,8 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { "aws.agent" "java-aws-sdk" "aws.requestId" "$requestId" "aws.table.name" "sometable" - "$SemanticAttributes.DB_SYSTEM" "dynamodb" - "$SemanticAttributes.DB_OPERATION" "${operation}" + "$DbIncubatingAttributes.DB_SYSTEM" "dynamodb" + "$DbIncubatingAttributes.DB_OPERATION" "${operation}" } } } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java index 7c0396312181..ff123568a522 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java @@ -12,6 +12,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; @@ -175,8 +176,8 @@ public void testSendDynamoDbRequestWithRetries() { .containsEntry("aws.agent", "java-aws-sdk") .containsEntry("aws.requestId", requestId) .containsEntry("aws.table.name", "sometable") - .containsEntry(SemanticAttributes.DB_SYSTEM, "dynamodb") - .containsEntry(SemanticAttributes.DB_OPERATION, operation); + .containsEntry(DbIncubatingAttributes.DB_SYSTEM, "dynamodb") + .containsEntry(DbIncubatingAttributes.DB_OPERATION, operation); }); if (isRecordIndividualHttpErrorEnabled()) { span.hasEventsSatisfyingExactly( diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java index 17bd446014b5..84267819c7e1 100644 --- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java @@ -27,7 +27,7 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlStatementSanitizer; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import java.net.URI; import java.util.Map; import org.apache.camel.Endpoint; @@ -122,14 +122,14 @@ public void pre( CamelDirection camelDirection) { super.pre(attributes, exchange, endpoint, camelDirection); - attributes.put(SemanticAttributes.DB_SYSTEM, system); + attributes.put(DbIncubatingAttributes.DB_SYSTEM, system); String statement = getStatement(exchange, endpoint); if (statement != null) { - attributes.put(SemanticAttributes.DB_STATEMENT, statement); + attributes.put(DbIncubatingAttributes.DB_STATEMENT, statement); } String dbName = getDbName(endpoint); if (dbName != null) { - attributes.put(SemanticAttributes.DB_NAME, dbName); + attributes.put(DbIncubatingAttributes.DB_NAME, dbName); } } } diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java index 9b52d67c5539..77597478ee35 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java @@ -14,7 +14,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerUsingTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.junit.jupiter.api.AfterAll; @@ -116,10 +116,10 @@ void testCassandra() { equalTo( stringKey("camel.uri"), "cql://" + host + ":" + cassandraPort + "/test"), - equalTo(SemanticAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), equalTo( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, "select * from test.users where id=? ALLOW FILTERING"), - equalTo(SemanticAttributes.DB_SYSTEM, "cassandra")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra")))); } } diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java index ef1cbb1a6047..b78598c791b9 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java @@ -14,7 +14,6 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.net.InetSocketAddress; import java.time.Duration; @@ -92,9 +91,10 @@ void syncTest(Parameter parameter) { equalTo(ServerAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), - equalTo(SemanticAttributes.DB_SYSTEM, "cassandra"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"), equalTo( - SemanticAttributes.DB_STATEMENT, "USE " + parameter.keyspace))), + DbIncubatingAttributes.DB_STATEMENT, + "USE " + parameter.keyspace))), trace -> trace.hasSpansSatisfyingExactly( span -> @@ -107,10 +107,11 @@ void syncTest(Parameter parameter) { equalTo(ServerAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), - equalTo(SemanticAttributes.DB_SYSTEM, "cassandra"), - equalTo(SemanticAttributes.DB_NAME, parameter.keyspace), - equalTo(SemanticAttributes.DB_STATEMENT, parameter.expectedStatement), - equalTo(SemanticAttributes.DB_OPERATION, parameter.operation), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"), + equalTo(DbIncubatingAttributes.DB_NAME, parameter.keyspace), + equalTo( + DbIncubatingAttributes.DB_STATEMENT, parameter.expectedStatement), + equalTo(DbIncubatingAttributes.DB_OPERATION, parameter.operation), equalTo( DbIncubatingAttributes.DB_CASSANDRA_TABLE, parameter.table)))); } else { @@ -127,9 +128,10 @@ void syncTest(Parameter parameter) { equalTo(ServerAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), - equalTo(SemanticAttributes.DB_SYSTEM, "cassandra"), - equalTo(SemanticAttributes.DB_STATEMENT, parameter.expectedStatement), - equalTo(SemanticAttributes.DB_OPERATION, parameter.operation), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"), + equalTo( + DbIncubatingAttributes.DB_STATEMENT, parameter.expectedStatement), + equalTo(DbIncubatingAttributes.DB_OPERATION, parameter.operation), equalTo( DbIncubatingAttributes.DB_CASSANDRA_TABLE, parameter.table)))); } @@ -167,9 +169,10 @@ void asyncTest(Parameter parameter) { equalTo(ServerAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), - equalTo(SemanticAttributes.DB_SYSTEM, "cassandra"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"), equalTo( - SemanticAttributes.DB_STATEMENT, "USE " + parameter.keyspace))), + DbIncubatingAttributes.DB_STATEMENT, + "USE " + parameter.keyspace))), trace -> trace.hasSpansSatisfyingExactly( span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(), @@ -183,10 +186,11 @@ void asyncTest(Parameter parameter) { equalTo(ServerAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), - equalTo(SemanticAttributes.DB_SYSTEM, "cassandra"), - equalTo(SemanticAttributes.DB_NAME, parameter.keyspace), - equalTo(SemanticAttributes.DB_STATEMENT, parameter.expectedStatement), - equalTo(SemanticAttributes.DB_OPERATION, parameter.operation), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"), + equalTo(DbIncubatingAttributes.DB_NAME, parameter.keyspace), + equalTo( + DbIncubatingAttributes.DB_STATEMENT, parameter.expectedStatement), + equalTo(DbIncubatingAttributes.DB_OPERATION, parameter.operation), equalTo(DbIncubatingAttributes.DB_CASSANDRA_TABLE, parameter.table)), span -> span.hasName("callbackListener") @@ -207,9 +211,10 @@ void asyncTest(Parameter parameter) { equalTo(ServerAttributes.SERVER_PORT, cassandraPort), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, cassandraPort), - equalTo(SemanticAttributes.DB_SYSTEM, "cassandra"), - equalTo(SemanticAttributes.DB_STATEMENT, parameter.expectedStatement), - equalTo(SemanticAttributes.DB_OPERATION, parameter.operation), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "cassandra"), + equalTo( + DbIncubatingAttributes.DB_STATEMENT, parameter.expectedStatement), + equalTo(DbIncubatingAttributes.DB_OPERATION, parameter.operation), equalTo(DbIncubatingAttributes.DB_CASSANDRA_TABLE, parameter.table)), span -> span.hasName("callbackListener") diff --git a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java index 292dcf8e718c..91f941a348da 100644 --- a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java +++ b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java @@ -14,11 +14,11 @@ import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE; import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT; import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_TABLE; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_NAME; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_OPERATION; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SYSTEM; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE; -import static io.opentelemetry.semconv.SemanticAttributes.DB_NAME; -import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.SemanticAttributes.DB_SYSTEM; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java index d5bd578009bc..96c937438ce6 100644 --- a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java +++ b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java @@ -14,11 +14,11 @@ import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE; import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT; import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_TABLE; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_NAME; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_OPERATION; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SYSTEM; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE; -import static io.opentelemetry.semconv.SemanticAttributes.DB_NAME; -import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.SemanticAttributes.DB_SYSTEM; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy index f50e7af2d46e..1629600100d1 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy @@ -7,6 +7,10 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import io.opentelemetry.semconv.NetworkAttributes import static io.opentelemetry.api.trace.SpanKind.CLIENT @@ -30,10 +34,10 @@ class CouchbaseSpanUtil { childOf((SpanData) parentSpan) } attributes { - "$SemanticAttributes.DB_SYSTEM" "couchbase" - "$SemanticAttributes.DB_NAME" bucketName - "$SemanticAttributes.DB_STATEMENT" statement - "$SemanticAttributes.DB_OPERATION"(operation ?: spanName) + "$DbIncubatingAttributes.DB_SYSTEM" "couchbase" + "$DbIncubatingAttributes.DB_NAME" bucketName + "$DbIncubatingAttributes.DB_STATEMENT" statement + "$DbIncubatingAttributes.DB_OPERATION"(operation ?: spanName) // Because of caching, not all requests hit the server so these attributes may be absent "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == null } diff --git a/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy index 97df9e0757f1..1ad81da8585e 100644 --- a/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy +++ b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy @@ -20,6 +20,10 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import spock.lang.Shared import java.util.concurrent.TimeUnit @@ -120,10 +124,10 @@ abstract class AbstractCouchbaseTest extends AgentInstrumentationSpecification { childOf((SpanData) parentSpan) } attributes { - "$SemanticAttributes.DB_SYSTEM" "couchbase" - "$SemanticAttributes.DB_NAME" bucketName - "$SemanticAttributes.DB_STATEMENT" statement - "$SemanticAttributes.DB_OPERATION"(operation ?: spanName) + "$DbIncubatingAttributes.DB_SYSTEM" "couchbase" + "$DbIncubatingAttributes.DB_NAME" bucketName + "$DbIncubatingAttributes.DB_STATEMENT" statement + "$DbIncubatingAttributes.DB_OPERATION"(operation ?: spanName) } } } diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java index 574dc3aeaae8..98c30ffc20ec 100644 --- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java +++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java @@ -18,9 +18,9 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; @@ -89,8 +89,8 @@ public void elasticsearchStatus() throws IOException { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), - equalTo(SemanticAttributes.DB_OPERATION, "info"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "elasticsearch"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "info"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UrlAttributes.URL_FULL, httpHost.toURI() + "/"), equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), @@ -125,8 +125,8 @@ public void elasticsearchIndex() throws IOException { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), - equalTo(SemanticAttributes.DB_OPERATION, "index"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "elasticsearch"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "index"), equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "PUT"), @@ -186,8 +186,8 @@ public void elasticsearchStatusAsync() throws Exception { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), - equalTo(SemanticAttributes.DB_OPERATION, "info"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "elasticsearch"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "info"), equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java index 82fb4adbf227..135ae812d249 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java @@ -11,9 +11,9 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; @@ -96,7 +96,7 @@ void elasticsearchStatus() throws IOException { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), @@ -172,7 +172,7 @@ public void onFailure(Exception e) { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java index cab760683600..62e8f77b9f90 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java @@ -11,9 +11,9 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; @@ -87,7 +87,7 @@ public void elasticsearchStatus() throws IOException { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), @@ -162,7 +162,7 @@ public void onFailure(Exception e) { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index fa10070d526b..d943721e0145 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -11,9 +11,9 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.Map; @@ -85,7 +85,7 @@ public void elasticsearchStatus() throws Exception { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), @@ -155,7 +155,7 @@ public void onFailure(Exception e) { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index 5743b7bff3ac..694c50caad9c 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -11,8 +11,8 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.util.Map; @@ -85,7 +85,7 @@ public void elasticsearchStatus() throws Exception { .hasKind(SpanKind.CLIENT) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), @@ -145,7 +145,7 @@ public void onFailure(Exception e) { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "elasticsearch"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "elasticsearch"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(ServerAttributes.SERVER_ADDRESS, httpHost.getHostName()), equalTo(ServerAttributes.SERVER_PORT, httpHost.getPort()), diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy index 12cf59be265d..98aed15af754 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy @@ -4,6 +4,8 @@ */ import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import org.elasticsearch.client.Client import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.settings.Settings @@ -113,8 +115,8 @@ class Elasticsearch5NodeClientTest extends AbstractElasticsearchNodeClientTest { kind CLIENT childOf(span(0)) attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -160,8 +162,8 @@ class Elasticsearch5NodeClientTest extends AbstractElasticsearchNodeClientTest { kind CLIENT childOf(span(0)) attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -226,8 +228,8 @@ class Elasticsearch5NodeClientTest extends AbstractElasticsearchNodeClientTest { name "CreateIndexAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "CreateIndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -239,8 +241,8 @@ class Elasticsearch5NodeClientTest extends AbstractElasticsearchNodeClientTest { name "ClusterHealthAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -251,8 +253,8 @@ class Elasticsearch5NodeClientTest extends AbstractElasticsearchNodeClientTest { name "GetAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -267,8 +269,8 @@ class Elasticsearch5NodeClientTest extends AbstractElasticsearchNodeClientTest { name "IndexAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -285,8 +287,8 @@ class Elasticsearch5NodeClientTest extends AbstractElasticsearchNodeClientTest { name "GetAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy index 318370acb794..fb451d2e4080 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy @@ -5,6 +5,8 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.settings.Settings @@ -128,8 +130,8 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl attributes { "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -174,8 +176,8 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl childOf(span(0)) errorEvent RemoteTransportException, String attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -244,8 +246,8 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl attributes { "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "CreateIndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -259,8 +261,8 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl attributes { "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -275,8 +277,8 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl name "PutMappingAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "PutMappingAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "PutMappingAction" "elasticsearch.action" "PutMappingAction" "elasticsearch.request" "PutMappingRequest" } @@ -289,8 +291,8 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl attributes { "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -309,8 +311,8 @@ class Elasticsearch5TransportClientTest extends AbstractElasticsearchTransportCl attributes { "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy index 44faed6942b3..cf89058c31ad 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy @@ -4,6 +4,8 @@ */ import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.Client import org.elasticsearch.common.io.FileSystemUtils @@ -116,8 +118,8 @@ class Elasticsearch53NodeClientTest extends AbstractElasticsearchNodeClientTest kind CLIENT childOf(span(0)) attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -163,8 +165,8 @@ class Elasticsearch53NodeClientTest extends AbstractElasticsearchNodeClientTest childOf(span(0)) errorEvent IndexNotFoundException, "no such index" attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -229,8 +231,8 @@ class Elasticsearch53NodeClientTest extends AbstractElasticsearchNodeClientTest name "CreateIndexAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "CreateIndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -242,8 +244,8 @@ class Elasticsearch53NodeClientTest extends AbstractElasticsearchNodeClientTest name "ClusterHealthAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -254,8 +256,8 @@ class Elasticsearch53NodeClientTest extends AbstractElasticsearchNodeClientTest name "GetAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -270,8 +272,8 @@ class Elasticsearch53NodeClientTest extends AbstractElasticsearchNodeClientTest name "IndexAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -289,8 +291,8 @@ class Elasticsearch53NodeClientTest extends AbstractElasticsearchNodeClientTest name "GetAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy index f9a023cdf91e..e66942c19b12 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy @@ -5,6 +5,8 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.common.io.FileSystemUtils @@ -134,8 +136,8 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC attributes { "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -179,8 +181,8 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC status ERROR errorEvent RemoteTransportException, String attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -249,8 +251,8 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC attributes { "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "CreateIndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -264,8 +266,8 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC attributes { "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -280,8 +282,8 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC name "PutMappingAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "PutMappingAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "PutMappingAction" "elasticsearch.action" "PutMappingAction" "elasticsearch.request" "PutMappingRequest" } @@ -294,8 +296,8 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC attributes { "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -315,8 +317,8 @@ class Elasticsearch53TransportClientTest extends AbstractElasticsearchTransportC attributes { "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy index 45978451d0c9..e18927da7017 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy @@ -7,6 +7,8 @@ package springdata import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import org.junit.jupiter.api.Assumptions import org.springframework.context.annotation.AnnotationConfigApplicationContext import spock.lang.Shared @@ -98,8 +100,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "SearchAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "SearchAction" "elasticsearch.action" "SearchAction" "elasticsearch.request" "SearchRequest" "elasticsearch.request.indices" indexName @@ -136,8 +138,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -154,8 +156,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "RefreshAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "RefreshAction" "elasticsearch.action" "RefreshAction" "elasticsearch.request" "RefreshRequest" "elasticsearch.request.indices" indexName @@ -187,8 +189,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -224,8 +226,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -242,8 +244,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "RefreshAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "RefreshAction" "elasticsearch.action" "RefreshAction" "elasticsearch.request" "RefreshRequest" "elasticsearch.request.indices" indexName @@ -267,8 +269,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -303,8 +305,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "DeleteAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "DeleteAction" "elasticsearch.action" "DeleteAction" "elasticsearch.request" "DeleteRequest" "elasticsearch.request.indices" indexName @@ -320,8 +322,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "RefreshAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "RefreshAction" "elasticsearch.action" "RefreshAction" "elasticsearch.request" "RefreshRequest" "elasticsearch.request.indices" indexName @@ -346,8 +348,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "SearchAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "SearchAction" "elasticsearch.action" "SearchAction" "elasticsearch.request" "SearchRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy index faf1dd312404..602e8acce585 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy @@ -7,6 +7,8 @@ package springdata import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.action.search.SearchResponse import org.elasticsearch.common.io.FileSystemUtils @@ -103,8 +105,8 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio status ERROR errorEvent IndexNotFoundException, "no such index" attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "RefreshAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "RefreshAction" "elasticsearch.action" "RefreshAction" "elasticsearch.request" "RefreshRequest" "elasticsearch.request.indices" indexName @@ -152,8 +154,8 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio name "CreateIndexAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "CreateIndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -165,8 +167,8 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio name "ClusterHealthAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -177,8 +179,8 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio name "SearchAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "SearchAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "SearchAction" "elasticsearch.action" "SearchAction" "elasticsearch.request" "SearchRequest" "elasticsearch.request.indices" indexName @@ -191,8 +193,8 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio name "IndexAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -210,8 +212,8 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio name "RefreshAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "RefreshAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "RefreshAction" "elasticsearch.action" "RefreshAction" "elasticsearch.request" "RefreshRequest" "elasticsearch.request.indices" indexName @@ -226,8 +228,8 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio name "SearchAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "SearchAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "SearchAction" "elasticsearch.action" "SearchAction" "elasticsearch.request" "SearchRequest" "elasticsearch.request.indices" indexName @@ -303,8 +305,8 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio name "SearchAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "SearchAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "SearchAction" "elasticsearch.action" "SearchAction" "elasticsearch.request" "SearchRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy index e4bb98248fdb..69f0c9763cd2 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy @@ -4,6 +4,8 @@ */ import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.Client import org.elasticsearch.common.io.FileSystemUtils @@ -92,8 +94,8 @@ class Elasticsearch6NodeClientTest extends AbstractElasticsearchNodeClientTest { kind CLIENT childOf(span(0)) attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -138,8 +140,8 @@ class Elasticsearch6NodeClientTest extends AbstractElasticsearchNodeClientTest { childOf(span(0)) errorEvent IndexNotFoundException, ~/no such index( \[invalid-index])?/ attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -203,8 +205,8 @@ class Elasticsearch6NodeClientTest extends AbstractElasticsearchNodeClientTest { name "CreateIndexAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "CreateIndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -216,8 +218,8 @@ class Elasticsearch6NodeClientTest extends AbstractElasticsearchNodeClientTest { name "GetAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -232,8 +234,8 @@ class Elasticsearch6NodeClientTest extends AbstractElasticsearchNodeClientTest { name "IndexAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -251,8 +253,8 @@ class Elasticsearch6NodeClientTest extends AbstractElasticsearchNodeClientTest { name "GetAction" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy index c7077ba96309..c847b17cc0c0 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy @@ -5,6 +5,8 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import io.opentelemetry.semconv.NetworkAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.transport.TransportClient @@ -110,8 +112,8 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" } "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "ClusterHealthAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" } @@ -155,8 +157,8 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl status ERROR errorEvent RemoteTransportException, String attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -229,8 +231,8 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" } "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "CreateIndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -245,8 +247,8 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" } "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -261,8 +263,8 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl name ~/(Auto)?PutMappingAction/ kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" ~/(Auto)?PutMappingAction/ + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" ~/(Auto)?PutMappingAction/ "elasticsearch.action" ~/(Auto)?PutMappingAction/ "elasticsearch.request" "PutMappingRequest" } @@ -276,8 +278,8 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" } "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "IndexAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "IndexAction" "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -298,8 +300,8 @@ class Elasticsearch6TransportClientTest extends AbstractElasticsearchTransportCl "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" } "$NetworkAttributes.NETWORK_PEER_ADDRESS" tcpPublishAddress.address "$NetworkAttributes.NETWORK_PEER_PORT" tcpPublishAddress.port - "$SemanticAttributes.DB_SYSTEM" "elasticsearch" - "$SemanticAttributes.DB_OPERATION" "GetAction" + "$DbIncubatingAttributes.DB_SYSTEM" "elasticsearch" + "$DbIncubatingAttributes.DB_OPERATION" "GetAction" "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName diff --git a/instrumentation/geode-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/geode/PutGetTest.java b/instrumentation/geode-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/geode/PutGetTest.java index 128e86f73030..d1209c5894b1 100644 --- a/instrumentation/geode-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/geode/PutGetTest.java +++ b/instrumentation/geode-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/geode/PutGetTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -132,24 +132,24 @@ void assertGeodeTrace(String verb, String query) { span.hasName("clear test-region") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "geode"), - equalTo(SemanticAttributes.DB_NAME, "test-region"), - equalTo(SemanticAttributes.DB_OPERATION, "clear")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "geode"), + equalTo(DbIncubatingAttributes.DB_NAME, "test-region"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "clear")), span -> span.hasName("put test-region") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "geode"), - equalTo(SemanticAttributes.DB_NAME, "test-region"), - equalTo(SemanticAttributes.DB_OPERATION, "put")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "geode"), + equalTo(DbIncubatingAttributes.DB_NAME, "test-region"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "put")), span -> span.hasName(verb.concat(" test-region")) .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "geode"), - equalTo(SemanticAttributes.DB_NAME, "test-region"), - equalTo(SemanticAttributes.DB_OPERATION, verb), - equalTo(SemanticAttributes.DB_STATEMENT, query)))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "geode"), + equalTo(DbIncubatingAttributes.DB_NAME, "test-region"), + equalTo(DbIncubatingAttributes.DB_OPERATION, verb), + equalTo(DbIncubatingAttributes.DB_STATEMENT, query)))); } static class Card implements DataSerializable { diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java index 4df5f766829e..1349572a4ade 100644 --- a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java +++ b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -61,13 +61,13 @@ static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData parent) { return span.hasKind(SpanKind.CLIENT) .hasParent(parent) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), - satisfies(SemanticAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), - satisfies(SemanticAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), + satisfies(DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), + satisfies(DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")); } static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData parent, String verb) { @@ -75,15 +75,15 @@ static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData parent, Str .hasKind(SpanKind.CLIENT) .hasParent(parent) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, stringAssert -> stringAssert.startsWith(verb.toLowerCase(Locale.ROOT))), - equalTo(SemanticAttributes.DB_OPERATION, verb), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")); + equalTo(DbIncubatingAttributes.DB_OPERATION, verb), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")); } static SpanDataAssert assertSessionSpan(SpanDataAssert span, SpanData parent, String spanName) { diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaTest.java index bcedab82bab7..21bda398eda5 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaTest.java @@ -12,7 +12,7 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import java.util.function.Consumer; import java.util.stream.Stream; import org.hibernate.Criteria; @@ -66,15 +66,15 @@ void testCriteria(String methodName, Consumer interaction) { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, stringAssert -> stringAssert.startsWith("select")), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java index bd30329fbc7e..9d88955e9198 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Named.named; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import java.util.function.BiConsumer; import java.util.function.Function; import java.util.stream.Stream; @@ -99,17 +99,17 @@ void testHibernateActions(Parameter parameter) { span.hasKind(CLIENT) .hasParent(trace.getSpan(2)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), satisfies( - SemanticAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value"))); + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value"))); } else { trace.hasSpansSatisfyingExactly( @@ -130,17 +130,17 @@ void testHibernateActions(Parameter parameter) { span.hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), satisfies( - SemanticAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -215,17 +215,17 @@ void testHibernatePersist() { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), satisfies( - SemanticAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -241,17 +241,17 @@ void testHibernatePersist() { span.hasKind(CLIENT) .hasParent(trace.getSpan(3)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), satisfies( - SemanticAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")))); + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")))); } @ParameterizedTest @@ -289,17 +289,17 @@ void testAttachesStateToQuery(Function queryBuildMethod) { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), satisfies( - SemanticAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java index 75011bf1161f..bc1d0d6870b5 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Named.named; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import java.util.Iterator; import java.util.function.Consumer; import java.util.stream.Stream; @@ -60,17 +60,17 @@ void testHibernateQueryExecuteUpdateWithTransaction() { span.hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), satisfies( - SemanticAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -117,14 +117,15 @@ void testHibernateQuerySingleCall(Parameter parameter) { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, val -> val.startsWith("select ")), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")))); + DbIncubatingAttributes.DB_STATEMENT, + val -> val.startsWith("select ")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")))); } private static Stream providesArgumentsSingleCall() { @@ -189,14 +190,15 @@ void testHibernateQueryIterate() { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, val -> val.startsWith("select ")), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")), + DbIncubatingAttributes.DB_STATEMENT, + val -> val.startsWith("select ")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java index 6ca20eb435b1..7c9248696228 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java @@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Named.named; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; import java.util.function.Consumer; @@ -63,17 +63,17 @@ void testHibernateAction(Parameter parameter) { span.hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), satisfies( - SemanticAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -173,17 +173,17 @@ void testHibernateActionStateless(Parameter parameter) { span.hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), satisfies( - SemanticAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -319,17 +319,17 @@ void testHibernateReplicate(Parameter parameter) { span.hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), satisfies( - SemanticAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -345,17 +345,17 @@ void testHibernateReplicate(Parameter parameter) { span.hasKind(CLIENT) .hasParent(trace.getSpan(3)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), satisfies( - SemanticAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")))); + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")))); } private static Stream provideArgumentsHibernateReplicate() { @@ -478,17 +478,17 @@ void testHibernateCommitAction(Parameter parameter) { span.hasKind(CLIENT) .hasParent(trace.getSpan(2)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), satisfies( - SemanticAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")))); + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")))); } private static Stream provideArgumentsHibernateCommitAction() { @@ -656,17 +656,17 @@ void testAttachesStateToQueryCreated(Consumer queryBuilder) { span.hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), satisfies( - SemanticAttributes.DB_OPERATION, + DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -756,15 +756,15 @@ void testHibernateOverlappingSessions() { .hasKind(CLIENT) .hasParent(trace.getSpan(2)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, stringAssert -> stringAssert.startsWith("insert")), - equalTo(SemanticAttributes.DB_OPERATION, "INSERT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "INSERT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), span -> { span.hasName("Session.save " + Value.class.getName()) .hasKind(INTERNAL) @@ -800,29 +800,29 @@ void testHibernateOverlappingSessions() { .hasKind(CLIENT) .hasParent(trace.getSpan(6)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, stringAssert -> stringAssert.startsWith("insert")), - equalTo(SemanticAttributes.DB_OPERATION, "INSERT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "INSERT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), span -> span.hasName("DELETE db1.Value") .hasKind(CLIENT) .hasParent(trace.getSpan(6)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, stringAssert -> stringAssert.startsWith("delete")), - equalTo(SemanticAttributes.DB_OPERATION, "DELETE"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")))); + equalTo(DbIncubatingAttributes.DB_OPERATION, "DELETE"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")))); assertThat(sessionId1.get()).isNotEqualTo(sessionId2.get()); assertThat(sessionId1.get()).isNotEqualTo(sessionId3.get()); diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java index 03748845a8bc..4275ed785bf4 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import java.util.regex.Pattern; import org.hibernate.Version; import org.junit.jupiter.api.Test; @@ -65,18 +65,18 @@ void testCrud() { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.matches( Pattern.compile( "select ([^.]+).id([^,]*), ([^.]+).firstName([^,]*), ([^.]+).lastName(.*)from Customer(.*)"))), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Customer")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -120,18 +120,18 @@ void testCrud() { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.matches( Pattern.compile( "insert into Customer (.*) values \\(.*, \\?, \\?\\)"))), - equalTo(SemanticAttributes.DB_OPERATION, "INSERT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Customer")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "INSERT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -163,14 +163,14 @@ void testCrud() { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), equalTo( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, "call next value for hibernate_sequence"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), - equalTo(SemanticAttributes.DB_OPERATION, "CALL")), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "CALL")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -187,18 +187,18 @@ void testCrud() { .hasKind(CLIENT) .hasParent(trace.getSpan(3)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.matches( Pattern.compile( "insert into Customer (.*) values \\(.* \\?, \\?\\)"))), - equalTo(SemanticAttributes.DB_OPERATION, "INSERT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Customer"))); + equalTo(DbIncubatingAttributes.DB_OPERATION, "INSERT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer"))); } }); testing.clearData(); @@ -234,18 +234,18 @@ void testCrud() { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.matches( Pattern.compile( "select ([^.]+).id([^,]*), ([^.]+).firstName([^,]*), ([^.]+).lastName (.*)from Customer (.*)where ([^.]+).id=\\?"))), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Customer")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) @@ -262,15 +262,15 @@ void testCrud() { .hasKind(CLIENT) .hasParent(trace.getSpan(3)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), equalTo( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, "update Customer set firstName=?, lastName=? where id=?"), - equalTo(SemanticAttributes.DB_OPERATION, "UPDATE"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Customer")))); + equalTo(DbIncubatingAttributes.DB_OPERATION, "UPDATE"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer")))); testing.clearData(); Customer foundCustomer = @@ -300,18 +300,18 @@ void testCrud() { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.matches( Pattern.compile( "select ([^.]+).id([^,]*), ([^.]+).firstName([^,]*), ([^.]+).lastName (.*)from Customer (.*)(where ([^.]+).lastName=\\?)"))), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Customer")))); + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer")))); testing.clearData(); testing.runWithSpan("parent", () -> repo.delete(foundCustomer)); @@ -338,18 +338,18 @@ void testCrud() { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.matches( Pattern.compile( "select ([^.]+).id([^,]*), ([^.]+).firstName([^,]*), ([^.]+).lastName (.*)from Customer (.*)where ([^.]+).id=\\?"))), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Customer")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer")), span -> span.hasName("Session.delete spring.jpa.Customer") .hasKind(INTERNAL) @@ -370,14 +370,15 @@ void testCrud() { span.hasName("DELETE test.Customer") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), equalTo( - SemanticAttributes.DB_STATEMENT, "delete from Customer where id=?"), - equalTo(SemanticAttributes.DB_OPERATION, "DELETE"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Customer"))); + DbIncubatingAttributes.DB_STATEMENT, + "delete from Customer where id=?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "DELETE"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer"))); } else { String findAction; @@ -402,18 +403,18 @@ void testCrud() { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.matches( Pattern.compile( "select ([^.]+).id([^,]*), ([^.]+).firstName([^,]*), ([^.]+).lastName (.*)from Customer (.*)where ([^.]+).id=\\?"))), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Customer")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer")), span -> span.hasName("Session.merge spring.jpa.Customer") .hasKind(INTERNAL) @@ -442,14 +443,15 @@ void testCrud() { span.hasName("DELETE test.Customer") .hasKind(CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), equalTo( - SemanticAttributes.DB_STATEMENT, "delete from Customer where id=?"), - equalTo(SemanticAttributes.DB_OPERATION, "DELETE"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Customer"))); + DbIncubatingAttributes.DB_STATEMENT, + "delete from Customer where id=?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "DELETE"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Customer"))); } }); } diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java index a181b14e3931..ed6e994825db 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; @@ -75,15 +75,15 @@ void testCriteriaQuery(Consumer> interaction) { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, stringAssert -> stringAssert.startsWith("select")), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), span -> span.hasName("Transaction.commit") .hasKind(SpanKind.INTERNAL) diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java index 11ec476320a7..acc504fcf2be 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.EntityTransaction; @@ -137,15 +137,15 @@ void testAttachesStateToQuery(Parameter parameter) { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), span -> assertTransactionCommitSpan( span, @@ -291,13 +291,13 @@ private static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData par return span.hasKind(SpanKind.CLIENT) .hasParent(parent) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), - satisfies(SemanticAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), - satisfies(SemanticAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), + satisfies(DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), + satisfies(DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")); } private static SpanDataAssert assertClientSpan( @@ -306,13 +306,13 @@ private static SpanDataAssert assertClientSpan( .hasKind(SpanKind.CLIENT) .hasParent(parent) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), - satisfies(SemanticAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), - satisfies(SemanticAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), + satisfies(DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), + satisfies(DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")); } private static SpanDataAssert assertSessionSpan( diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java index d1e79fa63a3f..02a7166d5b9b 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import jakarta.persistence.ParameterMode; import java.sql.Connection; import java.sql.DriverManager; @@ -101,12 +101,12 @@ void testProcedureCall() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), - equalTo(SemanticAttributes.DB_STATEMENT, "{call TEST_PROC()}"), - equalTo(SemanticAttributes.DB_OPERATION, "CALL")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "{call TEST_PROC()}"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "CALL")), span -> span.hasName("Transaction.commit") .hasKind(SpanKind.INTERNAL) diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java index 6d77f982db2e..4a6d02c5d764 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import java.util.Arrays; import java.util.List; import java.util.Locale; @@ -242,15 +242,15 @@ void testAttachesStateToQuery(Parameter parameter) { span.hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")), span -> assertSpanWithSessionId( span, @@ -806,13 +806,13 @@ private static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData par return span.hasKind(SpanKind.CLIENT) .hasParent(parent) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), - satisfies(SemanticAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), - satisfies(SemanticAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), + satisfies(DbIncubatingAttributes.DB_STATEMENT, val -> val.isInstanceOf(String.class)), + satisfies(DbIncubatingAttributes.DB_OPERATION, val -> val.isInstanceOf(String.class)), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")); } private static SpanDataAssert assertClientSpan( @@ -821,14 +821,14 @@ private static SpanDataAssert assertClientSpan( .hasKind(SpanKind.CLIENT) .hasParent(parent) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "h2"), - equalTo(SemanticAttributes.DB_NAME, "db1"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "h2"), + equalTo(DbIncubatingAttributes.DB_NAME, "db1"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "h2:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, stringAssert -> stringAssert.startsWith(verb.toLowerCase(Locale.ROOT))), - equalTo(SemanticAttributes.DB_OPERATION, verb), - equalTo(SemanticAttributes.DB_SQL_TABLE, "Value")); + equalTo(DbIncubatingAttributes.DB_OPERATION, verb), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")); } } diff --git a/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy b/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy index 26b4b0013fcb..8e7d20ecbfe4 100644 --- a/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy +++ b/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy @@ -5,6 +5,13 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import org.hibernate.Version import org.springframework.context.annotation.AnnotationConfigApplicationContext import spock.lang.Shared @@ -60,13 +67,13 @@ class SpringJpaTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(1) attributes { - "$SemanticAttributes.DB_SYSTEM" "hsqldb" - "$SemanticAttributes.DB_NAME" "test" - "$SemanticAttributes.DB_USER" "sa" - "$SemanticAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$SemanticAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName(.*)from Customer(.*)/ - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" + "$DbIncubatingAttributes.DB_NAME" "test" + "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" + "$DbIncubatingAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName(.*)from Customer(.*)/ + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" } } span(3) { @@ -116,12 +123,12 @@ class SpringJpaTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(1) attributes { - "$SemanticAttributes.DB_SYSTEM" "hsqldb" - "$SemanticAttributes.DB_NAME" "test" - "$SemanticAttributes.DB_USER" "sa" - "$SemanticAttributes.DB_STATEMENT" "call next value for Customer_SEQ" - "$SemanticAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$SemanticAttributes.DB_OPERATION" "CALL" + "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" + "$DbIncubatingAttributes.DB_NAME" "test" + "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_STATEMENT" "call next value for Customer_SEQ" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" + "$DbIncubatingAttributes.DB_OPERATION" "CALL" } } span(3) { @@ -137,13 +144,13 @@ class SpringJpaTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(3) attributes { - "$SemanticAttributes.DB_SYSTEM" "hsqldb" - "$SemanticAttributes.DB_NAME" "test" - "$SemanticAttributes.DB_USER" "sa" - "$SemanticAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$SemanticAttributes.DB_STATEMENT" ~/insert into Customer \(.*\) values \(.*\)/ - "$SemanticAttributes.DB_OPERATION" "INSERT" - "$SemanticAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" + "$DbIncubatingAttributes.DB_NAME" "test" + "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" + "$DbIncubatingAttributes.DB_STATEMENT" ~/insert into Customer \(.*\) values \(.*\)/ + "$DbIncubatingAttributes.DB_OPERATION" "INSERT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" } } } else { @@ -152,13 +159,13 @@ class SpringJpaTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(1) attributes { - "$SemanticAttributes.DB_SYSTEM" "hsqldb" - "$SemanticAttributes.DB_NAME" "test" - "$SemanticAttributes.DB_USER" "sa" - "$SemanticAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$SemanticAttributes.DB_STATEMENT" ~/insert into Customer \(.*\) values \(.*\)/ - "$SemanticAttributes.DB_OPERATION" "INSERT" - "$SemanticAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" + "$DbIncubatingAttributes.DB_NAME" "test" + "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" + "$DbIncubatingAttributes.DB_STATEMENT" ~/insert into Customer \(.*\) values \(.*\)/ + "$DbIncubatingAttributes.DB_OPERATION" "INSERT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" } } span(3) { @@ -207,13 +214,13 @@ class SpringJpaTest extends AgentInstrumentationSpecification { name "SELECT test.Customer" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "hsqldb" - "$SemanticAttributes.DB_NAME" "test" - "$SemanticAttributes.DB_USER" "sa" - "$SemanticAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$SemanticAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/ - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" + "$DbIncubatingAttributes.DB_NAME" "test" + "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" + "$DbIncubatingAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/ + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" } } span(3) { @@ -228,13 +235,13 @@ class SpringJpaTest extends AgentInstrumentationSpecification { name "UPDATE test.Customer" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "hsqldb" - "$SemanticAttributes.DB_NAME" "test" - "$SemanticAttributes.DB_USER" "sa" - "$SemanticAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$SemanticAttributes.DB_STATEMENT" ~/update Customer set firstName=\?,(.*)lastName=\? where id=\?/ - "$SemanticAttributes.DB_OPERATION" "UPDATE" - "$SemanticAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" + "$DbIncubatingAttributes.DB_NAME" "test" + "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" + "$DbIncubatingAttributes.DB_STATEMENT" ~/update Customer set firstName=\?,(.*)lastName=\? where id=\?/ + "$DbIncubatingAttributes.DB_OPERATION" "UPDATE" + "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" } } } @@ -271,13 +278,13 @@ class SpringJpaTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(1) attributes { - "$SemanticAttributes.DB_SYSTEM" "hsqldb" - "$SemanticAttributes.DB_NAME" "test" - "$SemanticAttributes.DB_USER" "sa" - "$SemanticAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$SemanticAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)(where ([^.]+)\.lastName( ?)=( ?)\?|)/ - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" + "$DbIncubatingAttributes.DB_NAME" "test" + "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" + "$DbIncubatingAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)(where ([^.]+)\.lastName( ?)=( ?)\?|)/ + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" } } } @@ -315,13 +322,13 @@ class SpringJpaTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(1) attributes { - "$SemanticAttributes.DB_SYSTEM" "hsqldb" - "$SemanticAttributes.DB_NAME" "test" - "$SemanticAttributes.DB_USER" "sa" - "$SemanticAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$SemanticAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/ - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" + "$DbIncubatingAttributes.DB_NAME" "test" + "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" + "$DbIncubatingAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/ + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" } } } @@ -340,13 +347,13 @@ class SpringJpaTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(1) attributes { - "$SemanticAttributes.DB_SYSTEM" "hsqldb" - "$SemanticAttributes.DB_NAME" "test" - "$SemanticAttributes.DB_USER" "sa" - "$SemanticAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$SemanticAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/ - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" + "$DbIncubatingAttributes.DB_NAME" "test" + "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" + "$DbIncubatingAttributes.DB_STATEMENT" ~/select ([^.]+)\.id([^,]*),([^.]+)\.firstName([^,]*),([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/ + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" } } } @@ -370,13 +377,13 @@ class SpringJpaTest extends AgentInstrumentationSpecification { name "DELETE test.Customer" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "hsqldb" - "$SemanticAttributes.DB_NAME" "test" - "$SemanticAttributes.DB_USER" "sa" - "$SemanticAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$SemanticAttributes.DB_STATEMENT" "delete from Customer where id=?" - "$SemanticAttributes.DB_OPERATION" "DELETE" - "$SemanticAttributes.DB_SQL_TABLE" "Customer" + "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" + "$DbIncubatingAttributes.DB_NAME" "test" + "$DbIncubatingAttributes.DB_USER" "sa" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" + "$DbIncubatingAttributes.DB_STATEMENT" "delete from Customer where id=?" + "$DbIncubatingAttributes.DB_OPERATION" "DELETE" + "$DbIncubatingAttributes.DB_SQL_TABLE" "Customer" } } } diff --git a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java index bfa62e8ee96f..f5f2fd5286ef 100644 --- a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java +++ b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java @@ -17,7 +17,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; @@ -113,12 +113,12 @@ void testProcedureCall() { .hasKind(CLIENT) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_STATEMENT, "{call TEST_PROC()}"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), - equalTo(SemanticAttributes.DB_OPERATION, "CALL")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "{call TEST_PROC()}"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "CALL")), span -> span.hasName("Transaction.commit") .hasKind(INTERNAL) diff --git a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java index f08b5eeb62cf..f17995330a7b 100644 --- a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java +++ b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java @@ -6,11 +6,11 @@ package io.opentelemetry.javaagent.instrumentation.hibernate.reactive.v1_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.SemanticAttributes.DB_NAME; -import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.SemanticAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.SemanticAttributes.DB_USER; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_NAME; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_OPERATION; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SQL_TABLE; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_USER; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; diff --git a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java index fc223926103c..1293c04fd34c 100644 --- a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java +++ b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java @@ -6,11 +6,11 @@ package io.opentelemetry.javaagent.instrumentation.hibernate.reactive.v2_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.SemanticAttributes.DB_NAME; -import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.SemanticAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.SemanticAttributes.DB_USER; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_NAME; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_OPERATION; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SQL_TABLE; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_USER; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; diff --git a/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy b/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy index 90c206a94354..a9e5803e08ae 100644 --- a/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy +++ b/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy @@ -12,6 +12,13 @@ import io.opentelemetry.instrumentation.jdbc.TestDriver import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.javaagent.instrumentation.jdbc.test.ProxyStatementFactory import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import org.apache.derby.jdbc.EmbeddedDataSource import org.apache.derby.jdbc.EmbeddedDriver @@ -188,15 +195,15 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" system - "$SemanticAttributes.DB_NAME" dbNameLower + "$DbIncubatingAttributes.DB_SYSTEM" system + "$DbIncubatingAttributes.DB_NAME" dbNameLower if (username != null) { - "$SemanticAttributes.DB_USER" username + "$DbIncubatingAttributes.DB_USER" username } - "$SemanticAttributes.DB_CONNECTION_STRING" url - "$SemanticAttributes.DB_STATEMENT" sanitizedQuery - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_CONNECTION_STRING" url + "$DbIncubatingAttributes.DB_STATEMENT" sanitizedQuery + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" table } } } @@ -248,15 +255,15 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" system - "$SemanticAttributes.DB_NAME" dbNameLower + "$DbIncubatingAttributes.DB_SYSTEM" system + "$DbIncubatingAttributes.DB_NAME" dbNameLower if (username != null) { - "$SemanticAttributes.DB_USER" username + "$DbIncubatingAttributes.DB_USER" username } - "$SemanticAttributes.DB_CONNECTION_STRING" url - "$SemanticAttributes.DB_STATEMENT" sanitizedQuery - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_CONNECTION_STRING" url + "$DbIncubatingAttributes.DB_STATEMENT" sanitizedQuery + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" table } } } @@ -300,15 +307,15 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" system - "$SemanticAttributes.DB_NAME" dbNameLower + "$DbIncubatingAttributes.DB_SYSTEM" system + "$DbIncubatingAttributes.DB_NAME" dbNameLower if (username != null) { - "$SemanticAttributes.DB_USER" username + "$DbIncubatingAttributes.DB_USER" username } - "$SemanticAttributes.DB_CONNECTION_STRING" url - "$SemanticAttributes.DB_STATEMENT" sanitizedQuery - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_CONNECTION_STRING" url + "$DbIncubatingAttributes.DB_STATEMENT" sanitizedQuery + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" table } } } @@ -352,15 +359,15 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" system - "$SemanticAttributes.DB_NAME" dbName.toLowerCase() + "$DbIncubatingAttributes.DB_SYSTEM" system + "$DbIncubatingAttributes.DB_NAME" dbName.toLowerCase() if (username != null) { - "$SemanticAttributes.DB_USER" username + "$DbIncubatingAttributes.DB_USER" username } - "$SemanticAttributes.DB_CONNECTION_STRING" url - "$SemanticAttributes.DB_STATEMENT" sanitizedQuery - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_CONNECTION_STRING" url + "$DbIncubatingAttributes.DB_STATEMENT" sanitizedQuery + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" table } } } @@ -404,15 +411,15 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" system - "$SemanticAttributes.DB_NAME" dbNameLower + "$DbIncubatingAttributes.DB_SYSTEM" system + "$DbIncubatingAttributes.DB_NAME" dbNameLower if (username != null) { - "$SemanticAttributes.DB_USER" username + "$DbIncubatingAttributes.DB_USER" username } - "$SemanticAttributes.DB_STATEMENT" query - "$SemanticAttributes.DB_CONNECTION_STRING" url - "$SemanticAttributes.DB_OPERATION" "CREATE TABLE" - "$SemanticAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_STATEMENT" query + "$DbIncubatingAttributes.DB_CONNECTION_STRING" url + "$DbIncubatingAttributes.DB_OPERATION" "CREATE TABLE" + "$DbIncubatingAttributes.DB_SQL_TABLE" table } } } @@ -459,15 +466,15 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" system - "$SemanticAttributes.DB_NAME" dbName.toLowerCase() + "$DbIncubatingAttributes.DB_SYSTEM" system + "$DbIncubatingAttributes.DB_NAME" dbName.toLowerCase() if (username != null) { - "$SemanticAttributes.DB_USER" username + "$DbIncubatingAttributes.DB_USER" username } - "$SemanticAttributes.DB_STATEMENT" query - "$SemanticAttributes.DB_CONNECTION_STRING" url - "$SemanticAttributes.DB_OPERATION" "CREATE TABLE" - "$SemanticAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_STATEMENT" query + "$DbIncubatingAttributes.DB_CONNECTION_STRING" url + "$DbIncubatingAttributes.DB_OPERATION" "CREATE TABLE" + "$DbIncubatingAttributes.DB_SQL_TABLE" table } } } @@ -526,15 +533,15 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" system - "$SemanticAttributes.DB_NAME" dbNameLower + "$DbIncubatingAttributes.DB_SYSTEM" system + "$DbIncubatingAttributes.DB_NAME" dbNameLower if (username != null) { - "$SemanticAttributes.DB_USER" username + "$DbIncubatingAttributes.DB_USER" username } - "$SemanticAttributes.DB_CONNECTION_STRING" url - "$SemanticAttributes.DB_STATEMENT" sanitizedQuery - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_CONNECTION_STRING" url + "$DbIncubatingAttributes.DB_STATEMENT" sanitizedQuery + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" table } } } @@ -585,10 +592,10 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { attributes { "$SemanticAttributes.CODE_NAMESPACE" datasource.class.name "$SemanticAttributes.CODE_FUNCTION" "getConnection" - "$SemanticAttributes.DB_SYSTEM" system - "$SemanticAttributes.DB_USER" { user == null | user == it } - "$SemanticAttributes.DB_NAME" "jdbcunittest" - "$SemanticAttributes.DB_CONNECTION_STRING" connectionString + "$DbIncubatingAttributes.DB_SYSTEM" system + "$DbIncubatingAttributes.DB_USER" { user == null | user == it } + "$DbIncubatingAttributes.DB_NAME" "jdbcunittest" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" connectionString } } if (recursive) { @@ -599,10 +606,10 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { attributes { "$SemanticAttributes.CODE_NAMESPACE" datasource.class.name "$SemanticAttributes.CODE_FUNCTION" "getConnection" - "$SemanticAttributes.DB_SYSTEM" system - "$SemanticAttributes.DB_USER" { user == null | user == it } - "$SemanticAttributes.DB_NAME" "jdbcunittest" - "$SemanticAttributes.DB_CONNECTION_STRING" connectionString + "$DbIncubatingAttributes.DB_SYSTEM" system + "$DbIncubatingAttributes.DB_USER" { user == null | user == it } + "$DbIncubatingAttributes.DB_NAME" "jdbcunittest" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" connectionString } } } @@ -649,9 +656,9 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" "other_sql" - "$SemanticAttributes.DB_STATEMENT" "testing ?" - "$SemanticAttributes.DB_CONNECTION_STRING" "testdb://localhost" + "$DbIncubatingAttributes.DB_SYSTEM" "other_sql" + "$DbIncubatingAttributes.DB_STATEMENT" "testing ?" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "testdb://localhost" "$ServerAttributes.SERVER_ADDRESS" "localhost" } } @@ -690,12 +697,12 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" "other_sql" - "$SemanticAttributes.DB_NAME" databaseName - "$SemanticAttributes.DB_CONNECTION_STRING" "testdb://localhost" - "$SemanticAttributes.DB_STATEMENT" sanitizedQuery - "$SemanticAttributes.DB_OPERATION" operation - "$SemanticAttributes.DB_SQL_TABLE" table + "$DbIncubatingAttributes.DB_SYSTEM" "other_sql" + "$DbIncubatingAttributes.DB_NAME" databaseName + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "testdb://localhost" + "$DbIncubatingAttributes.DB_STATEMENT" sanitizedQuery + "$DbIncubatingAttributes.DB_OPERATION" operation + "$DbIncubatingAttributes.DB_SQL_TABLE" table "$ServerAttributes.SERVER_ADDRESS" "localhost" } } @@ -747,13 +754,13 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { name "SELECT INFORMATION_SCHEMA.SYSTEM_USERS" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "hsqldb" - "$SemanticAttributes.DB_NAME" dbNameLower - "$SemanticAttributes.DB_USER" "SA" - "$SemanticAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$SemanticAttributes.DB_STATEMENT" "SELECT ? FROM INFORMATION_SCHEMA.SYSTEM_USERS" - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" "INFORMATION_SCHEMA.SYSTEM_USERS" + "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" + "$DbIncubatingAttributes.DB_NAME" dbNameLower + "$DbIncubatingAttributes.DB_USER" "SA" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" + "$DbIncubatingAttributes.DB_STATEMENT" "SELECT ? FROM INFORMATION_SCHEMA.SYSTEM_USERS" + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "INFORMATION_SCHEMA.SYSTEM_USERS" } } } @@ -796,11 +803,11 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" "other_sql" - "$SemanticAttributes.DB_CONNECTION_STRING" "testdb://localhost" - "$SemanticAttributes.DB_STATEMENT" "SELECT * FROM table" - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" "table" + "$DbIncubatingAttributes.DB_SYSTEM" "other_sql" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "testdb://localhost" + "$DbIncubatingAttributes.DB_STATEMENT" "SELECT * FROM table" + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "table" "$ServerAttributes.SERVER_ADDRESS" "localhost" } } diff --git a/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala b/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala index 027c9d028bb8..ca7ae5ebfab2 100644 --- a/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala +++ b/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala @@ -14,7 +14,19 @@ import io.opentelemetry.javaagent.testing.common.Java8BytecodeBridge import io.opentelemetry.sdk.testing.assertj.{SpanDataAssert, TraceAssert} import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import io.opentelemetry.semconv.SemanticAttributes.DbSystemValues +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import java.util.function.Consumer import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.{Test, TestInstance} @@ -79,12 +91,18 @@ class SlickTest { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, DbSystemValues.H2), - equalTo(SemanticAttributes.DB_NAME, Db), - equalTo(SemanticAttributes.DB_USER, Username), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "h2:mem:"), - equalTo(SemanticAttributes.DB_STATEMENT, "SELECT ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT") + equalTo( + DbIncubatingAttributes.DB_SYSTEM, + DbSystemValues.H2 + ), + equalTo(DbIncubatingAttributes.DB_NAME, Db), + equalTo(DbIncubatingAttributes.DB_USER, Username), + equalTo( + DbIncubatingAttributes.DB_CONNECTION_STRING, + "h2:mem:" + ), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SELECT ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT") ) } ) diff --git a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java index b92e96c9121c..f266e2fbdec6 100644 --- a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java +++ b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java @@ -11,7 +11,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import javax.annotation.Nullable; import javax.sql.DataSource; @@ -31,10 +31,10 @@ public void onEnd( if (dbInfo == null) { return; } - internalSet(attributes, SemanticAttributes.DB_SYSTEM, dbInfo.getSystem()); - internalSet(attributes, SemanticAttributes.DB_USER, dbInfo.getUser()); - internalSet(attributes, SemanticAttributes.DB_NAME, getName(dbInfo)); - internalSet(attributes, SemanticAttributes.DB_CONNECTION_STRING, dbInfo.getShortUrl()); + internalSet(attributes, DbIncubatingAttributes.DB_SYSTEM, dbInfo.getSystem()); + internalSet(attributes, DbIncubatingAttributes.DB_USER, dbInfo.getUser()); + internalSet(attributes, DbIncubatingAttributes.DB_NAME, getName(dbInfo)); + internalSet(attributes, DbIncubatingAttributes.DB_CONNECTION_STRING, dbInfo.getShortUrl()); } private static String getName(DbInfo dbInfo) { diff --git a/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy b/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy index 4990cd95b706..4c9482c16ebe 100644 --- a/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy +++ b/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy @@ -17,6 +17,13 @@ import io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.LibraryTestTrait import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes @@ -49,15 +56,15 @@ class OpenTelemetryConnectionTest extends InstrumentationSpecification implement kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" dbInfo.system - "$SemanticAttributes.DB_NAME" dbInfo.name - "$SemanticAttributes.DB_USER" dbInfo.user - "$SemanticAttributes.DB_CONNECTION_STRING" dbInfo.shortUrl + "$DbIncubatingAttributes.DB_SYSTEM" dbInfo.system + "$DbIncubatingAttributes.DB_NAME" dbInfo.name + "$DbIncubatingAttributes.DB_USER" dbInfo.user + "$DbIncubatingAttributes.DB_CONNECTION_STRING" dbInfo.shortUrl "$ServerAttributes.SERVER_ADDRESS" dbInfo.host "$ServerAttributes.SERVER_PORT" dbInfo.port - "$SemanticAttributes.DB_STATEMENT" query - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" "users" + "$DbIncubatingAttributes.DB_STATEMENT" query + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "users" } } } @@ -105,15 +112,15 @@ class OpenTelemetryConnectionTest extends InstrumentationSpecification implement kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" dbInfo.system - "$SemanticAttributes.DB_NAME" dbInfo.name - "$SemanticAttributes.DB_USER" dbInfo.user - "$SemanticAttributes.DB_CONNECTION_STRING" dbInfo.shortUrl + "$DbIncubatingAttributes.DB_SYSTEM" dbInfo.system + "$DbIncubatingAttributes.DB_NAME" dbInfo.name + "$DbIncubatingAttributes.DB_USER" dbInfo.user + "$DbIncubatingAttributes.DB_CONNECTION_STRING" dbInfo.shortUrl "$ServerAttributes.SERVER_ADDRESS" dbInfo.host "$ServerAttributes.SERVER_PORT" dbInfo.port - "$SemanticAttributes.DB_STATEMENT" query - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" "users" + "$DbIncubatingAttributes.DB_STATEMENT" query + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "users" } } } @@ -165,15 +172,15 @@ class OpenTelemetryConnectionTest extends InstrumentationSpecification implement kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" dbInfo.system - "$SemanticAttributes.DB_NAME" dbInfo.name - "$SemanticAttributes.DB_USER" dbInfo.user - "$SemanticAttributes.DB_CONNECTION_STRING" dbInfo.shortUrl + "$DbIncubatingAttributes.DB_SYSTEM" dbInfo.system + "$DbIncubatingAttributes.DB_NAME" dbInfo.name + "$DbIncubatingAttributes.DB_USER" dbInfo.user + "$DbIncubatingAttributes.DB_CONNECTION_STRING" dbInfo.shortUrl "$ServerAttributes.SERVER_ADDRESS" dbInfo.host "$ServerAttributes.SERVER_PORT" dbInfo.port - "$SemanticAttributes.DB_STATEMENT" query - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" "users" + "$DbIncubatingAttributes.DB_STATEMENT" query + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "users" } } } diff --git a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java index 778bf8095739..8e38ef660435 100644 --- a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java +++ b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java @@ -11,7 +11,7 @@ import io.opentelemetry.instrumentation.jdbc.internal.OpenTelemetryConnection; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import java.sql.CallableStatement; import java.sql.Connection; import java.sql.PreparedStatement; @@ -41,7 +41,7 @@ void buildWithDefaults() throws SQLException { span -> span.hasName("TestDataSource.getConnection"), span -> span.hasName("SELECT dbname") - .hasAttribute(equalTo(SemanticAttributes.DB_STATEMENT, "SELECT ?;")))); + .hasAttribute(equalTo(DbIncubatingAttributes.DB_STATEMENT, "SELECT ?;")))); } @Test @@ -117,7 +117,7 @@ void buildWithSanitizationDisabled() throws SQLException { span -> span.hasName("TestDataSource.getConnection"), span -> span.hasName("SELECT dbname") - .hasAttribute(equalTo(SemanticAttributes.DB_STATEMENT, "SELECT 1;")))); + .hasAttribute(equalTo(DbIncubatingAttributes.DB_STATEMENT, "SELECT 1;")))); } @Test diff --git a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java index 853ed7196b4f..b3ff16bf81da 100644 --- a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java +++ b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java @@ -15,6 +15,7 @@ import io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.sql.Connection; import java.sql.SQLException; @@ -52,10 +53,10 @@ void shouldEmitGetConnectionSpans(GetConnectionFunction getConnection) throws SQ equalTo( SemanticAttributes.CODE_NAMESPACE, TestDataSource.class.getName()), equalTo(SemanticAttributes.CODE_FUNCTION, "getConnection"), - equalTo(SemanticAttributes.DB_SYSTEM, "postgresql"), - equalTo(SemanticAttributes.DB_NAME, "dbname"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "postgresql"), + equalTo(DbIncubatingAttributes.DB_NAME, "dbname"), equalTo( - SemanticAttributes.DB_CONNECTION_STRING, + DbIncubatingAttributes.DB_CONNECTION_STRING, "postgresql://127.0.0.1:5432")))); assertThat(connection).isExactlyInstanceOf(OpenTelemetryConnection.class); diff --git a/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java b/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java index 5930a2562925..c482842b58c1 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java +++ b/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -61,9 +61,9 @@ void setCommand() { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port)))); } @@ -82,9 +82,9 @@ void getCommand() { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port))), trace -> @@ -93,9 +93,9 @@ void getCommand() { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET foo"), - equalTo(SemanticAttributes.DB_OPERATION, "GET"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET foo"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET"), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port)))); } @@ -114,9 +114,9 @@ void commandWithNoArguments() { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port))), trace -> @@ -125,9 +125,9 @@ void commandWithNoArguments() { span.hasName("RANDOMKEY") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY"), - equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY"), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port)))); } diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java index e00ac3692462..a9eaa432bebc 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java +++ b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java @@ -12,8 +12,8 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import org.assertj.core.api.AbstractLongAssert; import org.junit.jupiter.api.AfterAll; @@ -65,9 +65,9 @@ void setCommand() { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), @@ -91,9 +91,9 @@ void getCommand() { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), @@ -107,9 +107,9 @@ void getCommand() { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET foo"), - equalTo(SemanticAttributes.DB_OPERATION, "GET"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET foo"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET"), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), @@ -133,9 +133,9 @@ void commandWithNoArguments() { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), @@ -149,9 +149,9 @@ void commandWithNoArguments() { span.hasName("RANDOMKEY") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY"), - equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY"), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java b/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java index 392a8c17bed5..25d93c668b0e 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java +++ b/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java @@ -11,8 +11,8 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -62,9 +62,9 @@ void setCommand() { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1")))); @@ -84,9 +84,9 @@ void getCommand() { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"))), @@ -96,9 +96,9 @@ void getCommand() { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET foo"), - equalTo(SemanticAttributes.DB_OPERATION, "GET"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET foo"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1")))); @@ -118,9 +118,9 @@ void commandWithNoArguments() { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"))), @@ -130,9 +130,9 @@ void commandWithNoArguments() { span.hasName("RANDOMKEY") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY"), - equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1")))); diff --git a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy index 4c6e3a84e70e..5ad68cf4646b 100644 --- a/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-jakarta-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -4,19 +4,14 @@ */ import io.opentelemetry.api.trace.SpanKind -import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java index c73f5669475c..b88f452c0497 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java @@ -9,6 +9,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.SemanticAttributes; import javax.annotation.Nullable; @@ -16,11 +17,11 @@ final class LettuceConnectAttributesExtractor implements AttributesExtractor span.hasName("callback") .hasKind(SpanKind.INTERNAL) @@ -282,8 +282,8 @@ void getNonExistentKeyCommandWithHandleAsyncAndChainedWithThenApply() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "GET")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")), span -> span.hasName("callback1") .hasKind(SpanKind.INTERNAL) @@ -323,8 +323,8 @@ void testCommandWithNoArgumentsUsingBiconsumer() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY")), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) @@ -367,16 +367,16 @@ void testHashSetAndThenNestApplyToHashGetall() { span.hasName("HMSET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "HMSET"))), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "HMSET"))), trace -> trace.hasSpansSatisfyingExactly( span -> span.hasName("HGETALL") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "HGETALL")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "HGETALL")))); } @Test @@ -417,8 +417,8 @@ void testCommandCompletesExceptionally() { .hasStatus(StatusData.error()) .hasException(new IllegalStateException("TestException")) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "DEL")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "DEL")))); } @Test @@ -454,8 +454,8 @@ void testCommandBeforeItFinished() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "SADD"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SADD"), equalTo(booleanKey("lettuce.command.cancelled"), true)), span -> span.hasName("callback") @@ -491,8 +491,8 @@ void testDebugSegfaultCommandWithNoArgumentShouldProduceSpan() { span.hasName("DEBUG") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "DEBUG")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "DEBUG")))); } @Test @@ -525,7 +525,7 @@ void testShutdownCommandShouldProduceSpan() { span.hasName("SHUTDOWN") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "SHUTDOWN")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SHUTDOWN")))); } } diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java index 1400bf960416..fc640bd41b74 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java @@ -20,7 +20,7 @@ import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.util.Map; import org.junit.jupiter.api.AfterAll; @@ -122,7 +122,7 @@ void testConnect() { .hasAttributesSatisfyingExactly( equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis")))); } @Test @@ -145,7 +145,7 @@ void testConnectException() { .hasAttributesSatisfyingExactly( equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, incorrectPort), - equalTo(SemanticAttributes.DB_SYSTEM, "redis")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis")))); } @Test @@ -160,8 +160,8 @@ void testSetCommand() { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "SET")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")))); } @Test @@ -176,8 +176,8 @@ void testGetCommand() { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); } @Test @@ -192,8 +192,8 @@ void testGetNonExistentKeyCommand() { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); } @Test @@ -208,8 +208,8 @@ void testCommandWithNoArguments() { span.hasName("RANDOMKEY") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY")))); } @Test @@ -224,8 +224,8 @@ void testListCommand() { span.hasName("LPUSH") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "LPUSH")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "LPUSH")))); } @Test @@ -240,8 +240,8 @@ void testHashSetCommand() { span.hasName("HMSET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "HMSET")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "HMSET")))); } @Test @@ -256,8 +256,8 @@ void testHashGetallCommand() { span.hasName("HGETALL") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "HGETALL")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "HGETALL")))); } @Test @@ -288,8 +288,8 @@ void testDebugSegfaultCommandWithNoArgumentShouldProduceSpan() { span.hasName("DEBUG") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "DEBUG")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "DEBUG")))); } @Test @@ -322,7 +322,7 @@ void testShutdownCommandShouldProduceSpan() { span.hasName("SHUTDOWN") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "SHUTDOWN")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SHUTDOWN")))); } } diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java index 6959a0ec7f88..4d8132884d54 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java @@ -9,6 +9,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.SemanticAttributes; import javax.annotation.Nullable; @@ -16,11 +17,11 @@ final class LettuceConnectAttributesExtractor implements AttributesExtractor event @@ -176,9 +176,9 @@ void testSetCommandUsingFutureGetWithTimeout() span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET TESTSETKEY ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET TESTSETKEY ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")))); } @Test @@ -208,9 +208,9 @@ void testGetCommandChainedWithThenAccept() .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET TESTKEY"), - equalTo(SemanticAttributes.DB_OPERATION, "GET")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET TESTKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) @@ -265,9 +265,9 @@ void testGetNonExistentKeyCommandWithHandleAsyncAndChainedWithThenApply() .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY"), - equalTo(SemanticAttributes.DB_OPERATION, "GET")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")), span -> span.hasName("callback1") .hasKind(SpanKind.INTERNAL) @@ -308,9 +308,9 @@ void testCommandWithNoArgumentsUsingBiconsumer() .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY"), - equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY")), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) @@ -354,20 +354,20 @@ void testHashSetAndThenNestApplyToHashGetall() span.hasName("HMSET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, "HMSET TESTHM firstname ? lastname ? age ?"), - equalTo(SemanticAttributes.DB_OPERATION, "HMSET"))), + equalTo(DbIncubatingAttributes.DB_OPERATION, "HMSET"))), trace -> trace.hasSpansSatisfyingExactly( span -> span.hasName("HGETALL") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "HGETALL TESTHM"), - equalTo(SemanticAttributes.DB_OPERATION, "HGETALL")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "HGETALL TESTHM"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "HGETALL")))); } @Test @@ -408,9 +408,9 @@ void testCommandCompletesExceptionally() { .hasStatus(StatusData.error()) .hasException(new IllegalStateException("TestException")) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "DEL key1 key2"), - equalTo(SemanticAttributes.DB_OPERATION, "DEL")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "DEL key1 key2"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "DEL")))); } @Test @@ -446,9 +446,9 @@ void testCancelCommandBeforeItFinishes() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SADD SKEY ? ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SADD"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SADD SKEY ? ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SADD"), equalTo(booleanKey("lettuce.command.cancelled"), true)), span -> span.hasName("callback") @@ -471,9 +471,9 @@ void testDebugSegfaultCommandWithNoArgumentShouldProduceSpan() { span.hasName("DEBUG") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "DEBUG SEGFAULT"), - equalTo(SemanticAttributes.DB_OPERATION, "DEBUG")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "DEBUG SEGFAULT"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "DEBUG")))); } @Test @@ -491,8 +491,8 @@ void testShutdownCommandShouldProduceSpan() { span.hasName("SHUTDOWN") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE"), - equalTo(SemanticAttributes.DB_OPERATION, "SHUTDOWN")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SHUTDOWN")))); } } diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceReactiveClientTest.java index 3d05ccf3b86d..7bd97f633a4b 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceReactiveClientTest.java @@ -16,7 +16,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @@ -88,9 +88,9 @@ void testSetCommandWithSubscribeOnDefinedConsumer() .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET TESTSETKEY ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET TESTSETKEY ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) @@ -119,9 +119,9 @@ void testGetCommandWithLambdaFunction() span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET TESTKEY"), - equalTo(SemanticAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET TESTKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); } // to make sure instrumentation's chained completion stages won't interfere with user's, while @@ -158,9 +158,9 @@ void testGetNonExistentKeyCommand() span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY"), - equalTo(SemanticAttributes.DB_OPERATION, "GET")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")), span -> span.hasName("callback") .hasKind(SpanKind.INTERNAL) @@ -188,9 +188,9 @@ void testCommandWithNoArguments() span.hasName("RANDOMKEY") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY"), - equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY")))); } @Test @@ -204,9 +204,9 @@ void testCommandFluxPublisher() { span.hasName("COMMAND") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "COMMAND"), - equalTo(SemanticAttributes.DB_OPERATION, "COMMAND"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "COMMAND"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "COMMAND"), satisfies( AttributeKey.longKey("lettuce.command.results.count"), val -> val.isGreaterThan(100))))); @@ -223,9 +223,9 @@ void testCommandCancelAfter2OnFluxPublisher() { span.hasName("COMMAND") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "COMMAND"), - equalTo(SemanticAttributes.DB_OPERATION, "COMMAND"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "COMMAND"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "COMMAND"), satisfies( AttributeKey.booleanKey("lettuce.command.cancelled"), AbstractBooleanAssert::isTrue), @@ -257,9 +257,9 @@ void testDebugSegfaultCommandReturnsMonoVoidWithNoArgumentShouldProduceSpan() { span.hasName("DEBUG") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "DEBUG SEGFAULT"), - equalTo(SemanticAttributes.DB_OPERATION, "DEBUG")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "DEBUG SEGFAULT"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "DEBUG")))); } @Test @@ -277,9 +277,9 @@ void testShutdownCommandShouldProduceSpan() { span.hasName("SHUTDOWN") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE"), - equalTo(SemanticAttributes.DB_OPERATION, "SHUTDOWN")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SHUTDOWN")))); } @Test @@ -297,17 +297,17 @@ void testBlockingSubscriber() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET a ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET a ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET a"), - equalTo(SemanticAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET a"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); } @Test @@ -325,17 +325,17 @@ void testAsyncSubscriber() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET a ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET a ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET a"), - equalTo(SemanticAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET a"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); } @Test @@ -358,16 +358,16 @@ void testAsyncSubscriberWithSpecificThreadPool() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET a ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET a ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET a"), - equalTo(SemanticAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET a"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); } } diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java index fd08a008601b..b6bcec43408a 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java @@ -19,7 +19,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.util.Map; import org.assertj.core.api.AbstractAssert; @@ -88,7 +88,7 @@ void testConnect() { .hasAttributesSatisfyingExactly( equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis")))); } @Test @@ -110,7 +110,7 @@ void testConnectException() { .hasAttributesSatisfyingExactly( equalTo(ServerAttributes.SERVER_ADDRESS, host), equalTo(ServerAttributes.SERVER_PORT, incorrectPort), - equalTo(SemanticAttributes.DB_SYSTEM, "redis")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis")) .hasEventsSatisfyingExactly( event -> event @@ -140,9 +140,9 @@ void testSetCommand() { span.hasName("SET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET TESTSETKEY ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET TESTSETKEY ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")))); } @Test @@ -157,9 +157,9 @@ void testGetCommand() { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET TESTKEY"), - equalTo(SemanticAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET TESTKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); } @Test @@ -174,9 +174,9 @@ void testGetNonExistentKeyCommand() { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY"), - equalTo(SemanticAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); } @Test @@ -191,9 +191,9 @@ void testCommandWithNoArguments() { span.hasName("RANDOMKEY") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY"), - equalTo(SemanticAttributes.DB_OPERATION, "RANDOMKEY")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "RANDOMKEY")))); } @Test @@ -208,9 +208,9 @@ void testListCommand() { span.hasName("LPUSH") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "LPUSH TESTLIST ?"), - equalTo(SemanticAttributes.DB_OPERATION, "LPUSH")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "LPUSH TESTLIST ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "LPUSH")))); } @Test @@ -225,11 +225,11 @@ void testHashSetCommand() { span.hasName("HMSET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, "HMSET user firstname ? lastname ? age ?"), - equalTo(SemanticAttributes.DB_OPERATION, "HMSET")))); + equalTo(DbIncubatingAttributes.DB_OPERATION, "HMSET")))); } @Test @@ -244,9 +244,9 @@ void testHashGetallCommand() { span.hasName("HGETALL") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "HGETALL TESTHM"), - equalTo(SemanticAttributes.DB_OPERATION, "HGETALL")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "HGETALL TESTHM"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "HGETALL")))); } @Test @@ -264,9 +264,9 @@ void testDebugSegfaultCommandWithNoArgumentShouldProduceSpan() { span.hasName("DEBUG") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "DEBUG SEGFAULT"), - equalTo(SemanticAttributes.DB_OPERATION, "DEBUG")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "DEBUG SEGFAULT"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "DEBUG")))); } @Test @@ -284,8 +284,8 @@ void testShutdownCommandShouldProduceSpan() { span.hasName("SHUTDOWN") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE"), - equalTo(SemanticAttributes.DB_OPERATION, "SHUTDOWN")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SHUTDOWN")))); } } diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java index 1f0f5699f36e..a3b73cfc5f1d 100644 --- a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java @@ -13,8 +13,8 @@ import io.opentelemetry.instrumentation.lettuce.v5_1.AbstractLettuceReactiveClientTest; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -57,8 +57,8 @@ void testAsyncSubscriberWithSpecificThreadPool() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET a ?")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET a ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")), @@ -72,8 +72,8 @@ void testAsyncSubscriberWithSpecificThreadPool() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET a")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET a")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); diff --git a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java index 11261d355a4e..09f66708aaa8 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java +++ b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java @@ -28,7 +28,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.SemanticAttributes.DbSystemValues; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -155,7 +155,7 @@ private OpenTelemetrySpan nextSpan(Context context) { .spanBuilder("redis") .setSpanKind(SpanKind.CLIENT) .setParent(context) - .setAttribute(SemanticAttributes.DB_SYSTEM, DbSystemValues.REDIS); + .setAttribute(DbIncubatingAttributes.DB_SYSTEM, DbSystemValues.REDIS); return new OpenTelemetrySpan(context, spanBuilder, sanitizer); } } @@ -333,7 +333,7 @@ private void finish(Span span) { if (name != null) { String statement = sanitizer.sanitize(name, argsList != null ? argsList : splitArgs(argsString)); - span.setAttribute(SemanticAttributes.DB_STATEMENT, statement); + span.setAttribute(DbIncubatingAttributes.DB_STATEMENT, statement); } span.end(); } diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java index 6f3b4e0fcba8..b7ceacbbb706 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java @@ -21,8 +21,8 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.util.ArrayList; import java.util.Arrays; @@ -148,8 +148,8 @@ void testSetCommandUsingFutureGetWithTimeout() throws Exception { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET TESTSETKEY ?")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET TESTSETKEY ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -194,8 +194,8 @@ void testGetCommandChainedWithThenAccept() throws Exception { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET TESTKEY")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET TESTKEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -272,9 +272,10 @@ void testGetNonExistentKeyCommandWithHandleAsyncAndChainedWithThenApply() throws equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - SemanticAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY")) + DbIncubatingAttributes.DB_STATEMENT, + "GET NON_EXISTENT_KEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -338,8 +339,8 @@ void testCommandWithNoArgumentsUsingBiconsumer() throws Exception { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -397,9 +398,9 @@ void testHashSetAndThenNestApplyToHashGetall() throws Exception { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, "HMSET TESTHM firstname ? lastname ? age ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -415,8 +416,8 @@ void testHashSetAndThenNestApplyToHashGetall() throws Exception { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "HGETALL TESTHM")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "HGETALL TESTHM")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java index d3ed5fc9610a..26cc24206fad 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java @@ -12,8 +12,8 @@ import io.lettuce.core.api.sync.RedisCommands; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.SpanKind; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.util.Objects; import java.util.concurrent.CompletableFuture; @@ -95,8 +95,8 @@ void testSetCommandWithSubscribeOnDefinedConsumer() throws Exception { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET TESTSETKEY ?")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET TESTSETKEY ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")), @@ -133,8 +133,8 @@ void testGetCommandWithLambdaFunction() throws Exception { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET TESTKEY")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET TESTKEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -182,8 +182,9 @@ void testGetNonExistentKeyCommand() throws Exception { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo( + DbIncubatingAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")), @@ -219,8 +220,8 @@ void testCommandWithNoArguments() throws Exception { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -243,8 +244,8 @@ void testCommandFluxPublisher() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "COMMAND")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "COMMAND")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -288,8 +289,8 @@ void testBlockingSubscriber() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET a ?")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET a ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")), @@ -303,8 +304,8 @@ void testBlockingSubscriber() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET a")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET a")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -332,8 +333,8 @@ void testAsyncSubscriber() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET a ?")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET a ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")), @@ -347,8 +348,8 @@ void testAsyncSubscriber() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET a")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET a")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java index b6685ad6bd08..93232e3a3359 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java @@ -10,8 +10,8 @@ import io.lettuce.core.api.sync.RedisCommands; import io.opentelemetry.api.trace.SpanKind; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -69,8 +69,8 @@ void testAuthCommand() throws Exception { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "AUTH ?")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "AUTH ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java index 1b09cf27fbcf..87d24f6e7b57 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java @@ -20,8 +20,8 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.test.utils.PortUtils; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.util.Base64; import java.util.Map; @@ -116,8 +116,8 @@ void testSetCommand() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET TESTSETKEY ?")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET TESTSETKEY ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -148,8 +148,8 @@ void testSetCommandLocalhost() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET TESTSETKEY ?")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET TESTSETKEY ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -173,8 +173,8 @@ void testGetCommand() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET TESTKEY")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET TESTKEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -198,8 +198,9 @@ void testGetNonExistentKeyCommand() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo( + DbIncubatingAttributes.DB_STATEMENT, "GET NON_EXISTENT_KEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -223,8 +224,8 @@ void testCommandWithNoArguments() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "RANDOMKEY")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "RANDOMKEY")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -253,8 +254,8 @@ void testListCommand() { NetworkAttributes.NETWORK_PEER_PORT, containerConnection.port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, containerConnection.port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "LPUSH TESTLIST ?")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "LPUSH TESTLIST ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -278,9 +279,9 @@ void testHashSetCommand() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, "HMSET user firstname ? lastname ? age ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -305,8 +306,8 @@ void testHashGetallCommand() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "HGETALL TESTHM")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "HGETALL TESTHM")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -337,9 +338,9 @@ void testEvalCommand() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, "EVAL " + b64Script + " 1 TESTLIST ? ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -365,8 +366,8 @@ void testMsetCommand() { equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "MSET key1 ? key2 ?")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "MSET key1 ? key2 ?")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end")))); @@ -395,8 +396,8 @@ void testDebugSegfaultCommandWithNoArgumentProducesNoSpan() { NetworkAttributes.NETWORK_PEER_PORT, containerConnection.port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, containerConnection.port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "DEBUG SEGFAULT"))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "DEBUG SEGFAULT"))); } else { trace.hasSpansSatisfyingExactly( span -> @@ -409,8 +410,8 @@ void testDebugSegfaultCommandWithNoArgumentProducesNoSpan() { NetworkAttributes.NETWORK_PEER_PORT, containerConnection.port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, containerConnection.port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "DEBUG SEGFAULT")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "DEBUG SEGFAULT")) // these are no longer recorded since Lettuce 6.1.6 .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), @@ -444,8 +445,8 @@ void testShutdownCommandProducesNoSpan() { NetworkAttributes.NETWORK_PEER_PORT, containerConnection.port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, containerConnection.port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE"))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE"))); } else { trace.hasSpansSatisfyingExactly( span -> @@ -459,8 +460,8 @@ void testShutdownCommandProducesNoSpan() { NetworkAttributes.NETWORK_PEER_PORT, containerConnection.port), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, containerConnection.port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SHUTDOWN NOSAVE")) .hasEventsSatisfyingExactly( event -> event.hasName("redis.encode.start"), event -> event.hasName("redis.encode.end"))); diff --git a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java index 70ed0d55dacc..85c87e40721f 100644 --- a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java +++ b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java @@ -5,7 +5,7 @@ package io.opentelemetry.instrumentation.mongo.v3_1; -import static io.opentelemetry.semconv.SemanticAttributes.DB_MONGODB_COLLECTION; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_MONGODB_COLLECTION; import static java.util.Arrays.asList; import com.mongodb.event.CommandStartedEvent; diff --git a/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy b/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy index 2cae6b104a6e..c695d1879e1c 100644 --- a/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy +++ b/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy @@ -10,6 +10,12 @@ import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import org.slf4j.LoggerFactory @@ -415,14 +421,14 @@ abstract class AbstractMongoClientTest extends InstrumentationSpecification { attributes { "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" port - "$SemanticAttributes.DB_STATEMENT" { + "$DbIncubatingAttributes.DB_STATEMENT" { statementEval.call(it.replaceAll(" ", "")) } - "$SemanticAttributes.DB_SYSTEM" "mongodb" - "$SemanticAttributes.DB_CONNECTION_STRING" "mongodb://localhost:" + port - "$SemanticAttributes.DB_NAME" dbName - "$SemanticAttributes.DB_OPERATION" operation - "$SemanticAttributes.DB_MONGODB_COLLECTION" collection + "$DbIncubatingAttributes.DB_SYSTEM" "mongodb" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "mongodb://localhost:" + port + "$DbIncubatingAttributes.DB_NAME" dbName + "$DbIncubatingAttributes.DB_OPERATION" operation + "$DbIncubatingAttributes.DB_MONGODB_COLLECTION" collection } } } diff --git a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java index ccaad9074d65..55d5a6daf293 100644 --- a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java +++ b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java @@ -7,9 +7,9 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import java.io.IOException; @@ -93,9 +93,9 @@ void shouldGetStatusWithTraces() throws IOException { span.hasName("GET") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "opensearch"), - equalTo(SemanticAttributes.DB_OPERATION, "GET"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET _cluster/health")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "opensearch"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET _cluster/health")), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) @@ -158,9 +158,9 @@ public void onFailure(Exception e) { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "opensearch"), - equalTo(SemanticAttributes.DB_OPERATION, "GET"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET _cluster/health")), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "opensearch"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET _cluster/health")), span -> span.hasName("GET") .hasKind(SpanKind.CLIENT) diff --git a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java index 8ca518af7b31..af63f15e40f2 100644 --- a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java +++ b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java @@ -6,13 +6,13 @@ package io.opentelemetry.instrumentation.r2dbc.v1_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CONNECTION_STRING; -import static io.opentelemetry.semconv.SemanticAttributes.DB_NAME; -import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.SemanticAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.SemanticAttributes.DB_SYSTEM; -import static io.opentelemetry.semconv.SemanticAttributes.DB_USER; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CONNECTION_STRING; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_NAME; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_OPERATION; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SQL_TABLE; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SYSTEM; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_USER; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.r2dbc.spi.ConnectionFactoryOptions.DATABASE; diff --git a/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy b/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy index 6e4e9b98e0c6..a3b165355907 100644 --- a/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy +++ b/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy @@ -5,6 +5,8 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import org.testcontainers.containers.GenericContainer import redis.ByteStringDeserializerDefault import redis.ByteStringSerializerLowPriority @@ -89,8 +91,8 @@ class RediscalaClientTest extends AgentInstrumentationSpecification { name "SET" kind CLIENT attributes { - "$SemanticAttributes.DB_SYSTEM" "redis" - "$SemanticAttributes.DB_OPERATION" "SET" + "$DbIncubatingAttributes.DB_SYSTEM" "redis" + "$DbIncubatingAttributes.DB_OPERATION" "SET" } } } @@ -124,8 +126,8 @@ class RediscalaClientTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" "redis" - "$SemanticAttributes.DB_OPERATION" "SET" + "$DbIncubatingAttributes.DB_SYSTEM" "redis" + "$DbIncubatingAttributes.DB_OPERATION" "SET" } } span(2) { @@ -133,8 +135,8 @@ class RediscalaClientTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.DB_SYSTEM" "redis" - "$SemanticAttributes.DB_OPERATION" "GET" + "$DbIncubatingAttributes.DB_SYSTEM" "redis" + "$DbIncubatingAttributes.DB_OPERATION" "GET" } } } diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java index 6cec382329e6..21b7db554b94 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java @@ -16,8 +16,8 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.util.concurrent.Callable; @@ -112,9 +112,9 @@ void futureSet() throws ExecutionException, InterruptedException, TimeoutExcepti equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")))); } @Test @@ -145,9 +145,9 @@ void futureWhenComplete() throws ExecutionException, InterruptedException, Timeo equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SADD set1 ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SADD")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SADD set1 ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SADD")) .hasParent(trace.getSpan(0)), span -> span.hasName("callback").hasKind(INTERNAL).hasParent(trace.getSpan(0)))); } @@ -219,8 +219,8 @@ void atomicBatchCommand() throws ExecutionException, InterruptedException, Timeo equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "MULTI;SET batch1 ?")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "MULTI;SET batch1 ?")) .hasParent(trace.getSpan(0)), span -> span.hasName("SET") @@ -229,9 +229,9 @@ void atomicBatchCommand() throws ExecutionException, InterruptedException, Timeo equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET batch2 ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET batch2 ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")) .hasParent(trace.getSpan(0)), span -> span.hasName("EXEC") @@ -240,9 +240,9 @@ void atomicBatchCommand() throws ExecutionException, InterruptedException, Timeo equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "EXEC"), - equalTo(SemanticAttributes.DB_OPERATION, "EXEC")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "EXEC"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "EXEC")) .hasParent(trace.getSpan(0)), span -> span.hasName("callback").hasKind(INTERNAL).hasParent(trace.getSpan(0)))); } diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java index bb8c0daad941..f6b87150743f 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java @@ -17,8 +17,8 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.TraceAssert; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.HashMap; @@ -115,9 +115,9 @@ void stringCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET foo ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET"))), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET foo ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET"))), trace -> trace.hasSpansSatisfyingExactly( span -> @@ -127,9 +127,9 @@ void stringCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "GET foo"), - equalTo(SemanticAttributes.DB_OPERATION, "GET")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET foo"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "GET")))); } @Test @@ -153,9 +153,10 @@ void batchCommand() equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - SemanticAttributes.DB_STATEMENT, "SET batch1 ?;SET batch2 ?")))); + DbIncubatingAttributes.DB_STATEMENT, + "SET batch1 ?;SET batch2 ?")))); } private static void invokeExecute(RBatch batch) @@ -194,8 +195,8 @@ void atomicBatchCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "MULTI;SET batch1 ?")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "MULTI;SET batch1 ?")) .hasParent(trace.getSpan(0)), span -> span.hasName("SET") @@ -204,9 +205,9 @@ void atomicBatchCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SET batch2 ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SET")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET batch2 ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SET")) .hasParent(trace.getSpan(0)), span -> span.hasName("EXEC") @@ -215,9 +216,9 @@ void atomicBatchCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "EXEC"), - equalTo(SemanticAttributes.DB_OPERATION, "EXEC")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "EXEC"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "EXEC")) .hasParent(trace.getSpan(0)))); } @@ -237,9 +238,9 @@ void listCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "RPUSH list1 ?"), - equalTo(SemanticAttributes.DB_OPERATION, "RPUSH")) + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "RPUSH list1 ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "RPUSH")) .hasNoParent())); } @@ -262,11 +263,11 @@ void hashCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), equalTo( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, String.format("EVAL %s 1 map1 ? ?", script)), - equalTo(SemanticAttributes.DB_OPERATION, "EVAL"))), + equalTo(DbIncubatingAttributes.DB_OPERATION, "EVAL"))), trace -> trace.hasSpansSatisfyingExactly( span -> @@ -276,9 +277,9 @@ void hashCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "HGET map1 key1"), - equalTo(SemanticAttributes.DB_OPERATION, "HGET")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "HGET map1 key1"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "HGET")))); } @Test @@ -297,9 +298,9 @@ void setCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "SADD set1 ?"), - equalTo(SemanticAttributes.DB_OPERATION, "SADD")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "SADD set1 ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SADD")))); } @Test @@ -325,9 +326,10 @@ void sortedSetCommand() equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "ZADD sort_set1 ? ? ? ? ? ?"), - equalTo(SemanticAttributes.DB_OPERATION, "ZADD")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo( + DbIncubatingAttributes.DB_STATEMENT, "ZADD sort_set1 ? ? ? ? ? ?"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "ZADD")))); } private static void invokeAddAll(RScoredSortedSet object, Map arg) @@ -351,9 +353,9 @@ void atomicLongCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, "INCR AtomicLong"), - equalTo(SemanticAttributes.DB_OPERATION, "INCR")))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, "INCR AtomicLong"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "INCR")))); } @Test @@ -377,10 +379,10 @@ void lockCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "EVAL"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "EVAL"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, stringAssert -> stringAssert.startsWith("EVAL"))))); traceAsserts.add( trace -> @@ -392,10 +394,10 @@ void lockCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "EVAL"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "EVAL"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, stringAssert -> stringAssert.startsWith("EVAL"))))); if (lockHas3Traces()) { traceAsserts.add( @@ -408,10 +410,10 @@ void lockCommand() { equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"), equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, "127.0.0.1"), equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port), - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_OPERATION, "DEL"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_OPERATION, "DEL"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, stringAssert -> stringAssert.startsWith("DEL"))))); } diff --git a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java index ed1ce65834cc..c1dc0262e928 100644 --- a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java +++ b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java @@ -6,13 +6,13 @@ package io.opentelemetry.javaagent.instrumentation.spring.data.v3_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.SemanticAttributes.DB_CONNECTION_STRING; -import static io.opentelemetry.semconv.SemanticAttributes.DB_NAME; -import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.SemanticAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.SemanticAttributes.DB_SYSTEM; -import static io.opentelemetry.semconv.SemanticAttributes.DB_USER; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CONNECTION_STRING; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_NAME; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_OPERATION; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SQL_TABLE; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SYSTEM; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_USER; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java b/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java index 3df645775c34..e027679dcdaa 100644 --- a/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java +++ b/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java @@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.TraceAssert; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.List; import java.util.Optional; @@ -78,13 +79,14 @@ static void assertHibernate4Trace(TraceAssert trace, String repoClassName) { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), - satisfies(SemanticAttributes.DB_STATEMENT, val -> val.startsWith("insert ")), - equalTo(SemanticAttributes.DB_OPERATION, "INSERT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "JpaCustomer"))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + satisfies( + DbIncubatingAttributes.DB_STATEMENT, val -> val.startsWith("insert ")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "INSERT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer"))); } static void assertHibernateTrace(TraceAssert trace, String repoClassName) { @@ -99,26 +101,27 @@ static void assertHibernateTrace(TraceAssert trace, String repoClassName) { span.hasName("CALL test") .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, val -> val.startsWith("call next value for ")), - equalTo(SemanticAttributes.DB_OPERATION, "CALL")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "CALL")), span -> span.hasName("INSERT test.JpaCustomer") .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), - satisfies(SemanticAttributes.DB_STATEMENT, val -> val.startsWith("insert ")), - equalTo(SemanticAttributes.DB_OPERATION, "INSERT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "JpaCustomer"))); + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + satisfies( + DbIncubatingAttributes.DB_STATEMENT, val -> val.startsWith("insert ")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "INSERT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer"))); } @Test @@ -146,14 +149,15 @@ void testCrud() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, val -> val.startsWith("select ")), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "JpaCustomer")))); + DbIncubatingAttributes.DB_STATEMENT, + val -> val.startsWith("select ")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")))); clearData(); repo.save(customer); @@ -183,27 +187,29 @@ void testCrud() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, val -> val.startsWith("select ")), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "JpaCustomer")), + DbIncubatingAttributes.DB_STATEMENT, + val -> val.startsWith("select ")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")), span -> span.hasName("UPDATE test.JpaCustomer") .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, val -> val.startsWith("update ")), - equalTo(SemanticAttributes.DB_OPERATION, "UPDATE"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "JpaCustomer")))); + DbIncubatingAttributes.DB_STATEMENT, + val -> val.startsWith("update ")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "UPDATE"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")))); clearData(); customer = findByLastName(repo, "Anonymous").get(0); @@ -221,14 +227,15 @@ void testCrud() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, val -> val.startsWith("select ")), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "JpaCustomer")))); + DbIncubatingAttributes.DB_STATEMENT, + val -> val.startsWith("select ")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")))); clearData(); repo.delete(customer); @@ -246,27 +253,29 @@ void testCrud() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, val -> val.startsWith("select ")), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "JpaCustomer")), + DbIncubatingAttributes.DB_STATEMENT, + val -> val.startsWith("select ")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")), span -> span.hasName("DELETE test.JpaCustomer") .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, val -> val.startsWith("delete ")), - equalTo(SemanticAttributes.DB_OPERATION, "DELETE"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "JpaCustomer")))); + DbIncubatingAttributes.DB_STATEMENT, + val -> val.startsWith("delete ")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "DELETE"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")))); } @Test @@ -291,14 +300,15 @@ void testCustomRepositoryMethod() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, val -> val.startsWith("select ")), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "JpaCustomer")))); + DbIncubatingAttributes.DB_STATEMENT, + val -> val.startsWith("select ")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")))); } @Test @@ -336,13 +346,14 @@ void testFailedRepositoryMethod() { .hasKind(SpanKind.CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.DB_SYSTEM, "hsqldb"), - equalTo(SemanticAttributes.DB_NAME, "test"), - equalTo(SemanticAttributes.DB_USER, "sa"), - equalTo(SemanticAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "hsqldb"), + equalTo(DbIncubatingAttributes.DB_NAME, "test"), + equalTo(DbIncubatingAttributes.DB_USER, "sa"), + equalTo(DbIncubatingAttributes.DB_CONNECTION_STRING, "hsqldb:mem:"), satisfies( - SemanticAttributes.DB_STATEMENT, val -> val.startsWith("select ")), - equalTo(SemanticAttributes.DB_OPERATION, "SELECT"), - equalTo(SemanticAttributes.DB_SQL_TABLE, "JpaCustomer")))); + DbIncubatingAttributes.DB_STATEMENT, + val -> val.startsWith("select ")), + equalTo(DbIncubatingAttributes.DB_OPERATION, "SELECT"), + equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")))); } } diff --git a/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy b/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy index 1af5d70a4551..dca4b8bda8b7 100644 --- a/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy +++ b/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy @@ -7,6 +7,8 @@ import com.google.common.util.concurrent.MoreExecutors import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import net.spy.memcached.CASResponse import net.spy.memcached.ConnectionFactory import net.spy.memcached.ConnectionFactoryBuilder @@ -622,8 +624,8 @@ class SpymemcachedTest extends AgentInstrumentationSpecification { } attributes { - "$SemanticAttributes.DB_SYSTEM" "memcached" - "$SemanticAttributes.DB_OPERATION" operation + "$DbIncubatingAttributes.DB_SYSTEM" "memcached" + "$DbIncubatingAttributes.DB_OPERATION" operation if (error == "canceled") { "spymemcached.command.cancelled" true diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesExtractor.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesExtractor.java index 670d8dcf0903..3235953f6d72 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesExtractor.java +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesExtractor.java @@ -10,7 +10,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.DbIncubatingAttributes; import javax.annotation.Nullable; enum VertxRedisClientAttributesExtractor @@ -20,7 +20,8 @@ enum VertxRedisClientAttributesExtractor @Override public void onStart( AttributesBuilder attributes, Context parentContext, VertxRedisClientRequest request) { - internalSet(attributes, SemanticAttributes.DB_REDIS_DATABASE_INDEX, request.getDatabaseIndex()); + internalSet( + attributes, DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX, request.getDatabaseIndex()); } @Override diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java index ae13f0277561..3d05feb5c09b 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java @@ -12,8 +12,8 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.vertx.core.Vertx; import io.vertx.redis.client.Redis; @@ -195,10 +195,10 @@ void commandWithNoArguments() throws Exception { private static AttributeAssertion[] redisSpanAttributes(String operation, String statement) { return new AttributeAssertion[] { - equalTo(SemanticAttributes.DB_SYSTEM, "redis"), - equalTo(SemanticAttributes.DB_STATEMENT, statement), - equalTo(SemanticAttributes.DB_OPERATION, operation), - equalTo(SemanticAttributes.DB_REDIS_DATABASE_INDEX, 1), + equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"), + equalTo(DbIncubatingAttributes.DB_STATEMENT, statement), + equalTo(DbIncubatingAttributes.DB_OPERATION, operation), + equalTo(DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX, 1), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, port), equalTo(NetworkAttributes.NETWORK_PEER_PORT, port), diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy index 1d356c723df6..18dac6580681 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy @@ -11,6 +11,13 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes @@ -101,13 +108,13 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(2) attributes { - "$SemanticAttributes.DB_SYSTEM" "hsqldb" - "$SemanticAttributes.DB_NAME" "test" - "$SemanticAttributes.DB_USER" "SA" - "$SemanticAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$SemanticAttributes.DB_STATEMENT" "SELECT id, name, price, weight FROM products" - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" "products" + "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" + "$DbIncubatingAttributes.DB_NAME" "test" + "$DbIncubatingAttributes.DB_USER" "SA" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" + "$DbIncubatingAttributes.DB_STATEMENT" "SELECT id, name, price, weight FROM products" + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "products" } } } @@ -200,13 +207,13 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { kind CLIENT childOf(span(3)) attributes { - "$SemanticAttributes.DB_SYSTEM" "hsqldb" - "$SemanticAttributes.DB_NAME" "test" - "$SemanticAttributes.DB_USER" "SA" - "$SemanticAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$SemanticAttributes.DB_STATEMENT" "SELECT id AS request$requestId, name, price, weight FROM products" - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" "products" + "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" + "$DbIncubatingAttributes.DB_NAME" "test" + "$DbIncubatingAttributes.DB_USER" "SA" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" + "$DbIncubatingAttributes.DB_STATEMENT" "SELECT id AS request$requestId, name, price, weight FROM products" + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "products" } } } diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy index 1d356c723df6..18dac6580681 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy @@ -11,6 +11,13 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.DbIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes @@ -101,13 +108,13 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(2) attributes { - "$SemanticAttributes.DB_SYSTEM" "hsqldb" - "$SemanticAttributes.DB_NAME" "test" - "$SemanticAttributes.DB_USER" "SA" - "$SemanticAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$SemanticAttributes.DB_STATEMENT" "SELECT id, name, price, weight FROM products" - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" "products" + "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" + "$DbIncubatingAttributes.DB_NAME" "test" + "$DbIncubatingAttributes.DB_USER" "SA" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" + "$DbIncubatingAttributes.DB_STATEMENT" "SELECT id, name, price, weight FROM products" + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "products" } } } @@ -200,13 +207,13 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { kind CLIENT childOf(span(3)) attributes { - "$SemanticAttributes.DB_SYSTEM" "hsqldb" - "$SemanticAttributes.DB_NAME" "test" - "$SemanticAttributes.DB_USER" "SA" - "$SemanticAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" - "$SemanticAttributes.DB_STATEMENT" "SELECT id AS request$requestId, name, price, weight FROM products" - "$SemanticAttributes.DB_OPERATION" "SELECT" - "$SemanticAttributes.DB_SQL_TABLE" "products" + "$DbIncubatingAttributes.DB_SYSTEM" "hsqldb" + "$DbIncubatingAttributes.DB_NAME" "test" + "$DbIncubatingAttributes.DB_USER" "SA" + "$DbIncubatingAttributes.DB_CONNECTION_STRING" "hsqldb:mem:" + "$DbIncubatingAttributes.DB_STATEMENT" "SELECT id AS request$requestId, name, price, weight FROM products" + "$DbIncubatingAttributes.DB_OPERATION" "SELECT" + "$DbIncubatingAttributes.DB_SQL_TABLE" "products" } } } diff --git a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java index 0441ca1250e7..25ef59f98685 100644 --- a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java +++ b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java @@ -7,11 +7,11 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.SemanticAttributes.DB_NAME; -import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.SemanticAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.SemanticAttributes.DB_USER; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_NAME; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_OPERATION; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SQL_TABLE; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_USER; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_MESSAGE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_STACKTRACE; diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index 74578d1738bc..c4aab2a655c2 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -21,20 +21,6 @@ public class SemanticAttributes { private SemanticAttributes() {} - public static final AttributeKey DB_CONNECTION_STRING = - DbIncubatingAttributes.DB_CONNECTION_STRING; - public static final AttributeKey DB_NAME = DbIncubatingAttributes.DB_NAME; - public static final AttributeKey DB_OPERATION = DbIncubatingAttributes.DB_OPERATION; - public static final AttributeKey DB_REDIS_DATABASE_INDEX = - DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX; - public static final AttributeKey DB_SQL_TABLE = DbIncubatingAttributes.DB_SQL_TABLE; - public static final AttributeKey DB_STATEMENT = DbIncubatingAttributes.DB_STATEMENT; - public static final AttributeKey DB_SYSTEM = DbIncubatingAttributes.DB_SYSTEM; - public static final AttributeKey DB_USER = DbIncubatingAttributes.DB_USER; - - public static final AttributeKey DB_MONGODB_COLLECTION = - DbIncubatingAttributes.DB_MONGODB_COLLECTION; - public static final class DbSystemValues { public static final String OTHER_SQL = DbIncubatingAttributes.DbSystemValues.OTHER_SQL; public static final String MSSQL = DbIncubatingAttributes.DbSystemValues.MSSQL; diff --git a/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java b/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java index f76981fbb0b3..fc11162d7084 100644 --- a/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java @@ -32,6 +32,7 @@ import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.export.SpanExporter; +import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.spring.smoketest.OtelSpringStarterSmokeTestApplication; @@ -188,7 +189,7 @@ void shouldSendTelemetry() throws InterruptedException { spanDataAssert .hasKind(SpanKind.CLIENT) .hasAttribute( - SemanticAttributes.DB_STATEMENT, + DbIncubatingAttributes.DB_STATEMENT, "create table test_table (id bigint not null, primary key (id))")), traceAssert -> traceAssert.hasSpansSatisfyingExactly( From af3bb626be4503a24674f58778aa96b86e85ad8f Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:17:46 +0200 Subject: [PATCH 13/52] DB type --- .../decorators/DecoratorRegistry.java | 12 ++++--- .../v3_0/CassandraSqlAttributesGetter.java | 5 +-- .../v4_0/CassandraSqlAttributesGetter.java | 5 +-- .../v4_4/CassandraSqlAttributesGetter.java | 5 +-- .../v2_0/CouchbaseAttributesGetter.java | 5 +-- .../ElasticsearchDbAttributesGetter.java | 5 +-- ...lasticsearchTransportAttributesGetter.java | 5 +-- .../geode/GeodeDbAttributesGetter.java | 5 +-- .../internal/JdbcConnectionUrlParser.java | 33 ++++++++++--------- .../jedis/v1_4/JedisDbAttributesGetter.java | 5 +-- .../jedis/v3_0/JedisDbAttributesGetter.java | 5 +-- .../jedis/v4_0/JedisDbAttributesGetter.java | 5 +-- .../LettuceConnectAttributesExtractor.java | 4 +-- .../v4_0/LettuceDbAttributesGetter.java | 5 +-- .../LettuceConnectAttributesExtractor.java | 4 +-- .../v5_0/LettuceDbAttributesGetter.java | 5 +-- .../lettuce/v5_1/OpenTelemetryTracing.java | 5 +-- .../mongo/v3_1/MongoDbAttributesGetter.java | 5 +-- .../rest/OpenSearchRestAttributesGetter.java | 5 +-- .../r2dbc/v1_0/internal/DbExecution.java | 4 +-- .../rediscala/RediscalaAttributesGetter.java | 5 +-- .../redisson/RedissonDbAttributesGetter.java | 5 +-- .../VertxRedisClientAttributesGetter.java | 5 +-- .../semconv/SemanticAttributes.java | 23 ------------- 24 files changed, 84 insertions(+), 86 deletions(-) diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java index 9ec5c4e2b948..e451160e74a8 100644 --- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java @@ -6,7 +6,8 @@ package io.opentelemetry.javaagent.instrumentation.apachecamel.decorators; import io.opentelemetry.javaagent.instrumentation.apachecamel.SpanDecorator; -import io.opentelemetry.semconv.SemanticAttributes.DbSystemValues; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; + import java.util.HashMap; import java.util.Map; @@ -25,7 +26,7 @@ private static Map loadDecorators() { result.put("aws-sqs", new MessagingSpanDecorator("aws-sqs")); result.put("cometd", new MessagingSpanDecorator("cometd")); result.put("cometds", new MessagingSpanDecorator("cometds")); - result.put("cql", new DbSpanDecorator("cql", DbSystemValues.CASSANDRA)); + result.put("cql", new DbSpanDecorator("cql", DbIncubatingAttributes.DbSystemValues.CASSANDRA)); result.put("direct", new InternalSpanDecorator()); result.put("direct-vm", new InternalSpanDecorator()); result.put("disruptor", new InternalSpanDecorator()); @@ -36,12 +37,13 @@ private static Map loadDecorators() { result.put("https4", new Https4SpanDecorator()); result.put("http", new HttpSpanDecorator()); result.put("ironmq", new MessagingSpanDecorator("ironmq")); - result.put("jdbc", new DbSpanDecorator("jdbc", DbSystemValues.OTHER_SQL)); + result.put("jdbc", new DbSpanDecorator("jdbc", DbIncubatingAttributes.DbSystemValues.OTHER_SQL)); result.put("jetty", new HttpSpanDecorator()); result.put("jms", new MessagingSpanDecorator("jms")); result.put("kafka", new KafkaSpanDecorator()); result.put("log", new LogSpanDecorator()); - result.put("mongodb", new DbSpanDecorator("mongodb", DbSystemValues.MONGODB)); + result.put("mongodb", new DbSpanDecorator("mongodb", + DbIncubatingAttributes.DbSystemValues.MONGODB)); result.put("mqtt", new MessagingSpanDecorator("mqtt")); result.put("netty-http4", new HttpSpanDecorator()); result.put("netty-http", new HttpSpanDecorator()); @@ -52,7 +54,7 @@ private static Map loadDecorators() { result.put("seda", new InternalSpanDecorator()); result.put("servlet", new HttpSpanDecorator()); result.put("sjms", new MessagingSpanDecorator("sjms")); - result.put("sql", new DbSpanDecorator("sql", DbSystemValues.OTHER_SQL)); + result.put("sql", new DbSpanDecorator("sql", DbIncubatingAttributes.DbSystemValues.OTHER_SQL)); result.put("stomp", new MessagingSpanDecorator("stomp")); result.put("timer", new TimerSpanDecorator()); result.put("undertow", new HttpSpanDecorator()); diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java index c9591b7b8bae..d2cf19b71d27 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java @@ -6,14 +6,15 @@ package io.opentelemetry.javaagent.instrumentation.cassandra.v3_0; import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; + import javax.annotation.Nullable; final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter { @Override public String getSystem(CassandraRequest request) { - return SemanticAttributes.DbSystemValues.CASSANDRA; + return DbIncubatingAttributes.DbSystemValues.CASSANDRA; } @Override diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java index 5a840b77b7d5..4820ce5f25d8 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java @@ -7,14 +7,15 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; + import javax.annotation.Nullable; final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter { @Override public String getSystem(CassandraRequest request) { - return SemanticAttributes.DbSystemValues.CASSANDRA; + return DbIncubatingAttributes.DbSystemValues.CASSANDRA; } @Override diff --git a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraSqlAttributesGetter.java b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraSqlAttributesGetter.java index cdb4981834d1..4f910513f638 100644 --- a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraSqlAttributesGetter.java +++ b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraSqlAttributesGetter.java @@ -7,14 +7,15 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; + import javax.annotation.Nullable; final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter { @Override public String getSystem(CassandraRequest request) { - return SemanticAttributes.DbSystemValues.CASSANDRA; + return DbIncubatingAttributes.DbSystemValues.CASSANDRA; } @Override diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java index 6b2e234eefbf..9ae5f8970f47 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java @@ -6,14 +6,15 @@ package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0; import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; + import javax.annotation.Nullable; final class CouchbaseAttributesGetter implements DbClientAttributesGetter { @Override public String getSystem(CouchbaseRequestInfo couchbaseRequest) { - return SemanticAttributes.DbSystemValues.COUCHBASE; + return DbIncubatingAttributes.DbSystemValues.COUCHBASE; } @Override diff --git a/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchDbAttributesGetter.java b/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchDbAttributesGetter.java index 939ee8b19dd1..c8235574804a 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchDbAttributesGetter.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchDbAttributesGetter.java @@ -8,7 +8,6 @@ import static java.util.logging.Level.FINE; import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -16,6 +15,8 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import javax.annotation.Nullable; + +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import org.apache.http.HttpEntity; /** @@ -36,7 +37,7 @@ final class ElasticsearchDbAttributesGetter @Override public String getSystem(ElasticsearchRestRequest request) { - return SemanticAttributes.DbSystemValues.ELASTICSEARCH; + return DbIncubatingAttributes.DbSystemValues.ELASTICSEARCH; } @Override diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java b/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java index 044a96ce077f..11dbc419c5b9 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java @@ -6,7 +6,8 @@ package io.opentelemetry.javaagent.instrumentation.elasticsearch.transport; import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; + import javax.annotation.Nullable; final class ElasticsearchTransportAttributesGetter @@ -14,7 +15,7 @@ final class ElasticsearchTransportAttributesGetter @Override public String getSystem(ElasticTransportRequest s) { - return SemanticAttributes.DbSystemValues.ELASTICSEARCH; + return DbIncubatingAttributes.DbSystemValues.ELASTICSEARCH; } @Override diff --git a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java index d40da424f81d..e3497bf1b24c 100644 --- a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java +++ b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java @@ -8,7 +8,8 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlStatementSanitizer; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; + import javax.annotation.Nullable; final class GeodeDbAttributesGetter implements DbClientAttributesGetter { @@ -18,7 +19,7 @@ final class GeodeDbAttributesGetter implements DbClientAttributesGetter { @@ -18,7 +19,7 @@ final class JedisDbAttributesGetter implements DbClientAttributesGetter { @Override public String getSystem(JedisRequest request) { - return SemanticAttributes.DbSystemValues.REDIS; + return DbIncubatingAttributes.DbSystemValues.REDIS; } @Override diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java index ebc0ada4215a..c69bd63fceae 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java +++ b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java @@ -6,14 +6,15 @@ package io.opentelemetry.javaagent.instrumentation.jedis.v4_0; import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; + import javax.annotation.Nullable; final class JedisDbAttributesGetter implements DbClientAttributesGetter { @Override public String getSystem(JedisRequest request) { - return SemanticAttributes.DbSystemValues.REDIS; + return DbIncubatingAttributes.DbSystemValues.REDIS; } @Override diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java index b88f452c0497..b88298d272e5 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java @@ -10,14 +10,14 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.semconv.DbIncubatingAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import javax.annotation.Nullable; final class LettuceConnectAttributesExtractor implements AttributesExtractor { @Override public void onStart(AttributesBuilder attributes, Context parentContext, RedisURI redisUri) { - attributes.put(DbIncubatingAttributes.DB_SYSTEM, SemanticAttributes.DbSystemValues.REDIS); + attributes.put(DbIncubatingAttributes.DB_SYSTEM, DbIncubatingAttributes.DbSystemValues.REDIS); int database = redisUri.getDatabase(); if (database != 0) { diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java index 332f5711813b..242a51462fe8 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java @@ -7,14 +7,15 @@ import com.lambdaworks.redis.protocol.RedisCommand; import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; + import javax.annotation.Nullable; final class LettuceDbAttributesGetter implements DbClientAttributesGetter> { @Override public String getSystem(RedisCommand request) { - return SemanticAttributes.DbSystemValues.REDIS; + return DbIncubatingAttributes.DbSystemValues.REDIS; } @Override diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java index 4d8132884d54..2882fac0eccf 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java @@ -10,14 +10,14 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.semconv.DbIncubatingAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import javax.annotation.Nullable; final class LettuceConnectAttributesExtractor implements AttributesExtractor { @Override public void onStart(AttributesBuilder attributes, Context parentContext, RedisURI redisUri) { - attributes.put(DbIncubatingAttributes.DB_SYSTEM, SemanticAttributes.DbSystemValues.REDIS); + attributes.put(DbIncubatingAttributes.DB_SYSTEM, DbIncubatingAttributes.DbSystemValues.REDIS); int database = redisUri.getDatabase(); if (database != 0) { diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java index 1a028c5394ec..209a236a3e34 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java @@ -10,7 +10,8 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.RedisCommandSanitizer; import io.opentelemetry.instrumentation.lettuce.common.LettuceArgSplitter; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; + import java.util.Collections; import java.util.List; import javax.annotation.Nullable; @@ -22,7 +23,7 @@ final class LettuceDbAttributesGetter implements DbClientAttributesGetter request) { - return SemanticAttributes.DbSystemValues.REDIS; + return DbIncubatingAttributes.DbSystemValues.REDIS; } @Override diff --git a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java index 09f66708aaa8..b3e5badb2f6d 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java +++ b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java @@ -29,7 +29,8 @@ import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesExtractor; import io.opentelemetry.semconv.DbIncubatingAttributes; -import io.opentelemetry.semconv.SemanticAttributes.DbSystemValues; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; + import java.net.InetSocketAddress; import java.net.SocketAddress; import java.time.Instant; @@ -155,7 +156,7 @@ private OpenTelemetrySpan nextSpan(Context context) { .spanBuilder("redis") .setSpanKind(SpanKind.CLIENT) .setParent(context) - .setAttribute(DbIncubatingAttributes.DB_SYSTEM, DbSystemValues.REDIS); + .setAttribute(DbIncubatingAttributes.DB_SYSTEM, DbIncubatingAttributes.DbSystemValues.REDIS); return new OpenTelemetrySpan(context, spanBuilder, sanitizer); } } diff --git a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java index 5dfeec555614..875786068c9f 100644 --- a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java +++ b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java @@ -9,13 +9,14 @@ import com.mongodb.connection.ConnectionDescription; import com.mongodb.event.CommandStartedEvent; import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Arrays; import java.util.Map; import java.util.Optional; import javax.annotation.Nullable; + +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import org.bson.BsonArray; import org.bson.BsonDocument; import org.bson.BsonValue; @@ -49,7 +50,7 @@ class MongoDbAttributesGetter implements DbClientAttributesGetter> { @Override public String getSystem(RedisCommand redisCommand) { - return SemanticAttributes.DbSystemValues.REDIS; + return DbIncubatingAttributes.DbSystemValues.REDIS; } @Override diff --git a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java index 37397504dcc6..f611183a208d 100644 --- a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java +++ b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java @@ -6,14 +6,15 @@ package io.opentelemetry.javaagent.instrumentation.redisson; import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; + import javax.annotation.Nullable; final class RedissonDbAttributesGetter implements DbClientAttributesGetter { @Override public String getSystem(RedissonRequest request) { - return SemanticAttributes.DbSystemValues.REDIS; + return DbIncubatingAttributes.DbSystemValues.REDIS; } @Nullable diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java index 9251bf0ee915..18294e4ca4af 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java @@ -8,7 +8,8 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; import io.opentelemetry.instrumentation.api.incubator.semconv.db.RedisCommandSanitizer; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; + import javax.annotation.Nullable; public enum VertxRedisClientAttributesGetter @@ -20,7 +21,7 @@ public enum VertxRedisClientAttributesGetter @Override public String getSystem(VertxRedisClientRequest request) { - return SemanticAttributes.DbSystemValues.REDIS; + return DbIncubatingAttributes.DbSystemValues.REDIS; } @Override diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index c4aab2a655c2..8afb3b4dbf29 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -7,7 +7,6 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes; @@ -21,28 +20,6 @@ public class SemanticAttributes { private SemanticAttributes() {} - public static final class DbSystemValues { - public static final String OTHER_SQL = DbIncubatingAttributes.DbSystemValues.OTHER_SQL; - public static final String MSSQL = DbIncubatingAttributes.DbSystemValues.MSSQL; - public static final String MYSQL = DbIncubatingAttributes.DbSystemValues.MYSQL; - public static final String ORACLE = DbIncubatingAttributes.DbSystemValues.ORACLE; - public static final String DB2 = DbIncubatingAttributes.DbSystemValues.DB2; - public static final String POSTGRESQL = DbIncubatingAttributes.DbSystemValues.POSTGRESQL; - public static final String HANADB = DbIncubatingAttributes.DbSystemValues.HANADB; - public static final String DERBY = DbIncubatingAttributes.DbSystemValues.DERBY; - public static final String MARIADB = DbIncubatingAttributes.DbSystemValues.MARIADB; - public static final String H2 = DbIncubatingAttributes.DbSystemValues.H2; - public static final String CASSANDRA = DbIncubatingAttributes.DbSystemValues.CASSANDRA; - public static final String MONGODB = DbIncubatingAttributes.DbSystemValues.MONGODB; - public static final String REDIS = DbIncubatingAttributes.DbSystemValues.REDIS; - public static final String COUCHBASE = DbIncubatingAttributes.DbSystemValues.COUCHBASE; - public static final String GEODE = DbIncubatingAttributes.DbSystemValues.GEODE; - public static final String ELASTICSEARCH = DbIncubatingAttributes.DbSystemValues.ELASTICSEARCH; - public static final String OPENSEARCH = DbIncubatingAttributes.DbSystemValues.OPENSEARCH; - - private DbSystemValues() {} - } - public static final AttributeKey RPC_METHOD = RpcIncubatingAttributes.RPC_METHOD; public static final AttributeKey RPC_SERVICE = RpcIncubatingAttributes.RPC_SERVICE; public static final AttributeKey RPC_SYSTEM = RpcIncubatingAttributes.RPC_SYSTEM; From dac9c2348186c3e09efd350d845885b1ef5b5ea0 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:24:12 +0200 Subject: [PATCH 14/52] RPC_* --- .../rpc/RpcCommonAttributesExtractor.java | 8 +- .../semconv/rpc/RpcMetricsAdvice.java | 18 +- .../HttpClientExperimentalMetricsTest.java | 2 +- .../HttpServerExperimentalMetricsTest.java | 2 +- .../rpc/RpcAttributesExtractorTest.java | 14 +- .../semconv/rpc/RpcClientMetricsTest.java | 24 +- .../semconv/rpc/RpcServerMetricsTest.java | 24 +- .../semconv/http/HttpClientMetricsTest.java | 2 +- .../semconv/http/HttpServerMetricsTest.java | 2 +- .../apachedubbo/v2_7/AbstractDubboTest.groovy | 27 +- .../v2_7/AbstractDubboTraceChainTest.groovy | 39 +-- .../awssdk/v1_11/Aws1ClientTest.groovy | 9 +- .../groovy/Aws0ClientTest.groovy | 27 +- .../v1_11/AbstractAws1ClientTest.groovy | 21 +- .../AbstractSqsSuppressReceiveSpansTest.java | 43 ++-- .../awssdk/v1_11/AbstractSqsTracingTest.java | 55 ++-- .../v2_2/AbstractAws2ClientCoreTest.groovy | 21 +- .../awssdk/v2_2/AbstractAws2ClientTest.groovy | 21 +- ...AbstractAws2ClientRecordHttpErrorTest.java | 8 +- .../decorators/DecoratorRegistry.java | 8 +- .../v3_0/CassandraSqlAttributesGetter.java | 1 - .../v4_0/CassandraSqlAttributesGetter.java | 1 - .../v4_4/CassandraSqlAttributesGetter.java | 1 - .../v2_0/CouchbaseAttributesGetter.java | 1 - .../ElasticsearchDbAttributesGetter.java | 3 +- ...lasticsearchTransportAttributesGetter.java | 1 - .../geode/GeodeDbAttributesGetter.java | 1 - .../grpc/v1_6/GrpcAttributesExtractor.java | 4 +- .../grpc/v1_6/AbstractGrpcStreamingTest.java | 35 +-- .../grpc/v1_6/AbstractGrpcTest.java | 236 +++++++++--------- .../instrumentation/gwt/GwtTest.java | 16 +- .../internal/JdbcConnectionUrlParser.java | 1 - .../jedis/v1_4/JedisDbAttributesGetter.java | 1 - .../jedis/v3_0/JedisDbAttributesGetter.java | 1 - .../jedis/v4_0/JedisDbAttributesGetter.java | 1 - .../v4_0/LettuceDbAttributesGetter.java | 1 - .../v5_0/LettuceDbAttributesGetter.java | 1 - .../lettuce/v5_1/OpenTelemetryTracing.java | 4 +- .../mongo/v3_1/MongoDbAttributesGetter.java | 3 +- .../rest/OpenSearchRestAttributesGetter.java | 1 - .../rediscala/RediscalaAttributesGetter.java | 3 +- .../redisson/RedissonDbAttributesGetter.java | 1 - .../instrumentation/rmi/RmiTest.java | 25 +- .../src/test/groovy/SpringRmiTest.groovy | 27 +- .../VertxRedisClientAttributesGetter.java | 1 - .../semconv/SemanticAttributes.java | 7 - 46 files changed, 390 insertions(+), 363 deletions(-) diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcCommonAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcCommonAttributesExtractor.java index ec9a5131cea2..72cade9e84b0 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcCommonAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcCommonAttributesExtractor.java @@ -10,7 +10,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import javax.annotation.Nullable; abstract class RpcCommonAttributesExtractor @@ -24,9 +24,9 @@ abstract class RpcCommonAttributesExtractor @Override public final void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) { - internalSet(attributes, SemanticAttributes.RPC_SYSTEM, getter.getSystem(request)); - internalSet(attributes, SemanticAttributes.RPC_SERVICE, getter.getService(request)); - internalSet(attributes, SemanticAttributes.RPC_METHOD, getter.getMethod(request)); + internalSet(attributes, RpcIncubatingAttributes.RPC_SYSTEM, getter.getSystem(request)); + internalSet(attributes, RpcIncubatingAttributes.RPC_SERVICE, getter.getService(request)); + internalSet(attributes, RpcIncubatingAttributes.RPC_METHOD, getter.getMethod(request)); } @Override diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcMetricsAdvice.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcMetricsAdvice.java index ccb501655381..c737b29bcb81 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcMetricsAdvice.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcMetricsAdvice.java @@ -8,8 +8,8 @@ import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.util.Arrays; final class RpcMetricsAdvice { @@ -23,10 +23,10 @@ static void applyClientDurationAdvice(DoubleHistogramBuilder builder) { ((ExtendedDoubleHistogramBuilder) builder) .setAttributesAdvice( Arrays.asList( - SemanticAttributes.RPC_SYSTEM, - SemanticAttributes.RPC_SERVICE, - SemanticAttributes.RPC_METHOD, - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_SYSTEM, + RpcIncubatingAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_METHOD, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, NetworkAttributes.NETWORK_TYPE, NetworkAttributes.NETWORK_TRANSPORT, ServerAttributes.SERVER_ADDRESS, @@ -42,10 +42,10 @@ static void applyServerDurationAdvice(DoubleHistogramBuilder builder) { ((ExtendedDoubleHistogramBuilder) builder) .setAttributesAdvice( Arrays.asList( - SemanticAttributes.RPC_SYSTEM, - SemanticAttributes.RPC_SERVICE, - SemanticAttributes.RPC_METHOD, - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_SYSTEM, + RpcIncubatingAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_METHOD, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, NetworkAttributes.NETWORK_TYPE, NetworkAttributes.NETWORK_TRANSPORT, ServerAttributes.SERVER_ADDRESS, diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java index 1b5355641572..9d8748ab61c4 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientExperimentalMetricsTest.java @@ -19,10 +19,10 @@ import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java index f59a3d70a22e..95cc458ab13a 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpServerExperimentalMetricsTest.java @@ -19,10 +19,10 @@ import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcAttributesExtractorTest.java index eede93491532..dfca442b2573 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcAttributesExtractorTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcAttributesExtractorTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.Test; @@ -59,14 +59,14 @@ private static void testExtractor(AttributesExtractor, Void> extractor.onStart(attributes, context, request); assertThat(attributes.build()) .containsOnly( - entry(SemanticAttributes.RPC_SYSTEM, "test"), - entry(SemanticAttributes.RPC_SERVICE, "my.Service"), - entry(SemanticAttributes.RPC_METHOD, "Method")); + entry(RpcIncubatingAttributes.RPC_SYSTEM, "test"), + entry(RpcIncubatingAttributes.RPC_SERVICE, "my.Service"), + entry(RpcIncubatingAttributes.RPC_METHOD, "Method")); extractor.onEnd(attributes, context, request, null, null); assertThat(attributes.build()) .containsOnly( - entry(SemanticAttributes.RPC_SYSTEM, "test"), - entry(SemanticAttributes.RPC_SERVICE, "my.Service"), - entry(SemanticAttributes.RPC_METHOD, "Method")); + entry(RpcIncubatingAttributes.RPC_SYSTEM, "test"), + entry(RpcIncubatingAttributes.RPC_SERVICE, "my.Service"), + entry(RpcIncubatingAttributes.RPC_METHOD, "Method")); } } diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java index aac9de7713e2..768a67de0bb2 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java @@ -18,8 +18,8 @@ import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -35,9 +35,9 @@ void collectsMetrics() { Attributes requestAttributes = Attributes.builder() - .put(SemanticAttributes.RPC_SYSTEM, "grpc") - .put(SemanticAttributes.RPC_SERVICE, "myservice.EchoService") - .put(SemanticAttributes.RPC_METHOD, "exampleMethod") + .put(RpcIncubatingAttributes.RPC_SYSTEM, "grpc") + .put(RpcIncubatingAttributes.RPC_SERVICE, "myservice.EchoService") + .put(RpcIncubatingAttributes.RPC_METHOD, "exampleMethod") .build(); Attributes responseAttributes1 = @@ -87,11 +87,13 @@ void collectsMetrics() { point .hasSum(150 /* millis */) .hasAttributesSatisfying( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_SERVICE, "myservice.EchoService"), - equalTo(SemanticAttributes.RPC_METHOD, "exampleMethod"), + equalTo( + RpcIncubatingAttributes.RPC_METHOD, + "exampleMethod"), equalTo(ServerAttributes.SERVER_ADDRESS, "example.com"), equalTo(ServerAttributes.SERVER_PORT, 8080), equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), @@ -117,11 +119,13 @@ void collectsMetrics() { point .hasSum(150 /* millis */) .hasAttributesSatisfying( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_SERVICE, "myservice.EchoService"), - equalTo(SemanticAttributes.RPC_METHOD, "exampleMethod"), + equalTo( + RpcIncubatingAttributes.RPC_METHOD, + "exampleMethod"), equalTo(ServerAttributes.SERVER_PORT, 8080), equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"))))); } diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java index c2c8fd6091e6..bb8b59082aa5 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java @@ -18,8 +18,8 @@ import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -35,9 +35,9 @@ void collectsMetrics() { Attributes requestAttributes = Attributes.builder() - .put(SemanticAttributes.RPC_SYSTEM, "grpc") - .put(SemanticAttributes.RPC_SERVICE, "myservice.EchoService") - .put(SemanticAttributes.RPC_METHOD, "exampleMethod") + .put(RpcIncubatingAttributes.RPC_SYSTEM, "grpc") + .put(RpcIncubatingAttributes.RPC_SERVICE, "myservice.EchoService") + .put(RpcIncubatingAttributes.RPC_METHOD, "exampleMethod") .build(); Attributes responseAttributes1 = @@ -89,11 +89,13 @@ void collectsMetrics() { point .hasSum(150 /* millis */) .hasAttributesSatisfying( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_SERVICE, "myservice.EchoService"), - equalTo(SemanticAttributes.RPC_METHOD, "exampleMethod"), + equalTo( + RpcIncubatingAttributes.RPC_METHOD, + "exampleMethod"), equalTo(ServerAttributes.SERVER_ADDRESS, "example.com"), equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4")) @@ -118,11 +120,13 @@ void collectsMetrics() { point .hasSum(150 /* millis */) .hasAttributesSatisfying( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_SERVICE, "myservice.EchoService"), - equalTo(SemanticAttributes.RPC_METHOD, "exampleMethod"), + equalTo( + RpcIncubatingAttributes.RPC_METHOD, + "exampleMethod"), equalTo(NetworkAttributes.NETWORK_TRANSPORT, "tcp"))))); } diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java index f03f419a81c1..0e8c497c6edc 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientMetricsTest.java @@ -19,10 +19,10 @@ import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java index 45441d45c45b..9a9da78627cd 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerMetricsTest.java @@ -19,10 +19,10 @@ import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy index 36c1d91d734c..d1731553dc56 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy @@ -12,6 +12,9 @@ import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.SemanticAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes @@ -103,9 +106,9 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" - "$SemanticAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" - "$SemanticAttributes.RPC_METHOD" "\$invoke" + "$RpcIncubatingAttributes.RPC_SYSTEM" "apache_dubbo" + "$RpcIncubatingAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" + "$RpcIncubatingAttributes.RPC_METHOD" "\$invoke" "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" Long "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == null || it instanceof String} @@ -118,9 +121,9 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { kind SERVER childOf span(1) attributes { - "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" - "$SemanticAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService" - "$SemanticAttributes.RPC_METHOD" "hello" + "$RpcIncubatingAttributes.RPC_SYSTEM" "apache_dubbo" + "$RpcIncubatingAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService" + "$RpcIncubatingAttributes.RPC_METHOD" "hello" "$NetworkAttributes.NETWORK_PEER_ADDRESS" String "$NetworkAttributes.NETWORK_PEER_PORT" Long "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } @@ -179,9 +182,9 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" - "$SemanticAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" - "$SemanticAttributes.RPC_METHOD" "\$invokeAsync" + "$RpcIncubatingAttributes.RPC_SYSTEM" "apache_dubbo" + "$RpcIncubatingAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" + "$RpcIncubatingAttributes.RPC_METHOD" "\$invokeAsync" "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" Long "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == null || it instanceof String} @@ -194,9 +197,9 @@ abstract class AbstractDubboTest extends InstrumentationSpecification { kind SERVER childOf span(1) attributes { - "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" - "$SemanticAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService" - "$SemanticAttributes.RPC_METHOD" "hello" + "$RpcIncubatingAttributes.RPC_SYSTEM" "apache_dubbo" + "$RpcIncubatingAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService" + "$RpcIncubatingAttributes.RPC_METHOD" "hello" "$NetworkAttributes.NETWORK_PEER_ADDRESS" String "$NetworkAttributes.NETWORK_PEER_PORT" Long "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy index ae887afcf5db..b7674ea8fbcd 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy @@ -14,6 +14,9 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes @@ -139,9 +142,9 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" - "$SemanticAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" - "$SemanticAttributes.RPC_METHOD" "\$invoke" + "$RpcIncubatingAttributes.RPC_SYSTEM" "apache_dubbo" + "$RpcIncubatingAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" + "$RpcIncubatingAttributes.RPC_METHOD" "\$invoke" "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" Long "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == null || it instanceof String} @@ -154,9 +157,9 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification kind SERVER childOf span(1) attributes { - "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" - "$SemanticAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.MiddleService" - "$SemanticAttributes.RPC_METHOD" "hello" + "$RpcIncubatingAttributes.RPC_SYSTEM" "apache_dubbo" + "$RpcIncubatingAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.MiddleService" + "$RpcIncubatingAttributes.RPC_METHOD" "hello" "$NetworkAttributes.NETWORK_PEER_ADDRESS" String "$NetworkAttributes.NETWORK_PEER_PORT" Long "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } @@ -167,9 +170,9 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification kind CLIENT childOf span(2) attributes { - "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" - "$SemanticAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" - "$SemanticAttributes.RPC_METHOD" "\$invoke" + "$RpcIncubatingAttributes.RPC_SYSTEM" "apache_dubbo" + "$RpcIncubatingAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" + "$RpcIncubatingAttributes.RPC_METHOD" "\$invoke" "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" Long "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == null || it instanceof String } @@ -182,9 +185,9 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification kind SERVER childOf span(3) attributes { - "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" - "$SemanticAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService" - "$SemanticAttributes.RPC_METHOD" "hello" + "$RpcIncubatingAttributes.RPC_SYSTEM" "apache_dubbo" + "$RpcIncubatingAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService" + "$RpcIncubatingAttributes.RPC_METHOD" "hello" "$NetworkAttributes.NETWORK_PEER_ADDRESS" String "$NetworkAttributes.NETWORK_PEER_PORT" Long "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } @@ -255,9 +258,9 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification kind CLIENT childOf span(0) attributes { - "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" - "$SemanticAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" - "$SemanticAttributes.RPC_METHOD" "\$invoke" + "$RpcIncubatingAttributes.RPC_SYSTEM" "apache_dubbo" + "$RpcIncubatingAttributes.RPC_SERVICE" "org.apache.dubbo.rpc.service.GenericService" + "$RpcIncubatingAttributes.RPC_METHOD" "\$invoke" "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" Long "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == null || it instanceof String} @@ -270,9 +273,9 @@ abstract class AbstractDubboTraceChainTest extends InstrumentationSpecification kind SERVER childOf span(1) attributes { - "$SemanticAttributes.RPC_SYSTEM" "apache_dubbo" - "$SemanticAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.MiddleService" - "$SemanticAttributes.RPC_METHOD" "hello" + "$RpcIncubatingAttributes.RPC_SYSTEM" "apache_dubbo" + "$RpcIncubatingAttributes.RPC_SERVICE" "io.opentelemetry.instrumentation.apachedubbo.v2_7.api.MiddleService" + "$RpcIncubatingAttributes.RPC_METHOD" "hello" "$NetworkAttributes.NETWORK_PEER_ADDRESS" String "$NetworkAttributes.NETWORK_PEER_PORT" Long "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy index 7fce58535ab4..7ce7d64ff2e9 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy @@ -20,6 +20,9 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractAws1ClientTest import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.semconv.SemanticAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes @@ -106,9 +109,9 @@ class Aws1ClientTest extends AbstractAws1ClientTest implements AgentTestTrait { "$UrlAttributes.URL_FULL" "https://s3.amazonaws.com" "$HttpAttributes.HTTP_REQUEST_METHOD" "HEAD" "$ServerAttributes.SERVER_ADDRESS" "s3.amazonaws.com" - "$SemanticAttributes.RPC_SYSTEM" "aws-api" - "$SemanticAttributes.RPC_SERVICE" "Amazon S3" - "$SemanticAttributes.RPC_METHOD" "HeadBucket" + "$RpcIncubatingAttributes.RPC_SYSTEM" "aws-api" + "$RpcIncubatingAttributes.RPC_SERVICE" "Amazon S3" + "$RpcIncubatingAttributes.RPC_METHOD" "HeadBucket" "aws.endpoint" "https://s3.amazonaws.com" "aws.agent" "java-aws-sdk" "aws.bucket.name" "someBucket" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy index 012da31e17ca..f0ac276dd2cc 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy @@ -25,6 +25,9 @@ import com.amazonaws.services.s3.S3ClientOptions import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes @@ -119,9 +122,9 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$ServerAttributes.SERVER_PORT" server.httpPort() "$ServerAttributes.SERVER_ADDRESS" "127.0.0.1" - "$SemanticAttributes.RPC_SYSTEM" "aws-api" - "$SemanticAttributes.RPC_SERVICE" { it.contains(service) } - "$SemanticAttributes.RPC_METHOD" "${operation}" + "$RpcIncubatingAttributes.RPC_SYSTEM" "aws-api" + "$RpcIncubatingAttributes.RPC_SERVICE" { it.contains(service) } + "$RpcIncubatingAttributes.RPC_METHOD" "${operation}" "aws.endpoint" "${server.httpUri()}" "aws.agent" "java-aws-sdk" for (def addedTag : additionalAttributes) { @@ -179,9 +182,9 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$ServerAttributes.SERVER_PORT" 61 "$ServerAttributes.SERVER_ADDRESS" "localhost" - "$SemanticAttributes.RPC_SYSTEM" "aws-api" - "$SemanticAttributes.RPC_SERVICE" { it.contains(service) } - "$SemanticAttributes.RPC_METHOD" "${operation}" + "$RpcIncubatingAttributes.RPC_SYSTEM" "aws-api" + "$RpcIncubatingAttributes.RPC_SERVICE" { it.contains(service) } + "$RpcIncubatingAttributes.RPC_METHOD" "${operation}" "aws.endpoint" "http://localhost:${UNUSABLE_PORT}" "aws.agent" "java-aws-sdk" for (def addedTag : additionalAttributes) { @@ -226,9 +229,9 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { "$UrlAttributes.URL_FULL" "https://s3.amazonaws.com" "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$ServerAttributes.SERVER_ADDRESS" "s3.amazonaws.com" - "$SemanticAttributes.RPC_SYSTEM" "aws-api" - "$SemanticAttributes.RPC_SERVICE" "Amazon S3" - "$SemanticAttributes.RPC_METHOD" "GetObject" + "$RpcIncubatingAttributes.RPC_SYSTEM" "aws-api" + "$RpcIncubatingAttributes.RPC_SERVICE" "Amazon S3" + "$RpcIncubatingAttributes.RPC_METHOD" "GetObject" "aws.endpoint" "https://s3.amazonaws.com" "aws.agent" "java-aws-sdk" "aws.bucket.name" "someBucket" @@ -270,9 +273,9 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$ServerAttributes.SERVER_PORT" server.httpPort() "$ServerAttributes.SERVER_ADDRESS" "127.0.0.1" - "$SemanticAttributes.RPC_SYSTEM" "aws-api" - "$SemanticAttributes.RPC_SERVICE" "Amazon S3" - "$SemanticAttributes.RPC_METHOD" "GetObject" + "$RpcIncubatingAttributes.RPC_SYSTEM" "aws-api" + "$RpcIncubatingAttributes.RPC_SERVICE" "Amazon S3" + "$RpcIncubatingAttributes.RPC_METHOD" "GetObject" "aws.endpoint" "${server.httpUri()}" "aws.agent" "java-aws-sdk" "aws.bucket.name" "someBucket" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy index bf24198d3ec7..0f2449c5a17a 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy @@ -32,6 +32,9 @@ import com.amazonaws.services.sns.model.PublishRequest import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes @@ -117,9 +120,9 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$ServerAttributes.SERVER_PORT" server.httpPort() "$ServerAttributes.SERVER_ADDRESS" "127.0.0.1" - "$SemanticAttributes.RPC_SYSTEM" "aws-api" - "$SemanticAttributes.RPC_SERVICE" { it.contains(service) } - "$SemanticAttributes.RPC_METHOD" "${operation}" + "$RpcIncubatingAttributes.RPC_SYSTEM" "aws-api" + "$RpcIncubatingAttributes.RPC_SERVICE" { it.contains(service) } + "$RpcIncubatingAttributes.RPC_METHOD" "${operation}" "aws.endpoint" "${server.httpUri()}" "aws.agent" "java-aws-sdk" for (def addedTag : additionalAttributes) { @@ -212,9 +215,9 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$ServerAttributes.SERVER_ADDRESS" "127.0.0.1" "$ServerAttributes.SERVER_PORT" 61 - "$SemanticAttributes.RPC_SYSTEM" "aws-api" - "$SemanticAttributes.RPC_SERVICE" { it.contains(service) } - "$SemanticAttributes.RPC_METHOD" "${operation}" + "$RpcIncubatingAttributes.RPC_SYSTEM" "aws-api" + "$RpcIncubatingAttributes.RPC_SERVICE" { it.contains(service) } + "$RpcIncubatingAttributes.RPC_METHOD" "${operation}" "aws.endpoint" "http://127.0.0.1:${UNUSABLE_PORT}" "aws.agent" "java-aws-sdk" for (def addedTag : additionalAttributes) { @@ -268,9 +271,9 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" "$ServerAttributes.SERVER_PORT" server.httpPort() "$ServerAttributes.SERVER_ADDRESS" "127.0.0.1" - "$SemanticAttributes.RPC_SYSTEM" "aws-api" - "$SemanticAttributes.RPC_SERVICE" "Amazon S3" - "$SemanticAttributes.RPC_METHOD" "GetObject" + "$RpcIncubatingAttributes.RPC_SYSTEM" "aws-api" + "$RpcIncubatingAttributes.RPC_SERVICE" "Amazon S3" + "$RpcIncubatingAttributes.RPC_METHOD" "GetObject" "aws.endpoint" "${server.httpUri()}" "aws.agent" "java-aws-sdk" "aws.bucket.name" "someBucket" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java index bdc85aacdd33..b0fee80346d7 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java @@ -29,6 +29,7 @@ import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import org.elasticmq.rest.sqs.SQSRestServer; import org.elasticmq.rest.sqs.SQSRestServerBuilder; import org.junit.jupiter.api.AfterEach; @@ -96,9 +97,9 @@ void testSimpleSqsProducerConsumerServices() { equalTo(stringKey("aws.agent"), "java-aws-sdk"), equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort), equalTo(stringKey("aws.queue.name"), "testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "CreateQueue"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "CreateQueue"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), @@ -117,9 +118,9 @@ void testSimpleSqsProducerConsumerServices() { equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "SendMessage"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SendMessage"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), @@ -143,9 +144,9 @@ void testSimpleSqsProducerConsumerServices() { equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), @@ -197,9 +198,9 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(stringKey("aws.agent"), "java-aws-sdk"), equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort), equalTo(stringKey("aws.queue.name"), "testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "CreateQueue"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "CreateQueue"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), @@ -218,9 +219,9 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "SendMessage"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SendMessage"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), @@ -244,9 +245,9 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), @@ -281,9 +282,9 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java index 7cc5cd1a3a44..d144e7349688 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java @@ -35,6 +35,7 @@ import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -129,9 +130,9 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(stringKey("aws.agent"), "java-aws-sdk"), equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort), equalTo(stringKey("aws.queue.name"), "testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "CreateQueue"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "CreateQueue"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), @@ -149,9 +150,9 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "SendMessage"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SendMessage"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), @@ -189,9 +190,9 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), @@ -225,9 +226,9 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), @@ -291,9 +292,9 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(stringKey("aws.agent"), "java-aws-sdk"), equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort), equalTo(stringKey("aws.queue.name"), "testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "CreateQueue"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "CreateQueue"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), @@ -312,9 +313,9 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo( stringKey("aws.queue.url"), "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "SendMessage"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SendMessage"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), @@ -352,9 +353,9 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo( @@ -375,9 +376,9 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo( @@ -404,9 +405,9 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { "http://localhost:" + sqsPort + "/000000000000/testSdkSqs"), - equalTo(SemanticAttributes.RPC_SYSTEM, "aws-api"), - equalTo(SemanticAttributes.RPC_SERVICE, "AmazonSQS"), - equalTo(SemanticAttributes.RPC_METHOD, "ReceiveMessage"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "AmazonSQS"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "ReceiveMessage"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), equalTo( diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy index 671d23405d85..b238c6857232 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy @@ -8,6 +8,9 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.DbIncubatingAttributes import io.opentelemetry.semconv.DbIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes @@ -145,9 +148,9 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { "$UrlAttributes.URL_FULL" { it.startsWith("${server.httpUri()}${path}") } "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.RPC_SYSTEM" "aws-api" - "$SemanticAttributes.RPC_SERVICE" "DynamoDb" - "$SemanticAttributes.RPC_METHOD" "CreateTable" + "$RpcIncubatingAttributes.RPC_SYSTEM" "aws-api" + "$RpcIncubatingAttributes.RPC_SERVICE" "DynamoDb" + "$RpcIncubatingAttributes.RPC_METHOD" "CreateTable" "aws.agent" "java-aws-sdk" "aws.requestId" "$requestId" "aws.table.name" "sometable" @@ -178,9 +181,9 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { "$UrlAttributes.URL_FULL" { it.startsWith("${server.httpUri()}${path}") } "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.RPC_SYSTEM" "aws-api" - "$SemanticAttributes.RPC_SERVICE" "DynamoDb" - "$SemanticAttributes.RPC_METHOD" "Query" + "$RpcIncubatingAttributes.RPC_SYSTEM" "aws-api" + "$RpcIncubatingAttributes.RPC_SERVICE" "DynamoDb" + "$RpcIncubatingAttributes.RPC_METHOD" "Query" "aws.agent" "java-aws-sdk" "aws.requestId" "$requestId" "aws.table.name" "sometable" @@ -210,9 +213,9 @@ abstract class AbstractAws2ClientCoreTest extends InstrumentationSpecification { "$UrlAttributes.URL_FULL" { it.startsWith("${server.httpUri()}${path}") } "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.RPC_SYSTEM" "aws-api" - "$SemanticAttributes.RPC_SERVICE" "$service" - "$SemanticAttributes.RPC_METHOD" "${operation}" + "$RpcIncubatingAttributes.RPC_SYSTEM" "aws-api" + "$RpcIncubatingAttributes.RPC_SERVICE" "$service" + "$RpcIncubatingAttributes.RPC_METHOD" "${operation}" "aws.agent" "java-aws-sdk" "aws.requestId" "$requestId" "aws.table.name" "sometable" diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy index dfa767caa64e..750417270890 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy @@ -7,6 +7,9 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.semconv.SemanticAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes @@ -132,9 +135,9 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { "$ServerAttributes.SERVER_PORT" server.httpPort() "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.RPC_SYSTEM" "aws-api" - "$SemanticAttributes.RPC_SERVICE" "$service" - "$SemanticAttributes.RPC_METHOD" "${operation}" + "$RpcIncubatingAttributes.RPC_SYSTEM" "aws-api" + "$RpcIncubatingAttributes.RPC_SERVICE" "$service" + "$RpcIncubatingAttributes.RPC_METHOD" "${operation}" "aws.agent" "java-aws-sdk" "aws.requestId" "$requestId" if (service == "S3") { @@ -292,9 +295,9 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { "$ServerAttributes.SERVER_PORT" server.httpPort() "$HttpAttributes.HTTP_REQUEST_METHOD" "$method" "$HttpAttributes.HTTP_RESPONSE_STATUS_CODE" 200 - "$SemanticAttributes.RPC_SYSTEM" "aws-api" - "$SemanticAttributes.RPC_SERVICE" "$service" - "$SemanticAttributes.RPC_METHOD" "${operation}" + "$RpcIncubatingAttributes.RPC_SYSTEM" "aws-api" + "$RpcIncubatingAttributes.RPC_SERVICE" "$service" + "$RpcIncubatingAttributes.RPC_METHOD" "${operation}" "aws.agent" "java-aws-sdk" "aws.requestId" "$requestId" if (service == "S3") { @@ -455,9 +458,9 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { "$UrlAttributes.URL_FULL" { it == "http://somebucket.localhost:${server.httpPort()}/somekey" || it == "http://localhost:${server.httpPort()}/somebucket/somekey" } "$ServerAttributes.SERVER_PORT" server.httpPort() "$HttpAttributes.HTTP_REQUEST_METHOD" "GET" - "$SemanticAttributes.RPC_SYSTEM" "aws-api" - "$SemanticAttributes.RPC_SERVICE" "S3" - "$SemanticAttributes.RPC_METHOD" "GetObject" + "$RpcIncubatingAttributes.RPC_SYSTEM" "aws-api" + "$RpcIncubatingAttributes.RPC_SERVICE" "S3" + "$RpcIncubatingAttributes.RPC_METHOD" "GetObject" "aws.agent" "java-aws-sdk" "aws.bucket.name" "somebucket" } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java index ff123568a522..d041a624b0b1 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java @@ -14,8 +14,8 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpResponse; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; import io.opentelemetry.testing.internal.armeria.common.MediaType; @@ -170,9 +170,9 @@ public void testSendDynamoDbRequestWithRetries() { .containsEntry(ServerAttributes.SERVER_PORT, server.httpPort()) .containsEntry(HttpAttributes.HTTP_REQUEST_METHOD, method) .containsEntry(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200) - .containsEntry(SemanticAttributes.RPC_SYSTEM, "aws-api") - .containsEntry(SemanticAttributes.RPC_SERVICE, service) - .containsEntry(SemanticAttributes.RPC_METHOD, operation) + .containsEntry(RpcIncubatingAttributes.RPC_SYSTEM, "aws-api") + .containsEntry(RpcIncubatingAttributes.RPC_SERVICE, service) + .containsEntry(RpcIncubatingAttributes.RPC_METHOD, operation) .containsEntry("aws.agent", "java-aws-sdk") .containsEntry("aws.requestId", requestId) .containsEntry("aws.table.name", "sometable") diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java index e451160e74a8..c8171d2d6cb2 100644 --- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java @@ -7,7 +7,6 @@ import io.opentelemetry.javaagent.instrumentation.apachecamel.SpanDecorator; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import java.util.HashMap; import java.util.Map; @@ -37,13 +36,14 @@ private static Map loadDecorators() { result.put("https4", new Https4SpanDecorator()); result.put("http", new HttpSpanDecorator()); result.put("ironmq", new MessagingSpanDecorator("ironmq")); - result.put("jdbc", new DbSpanDecorator("jdbc", DbIncubatingAttributes.DbSystemValues.OTHER_SQL)); + result.put( + "jdbc", new DbSpanDecorator("jdbc", DbIncubatingAttributes.DbSystemValues.OTHER_SQL)); result.put("jetty", new HttpSpanDecorator()); result.put("jms", new MessagingSpanDecorator("jms")); result.put("kafka", new KafkaSpanDecorator()); result.put("log", new LogSpanDecorator()); - result.put("mongodb", new DbSpanDecorator("mongodb", - DbIncubatingAttributes.DbSystemValues.MONGODB)); + result.put( + "mongodb", new DbSpanDecorator("mongodb", DbIncubatingAttributes.DbSystemValues.MONGODB)); result.put("mqtt", new MessagingSpanDecorator("mqtt")); result.put("netty-http4", new HttpSpanDecorator()); result.put("netty-http", new HttpSpanDecorator()); diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java index d2cf19b71d27..5b973f4e9922 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSqlAttributesGetter.java @@ -7,7 +7,6 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesGetter; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import javax.annotation.Nullable; final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter { diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java index 4820ce5f25d8..e08cf36a940f 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSqlAttributesGetter.java @@ -8,7 +8,6 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesGetter; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import javax.annotation.Nullable; final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter { diff --git a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraSqlAttributesGetter.java b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraSqlAttributesGetter.java index 4f910513f638..c2dc9a0e2f67 100644 --- a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraSqlAttributesGetter.java +++ b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraSqlAttributesGetter.java @@ -8,7 +8,6 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesGetter; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import javax.annotation.Nullable; final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter { diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java index 9ae5f8970f47..05edc5679f75 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java @@ -7,7 +7,6 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import javax.annotation.Nullable; final class CouchbaseAttributesGetter implements DbClientAttributesGetter { diff --git a/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchDbAttributesGetter.java b/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchDbAttributesGetter.java index c8235574804a..aaf65a7e44b1 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchDbAttributesGetter.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-common/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/internal/ElasticsearchDbAttributesGetter.java @@ -8,6 +8,7 @@ import static java.util.logging.Level.FINE; import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -15,8 +16,6 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import javax.annotation.Nullable; - -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import org.apache.http.HttpEntity; /** diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java b/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java index 11dbc419c5b9..537dd06bed20 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java +++ b/instrumentation/elasticsearch/elasticsearch-transport-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/ElasticsearchTransportAttributesGetter.java @@ -7,7 +7,6 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import javax.annotation.Nullable; final class ElasticsearchTransportAttributesGetter diff --git a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java index e3497bf1b24c..e4382e20413f 100644 --- a/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java +++ b/instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeDbAttributesGetter.java @@ -9,7 +9,6 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlStatementSanitizer; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import javax.annotation.Nullable; final class GeodeDbAttributesGetter implements DbClientAttributesGetter { diff --git a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcAttributesExtractor.java b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcAttributesExtractor.java index 02491451f985..d8665ec49941 100644 --- a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcAttributesExtractor.java +++ b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcAttributesExtractor.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.util.List; import javax.annotation.Nullable; @@ -39,7 +39,7 @@ public void onEnd( @Nullable Status status, @Nullable Throwable error) { if (status != null) { - attributes.put(SemanticAttributes.RPC_GRPC_STATUS_CODE, status.getCode().value()); + attributes.put(RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, status.getCode().value()); } for (String key : capturedRequestMetadata) { List value = getter.metadataValue(request, key); diff --git a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java index 33d4ac17b7ed..7ea2791de176 100644 --- a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java +++ b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java @@ -26,6 +26,7 @@ import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.util.ArrayList; import java.util.List; import java.util.Queue; @@ -179,11 +180,11 @@ public void onCompleted() { .hasNoParent() .hasAttributesSatisfyingExactly( addExtraClientAttributes( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "Conversation"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "Conversation"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) @@ -193,11 +194,11 @@ public void onCompleted() { .hasKind(SpanKind.SERVER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "Conversation"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "Conversation"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, server.getPort()), @@ -224,13 +225,14 @@ public void onCompleted() { equalTo( ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo( - SemanticAttributes.RPC_METHOD, "Conversation"), + RpcIncubatingAttributes.RPC_METHOD, + "Conversation"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value())))))); testing() .waitAndAssertMetrics( @@ -251,13 +253,14 @@ public void onCompleted() { equalTo( ServerAttributes.SERVER_PORT, server.getPort()), equalTo( - SemanticAttributes.RPC_METHOD, "Conversation"), + RpcIncubatingAttributes.RPC_METHOD, + "Conversation"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value())))))); } diff --git a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java index d5ea9ab472a9..6d4da4e2dc28 100644 --- a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java +++ b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java @@ -51,6 +51,7 @@ import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -135,11 +136,11 @@ public void sayHello( .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( addExtraClientAttributes( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) @@ -161,11 +162,11 @@ public void sayHello( .hasKind(SpanKind.SERVER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, server.getPort()), @@ -203,13 +204,14 @@ public void sayHello( point.hasAttributesSatisfying( equalTo( ServerAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_METHOD, "SayHello"), + equalTo( + RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value())))))); testing() .waitAndAssertMetrics( @@ -229,13 +231,14 @@ public void sayHello( ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo( ServerAttributes.SERVER_PORT, server.getPort()), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_METHOD, "SayHello"), + equalTo( + RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value())))))); } @@ -295,11 +298,11 @@ public void sayHello( .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( addExtraClientAttributes( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) @@ -321,11 +324,11 @@ public void sayHello( .hasKind(SpanKind.SERVER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, server.getPort()), @@ -367,13 +370,14 @@ public void sayHello( point.hasAttributesSatisfying( equalTo( ServerAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_METHOD, "SayHello"), + equalTo( + RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value())))))); testing() .waitAndAssertMetrics( @@ -393,13 +397,14 @@ public void sayHello( ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo( ServerAttributes.SERVER_PORT, server.getPort()), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_METHOD, "SayHello"), + equalTo( + RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value())))))); } @@ -467,11 +472,11 @@ public void onCompleted() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( addExtraClientAttributes( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) @@ -493,11 +498,11 @@ public void onCompleted() { .hasKind(SpanKind.SERVER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, server.getPort()), @@ -539,13 +544,14 @@ public void onCompleted() { point.hasAttributesSatisfying( equalTo( ServerAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_METHOD, "SayHello"), + equalTo( + RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value())))))); testing() .waitAndAssertMetrics( @@ -565,13 +571,14 @@ public void onCompleted() { ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo( ServerAttributes.SERVER_PORT, server.getPort()), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_METHOD, "SayHello"), + equalTo( + RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value())))))); } @@ -614,11 +621,11 @@ public void sayHello( .hasStatus(StatusData.error()) .hasAttributesSatisfyingExactly( addExtraClientAttributes( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) status.getCode().value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) @@ -635,11 +642,11 @@ public void sayHello( .hasParent(trace.getSpan(0)) .hasStatus(isServerError ? StatusData.error() : StatusData.unset()) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) status.getCode().value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, server.getPort()), @@ -679,13 +686,14 @@ public void sayHello( point.hasAttributesSatisfying( equalTo( ServerAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_METHOD, "SayHello"), + equalTo( + RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) status.getCode().value())))))); testing() .waitAndAssertMetrics( @@ -705,13 +713,14 @@ public void sayHello( ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo( ServerAttributes.SERVER_PORT, server.getPort()), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_METHOD, "SayHello"), + equalTo( + RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) status.getCode().value())))))); } @@ -762,11 +771,11 @@ public void sayHello( .hasStatus(StatusData.error()) .hasAttributesSatisfyingExactly( addExtraClientAttributes( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.UNKNOWN.getCode().value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) @@ -783,11 +792,11 @@ public void sayHello( .hasParent(trace.getSpan(0)) .hasStatus(StatusData.error()) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.UNKNOWN.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, server.getPort()), @@ -822,13 +831,14 @@ public void sayHello( point.hasAttributesSatisfying( equalTo( ServerAttributes.SERVER_ADDRESS, "localhost"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_METHOD, "SayHello"), + equalTo( + RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.UNKNOWN.value())))))); testing() .waitAndAssertMetrics( @@ -848,13 +858,14 @@ public void sayHello( ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo( ServerAttributes.SERVER_PORT, server.getPort()), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_METHOD, "SayHello"), + equalTo( + RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.UNKNOWN.value())))))); } @@ -1006,11 +1017,11 @@ public void onCompleted() { .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( addExtraClientAttributes( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) @@ -1032,11 +1043,11 @@ public void onCompleted() { .hasKind(SpanKind.SERVER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, server.getPort()), @@ -1123,11 +1134,11 @@ public void onCompleted() { .hasStatus(StatusData.error()) .hasAttributesSatisfyingExactly( addExtraClientAttributes( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayMultipleHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayMultipleHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.CANCELLED.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) @@ -1151,11 +1162,11 @@ public void onCompleted() { .hasKind(SpanKind.SERVER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayMultipleHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayMultipleHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.CANCELLED.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, server.getPort()), @@ -1238,13 +1249,14 @@ public void onCompleted() { .hasNoParent() .hasAttributesSatisfyingExactly( addExtraClientAttributes( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_SERVICE, "grpc.reflection.v1alpha.ServerReflection"), - equalTo(SemanticAttributes.RPC_METHOD, "ServerReflectionInfo"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_METHOD, "ServerReflectionInfo"), + equalTo( + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) @@ -1267,13 +1279,13 @@ public void onCompleted() { .hasKind(SpanKind.SERVER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), equalTo( - SemanticAttributes.RPC_SERVICE, + RpcIncubatingAttributes.RPC_SERVICE, "grpc.reflection.v1alpha.ServerReflection"), - equalTo(SemanticAttributes.RPC_METHOD, "ServerReflectionInfo"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "ServerReflectionInfo"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, server.getPort()), @@ -1344,11 +1356,11 @@ public void sayHello( .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( addExtraClientAttributes( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, (long) server.getPort()))) @@ -1370,11 +1382,11 @@ public void sayHello( .hasKind(SpanKind.SERVER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "grpc"), - equalTo(SemanticAttributes.RPC_SERVICE, "example.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "SayHello"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "example.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "SayHello"), equalTo( - SemanticAttributes.RPC_GRPC_STATUS_CODE, + RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE, (long) Status.Code.OK.value()), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, server.getPort()), diff --git a/instrumentation/gwt-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtTest.java b/instrumentation/gwt-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtTest.java index fe69fea4bce1..711d627c3ddb 100644 --- a/instrumentation/gwt-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtTest.java +++ b/instrumentation/gwt-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/gwt/GwtTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.io.File; import java.io.IOException; import java.net.URI; @@ -157,10 +157,11 @@ void testGwt() { .hasKind(SpanKind.SERVER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "gwt"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "gwt"), equalTo( - SemanticAttributes.RPC_SERVICE, "test.gwt.shared.MessageService"), - equalTo(SemanticAttributes.RPC_METHOD, "sendMessage")))); + RpcIncubatingAttributes.RPC_SERVICE, + "test.gwt.shared.MessageService"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "sendMessage")))); testing.clearData(); @@ -181,10 +182,11 @@ void testGwt() { .hasParent(trace.getSpan(0)) .hasException(new IOException()) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "gwt"), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "gwt"), equalTo( - SemanticAttributes.RPC_SERVICE, "test.gwt.shared.MessageService"), - equalTo(SemanticAttributes.RPC_METHOD, "sendMessage")))); + RpcIncubatingAttributes.RPC_SERVICE, + "test.gwt.shared.MessageService"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "sendMessage")))); driver.close(); } diff --git a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParser.java b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParser.java index 23dbcf3071f8..73428ab82b0d 100644 --- a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParser.java +++ b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParser.java @@ -12,7 +12,6 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URLDecoder; diff --git a/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisDbAttributesGetter.java b/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisDbAttributesGetter.java index 501fa3219c31..3ae3372ca95f 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisDbAttributesGetter.java +++ b/instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisDbAttributesGetter.java @@ -9,7 +9,6 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.RedisCommandSanitizer; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import javax.annotation.Nullable; final class JedisDbAttributesGetter implements DbClientAttributesGetter { diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisDbAttributesGetter.java b/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisDbAttributesGetter.java index 587dea97e95f..e2580f553f96 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisDbAttributesGetter.java +++ b/instrumentation/jedis/jedis-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/JedisDbAttributesGetter.java @@ -7,7 +7,6 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import javax.annotation.Nullable; final class JedisDbAttributesGetter implements DbClientAttributesGetter { diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java index c69bd63fceae..4d77c785d768 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java +++ b/instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java @@ -7,7 +7,6 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import javax.annotation.Nullable; final class JedisDbAttributesGetter implements DbClientAttributesGetter { diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java index 242a51462fe8..0322e0e61dd9 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceDbAttributesGetter.java @@ -8,7 +8,6 @@ import com.lambdaworks.redis.protocol.RedisCommand; import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import javax.annotation.Nullable; final class LettuceDbAttributesGetter implements DbClientAttributesGetter> { diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java index 209a236a3e34..6ecbaa3d1ee9 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java @@ -11,7 +11,6 @@ import io.opentelemetry.instrumentation.lettuce.common.LettuceArgSplitter; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import java.util.Collections; import java.util.List; import javax.annotation.Nullable; diff --git a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java index b3e5badb2f6d..b8dc94ed7022 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java +++ b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java @@ -30,7 +30,6 @@ import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesExtractor; import io.opentelemetry.semconv.DbIncubatingAttributes; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import java.net.InetSocketAddress; import java.net.SocketAddress; import java.time.Instant; @@ -156,7 +155,8 @@ private OpenTelemetrySpan nextSpan(Context context) { .spanBuilder("redis") .setSpanKind(SpanKind.CLIENT) .setParent(context) - .setAttribute(DbIncubatingAttributes.DB_SYSTEM, DbIncubatingAttributes.DbSystemValues.REDIS); + .setAttribute( + DbIncubatingAttributes.DB_SYSTEM, DbIncubatingAttributes.DbSystemValues.REDIS); return new OpenTelemetrySpan(context, spanBuilder, sanitizer); } } diff --git a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java index 875786068c9f..453c9bddf69a 100644 --- a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java +++ b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetter.java @@ -9,14 +9,13 @@ import com.mongodb.connection.ConnectionDescription; import com.mongodb.event.CommandStartedEvent; import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Arrays; import java.util.Map; import java.util.Optional; import javax.annotation.Nullable; - -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import org.bson.BsonArray; import org.bson.BsonDocument; import org.bson.BsonValue; diff --git a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java b/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java index 4f7d155a2b4c..79e70641dfd9 100644 --- a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java +++ b/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java @@ -7,7 +7,6 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import javax.annotation.Nullable; final class OpenSearchRestAttributesGetter diff --git a/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaAttributesGetter.java b/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaAttributesGetter.java index e300f0477cc1..a99f63faebc2 100644 --- a/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaAttributesGetter.java +++ b/instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaAttributesGetter.java @@ -6,10 +6,9 @@ package io.opentelemetry.javaagent.instrumentation.rediscala; import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.Locale; import javax.annotation.Nullable; - -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import redis.RedisCommand; final class RediscalaAttributesGetter implements DbClientAttributesGetter> { diff --git a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java index f611183a208d..e11f73ec316a 100644 --- a/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java +++ b/instrumentation/redisson/redisson-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/RedissonDbAttributesGetter.java @@ -7,7 +7,6 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import javax.annotation.Nullable; final class RedissonDbAttributesGetter implements DbClientAttributesGetter { diff --git a/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java b/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java index 929e6bf82255..1668ba922bef 100644 --- a/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java +++ b/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java @@ -16,6 +16,7 @@ import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.rmi.registry.LocateRegistry; import java.rmi.registry.Registry; import java.rmi.server.UnicastRemoteObject; @@ -82,17 +83,17 @@ void clientCallCreatesSpans() throws Exception { .hasKind(SpanKind.CLIENT) .hasParentSpanId(trace.get(0).getSpanId()) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "java_rmi"), - equalTo(SemanticAttributes.RPC_SERVICE, "rmi.app.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "hello")), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "java_rmi"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "rmi.app.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "hello")), span -> assertThat(span) .hasName("rmi.app.Server/hello") .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "java_rmi"), - equalTo(SemanticAttributes.RPC_SERVICE, "rmi.app.Server"), - equalTo(SemanticAttributes.RPC_METHOD, "hello")))); + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "java_rmi"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "rmi.app.Server"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "hello")))); } @Test @@ -158,9 +159,9 @@ void serviceThrownException() throws Exception { SemanticAttributes.EXCEPTION_STACKTRACE, AbstractAssert::isNotNull))) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "java_rmi"), - equalTo(SemanticAttributes.RPC_SERVICE, "rmi.app.Greeter"), - equalTo(SemanticAttributes.RPC_METHOD, "exceptional")), + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "java_rmi"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "rmi.app.Greeter"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "exceptional")), span -> assertThat(span) .hasName("rmi.app.Server/exceptional") @@ -180,8 +181,8 @@ void serviceThrownException() throws Exception { SemanticAttributes.EXCEPTION_STACKTRACE, AbstractAssert::isNotNull))) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.RPC_SYSTEM, "java_rmi"), - equalTo(SemanticAttributes.RPC_SERVICE, "rmi.app.Server"), - equalTo(SemanticAttributes.RPC_METHOD, "exceptional")))); + equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "java_rmi"), + equalTo(RpcIncubatingAttributes.RPC_SERVICE, "rmi.app.Server"), + equalTo(RpcIncubatingAttributes.RPC_METHOD, "exceptional")))); } } diff --git a/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy b/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy index 5455646f8c04..47050fdaf25d 100644 --- a/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy +++ b/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy @@ -7,6 +7,9 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import org.springframework.boot.SpringApplication import org.springframework.context.ConfigurableApplicationContext import org.springframework.context.annotation.Bean @@ -94,9 +97,9 @@ class SpringRmiTest extends AgentInstrumentationSpecification { kind SpanKind.CLIENT childOf span(0) attributes { - "$SemanticAttributes.RPC_SYSTEM" "spring_rmi" - "$SemanticAttributes.RPC_SERVICE" "springrmi.app.SpringRmiGreeter" - "$SemanticAttributes.RPC_METHOD" "hello" + "$RpcIncubatingAttributes.RPC_SYSTEM" "spring_rmi" + "$RpcIncubatingAttributes.RPC_SERVICE" "springrmi.app.SpringRmiGreeter" + "$RpcIncubatingAttributes.RPC_METHOD" "hello" } } span(2) { @@ -104,9 +107,9 @@ class SpringRmiTest extends AgentInstrumentationSpecification { kind SpanKind.SERVER childOf span(1) attributes { - "$SemanticAttributes.RPC_SYSTEM" "spring_rmi" - "$SemanticAttributes.RPC_SERVICE" "springrmi.app.SpringRmiGreeterImpl" - "$SemanticAttributes.RPC_METHOD" "hello" + "$RpcIncubatingAttributes.RPC_SYSTEM" "spring_rmi" + "$RpcIncubatingAttributes.RPC_SERVICE" "springrmi.app.SpringRmiGreeterImpl" + "$RpcIncubatingAttributes.RPC_METHOD" "hello" } } } @@ -150,9 +153,9 @@ class SpringRmiTest extends AgentInstrumentationSpecification { } } attributes { - "$SemanticAttributes.RPC_SYSTEM" "spring_rmi" - "$SemanticAttributes.RPC_SERVICE" "springrmi.app.SpringRmiGreeter" - "$SemanticAttributes.RPC_METHOD" "exceptional" + "$RpcIncubatingAttributes.RPC_SYSTEM" "spring_rmi" + "$RpcIncubatingAttributes.RPC_SERVICE" "springrmi.app.SpringRmiGreeter" + "$RpcIncubatingAttributes.RPC_METHOD" "exceptional" } } span(2) { @@ -169,9 +172,9 @@ class SpringRmiTest extends AgentInstrumentationSpecification { } } attributes { - "$SemanticAttributes.RPC_SYSTEM" "spring_rmi" - "$SemanticAttributes.RPC_SERVICE" "springrmi.app.SpringRmiGreeterImpl" - "$SemanticAttributes.RPC_METHOD" "exceptional" + "$RpcIncubatingAttributes.RPC_SYSTEM" "spring_rmi" + "$RpcIncubatingAttributes.RPC_SERVICE" "springrmi.app.SpringRmiGreeterImpl" + "$RpcIncubatingAttributes.RPC_METHOD" "exceptional" } } } diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java index 18294e4ca4af..da2cb4f6cf94 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java @@ -9,7 +9,6 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.RedisCommandSanitizer; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; - import javax.annotation.Nullable; public enum VertxRedisClientAttributesGetter diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index 8afb3b4dbf29..9000177ebe82 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -12,7 +12,6 @@ import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import io.opentelemetry.semconv.incubating.PeerIncubatingAttributes; -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.util.List; @@ -20,12 +19,6 @@ public class SemanticAttributes { private SemanticAttributes() {} - public static final AttributeKey RPC_METHOD = RpcIncubatingAttributes.RPC_METHOD; - public static final AttributeKey RPC_SERVICE = RpcIncubatingAttributes.RPC_SERVICE; - public static final AttributeKey RPC_SYSTEM = RpcIncubatingAttributes.RPC_SYSTEM; - public static final AttributeKey RPC_GRPC_STATUS_CODE = - RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE; - public static final AttributeKey MESSAGING_BATCH_MESSAGE_COUNT = MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT; public static final AttributeKey MESSAGING_CLIENT_ID = From 94f2a1e12e8a863cbc54c4de2baa466fe8f2b15f Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 21:41:05 +0200 Subject: [PATCH 15/52] fix incubating imports --- .../db/DbClientAttributesExtractor.java | 2 +- .../db/DbClientCommonAttributesExtractor.java | 2 +- .../db/SqlClientAttributesExtractor.java | 2 +- .../SqlClientAttributesExtractorBuilder.java | 2 +- .../MessagingAttributesExtractor.java | 34 +-- .../db/DbClientAttributesExtractorTest.java | 2 +- .../db/SqlClientAttributesExtractorTest.java | 2 +- .../MessagingAttributesExtractorTest.java | 31 +-- .../apachedubbo/v2_7/AbstractDubboTest.groovy | 6 +- .../v2_7/AbstractDubboTraceChainTest.groovy | 6 +- .../internal/SqsEventAttributesExtractor.java | 6 +- .../SqsMessageAttributesExtractor.java | 11 +- .../v2_2/AwsLambdaSqsEventWrapperTest.java | 6 +- .../v2_2/AwsLambdaSqsMessageHandlerTest.java | 23 +- .../AbstractAwsLambdaSqsEventHandlerTest.java | 13 +- .../src/test/groovy/S3TracingTest.groovy | 24 +- .../src/test/groovy/SnsTracingTest.groovy | 16 +- .../awssdk/v1_11/Aws1ClientTest.groovy | 6 +- .../groovy/Aws0ClientTest.groovy | 6 +- .../awssdk/v1_11/SnsAttributesExtractor.java | 4 +- .../v1_11/AbstractAws1ClientTest.groovy | 11 +- .../AbstractSqsSuppressReceiveSpansTest.java | 46 ++-- .../awssdk/v1_11/AbstractSqsTracingTest.java | 75 ++++--- .../awssdk/v2_2/AwsSdkRequestType.java | 6 +- .../v2_2/TracingExecutionInterceptor.java | 2 +- .../v2_2/AbstractAws2ClientCoreTest.groovy | 10 +- .../awssdk/v2_2/AbstractAws2ClientTest.groovy | 30 +-- ...ractAws2SqsSuppressReceiveSpansTest.groovy | 42 ++-- .../v2_2/AbstractAws2SqsTracingTest.groovy | 51 +++-- ...AbstractAws2ClientRecordHttpErrorTest.java | 2 +- .../decorators/DbSpanDecorator.java | 2 +- .../decorators/KafkaSpanDecorator.java | 7 +- .../decorators/MessagingSpanDecorator.java | 7 +- .../apachecamel/aws/AwsSpanAssertions.java | 25 ++- .../apachecamel/aws/CamelSpanAssertions.java | 10 +- .../apachecamel/decorators/CassandraTest.java | 2 +- .../cassandra/v3_0/CassandraSingletons.java | 2 +- .../src/test/java/CassandraClientTest.java | 2 +- .../v4/common/AbstractCassandraTest.java | 22 +- .../v4_0/CassandraAttributesExtractor.java | 2 +- .../cassandra/v4_0/CassandraSingletons.java | 2 +- .../v4_4/CassandraAttributesExtractor.java | 2 +- .../v4_4/CassandraTelemetryBuilder.java | 2 +- .../v4_4/AbstractCassandra44Test.java | 22 +- .../src/test/groovy/CouchbaseSpanUtil.groovy | 8 +- .../groovy/util/AbstractCouchbaseTest.groovy | 8 +- .../apiclient/ElasticsearchClientTest.java | 2 +- .../rest/v5_0/ElasticsearchRest5Test.java | 2 +- .../rest/v6_4/ElasticsearchRest6Test.java | 2 +- .../rest/v7_0/ElasticsearchRest7Test.java | 2 +- .../rest/v7_0/ElasticsearchRest7Test.java | 2 +- .../Elasticsearch5NodeClientTest.groovy | 4 +- .../Elasticsearch5TransportClientTest.groovy | 4 +- .../Elasticsearch53NodeClientTest.groovy | 4 +- .../Elasticsearch53TransportClientTest.groovy | 4 +- ...Elasticsearch53SpringRepositoryTest.groovy | 4 +- .../Elasticsearch53SpringTemplateTest.groovy | 4 +- .../Elasticsearch6NodeClientTest.groovy | 4 +- .../Elasticsearch6TransportClientTest.groovy | 4 +- .../instrumentation/geode/PutGetTest.java | 2 +- .../hibernate/v3_3/AbstractHibernateTest.java | 2 +- .../hibernate/v4_0/CriteriaTest.java | 2 +- .../hibernate/v4_0/EntityManagerTest.java | 2 +- .../hibernate/v4_0/QueryTest.java | 2 +- .../hibernate/v4_0/SessionTest.java | 2 +- .../test/java/spring/jpa/SpringJpaTest.java | 2 +- .../hibernate/v6_0/CriteriaTest.java | 2 +- .../hibernate/v6_0/EntityManagerTest.java | 2 +- .../hibernate/v6_0/ProcedureCallTest.java | 2 +- .../hibernate/v6_0/SessionTest.java | 2 +- .../src/test/groovy/SpringJpaTest.groovy | 14 +- .../hibernate/v4_3/ProcedureCallTest.java | 2 +- .../reactive/v1_0/HibernateReactiveTest.java | 10 +- .../reactive/v2_0/HibernateReactiveTest.java | 10 +- .../groovy/JdbcInstrumentationTest.groovy | 14 +- .../scalaexecutors/SlickTest.scala | 24 +- .../DataSourceDbAttributesExtractor.java | 2 +- .../jdbc/OpenTelemetryConnectionTest.groovy | 14 +- .../jdbc/datasource/JdbcTelemetryTest.java | 2 +- .../OpenTelemetryDataSourceTest.java | 2 +- .../jedis/v1_4/JedisClientTest.java | 2 +- .../jedis/v3_0/Jedis30ClientTest.java | 2 +- .../jedis/v4_0/Jedis40ClientTest.java | 2 +- .../jms/v1_1/Jms2InstrumentationTest.java | 47 ++-- .../jms/v1_1/AbstractJms1Test.java | 67 +++--- .../jms/v1_1/Jms1InstrumentationTest.java | 22 +- .../v1_1/Jms1SuppressReceiveSpansTest.java | 22 +- .../jms/v3_0/AbstractJms3Test.java | 39 ++-- .../jms/v3_0/Jms3InstrumentationTest.java | 19 +- .../v3_0/Jms3SuppressReceiveSpansTest.java | 19 +- .../kafka/internal/KafkaClientBaseTest.java | 54 ++--- .../InterceptorsSuppressReceiveSpansTest.java | 32 +-- .../kafkaclients/v2_6/InterceptorsTest.java | 49 +++-- .../v2_6/WrapperSuppressReceiveSpansTest.java | 30 +-- .../kafkaclients/v2_6/WrapperTest.java | 42 ++-- .../KafkaConsumerAttributesExtractor.java | 13 +- .../KafkaProducerAttributesExtractor.java | 12 +- .../KafkaReceiveAttributesExtractor.java | 4 +- .../groovy/KafkaStreamsDefaultTest.groovy | 96 ++++---- ...afkaStreamsSuppressReceiveSpansTest.groovy | 71 +++--- .../LettuceConnectAttributesExtractor.java | 2 +- .../lettuce/v4_0/LettuceAsyncClientTest.java | 2 +- .../lettuce/v4_0/LettuceSyncClientTest.java | 2 +- .../LettuceConnectAttributesExtractor.java | 2 +- .../lettuce/v5_0/LettuceAsyncClientTest.java | 2 +- .../v5_0/LettuceReactiveClientTest.java | 2 +- .../lettuce/v5_0/LettuceSyncClientTest.java | 2 +- .../v5_1/LettuceReactiveClientTest.java | 2 +- .../lettuce/v5_1/OpenTelemetryTracing.java | 2 +- .../v5_1/AbstractLettuceAsyncClientTest.java | 2 +- .../AbstractLettuceReactiveClientTest.java | 2 +- .../AbstractLettuceSyncClientAuthTest.java | 2 +- .../v5_1/AbstractLettuceSyncClientTest.java | 2 +- .../mongo/v3_1/MongoAttributesExtractor.java | 2 +- .../testing/AbstractMongoClientTest.groovy | 12 +- .../src/test/java/OpenSearchRestTest.java | 2 +- .../pulsar/v2_8/PulsarClientTest.java | 35 +-- .../v1_0/AbstractR2dbcStatementTest.java | 14 +- .../RabbitChannelInstrumentation.java | 5 +- ...abbitDeliveryExtraAttributesExtractor.java | 5 +- .../rabbitmq/RabbitInstrumenterHelper.java | 7 +- .../rabbitmq/RabbitMqTest.java | 15 +- .../rabbitmq/ReactorRabbitMqTest.java | 4 +- .../kafka/v1_0/AbstractReactorKafkaTest.java | 48 ++-- .../test/groovy/RediscalaClientTest.groovy | 4 +- .../AbstractRedissonAsyncClientTest.java | 2 +- .../redisson/AbstractRedissonClientTest.java | 2 +- ...onsumerExperimentalAttributeExtractor.java | 4 +- .../v4_8/RocketMqInstrumenterFactory.java | 4 +- ...roducerExperimentalAttributeExtractor.java | 4 +- .../v4_8/AbstractRocketMqClientTest.java | 147 ++++++++----- ...etMqConsumerProcessAttributeExtractor.java | 10 +- ...etMqConsumerReceiveAttributeExtractor.java | 2 +- .../RocketMqProducerAttributeExtractor.java | 10 +- ...RocketMqClientSuppressReceiveSpanTest.java | 18 +- .../v5_0/AbstractRocketMqClientTest.java | 24 +- .../kafka/KafkaIntegrationTest.java | 41 ++-- .../data/v3_0/ReactiveSpringDataTest.java | 14 +- .../src/main/java/AbstractSpringJpaTest.java | 2 +- .../SpringIntegrationAndRabbitTest.groovy | 40 ++-- .../src/test/groovy/SpringListenerTest.groovy | 25 ++- .../jms/v6_0/SpringJmsListenerTest.java | 51 ++--- ...pringListenerSuppressReceiveSpansTest.java | 18 +- .../spring/kafka/v2_7/SpringKafkaTest.java | 205 ++++++++++-------- ...ractSpringKafkaNoReceiveTelemetryTest.java | 161 ++++++++------ .../rabbit/v1_0/ContextPropagationTest.java | 14 +- .../src/test/groovy/SpringRmiTest.groovy | 6 +- .../src/test/groovy/SpymemcachedTest.groovy | 4 +- .../kafka/v3_6/AbstractVertxKafkaTest.java | 48 ++-- .../VertxRedisClientAttributesExtractor.java | 2 +- .../v4_0/redis/VertxRedisClientTest.java | 2 +- .../VertxReactivePropagationTest.groovy | 14 +- .../VertxReactivePropagationTest.groovy | 14 +- .../vertx/v4_0/sql/VertxSqlClientTest.java | 10 +- .../semconv/SemanticAttributes.java | 51 ----- .../smoketest/OtelSpringStarterSmokeTest.java | 2 +- 156 files changed, 1389 insertions(+), 1147 deletions(-) diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java index d46f57cfd35a..83682e91132b 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java @@ -10,7 +10,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; /** * Extractor of { diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractor.java index ee8e5fe35c01..0c5b6125be60 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractor.java @@ -12,7 +12,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.internal.SpanKey; import io.opentelemetry.instrumentation.api.internal.SpanKeyProvider; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.util.List; import javax.annotation.Nullable; @@ -62,40 +62,46 @@ public static MessagingAttributesExtractorBuilder, Object>> expectedEntries = new ArrayList<>(); - expectedEntries.add(entry(SemanticAttributes.MESSAGING_SYSTEM, "myQueue")); - expectedEntries.add(entry(SemanticAttributes.MESSAGING_DESTINATION_NAME, expectedDestination)); + expectedEntries.add(entry(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "myQueue")); + expectedEntries.add( + entry(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, expectedDestination)); if (temporary) { - expectedEntries.add(entry(SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY, true)); + expectedEntries.add( + entry(MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPORARY, true)); } else { expectedEntries.add( - entry(SemanticAttributes.MESSAGING_DESTINATION_TEMPLATE, expectedDestination)); + entry(MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPLATE, expectedDestination)); } if (anonymous) { - expectedEntries.add(entry(SemanticAttributes.MESSAGING_DESTINATION_ANONYMOUS, true)); + expectedEntries.add( + entry(MessagingIncubatingAttributes.MESSAGING_DESTINATION_ANONYMOUS, true)); } - expectedEntries.add(entry(SemanticAttributes.MESSAGING_MESSAGE_CONVERSATION_ID, "42")); - expectedEntries.add(entry(SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, 100L)); - expectedEntries.add(entry(SemanticAttributes.MESSAGING_MESSAGE_ENVELOPE_SIZE, 120L)); - expectedEntries.add(entry(SemanticAttributes.MESSAGING_CLIENT_ID, "43")); - expectedEntries.add(entry(SemanticAttributes.MESSAGING_OPERATION, operation.operationName())); + expectedEntries.add( + entry(MessagingIncubatingAttributes.MESSAGING_MESSAGE_CONVERSATION_ID, "42")); + expectedEntries.add(entry(MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, 100L)); + expectedEntries.add(entry(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ENVELOPE_SIZE, 120L)); + expectedEntries.add(entry(MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, "43")); + expectedEntries.add( + entry(MessagingIncubatingAttributes.MESSAGING_OPERATION, operation.operationName())); @SuppressWarnings({"unchecked", "rawtypes"}) MapEntry, ?>[] expectedEntriesArr = @@ -94,8 +99,8 @@ void shouldExtractAllAvailableAttributes( assertThat(endAttributes.build()) .containsOnly( - entry(SemanticAttributes.MESSAGING_MESSAGE_ID, "42"), - entry(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 2L)); + entry(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, "42"), + entry(MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 2L)); } static Stream destinations() { diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy index d1731553dc56..fad12dfe9c3f 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy @@ -12,9 +12,9 @@ import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.SemanticAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy index b7674ea8fbcd..7402fb3a601a 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy @@ -14,9 +14,9 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsEventAttributesExtractor.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsEventAttributesExtractor.java index 92474ece0494..fbdd674450c6 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsEventAttributesExtractor.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsEventAttributesExtractor.java @@ -9,14 +9,14 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import javax.annotation.Nullable; class SqsEventAttributesExtractor implements AttributesExtractor { @Override public void onStart(AttributesBuilder attributes, Context parentContext, SQSEvent event) { - attributes.put(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"); - attributes.put(SemanticAttributes.MESSAGING_OPERATION, "process"); + attributes.put(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"); + attributes.put(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"); } @Override diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsMessageAttributesExtractor.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsMessageAttributesExtractor.java index fbcf5701dda6..5e70628a7692 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsMessageAttributesExtractor.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsMessageAttributesExtractor.java @@ -9,16 +9,17 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import javax.annotation.Nullable; class SqsMessageAttributesExtractor implements AttributesExtractor { @Override public void onStart(AttributesBuilder attributes, Context parentContext, SQSMessage message) { - attributes.put(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"); - attributes.put(SemanticAttributes.MESSAGING_OPERATION, "process"); - attributes.put(SemanticAttributes.MESSAGING_MESSAGE_ID, message.getMessageId()); - attributes.put(SemanticAttributes.MESSAGING_DESTINATION_NAME, message.getEventSource()); + attributes.put(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"); + attributes.put(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"); + attributes.put(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, message.getMessageId()); + attributes.put( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, message.getEventSource()); } @Override diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java index 6d527f6fadaf..588424559c78 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.lang.reflect.Constructor; import java.util.Collections; import org.junit.jupiter.api.AfterEach; @@ -83,8 +84,9 @@ void eventTraced() { span.hasName("otel process") .hasKind(SpanKind.CONSUMER) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process")))); + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "process")))); } public static final class TestRequestHandler implements RequestHandler { diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java index e7ba82dab86a..c4bd9333bb03 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java @@ -20,6 +20,7 @@ import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.lang.reflect.Constructor; import java.util.Arrays; import java.util.Collections; @@ -85,8 +86,8 @@ void processSpans() { .hasKind(SpanKind.CONSUMER) .hasParentSpanId(trace.getSpan(0).getSpanId()) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process")) + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process")) .hasLinks( LinkData.create( SpanContext.createFromRemoteParent( @@ -105,10 +106,11 @@ void processSpans() { .hasKind(SpanKind.CONSUMER) .hasParentSpanId(trace.getSpan(1).getSpanId()) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, "message1"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "queue1")) + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, "message1"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "queue1")) .hasLinks( LinkData.create( SpanContext.createFromRemoteParent( @@ -121,10 +123,11 @@ void processSpans() { .hasKind(SpanKind.CONSUMER) .hasParentSpanId(trace.getSpan(1).getSpanId()) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, "message2"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "queue1")) + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, "message2"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "queue1")) .hasLinks( LinkData.create( SpanContext.createFromRemoteParent( diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java index a1644f15cb95..6181fae1463b 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java @@ -15,6 +15,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.lang.reflect.Constructor; import java.util.Arrays; import java.util.Collections; @@ -79,8 +80,10 @@ void sameSource() { .hasKind(SpanKind.CONSUMER) .hasParentSpanId(trace.getSpan(0).getSpanId()) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process")) + equalTo( + MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "process")) .hasLinksSatisfying( links -> assertThat(links) @@ -125,8 +128,10 @@ void differentSource() { .hasKind(SpanKind.CONSUMER) .hasParentSpanId(trace.getSpan(0).getSpanId()) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process")) + equalTo( + MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "process")) .hasLinksSatisfying( links -> assertThat(links) diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy index f10b5b1bb8a7..546fb51d9e9d 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy @@ -5,6 +5,10 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes @@ -199,10 +203,10 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$ServerAttributes.SERVER_ADDRESS" String "$ServerAttributes.SERVER_PORT" { it == null || Number } - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "s3ToSqsTestQueue" - "$SemanticAttributes.MESSAGING_OPERATION" "process" - "$SemanticAttributes.MESSAGING_MESSAGE_ID" String + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "s3ToSqsTestQueue" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" } } @@ -430,7 +434,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$ServerAttributes.SERVER_PORT" { it == null || Number } - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" topicArn + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" topicArn } } } @@ -472,7 +476,7 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$ServerAttributes.SERVER_PORT" { it == null || Number } - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" topicArn + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" topicArn } } } @@ -535,10 +539,10 @@ class S3TracingTest extends AgentInstrumentationSpecification { "$UrlAttributes.URL_FULL" { it.startsWith("http://") } "$ServerAttributes.SERVER_ADDRESS" String "$ServerAttributes.SERVER_PORT" { it == null || Number } - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "s3ToSnsToSqsTestQueue" - "$SemanticAttributes.MESSAGING_OPERATION" "process" - "$SemanticAttributes.MESSAGING_MESSAGE_ID" String + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "s3ToSnsToSqsTestQueue" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" } } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy index 73591b372c07..17dbaed4cf6b 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy @@ -5,6 +5,10 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes @@ -150,7 +154,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$ServerAttributes.SERVER_PORT" { it == null || Number } - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" topicArn + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" topicArn } } } @@ -171,7 +175,7 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$ServerAttributes.SERVER_ADDRESS" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" "$ServerAttributes.SERVER_PORT" { it == null || Number } - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" topicArn + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" topicArn } } span(1) { @@ -190,10 +194,10 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "$UrlAttributes.URL_FULL" String "$ServerAttributes.SERVER_ADDRESS" String "$ServerAttributes.SERVER_PORT" { it == null || Number } - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "snsToSqsTestQueue" - "$SemanticAttributes.MESSAGING_OPERATION" "process" - "$SemanticAttributes.MESSAGING_MESSAGE_ID" String + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "snsToSqsTestQueue" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String "$NetworkAttributes.NETWORK_PROTOCOL_VERSION" "1.1" } } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy index 7ce7d64ff2e9..d689a37bb552 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy @@ -20,9 +20,9 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractAws1ClientTest import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.semconv.SemanticAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy index f0ac276dd2cc..20078ecc9b76 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy @@ -25,9 +25,9 @@ import com.amazonaws.services.s3.S3ClientOptions import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SnsAttributesExtractor.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SnsAttributesExtractor.java index 59c1731df415..c0084254a75a 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SnsAttributesExtractor.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SnsAttributesExtractor.java @@ -12,7 +12,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import javax.annotation.Nullable; public class SnsAttributesExtractor implements AttributesExtractor, Response> { @@ -20,7 +20,7 @@ public class SnsAttributesExtractor implements AttributesExtractor, R public void onStart(AttributesBuilder attributes, Context parentContext, Request request) { String destination = findMessageDestination(request.getOriginalRequest()); AttributesExtractorUtil.internalSet( - attributes, SemanticAttributes.MESSAGING_DESTINATION_NAME, destination); + attributes, MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destination); } /* diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy index 0f2449c5a17a..a512fb1c336f 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy @@ -32,9 +32,10 @@ import com.amazonaws.services.sns.model.PublishRequest import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes @@ -165,7 +166,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { """ - "SNS" | "Publish" | "POST" | "d74b8436-ae13-5ab4-a9ff-ce54dfea72a0" | AmazonSNSClientBuilder.standard() | { c -> c.publish(new PublishRequest().withMessage("somemessage").withTopicArn("somearn")) } | ["$SemanticAttributes.MESSAGING_DESTINATION_NAME": "somearn"] | """ + "SNS" | "Publish" | "POST" | "d74b8436-ae13-5ab4-a9ff-ce54dfea72a0" | AmazonSNSClientBuilder.standard() | { c -> c.publish(new PublishRequest().withMessage("somemessage").withTopicArn("somearn")) } | ["$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME": "somearn"] | """ 567910cd-659e-55d4-8ccb-5aaf14679dc0 @@ -175,7 +176,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { """ - "SNS" | "Publish" | "POST" | "d74b8436-ae13-5ab4-a9ff-ce54dfea72a0" | AmazonSNSClientBuilder.standard() | { c -> c.publish(new PublishRequest().withMessage("somemessage").withTargetArn("somearn")) } | ["$SemanticAttributes.MESSAGING_DESTINATION_NAME": "somearn"] | """ + "SNS" | "Publish" | "POST" | "d74b8436-ae13-5ab4-a9ff-ce54dfea72a0" | AmazonSNSClientBuilder.standard() | { c -> c.publish(new PublishRequest().withMessage("somemessage").withTargetArn("somearn")) } | ["$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME": "somearn"] | """ 567910cd-659e-55d4-8ccb-5aaf14679dc0 diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java index b0fee80346d7..88ff9e72015d 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java @@ -26,9 +26,9 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import org.elasticmq.rest.sqs.SQSRestServer; import org.elasticmq.rest.sqs.SQSRestServerBuilder; @@ -126,12 +126,15 @@ void testSimpleSqsProducerConsumerServices() { equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testSdkSqs"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), span -> @@ -152,12 +155,15 @@ void testSimpleSqsProducerConsumerServices() { equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testSdkSqs"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), span -> @@ -227,12 +233,15 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testSdkSqs"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), span -> @@ -253,12 +262,15 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testSdkSqs"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), span -> diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java index d144e7349688..4b0031e2119b 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java @@ -32,9 +32,9 @@ import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.util.ArrayList; import java.util.Arrays; @@ -158,12 +158,15 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testSdkSqs"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))); @@ -198,11 +201,16 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), - equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1), + MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testSdkSqs"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, + 1), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))); if (testCaptureHeaders) { @@ -234,12 +242,15 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testSdkSqs"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))); @@ -321,12 +332,15 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { equalTo(UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testSdkSqs"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"))), trace -> { @@ -385,12 +399,19 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_SYSTEM, + "AmazonSQS"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), - equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, + "receive"), + equalTo( + MessagingIncubatingAttributes + .MESSAGING_BATCH_MESSAGE_COUNT, + 1), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), span -> span.hasName("testSdkSqs process") @@ -414,13 +435,17 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() { UrlAttributes.URL_FULL, "http://localhost:" + sqsPort), equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"), equalTo(ServerAttributes.SERVER_PORT, sqsPort), - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_SYSTEM, + "AmazonSQS"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSdkSqs"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, + "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1")), span -> diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkRequestType.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkRequestType.java index 72ea417bf8e4..43053823ef47 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkRequestType.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkRequestType.java @@ -7,7 +7,7 @@ import static io.opentelemetry.instrumentation.awssdk.v2_2.FieldMapping.request; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.util.Collections; import java.util.List; import java.util.Map; @@ -21,8 +21,8 @@ enum AwsSdkRequestType { /* * Only one of TopicArn and TargetArn are permitted on an SNS request. */ - request(SemanticAttributes.MESSAGING_DESTINATION_NAME.getKey(), "TargetArn"), - request(SemanticAttributes.MESSAGING_DESTINATION_NAME.getKey(), "TopicArn")); + request(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME.getKey(), "TargetArn"), + request(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME.getKey(), "TopicArn")); // Wrapping in unmodifiableMap @SuppressWarnings("ImmutableEnumChecker") diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java index 75d1f6f0c9e1..af487ade5aec 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java @@ -17,7 +17,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.internal.InstrumenterUtil; import io.opentelemetry.instrumentation.api.internal.Timer; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import java.io.BufferedReader; import java.io.ByteArrayInputStream; diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy index b238c6857232..9d7b42c67405 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy @@ -8,11 +8,11 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy index 750417270890..fd30744ba557 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy @@ -7,9 +7,13 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.semconv.SemanticAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes @@ -146,14 +150,14 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { "aws.queue.name" "somequeue" } else if (service == "Sqs" && operation == "SendMessage") { "aws.queue.url" QUEUE_URL - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "somequeue" - "$SemanticAttributes.MESSAGING_OPERATION" "publish" - "$SemanticAttributes.MESSAGING_MESSAGE_ID" String - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "somequeue" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" } else if (service == "Kinesis") { "aws.stream.name" "somestream" } else if (service == "Sns") { - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "somearn" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "somearn" } } } @@ -306,14 +310,14 @@ abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest { "aws.queue.name" "somequeue" } else if (service == "Sqs" && operation == "SendMessage") { "aws.queue.url" QUEUE_URL - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "somequeue" - "$SemanticAttributes.MESSAGING_OPERATION" "publish" - "$SemanticAttributes.MESSAGING_MESSAGE_ID" String - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "somequeue" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" } else if (service == "Kinesis") { "aws.stream.name" "somestream" } else if (service == "Sns") { - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "somearn" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "somearn" } } } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy index e1020808725b..a5887dc1989f 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy @@ -7,6 +7,10 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes @@ -159,10 +163,10 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" sqsPort - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$SemanticAttributes.MESSAGING_OPERATION" "publish" - "$SemanticAttributes.MESSAGING_MESSAGE_ID" String + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String } } span(1) { @@ -180,10 +184,10 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" sqsPort - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$SemanticAttributes.MESSAGING_OPERATION" "process" - "$SemanticAttributes.MESSAGING_MESSAGE_ID" String + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String } } span(2) { @@ -331,9 +335,9 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" sqsPort - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$SemanticAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" } } for (int i: 1..(xrayInjectionEnabled ? 3 : 2)) { @@ -353,10 +357,10 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" sqsPort - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$SemanticAttributes.MESSAGING_OPERATION" "process" - "$SemanticAttributes.MESSAGING_MESSAGE_ID" String + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String } } } @@ -381,10 +385,10 @@ abstract class AbstractAws2SqsSuppressReceiveSpansTest extends InstrumentationSp "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" sqsPort - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$SemanticAttributes.MESSAGING_OPERATION" "process" - "$SemanticAttributes.MESSAGING_MESSAGE_ID" String + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String } } } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy index 731f0a6ccd39..ab5b7ab8095e 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy @@ -8,6 +8,11 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes @@ -161,10 +166,10 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" sqsPort - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$SemanticAttributes.MESSAGING_OPERATION" "publish" - "$SemanticAttributes.MESSAGING_MESSAGE_ID" String + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String if (captureHeaders) { "messaging.header.test_message_header" { it == ["test"] } } @@ -222,10 +227,10 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" sqsPort - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$SemanticAttributes.MESSAGING_OPERATION" "receive" - "$SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT" 1 + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "receive" + "$MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT" 1 if (captureHeaders) { "messaging.header.test_message_header" { it == ["test"] } } @@ -246,10 +251,10 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" sqsPort - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$SemanticAttributes.MESSAGING_OPERATION" "process" - "$SemanticAttributes.MESSAGING_MESSAGE_ID" String + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String if (captureHeaders) { "messaging.header.test_message_header" { it == ["test"] } } @@ -397,9 +402,9 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" sqsPort - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$SemanticAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" } } publishSpan = span(0) @@ -421,10 +426,10 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" sqsPort - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$SemanticAttributes.MESSAGING_OPERATION" "receive" - "$SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT" 3 + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "receive" + "$MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT" 3 } } if (!xrayInjectionEnabled) { @@ -460,10 +465,10 @@ abstract class AbstractAws2SqsTracingTest extends InstrumentationSpecification { "$UrlAttributes.URL_FULL" { it.startsWith("http://localhost:$sqsPort") } "$ServerAttributes.SERVER_ADDRESS" "localhost" "$ServerAttributes.SERVER_PORT" sqsPort - "$SemanticAttributes.MESSAGING_SYSTEM" "AmazonSQS" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" - "$SemanticAttributes.MESSAGING_OPERATION" "process" - "$SemanticAttributes.MESSAGING_MESSAGE_ID" String + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "AmazonSQS" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testSdkSqs" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String } } span(1 + 2*i + 1) { diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java index d041a624b0b1..d5275a796ed5 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java index 84267819c7e1..2db260a9f088 100644 --- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java @@ -27,7 +27,7 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlStatementSanitizer; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.net.URI; import java.util.Map; import org.apache.camel.Endpoint; diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java index 38fdcd38fec3..7656008e5007 100644 --- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java @@ -25,7 +25,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; @@ -60,11 +60,12 @@ public void pre( CamelDirection camelDirection) { super.pre(attributes, exchange, endpoint, camelDirection); - attributes.put(SemanticAttributes.MESSAGING_OPERATION, "process"); + attributes.put(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"); Integer partition = exchange.getIn().getHeader(PARTITION, Integer.class); if (partition != null) { - attributes.put(SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, partition); + attributes.put( + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, partition); } if (CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES) { diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/MessagingSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/MessagingSpanDecorator.java index f5b88ee674c4..478f3e07d087 100644 --- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/MessagingSpanDecorator.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/MessagingSpanDecorator.java @@ -26,7 +26,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.net.URI; import java.util.Map; import org.apache.camel.Endpoint; @@ -59,11 +59,12 @@ public void pre( super.pre(attributes, exchange, endpoint, camelDirection); attributes.put( - SemanticAttributes.MESSAGING_DESTINATION_NAME, getDestination(exchange, endpoint)); + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + getDestination(exchange, endpoint)); String messageId = getMessageId(exchange); if (messageId != null) { - attributes.put(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId); + attributes.put(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId); } } diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java index 26b8b09b6cf9..8e40145c3d06 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java @@ -16,9 +16,9 @@ import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -91,18 +91,25 @@ static SpanDataAssert sqs( || spanName.endsWith("publish")) { attributeAssertions.addAll( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, queueName), - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"))); + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, queueName), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "AmazonSQS"))); if (spanName.endsWith("receive")) { - attributeAssertions.add(equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive")); + attributeAssertions.add( + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive")); } else if (spanName.endsWith("process")) { - attributeAssertions.add(equalTo(SemanticAttributes.MESSAGING_OPERATION, "process")); attributeAssertions.add( - satisfies(SemanticAttributes.MESSAGING_MESSAGE_ID, val -> assertThat(val).isNotNull())); + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process")); + attributeAssertions.add( + satisfies( + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, + val -> assertThat(val).isNotNull())); } else if (spanName.endsWith("publish")) { - attributeAssertions.add(equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish")); attributeAssertions.add( - satisfies(SemanticAttributes.MESSAGING_MESSAGE_ID, val -> assertThat(val).isNotNull())); + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish")); + attributeAssertions.add( + satisfies( + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, + val -> assertThat(val).isNotNull())); } } @@ -141,7 +148,7 @@ static SpanDataAssert sns(SpanDataAssert span, String spanName, String topicArn) equalTo(stringKey("rpc.system"), "aws-api"), equalTo(stringKey("rpc.method"), spanName.substring(4)), equalTo(stringKey("rpc.service"), "AmazonSNS"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, topicArn), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, topicArn), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "POST"), equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200), satisfies(UrlAttributes.URL_FULL, val -> val.isInstanceOf(String.class)), diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpanAssertions.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpanAssertions.java index eed7f11480ad..a90fe8fbaf92 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpanAssertions.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpanAssertions.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; class CamelSpanAssertions { @@ -31,7 +31,7 @@ static SpanDataAssert sqsProduce(SpanDataAssert span, String queueName) { equalTo( stringKey("camel.uri"), "aws-sqs://" + queueName + "?amazonSQSClient=%23sqsClient&delay=1000"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, queueName)); + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, queueName)); } static SpanDataAssert sqsConsume(SpanDataAssert span, String queueName) { @@ -45,9 +45,9 @@ static SpanDataAssert sqsConsume(SpanDataAssert span, String queueName, int dela equalTo( stringKey("camel.uri"), "aws-sqs://" + queueName + "?amazonSQSClient=%23sqsClient&delay=" + delay), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, queueName), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, queueName), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, stringAssert -> stringAssert.isInstanceOf(String.class))); } @@ -57,7 +57,7 @@ static SpanDataAssert snsPublish(SpanDataAssert span, String topicName) { .hasAttributesSatisfying( equalTo( stringKey("camel.uri"), "aws-sns://" + topicName + "?amazonSNSClient=%23snsClient"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, topicName)); + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, topicName)); } static SpanDataAssert s3(SpanDataAssert span, String bucketName) { diff --git a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java index 77597478ee35..4e21f1bff32d 100644 --- a/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java +++ b/instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java @@ -14,7 +14,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerUsingTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.junit.jupiter.api.AfterAll; diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java index f76af78a8a19..7792bcd3f8ad 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; public final class CassandraSingletons { private static final String INSTRUMENTATION_NAME = "io.opentelemetry.cassandra-3.0"; diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java index b78598c791b9..1cde8e6cc115 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.net.InetSocketAddress; diff --git a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java index 91f941a348da..e86c575f380a 100644 --- a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java +++ b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java @@ -7,17 +7,17 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_DC; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_ID; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_IDEMPOTENCE; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_TABLE; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_NAME; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SYSTEM; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_DC; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_ID; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_IDEMPOTENCE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_TABLE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java index eb01ca05aceb..2b5b184fdaa0 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.net.InetSocketAddress; import java.net.SocketAddress; diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java index 80d8696397f3..73c98569f6cf 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; public final class CassandraSingletons { private static final String INSTRUMENTATION_NAME = "io.opentelemetry.cassandra-4.0"; diff --git a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java index 6c4499e29840..d6faf68ec320 100644 --- a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java +++ b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java @@ -16,7 +16,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.lang.reflect.Field; import java.net.InetSocketAddress; diff --git a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java index d23e49b8224b..4961507a24ce 100644 --- a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java +++ b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor; import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; /** A builder of {@link CassandraTelemetry}. */ public class CassandraTelemetryBuilder { diff --git a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java index 96c937438ce6..e3a5ff4db120 100644 --- a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java +++ b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java @@ -7,17 +7,17 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_DC; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_ID; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_IDEMPOTENCE; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CASSANDRA_TABLE; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_NAME; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SYSTEM; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_DC; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_ID; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_IDEMPOTENCE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_PAGE_SIZE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_SPECULATIVE_EXECUTION_COUNT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_TABLE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy index 1629600100d1..df49e2976f0b 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy @@ -7,10 +7,10 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.NetworkAttributes import static io.opentelemetry.api.trace.SpanKind.CLIENT diff --git a/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy index 1ad81da8585e..8ef3194fe351 100644 --- a/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy +++ b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy @@ -20,10 +20,10 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import spock.lang.Shared import java.util.concurrent.TimeUnit diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java index 98c30ffc20ec..1f354e5e1a6b 100644 --- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java +++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java @@ -18,7 +18,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java index 135ae812d249..54b49fa5b44e 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java index 62e8f77b9f90..b8ece84a90b5 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index d943721e0145..c0fa82c352ce 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index 694c50caad9c..2e79a44bb9b7 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy index 98aed15af754..9e3eeecd64ae 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy @@ -4,8 +4,8 @@ */ import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.elasticsearch.client.Client import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.settings.Settings diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy index fb451d2e4080..e73c4fdadb14 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy @@ -5,8 +5,8 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.settings.Settings diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy index cf89058c31ad..0afab3e572e6 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy @@ -4,8 +4,8 @@ */ import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.Client import org.elasticsearch.common.io.FileSystemUtils diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy index e66942c19b12..b045e2b71fb3 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy @@ -5,8 +5,8 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.common.io.FileSystemUtils diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy index e18927da7017..d981e40407cb 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy @@ -7,8 +7,8 @@ package springdata import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.junit.jupiter.api.Assumptions import org.springframework.context.annotation.AnnotationConfigApplicationContext import spock.lang.Shared diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy index 602e8acce585..6d0170e4fc50 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy @@ -7,8 +7,8 @@ package springdata import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.action.search.SearchResponse import org.elasticsearch.common.io.FileSystemUtils diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy index 69f0c9763cd2..0926e58da4c7 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy @@ -4,8 +4,8 @@ */ import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.Client import org.elasticsearch.common.io.FileSystemUtils diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy index c847b17cc0c0..119bbf2eab14 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy @@ -5,8 +5,8 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.NetworkAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.transport.TransportClient diff --git a/instrumentation/geode-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/geode/PutGetTest.java b/instrumentation/geode-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/geode/PutGetTest.java index d1209c5894b1..954ae031785d 100644 --- a/instrumentation/geode-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/geode/PutGetTest.java +++ b/instrumentation/geode-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/geode/PutGetTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java index 1349572a4ade..458b16fff71f 100644 --- a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java +++ b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaTest.java index 21bda398eda5..509173d79e80 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaTest.java @@ -12,7 +12,7 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.function.Consumer; import java.util.stream.Stream; import org.hibernate.Criteria; diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java index 9d88955e9198..89c4259f8480 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Named.named; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.function.BiConsumer; import java.util.function.Function; import java.util.stream.Stream; diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java index bc1d0d6870b5..97088676d60a 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Named.named; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.Iterator; import java.util.function.Consumer; import java.util.stream.Stream; diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java index 7c9248696228..9f6f5f440d6c 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java @@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Named.named; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; import java.util.function.Consumer; diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java index 4275ed785bf4..1db265104ca3 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.regex.Pattern; import org.hibernate.Version; import org.junit.jupiter.api.Test; diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java index ed6e994825db..1447be9baffb 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java index acc504fcf2be..28fb78af3679 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.EntityTransaction; diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java index 02a7166d5b9b..c22fc5140e02 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import jakarta.persistence.ParameterMode; import java.sql.Connection; import java.sql.DriverManager; diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java index 4a6d02c5d764..7edacaf430b3 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.Arrays; import java.util.List; import java.util.Locale; diff --git a/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy b/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy index 8e7d20ecbfe4..6d88bc1bb189 100644 --- a/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy +++ b/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy @@ -5,13 +5,13 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.hibernate.Version import org.springframework.context.annotation.AnnotationConfigApplicationContext import spock.lang.Shared diff --git a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java index f5f2fd5286ef..eb5dff7ea565 100644 --- a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java +++ b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java @@ -17,7 +17,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; diff --git a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java index f17995330a7b..f38d14f295ff 100644 --- a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java +++ b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java @@ -6,11 +6,11 @@ package io.opentelemetry.javaagent.instrumentation.hibernate.reactive.v1_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_NAME; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_USER; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; diff --git a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java index 1293c04fd34c..5d2ba72cd60a 100644 --- a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java +++ b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java @@ -6,11 +6,11 @@ package io.opentelemetry.javaagent.instrumentation.hibernate.reactive.v2_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_NAME; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_USER; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; diff --git a/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy b/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy index a9e5803e08ae..89c48de168e9 100644 --- a/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy +++ b/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy @@ -12,13 +12,13 @@ import io.opentelemetry.instrumentation.jdbc.TestDriver import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.javaagent.instrumentation.jdbc.test.ProxyStatementFactory import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import org.apache.derby.jdbc.EmbeddedDataSource import org.apache.derby.jdbc.EmbeddedDriver diff --git a/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala b/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala index ca7ae5ebfab2..8ff8a0e31dd9 100644 --- a/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala +++ b/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala @@ -14,19 +14,19 @@ import io.opentelemetry.javaagent.testing.common.Java8BytecodeBridge import io.opentelemetry.sdk.testing.assertj.{SpanDataAssert, TraceAssert} import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.SemanticAttributes.DbSystemValues -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import java.util.function.Consumer import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.{Test, TestInstance} diff --git a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java index f266e2fbdec6..ec0ae8e18a58 100644 --- a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java +++ b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java @@ -11,7 +11,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import javax.annotation.Nullable; import javax.sql.DataSource; diff --git a/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy b/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy index 4c9482c16ebe..4f89a3725352 100644 --- a/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy +++ b/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy @@ -17,13 +17,13 @@ import io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.LibraryTestTrait import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes diff --git a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java index 8e38ef660435..977a87f54c56 100644 --- a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java +++ b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java @@ -11,7 +11,7 @@ import io.opentelemetry.instrumentation.jdbc.internal.OpenTelemetryConnection; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.sql.CallableStatement; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java index b3ff16bf81da..621456de6c07 100644 --- a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java +++ b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.sql.Connection; import java.sql.SQLException; diff --git a/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java b/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java index c482842b58c1..f97b8c12c320 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java +++ b/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java index a9eaa432bebc..28efe8d23933 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java +++ b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import org.assertj.core.api.AbstractLongAssert; diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java b/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java index 25d93c668b0e..974e2f45bb6e 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java +++ b/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/instrumentation/jms/jms-1.1/javaagent/src/jms2Test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms2InstrumentationTest.java b/instrumentation/jms/jms-1.1/javaagent/src/jms2Test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms2InstrumentationTest.java index 2412c8b7d085..439fa62de2ec 100644 --- a/instrumentation/jms/jms-1.1/javaagent/src/jms2Test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms2InstrumentationTest.java +++ b/instrumentation/jms/jms-1.1/javaagent/src/jms2Test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms2InstrumentationTest.java @@ -18,7 +18,7 @@ import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.io.File; import java.nio.file.Files; import java.util.Collections; @@ -167,10 +167,12 @@ void testMessageConsumer( .hasKind(PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + destinationName), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary))); producerSpan.set(trace.getSpan(1)); @@ -184,10 +186,12 @@ void testMessageConsumer( .hasParent(trace.getSpan(0)) .hasLinks(LinkData.create(producerSpan.get().getSpanContext())) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + destinationName), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)))); } @@ -230,20 +234,24 @@ void testMessageListener( .hasKind(PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + destinationName), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)), span -> span.hasName(destinationName + " process") .hasKind(CONSUMER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + destinationName), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)), span -> span.hasName("consumer").hasParent(trace.getSpan(2)))); } @@ -270,8 +278,9 @@ void shouldNotEmitTelemetryOnEmptyReceive( private static AttributeAssertion messagingTempDestination(boolean isTemporary) { return isTemporary - ? equalTo(SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY, true) - : satisfies(SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY, AbstractAssert::isNull); + ? equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPORARY, true) + : satisfies( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPORARY, AbstractAssert::isNull); } static final class EmptyReceiveArgumentsProvider implements ArgumentsProvider { diff --git a/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/AbstractJms1Test.java b/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/AbstractJms1Test.java index d3f6382f11b7..3b1adcb499ec 100644 --- a/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/AbstractJms1Test.java +++ b/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/AbstractJms1Test.java @@ -18,7 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; @@ -126,20 +126,24 @@ void testMessageListener( .hasKind(PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + destinationName), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)), span -> span.hasName(destinationName + " process") .hasKind(CONSUMER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + destinationName), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)), span -> span.hasName("consumer").hasParent(trace.getSpan(2)))); } @@ -205,10 +209,12 @@ void shouldCaptureMessageHeaders( .hasKind(PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + destinationName), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary), equalTo( stringArrayKey("messaging.header.test_message_header"), @@ -221,10 +227,12 @@ void shouldCaptureMessageHeaders( .hasKind(CONSUMER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + destinationName), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary), equalTo( stringArrayKey("messaging.header.test_message_header"), @@ -275,10 +283,12 @@ void shouldFailWhenSendingReadOnlyMessage( .hasKind(PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + destinationName), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary))), trace -> trace.hasSpansSatisfyingExactly( @@ -288,17 +298,20 @@ void shouldFailWhenSendingReadOnlyMessage( .hasNoParent() .hasTotalRecordedLinks(0) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + destinationName), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)))); } static AttributeAssertion messagingTempDestination(boolean isTemporary) { return isTemporary - ? equalTo(SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY, true) - : satisfies(SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY, AbstractAssert::isNull); + ? equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPORARY, true) + : satisfies( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPORARY, AbstractAssert::isNull); } static final class EmptyReceiveArgumentsProvider implements ArgumentsProvider { diff --git a/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1InstrumentationTest.java b/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1InstrumentationTest.java index a1e315170bb7..dc21edad5f6d 100644 --- a/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1InstrumentationTest.java +++ b/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1InstrumentationTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.util.concurrent.atomic.AtomicReference; import javax.jms.Destination; import javax.jms.JMSException; @@ -60,10 +60,12 @@ void testMessageConsumer( .hasKind(PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + destinationName), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary))); producerSpan.set(trace.getSpan(1)); @@ -77,10 +79,12 @@ void testMessageConsumer( .hasParent(trace.getSpan(0)) .hasLinks(LinkData.create(producerSpan.get().getSpanContext())) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + destinationName), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)))); } } diff --git a/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1SuppressReceiveSpansTest.java b/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1SuppressReceiveSpansTest.java index 004779411c7a..261f2c3e87f9 100644 --- a/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1SuppressReceiveSpansTest.java +++ b/instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms1SuppressReceiveSpansTest.java @@ -10,7 +10,7 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import javax.jms.Destination; import javax.jms.JMSException; import javax.jms.MessageConsumer; @@ -56,10 +56,12 @@ void testMessageConsumer( .hasKind(PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + destinationName), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)), span -> span.hasName(destinationName + " receive") @@ -67,10 +69,12 @@ void testMessageConsumer( .hasParent(trace.getSpan(1)) .hasTotalRecordedLinks(0) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + destinationName), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary))), trace -> trace.hasSpansSatisfyingExactly(span -> span.hasName("consumer parent").hasNoParent())); diff --git a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/AbstractJms3Test.java b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/AbstractJms3Test.java index 47ac7c5211f8..1efc43318d37 100644 --- a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/AbstractJms3Test.java +++ b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/AbstractJms3Test.java @@ -18,7 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import jakarta.jms.Connection; import jakarta.jms.Destination; import jakarta.jms.JMSException; @@ -142,24 +142,24 @@ void testMessageListener(DestinationFactory destinationFactory, boolean isTempor .hasKind(PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, producerDestinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)), span -> span.hasName(actualDestinationName + " process") .hasKind(CONSUMER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, actualDestinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId)), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId)), span -> span.hasName("consumer").hasParent(trace.getSpan(2)))); } @@ -226,12 +226,12 @@ void shouldCaptureMessageHeaders(DestinationFactory destinationFactory, boolean .hasKind(PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, producerDestinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary), equalTo( stringArrayKey("messaging.header.test_message_header"), @@ -244,12 +244,12 @@ void shouldCaptureMessageHeaders(DestinationFactory destinationFactory, boolean .hasKind(CONSUMER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, actualDestinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), equalTo( stringArrayKey("messaging.header.test_message_header"), singletonList("test")), @@ -261,8 +261,9 @@ void shouldCaptureMessageHeaders(DestinationFactory destinationFactory, boolean static AttributeAssertion messagingTempDestination(boolean isTemporary) { return isTemporary - ? equalTo(SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY, true) - : satisfies(SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY, AbstractAssert::isNull); + ? equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPORARY, true) + : satisfies( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPORARY, AbstractAssert::isNull); } static final class EmptyReceiveArgumentsProvider implements ArgumentsProvider { diff --git a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java index 4bfa71ab52ba..b5f8b1f3cd58 100644 --- a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java +++ b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import jakarta.jms.Destination; import jakarta.jms.JMSException; import jakarta.jms.MessageConsumer; @@ -63,12 +63,12 @@ void testMessageConsumer(DestinationFactory destinationFactory, boolean isTempor .hasKind(PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, producerDestinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary))); producerSpan.set(trace.getSpan(1)); @@ -82,11 +82,12 @@ void testMessageConsumer(DestinationFactory destinationFactory, boolean isTempor .hasParent(trace.getSpan(0)) .hasLinks(LinkData.create(producerSpan.get().getSpanContext())) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, actualDestinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId)))); + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId)))); } } diff --git a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3SuppressReceiveSpansTest.java b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3SuppressReceiveSpansTest.java index 9fc284d0b5f9..3789a29acf34 100644 --- a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3SuppressReceiveSpansTest.java +++ b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3SuppressReceiveSpansTest.java @@ -10,7 +10,7 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import jakarta.jms.Destination; import jakarta.jms.JMSException; import jakarta.jms.MessageConsumer; @@ -59,12 +59,12 @@ void testMessageConsumer(DestinationFactory destinationFactory, boolean isTempor .hasKind(PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, producerDestinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), messagingTempDestination(isTemporary)), span -> span.hasName(actualDestinationName + " receive") @@ -72,12 +72,13 @@ void testMessageConsumer(DestinationFactory destinationFactory, boolean isTempor .hasParent(trace.getSpan(1)) .hasTotalRecordedLinks(0) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, actualDestinationName), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId))), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId))), trace -> trace.hasSpansSatisfyingExactly(span -> span.hasName("consumer parent").hasNoParent())); } diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java index e1a3f0e41d2d..332342324da1 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java @@ -10,7 +10,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.ArrayList; @@ -157,23 +157,25 @@ protected static List sendAttributes( List assertions = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative))); if (messageKey != null) { - assertions.add(equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, messageKey)); + assertions.add( + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, messageKey)); } if (messageValue == null) { - assertions.add(equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE, true)); + assertions.add( + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE, true)); } if (testHeaders) { assertions.add( @@ -188,18 +190,18 @@ protected static List receiveAttributes(boolean testHeaders) List assertions = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), satisfies( - SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, + MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, AbstractLongAssert::isPositive))); // consumer group is not available in version 0.11 if (Boolean.getBoolean("testLatestDeps")) { - assertions.add(equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test")); + assertions.add(equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test")); } if (testHeaders) { assertions.add( @@ -215,34 +217,36 @@ protected static List processAttributes( List assertions = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), satisfies( AttributeKey.longKey("kafka.record.queue_time_ms"), AbstractLongAssert::isNotNegative))); // consumer group is not available in version 0.11 if (Boolean.getBoolean("testLatestDeps")) { - assertions.add(equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test")); + assertions.add(equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test")); } if (messageKey != null) { - assertions.add(equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, messageKey)); + assertions.add( + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, messageKey)); } if (messageValue == null) { - assertions.add(equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE, true)); + assertions.add( + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE, true)); } else { assertions.add( equalTo( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, messageValue.getBytes(StandardCharsets.UTF_8).length)); } if (testHeaders) { diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsSuppressReceiveSpansTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsSuppressReceiveSpansTest.java index d35be4757947..09634c11976e 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsSuppressReceiveSpansTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsSuppressReceiveSpansTest.java @@ -9,7 +9,7 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.nio.charset.StandardCharsets; import org.assertj.core.api.AbstractLongAssert; @@ -26,32 +26,38 @@ void assertTraces() { .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + SHARED_TOPIC), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer"))), span -> span.hasName(SHARED_TOPIC + " process") .hasKind(SpanKind.CONSUMER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + SHARED_TOPIC), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), equalTo( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, greeting.getBytes(StandardCharsets.UTF_8).length), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, + "test"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer"))), span -> span.hasName("process child") diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java index e54bda8f2e95..c694c7cd13d0 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.sdk.trace.data.LinkData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.nio.charset.StandardCharsets; import java.util.concurrent.atomic.AtomicReference; import org.assertj.core.api.AbstractLongAssert; @@ -33,11 +33,13 @@ void assertTraces() { .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + SHARED_TOPIC), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")))); SpanContext spanContext = trace.getSpan(1).getSpanContext(); producerSpanContext.set( @@ -55,35 +57,44 @@ void assertTraces() { .hasNoParent() .hasLinksSatisfying(links -> assertThat(links).isEmpty()) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), - equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + SHARED_TOPIC), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, + "test"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), - equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1)), + equalTo( + MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1)), span -> span.hasName(SHARED_TOPIC + " process") .hasKind(SpanKind.CONSUMER) .hasParent(trace.getSpan(0)) .hasLinks(LinkData.create(producerSpanContext.get())) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + SHARED_TOPIC), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, greeting.getBytes(StandardCharsets.UTF_8).length), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, + "test"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer"))), span -> span.hasName("process child") diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperSuppressReceiveSpansTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperSuppressReceiveSpansTest.java index 7e886b52a4c2..554da765571d 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperSuppressReceiveSpansTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperSuppressReceiveSpansTest.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; @@ -56,17 +56,17 @@ protected static List sendAttributes(boolean testHeaders) { List assertions = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative))); if (testHeaders) { assertions.add( @@ -81,24 +81,24 @@ private static List processAttributes(String greeting, boole List assertions = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), equalTo( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, greeting.getBytes(StandardCharsets.UTF_8).length), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), satisfies( AttributeKey.longKey("kafka.record.queue_time_ms"), AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test"), + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")))); if (testHeaders) { assertions.add( diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperTest.java index 23beabbd3a8f..8d5a84449359 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperTest.java @@ -14,7 +14,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.LinkData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; @@ -78,17 +78,17 @@ protected static List sendAttributes(boolean testHeaders) { List assertions = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative))); if (testHeaders) { assertions.add( @@ -103,24 +103,24 @@ private static List processAttributes(String greeting, boole List assertions = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), equalTo( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, greeting.getBytes(StandardCharsets.UTF_8).length), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), satisfies( AttributeKey.longKey("kafka.record.queue_time_ms"), AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test"), + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")))); if (testHeaders) { assertions.add( @@ -135,14 +135,14 @@ protected static List receiveAttributes(boolean testHeaders) List assertions = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), - equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), - equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1))); + equalTo(MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1))); if (testHeaders) { assertions.add( equalTo( diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesExtractor.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesExtractor.java index 28a7ae116851..e01efe827440 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesExtractor.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesExtractor.java @@ -8,7 +8,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.nio.ByteBuffer; import javax.annotation.Nullable; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -23,20 +23,21 @@ public void onStart( ConsumerRecord record = request.getRecord(); attributes.put( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, (long) record.partition()); - attributes.put(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, record.offset()); + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + (long) record.partition()); + attributes.put(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, record.offset()); Object key = record.key(); if (key != null && canSerialize(key.getClass())) { - attributes.put(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, key.toString()); + attributes.put(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, key.toString()); } if (record.value() == null) { - attributes.put(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE, true); + attributes.put(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE, true); } String consumerGroup = request.getConsumerGroup(); if (consumerGroup != null) { - attributes.put(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, consumerGroup); + attributes.put(MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, consumerGroup); } } diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesExtractor.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesExtractor.java index ceae2344c1b9..abc30140a9ad 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesExtractor.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesExtractor.java @@ -8,7 +8,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.nio.ByteBuffer; import javax.annotation.Nullable; import org.apache.kafka.clients.producer.RecordMetadata; @@ -22,10 +22,10 @@ public void onStart( Object key = request.getRecord().key(); if (key != null && canSerialize(key.getClass())) { - attributes.put(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, key.toString()); + attributes.put(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, key.toString()); } if (request.getRecord().value() == null) { - attributes.put(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE, true); + attributes.put(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE, true); } } @@ -45,8 +45,10 @@ public void onEnd( if (recordMetadata != null) { attributes.put( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, recordMetadata.partition()); - attributes.put(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, recordMetadata.offset()); + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + recordMetadata.partition()); + attributes.put( + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, recordMetadata.offset()); } } } diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesExtractor.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesExtractor.java index d8d08ca2d71e..9e6c4aba96c4 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesExtractor.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaReceiveAttributesExtractor.java @@ -8,7 +8,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import javax.annotation.Nullable; enum KafkaReceiveAttributesExtractor implements AttributesExtractor { @@ -20,7 +20,7 @@ public void onStart( String consumerGroup = request.getConsumerGroup(); if (consumerGroup != null) { - attributes.put(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, consumerGroup); + attributes.put(MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, consumerGroup); } } diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy index 78c43d9e249f..f9b3a062a905 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy @@ -9,6 +9,16 @@ import io.opentelemetry.context.Context import io.opentelemetry.context.propagation.TextMapGetter import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import org.apache.kafka.clients.producer.ProducerRecord import org.apache.kafka.common.header.Headers import org.apache.kafka.common.serialization.Serdes @@ -97,13 +107,13 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest { kind PRODUCER hasNoParent() attributes { - "$SemanticAttributes.MESSAGING_SYSTEM" "kafka" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING - "$SemanticAttributes.MESSAGING_OPERATION" "publish" - "$SemanticAttributes.MESSAGING_CLIENT_ID" { it.startsWith("producer") } - "$SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } - "$SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 - "$SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY" "10" + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.startsWith("producer") } + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY" "10" } } @@ -116,13 +126,13 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest { kind CONSUMER hasNoParent() attributes { - "$SemanticAttributes.MESSAGING_SYSTEM" "kafka" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING - "$SemanticAttributes.MESSAGING_OPERATION" "receive" - "$SemanticAttributes.MESSAGING_CLIENT_ID" { it.endsWith("consumer") } - "$SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT" 1 + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "receive" + "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.endsWith("consumer") } + "$MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT" 1 if (Boolean.getBoolean("testLatestDeps")) { - "$SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP" "test-application" + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP" "test-application" } } } @@ -133,18 +143,18 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest { childOf span(0) hasLink(producerPending) attributes { - "$SemanticAttributes.MESSAGING_SYSTEM" "kafka" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING - "$SemanticAttributes.MESSAGING_OPERATION" "process" - "$SemanticAttributes.MESSAGING_CLIENT_ID" { it.endsWith("consumer") } - "$SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long - "$SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } - "$SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 - "$SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY" "10" + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.endsWith("consumer") } + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY" "10" "kafka.record.queue_time_ms" { it >= 0 } "asdf" "testing" if (Boolean.getBoolean("testLatestDeps")) { - "$SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP" "test-application" + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP" "test-application" } } } @@ -154,12 +164,12 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest { kind PRODUCER childOf span(1) attributes { - "$SemanticAttributes.MESSAGING_SYSTEM" "kafka" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED - "$SemanticAttributes.MESSAGING_OPERATION" "publish" - "$SemanticAttributes.MESSAGING_CLIENT_ID" { it.endsWith("producer") } - "$SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } - "$SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.endsWith("producer") } + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 } } @@ -172,13 +182,13 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest { kind CONSUMER hasNoParent() attributes { - "$SemanticAttributes.MESSAGING_SYSTEM" "kafka" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED - "$SemanticAttributes.MESSAGING_OPERATION" "receive" - "$SemanticAttributes.MESSAGING_CLIENT_ID" { it.startsWith("consumer") } - "$SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT" 1 + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "receive" + "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.startsWith("consumer") } + "$MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT" 1 if (Boolean.getBoolean("testLatestDeps")) { - "$SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP" "test" + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP" "test" } } } @@ -189,16 +199,16 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest { childOf span(0) hasLink producerProcessed attributes { - "$SemanticAttributes.MESSAGING_SYSTEM" "kafka" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED - "$SemanticAttributes.MESSAGING_OPERATION" "process" - "$SemanticAttributes.MESSAGING_CLIENT_ID" { it.startsWith("consumer") } - "$SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long - "$SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } - "$SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 - "$SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY" "10" + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.startsWith("consumer") } + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY" "10" if (Boolean.getBoolean("testLatestDeps")) { - "$SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP" "test" + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP" "test" } "kafka.record.queue_time_ms" { it >= 0 } "testing" 123 diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy index 3297f43bf50f..6f993bac1f8c 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy @@ -9,6 +9,15 @@ import io.opentelemetry.context.Context import io.opentelemetry.context.propagation.TextMapGetter import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import org.apache.kafka.clients.producer.ProducerRecord import org.apache.kafka.common.header.Headers import org.apache.kafka.common.serialization.Serdes @@ -92,13 +101,13 @@ class KafkaStreamsSuppressReceiveSpansTest extends KafkaStreamsBaseTest { kind PRODUCER hasNoParent() attributes { - "$SemanticAttributes.MESSAGING_SYSTEM" "kafka" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING - "$SemanticAttributes.MESSAGING_OPERATION" "publish" - "$SemanticAttributes.MESSAGING_CLIENT_ID" "producer-1" - "$SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } - "$SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 - "$SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY" "10" + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" "producer-1" + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY" "10" } } // kafka-stream CONSUMER @@ -107,18 +116,18 @@ class KafkaStreamsSuppressReceiveSpansTest extends KafkaStreamsBaseTest { kind CONSUMER childOf span(0) attributes { - "$SemanticAttributes.MESSAGING_SYSTEM" "kafka" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING - "$SemanticAttributes.MESSAGING_OPERATION" "process" - "$SemanticAttributes.MESSAGING_CLIENT_ID" { it.endsWith("consumer") } - "$SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long - "$SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } - "$SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 - "$SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY" "10" + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.endsWith("consumer") } + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY" "10" "kafka.record.queue_time_ms" { it >= 0 } "asdf" "testing" if (Boolean.getBoolean("testLatestDeps")) { - "$SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP" "test-application" + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP" "test-application" } } } @@ -131,12 +140,12 @@ class KafkaStreamsSuppressReceiveSpansTest extends KafkaStreamsBaseTest { kind PRODUCER childOf span(1) attributes { - "$SemanticAttributes.MESSAGING_SYSTEM" "kafka" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED - "$SemanticAttributes.MESSAGING_OPERATION" "publish" - "$SemanticAttributes.MESSAGING_CLIENT_ID" String - "$SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } - "$SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" String + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 } } // kafka-clients CONSUMER process @@ -145,16 +154,16 @@ class KafkaStreamsSuppressReceiveSpansTest extends KafkaStreamsBaseTest { kind CONSUMER childOf span(2) attributes { - "$SemanticAttributes.MESSAGING_SYSTEM" "kafka" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED - "$SemanticAttributes.MESSAGING_OPERATION" "process" - "$SemanticAttributes.MESSAGING_CLIENT_ID" { it.startsWith("consumer") } - "$SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long - "$SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } - "$SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 - "$SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY" "10" + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "kafka" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_CLIENT_ID" { it.startsWith("consumer") } + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 } + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET" 0 + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY" "10" if (Boolean.getBoolean("testLatestDeps")) { - "$SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP" "test" + "$MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP" "test" } "kafka.record.queue_time_ms" { it >= 0 } "testing" 123 diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java index b88298d272e5..0c12619ca9e2 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java @@ -9,7 +9,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import javax.annotation.Nullable; diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java index 67684fffe6ed..f8fd44ebebc2 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java @@ -30,7 +30,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.util.Map; import java.util.concurrent.CancellationException; diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java index fc640bd41b74..24dbdfa96396 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java @@ -20,7 +20,7 @@ import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.util.Map; import org.junit.jupiter.api.AfterAll; diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java index 2882fac0eccf..0a660d5dbe9b 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java @@ -9,7 +9,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import javax.annotation.Nullable; diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java index 7cb08d3be853..af1cdd92a2ee 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java @@ -28,7 +28,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.util.Map; import java.util.concurrent.CancellationException; diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceReactiveClientTest.java index 7bd97f633a4b..aa9332419ba6 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceReactiveClientTest.java @@ -16,7 +16,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java index b6bcec43408a..9b1efe50e0a8 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java @@ -19,7 +19,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.util.Map; import org.assertj.core.api.AbstractAssert; diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java index a3b73cfc5f1d..c040c882c102 100644 --- a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.lettuce.v5_1.AbstractLettuceReactiveClientTest; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import org.junit.jupiter.api.Test; diff --git a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java index b8dc94ed7022..5bb61d148eb7 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java +++ b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java @@ -28,7 +28,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesExtractor; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.net.InetSocketAddress; import java.net.SocketAddress; diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java index b7ceacbbb706..40a5a9bd5804 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java @@ -21,7 +21,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.util.ArrayList; diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java index 26cc24206fad..76bc2d11483f 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java @@ -12,7 +12,7 @@ import io.lettuce.core.api.sync.RedisCommands; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.util.Objects; diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java index 93232e3a3359..4fc003bd3611 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java @@ -10,7 +10,7 @@ import io.lettuce.core.api.sync.RedisCommands; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import org.junit.jupiter.api.AfterAll; diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java index 87d24f6e7b57..34641bc2ff02 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java @@ -20,7 +20,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.test.utils.PortUtils; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import java.util.Base64; diff --git a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java index 85c87e40721f..9505ddff6422 100644 --- a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java +++ b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java @@ -5,7 +5,7 @@ package io.opentelemetry.instrumentation.mongo.v3_1; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_MONGODB_COLLECTION; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_MONGODB_COLLECTION; import static java.util.Arrays.asList; import com.mongodb.event.CommandStartedEvent; diff --git a/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy b/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy index c695d1879e1c..4f265f0b86b9 100644 --- a/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy +++ b/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy @@ -10,12 +10,12 @@ import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import org.slf4j.LoggerFactory diff --git a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java index 55d5a6daf293..3221374c47a8 100644 --- a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java +++ b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java @@ -7,7 +7,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; diff --git a/instrumentation/pulsar/pulsar-2.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarClientTest.java b/instrumentation/pulsar/pulsar-2.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarClientTest.java index 267fff87381f..97a316f50c29 100644 --- a/instrumentation/pulsar/pulsar-2.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarClientTest.java +++ b/instrumentation/pulsar/pulsar-2.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/PulsarClientTest.java @@ -17,8 +17,8 @@ import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; @@ -620,14 +620,14 @@ private static List sendAttributes( List assertions = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "pulsar"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "pulsar"), equalTo(ServerAttributes.SERVER_ADDRESS, brokerHost), equalTo(ServerAttributes.SERVER_PORT, brokerPort), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destination), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destination), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative), equalTo(MESSAGE_TYPE, "normal"))); if (testHeaders) { @@ -654,14 +654,14 @@ private static List receiveAttributes( List assertions = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "pulsar"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "pulsar"), equalTo(ServerAttributes.SERVER_ADDRESS, brokerHost), equalTo(ServerAttributes.SERVER_PORT, brokerPort), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destination), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destination), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative))); if (testHeaders) { assertions.add( @@ -672,7 +672,8 @@ private static List receiveAttributes( if (isBatch) { assertions.add( satisfies( - SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, AbstractLongAssert::isPositive)); + MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, + AbstractLongAssert::isPositive)); } return assertions; } @@ -682,12 +683,12 @@ private static List processAttributes( List assertions = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "pulsar"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destination), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), - equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "pulsar"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destination), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, messageId), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative))); if (testHeaders) { assertions.add( diff --git a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java index af63f15e40f2..3709b0145762 100644 --- a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java +++ b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java @@ -6,13 +6,13 @@ package io.opentelemetry.instrumentation.r2dbc.v1_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CONNECTION_STRING; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_NAME; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SYSTEM; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_USER; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.r2dbc.spi.ConnectionFactoryOptions.DATABASE; diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelInstrumentation.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelInstrumentation.java index 1770f734b069..89ccfd232a9a 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelInstrumentation.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelInstrumentation.java @@ -37,7 +37,7 @@ import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -151,7 +151,8 @@ public static void setSpanNameAddHeaders( if (span.getSpanContext().isValid()) { helper().onPublish(span, exchange, routingKey); if (body != null) { - span.setAttribute(SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, (long) body.length); + span.setAttribute( + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, (long) body.length); } // This is the internal behavior when props are null. We're just doing it earlier now. diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitDeliveryExtraAttributesExtractor.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitDeliveryExtraAttributesExtractor.java index 9ded46e749d3..ffe9e510542b 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitDeliveryExtraAttributesExtractor.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitDeliveryExtraAttributesExtractor.java @@ -9,7 +9,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import javax.annotation.Nullable; class RabbitDeliveryExtraAttributesExtractor implements AttributesExtractor { @@ -20,7 +20,8 @@ public void onStart( Envelope envelope = request.getEnvelope(); String routingKey = envelope.getRoutingKey(); if (routingKey != null && !routingKey.isEmpty()) { - attributes.put(SemanticAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY, routingKey); + attributes.put( + MessagingIncubatingAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY, routingKey); } } diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitInstrumenterHelper.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitInstrumenterHelper.java index 12402ae2bcd2..604b2e732cb0 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitInstrumenterHelper.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitInstrumenterHelper.java @@ -14,7 +14,7 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.context.Context; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.util.Map; public class RabbitInstrumenterHelper { @@ -33,10 +33,11 @@ public static RabbitInstrumenterHelper helper() { public void onPublish(Span span, String exchange, String routingKey) { String exchangeName = normalizeExchangeName(exchange); - span.setAttribute(SemanticAttributes.MESSAGING_DESTINATION_NAME, exchangeName); + span.setAttribute(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, exchangeName); span.updateName(exchangeName + " publish"); if (routingKey != null && !routingKey.isEmpty()) { - span.setAttribute(SemanticAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY, routingKey); + span.setAttribute( + MessagingIncubatingAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY, routingKey); } if (CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES) { span.setAttribute(RABBITMQ_COMMAND, "basic.publish"); diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java index 8a190b3afaf7..de1e720d2610 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java @@ -31,6 +31,7 @@ import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.io.FileNotFoundException; import java.io.IOException; import java.nio.charset.Charset; @@ -754,7 +755,8 @@ private static void verifySpan( assertTrue(deliveryMode == null || deliveryMode == 2); assertNotNull( - attrs.get(SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE)); + attrs.get( + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE)); }); }); break; @@ -774,7 +776,7 @@ private static void verifySpan( || queue.equals("some-routing-queue") || queue.startsWith("amq.gen-")); - attrs.get(SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE); + attrs.get(MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE); }); }); break; @@ -785,7 +787,7 @@ private static void verifySpan( assertThat(attributes) .satisfies( attrs -> { - attrs.get(SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE); + attrs.get(MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE); }); }); break; @@ -817,7 +819,7 @@ private static void verifySpan( @SuppressWarnings("deprecation") private static void verifyMessagingAttributes( SpanDataAssert span, String exchange, String routingKey, String operation) { - span.hasAttribute(SemanticAttributes.MESSAGING_SYSTEM, "rabbitmq") + span.hasAttribute(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rabbitmq") .hasAttributesSatisfying( attributes -> { assertThat(attributes) @@ -828,7 +830,8 @@ private static void verifyMessagingAttributes( assertTrue(destinationName == null || destinationName.equals(exchange)); String routingKeyAttr = attrs.get( - SemanticAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY); + MessagingIncubatingAttributes + .MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY); assertTrue( routingKeyAttr == null || routingKeyAttr.equals(routingKey) @@ -837,7 +840,7 @@ private static void verifyMessagingAttributes( }); if (operation != null && !operation.equals("publish")) { - span.hasAttribute(SemanticAttributes.MESSAGING_OPERATION, operation); + span.hasAttribute(MessagingIncubatingAttributes.MESSAGING_OPERATION, operation); } } diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java index f51a7717a0c3..d122a9a82763 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/ReactorRabbitMqTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -43,7 +43,7 @@ void testShouldNotFailDeclaringExchange() { span -> { span.hasName("exchange.declare") .hasKind(SpanKind.CLIENT) - .hasAttribute(SemanticAttributes.MESSAGING_SYSTEM, "rabbitmq") + .hasAttribute(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rabbitmq") .hasAttribute(AttributeKey.stringKey("rabbitmq.command"), "exchange.declare") .hasAttributesSatisfying( attributes -> diff --git a/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java b/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java index 89d3e0249475..ef5b333ed76a 100644 --- a/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java +++ b/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java @@ -19,7 +19,7 @@ import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.lang.reflect.InvocationTargetException; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -178,21 +178,22 @@ protected static List sendAttributes(ProducerRecord assertions = new ArrayList<>( asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, record.topic()), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, record.topic()), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative))); String messageKey = record.key(); if (messageKey != null) { - assertions.add(equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, messageKey)); + assertions.add( + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, messageKey)); } return assertions; } @@ -201,15 +202,15 @@ protected static List receiveAttributes(String topic) { ArrayList assertions = new ArrayList<>( asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, topic), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, topic), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), - equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1))); + equalTo(MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1))); if (Boolean.getBoolean("hasConsumerGroup")) { - assertions.add(equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test")); + assertions.add(equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test")); } return assertions; } @@ -219,20 +220,20 @@ protected static List processAttributes( List assertions = new ArrayList<>( asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, record.topic()), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, record.topic()), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative))); if (Boolean.getBoolean("hasConsumerGroup")) { - assertions.add(equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test")); + assertions.add(equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test")); } if (Boolean.getBoolean("otel.instrumentation.kafka.experimental-span-attributes")) { assertions.add( @@ -240,13 +241,14 @@ protected static List processAttributes( } String messageKey = record.key(); if (messageKey != null) { - assertions.add(equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, messageKey)); + assertions.add( + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, messageKey)); } String messageValue = record.value(); if (messageValue != null) { assertions.add( equalTo( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, messageValue.getBytes(StandardCharsets.UTF_8).length)); } return assertions; diff --git a/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy b/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy index a3b165355907..c2f4265e2b5e 100644 --- a/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy +++ b/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy @@ -5,8 +5,8 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.testcontainers.containers.GenericContainer import redis.ByteStringDeserializerDefault import redis.ByteStringSerializerLowPriority diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java index 21b7db554b94..760c04de734b 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java @@ -16,7 +16,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java index f6b87150743f..11d44ed44373 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java @@ -17,7 +17,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.TraceAssert; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqConsumerExperimentalAttributeExtractor.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqConsumerExperimentalAttributeExtractor.java index 0329517365ae..52c511abce67 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqConsumerExperimentalAttributeExtractor.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqConsumerExperimentalAttributeExtractor.java @@ -9,7 +9,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.net.SocketAddress; import javax.annotation.Nullable; import org.apache.rocketmq.common.message.MessageExt; @@ -29,7 +29,7 @@ enum RocketMqConsumerExperimentalAttributeExtractor public void onStart(AttributesBuilder attributes, Context parentContext, MessageExt msg) { String tags = msg.getTags(); if (tags != null) { - attributes.put(SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, tags); + attributes.put(MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, tags); } attributes.put(MESSAGING_ROCKETMQ_QUEUE_ID, msg.getQueueId()); attributes.put(MESSAGING_ROCKETMQ_QUEUE_OFFSET, msg.getQueueOffset()); diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqInstrumenterFactory.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqInstrumenterFactory.java index d3a96e0647e6..7e0831b8b396 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqInstrumenterFactory.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqInstrumenterFactory.java @@ -6,8 +6,8 @@ package io.opentelemetry.instrumentation.rocketmqclient.v4_8; import static io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor.constant; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_OPERATION; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_SYSTEM; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessageOperation; diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqProducerExperimentalAttributeExtractor.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqProducerExperimentalAttributeExtractor.java index ffec5ebf41f7..fa13de6cb011 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqProducerExperimentalAttributeExtractor.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqProducerExperimentalAttributeExtractor.java @@ -9,7 +9,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import javax.annotation.Nullable; import org.apache.rocketmq.client.hook.SendMessageContext; @@ -28,7 +28,7 @@ public void onStart( if (request.getMessage() != null) { String tags = request.getMessage().getTags(); if (tags != null) { - attributes.put(SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, tags); + attributes.put(MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, tags); } } String brokerAddr = request.getBrokerAddr(); diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/AbstractRocketMqClientTest.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/AbstractRocketMqClientTest.java index 00a5f7c49fff..60b277d7a46d 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/AbstractRocketMqClientTest.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/AbstractRocketMqClientTest.java @@ -17,7 +17,7 @@ import io.opentelemetry.instrumentation.rocketmqclient.v4_8.base.BaseConf; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.LinkData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; @@ -138,13 +138,18 @@ public void onException(Throwable throwable) { span.hasName(sharedTopic + " publish") .hasKind(SpanKind.PRODUCER) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "rocketmq"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rocketmq"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + sharedTopic), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, "TagA"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, + "TagA"), satisfies( AttributeKey.stringKey("messaging.rocketmq.broker_address"), val -> val.isInstanceOf(String.class)), @@ -156,16 +161,21 @@ public void onException(Throwable throwable) { .hasKind(SpanKind.CONSUMER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "rocketmq"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rocketmq"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + sharedTopic), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, val -> val.isInstanceOf(Long.class)), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, "TagA"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, + "TagA"), satisfies( AttributeKey.stringKey("messaging.rocketmq.broker_address"), val -> val.isInstanceOf(String.class)), @@ -204,13 +214,18 @@ void testRocketmqProduceAndConsume() throws Exception { .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "rocketmq"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rocketmq"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + sharedTopic), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, "TagA"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, + "TagA"), satisfies( AttributeKey.stringKey("messaging.rocketmq.broker_address"), val -> val.isInstanceOf(String.class)), @@ -222,16 +237,21 @@ void testRocketmqProduceAndConsume() throws Exception { .hasKind(SpanKind.CONSUMER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "rocketmq"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rocketmq"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + sharedTopic), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, val -> val.isInstanceOf(Long.class)), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, "TagA"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, + "TagA"), satisfies( AttributeKey.stringKey("messaging.rocketmq.broker_address"), val -> val.isInstanceOf(String.class)), @@ -283,11 +303,13 @@ void testRocketmqProduceAndBatchConsume() throws Exception { .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "rocketmq"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rocketmq"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + sharedTopic), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), satisfies( AttributeKey.stringKey("messaging.rocketmq.broker_address"), @@ -310,24 +332,30 @@ void testRocketmqProduceAndBatchConsume() throws Exception { span.hasName("multiple_sources receive") .hasKind(SpanKind.CONSUMER) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "rocketmq"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive")), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rocketmq"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive")), span -> span.hasName(sharedTopic + " process") .hasKind(SpanKind.CONSUMER) .hasParent(trace.getSpan(0)) .hasLinksSatisfying(links(producerSpanContext.get())) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "rocketmq"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rocketmq"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + sharedTopic), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, val -> val.isInstanceOf(Long.class)), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, "TagA"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, + "TagA"), satisfies( AttributeKey.stringKey("messaging.rocketmq.broker_address"), val -> val.isNotEmpty()), @@ -343,16 +371,21 @@ void testRocketmqProduceAndBatchConsume() throws Exception { .hasParent(trace.getSpan(0)) .hasLinksSatisfying(links(producerSpanContext.get())) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "rocketmq"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rocketmq"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + sharedTopic), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, val -> val.isInstanceOf(Long.class)), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, "TagB"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, + "TagB"), satisfies( AttributeKey.stringKey("messaging.rocketmq.broker_address"), val -> val.isNotEmpty()), @@ -396,13 +429,18 @@ void captureMessageHeaderAsSpanAttributes() throws Exception { .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "rocketmq"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rocketmq"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + sharedTopic), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, "TagA"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, + "TagA"), satisfies( AttributeKey.stringKey("messaging.rocketmq.broker_address"), val -> val.isInstanceOf(String.class)), @@ -418,16 +456,21 @@ void captureMessageHeaderAsSpanAttributes() throws Exception { .hasKind(SpanKind.CONSUMER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "rocketmq"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, sharedTopic), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rocketmq"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + sharedTopic), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, val -> val.isInstanceOf(Long.class)), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)), - equalTo(SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, "TagA"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG, + "TagA"), satisfies( AttributeKey.stringKey("messaging.rocketmq.broker_address"), val -> val.isInstanceOf(String.class)), diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerProcessAttributeExtractor.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerProcessAttributeExtractor.java index 8f96ff897d3d..ce36d59cb5f1 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerProcessAttributeExtractor.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerProcessAttributeExtractor.java @@ -5,11 +5,11 @@ package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v5_0; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_CLIENT_GROUP; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_GROUP; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_KEYS; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_CLIENT_GROUP; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_GROUP; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_KEYS; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerReceiveAttributeExtractor.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerReceiveAttributeExtractor.java index 8c27df7aa7fd..c60ccd08b66c 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerReceiveAttributeExtractor.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqConsumerReceiveAttributeExtractor.java @@ -5,7 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v5_0; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_CLIENT_GROUP; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_CLIENT_GROUP; import apache.rocketmq.v2.ReceiveMessageRequest; import io.opentelemetry.api.common.AttributesBuilder; diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java index 212394969d12..d688818f38ab 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java @@ -5,11 +5,11 @@ package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v5_0; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_GROUP; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_KEYS; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TYPE; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_GROUP; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_KEYS; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TYPE; import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.DELAY; import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.FIFO; import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.NORMAL; diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java index 6a37482eca2a..65a2d22c9c0e 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java @@ -6,15 +6,15 @@ package io.opentelemetry.instrumentation.rocketmqclient.v5_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_DESTINATION_NAME; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_MESSAGE_ID; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_OPERATION; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_CLIENT_GROUP; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_KEYS; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TYPE; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_SYSTEM; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_CLIENT_GROUP; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_KEYS; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TYPE; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM; import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.NORMAL; import io.opentelemetry.api.trace.SpanKind; diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java index 57aaf65753ac..12200052039a 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java @@ -7,18 +7,18 @@ import static io.opentelemetry.instrumentation.testing.util.TelemetryDataUtil.orderByRootSpanKind; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_DESTINATION_NAME; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_MESSAGE_ID; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_OPERATION; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_CLIENT_GROUP; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_GROUP; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_KEYS; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TYPE; -import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_SYSTEM; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_CLIENT_GROUP; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_GROUP; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_KEYS; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TYPE; +import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM; import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.DELAY; import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.FIFO; import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.NORMAL; diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/kafka/KafkaIntegrationTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/kafka/KafkaIntegrationTest.java index 3e8359521ac2..39440d1b3826 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/kafka/KafkaIntegrationTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/kafka/KafkaIntegrationTest.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.time.Duration; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -107,41 +107,48 @@ private static void runShouldInstrumentProducerAndConsumer( .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10")), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10")), span -> span.hasName("testTopic process") .hasKind(SpanKind.CONSUMER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), equalTo( - SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testListener"), + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, + "testListener"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer"))), span -> span.hasName("consumer").hasParent(trace.getSpan(2)))); } diff --git a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java index c1dc0262e928..26461c257d12 100644 --- a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java +++ b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java @@ -6,13 +6,13 @@ package io.opentelemetry.javaagent.instrumentation.spring.data.v3_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_CONNECTION_STRING; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_NAME; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SYSTEM; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_USER; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java b/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java index e027679dcdaa..e9da98550a17 100644 --- a/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java +++ b/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java @@ -17,7 +17,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.TraceAssert; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.SemanticAttributes; import java.util.List; import java.util.Optional; diff --git a/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy b/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy index a3cb814c9fb4..8aed7d62cda1 100644 --- a/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy +++ b/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy @@ -6,6 +6,12 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.NetworkAttributes import static io.opentelemetry.api.trace.SpanKind.CLIENT @@ -48,7 +54,7 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null } "$NetworkAttributes.NETWORK_PEER_PORT" Long "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } - "$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq" + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "rabbitmq" } } span(3) { @@ -60,11 +66,11 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null } "$NetworkAttributes.NETWORK_PEER_PORT" Long "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } - "$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testTopic" - "$SemanticAttributes.MESSAGING_OPERATION" "publish" - "$SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long - "$SemanticAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY" String + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "rabbitmq" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testTopic" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long + "$MessagingIncubatingAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY" String } } // spring-cloud-stream-binder-rabbit listener puts all messages into a BlockingQueue immediately after receiving @@ -78,11 +84,11 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null } "$NetworkAttributes.NETWORK_PEER_PORT" Long "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } - "$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testTopic" - "$SemanticAttributes.MESSAGING_OPERATION" "process" - "$SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long - "$SemanticAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY" String + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "rabbitmq" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testTopic" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long + "$MessagingIncubatingAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY" String } } // spring-integration will detect that spring-rabbit has already created a consumer span and back off @@ -92,11 +98,11 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i childOf span(3) kind CONSUMER attributes { - "$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testTopic" - "$SemanticAttributes.MESSAGING_OPERATION" "process" - "$SemanticAttributes.MESSAGING_MESSAGE_ID" String - "$SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "rabbitmq" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" "testTopic" + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "process" + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE" Long } } span(6) { @@ -115,7 +121,7 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i "$NetworkAttributes.NETWORK_PEER_ADDRESS" { it == "127.0.0.1" || it == "0:0:0:0:0:0:0:1" || it == null } "$NetworkAttributes.NETWORK_PEER_PORT" Long "$NetworkAttributes.NETWORK_TYPE" { it == "ipv4" || it == "ipv6" || it == null } - "$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq" + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "rabbitmq" } } } diff --git a/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/test/groovy/SpringListenerTest.groovy b/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/test/groovy/SpringListenerTest.groovy index 8743750567ee..397cc154ea8a 100644 --- a/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/test/groovy/SpringListenerTest.groovy +++ b/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/test/groovy/SpringListenerTest.groovy @@ -7,6 +7,11 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import listener.AnnotatedListenerConfig import listener.ManualListenerConfig import org.springframework.context.annotation.AnnotationConfigApplicationContext @@ -54,13 +59,13 @@ class SpringListenerTest extends AgentInstrumentationSpecification { kind PRODUCER hasNoParent() attributes { - "$SemanticAttributes.MESSAGING_SYSTEM" "jms" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" destinationName - "$SemanticAttributes.MESSAGING_OPERATION" "publish" + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "jms" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" destinationName + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" "publish" if (destinationName == "(temporary)") { - "$SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY" true + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPORARY" true } - "$SemanticAttributes.MESSAGING_MESSAGE_ID" String + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" String if (testHeaders) { "messaging.header.test_message_header" { it == ["test"] } "messaging.header.test_message_int_header" { it == ["1234"] } @@ -87,15 +92,15 @@ class SpringListenerTest extends AgentInstrumentationSpecification { hasNoLinks() } attributes { - "$SemanticAttributes.MESSAGING_SYSTEM" "jms" - "$SemanticAttributes.MESSAGING_DESTINATION_NAME" destinationName - "$SemanticAttributes.MESSAGING_OPERATION" operation + "$MessagingIncubatingAttributes.MESSAGING_SYSTEM" "jms" + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME" destinationName + "$MessagingIncubatingAttributes.MESSAGING_OPERATION" operation if (messageId != null) { //In some tests we don't know exact messageId, so we pass "" and verify just the existence of the attribute - "$SemanticAttributes.MESSAGING_MESSAGE_ID" { it == messageId || messageId == "" } + "$MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID" { it == messageId || messageId == "" } } if (destinationName == "(temporary)") { - "$SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY" true + "$MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPORARY" true } if (testHeaders) { "messaging.header.test_message_header" { it == ["test"] } diff --git a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java index 82d49fdc1a50..d0f50978b3f0 100644 --- a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java +++ b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java @@ -17,7 +17,7 @@ import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import jakarta.jms.ConnectionFactory; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -46,12 +46,13 @@ void assertSpringJmsListener() { .hasKind(PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "spring-jms-listener"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank))); producerSpan.set(trace.getSpan(1)); @@ -64,13 +65,13 @@ void assertSpringJmsListener() { .hasNoParent() .hasLinks(LinkData.create(producerSpan.get().getSpanContext())) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank)), span -> span.hasName("spring-jms-listener process") @@ -78,13 +79,13 @@ void assertSpringJmsListener() { .hasParent(trace.getSpan(0)) .hasLinks(LinkData.create(producerSpan.get().getSpanContext())) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank)), span -> span.hasName("consumer").hasParent(trace.getSpan(1)))); } @@ -131,13 +132,13 @@ void shouldCaptureHeaders(Class configClass) .hasKind(PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank), equalTo( stringArrayKey("messaging.header.test_message_header"), @@ -152,13 +153,13 @@ void shouldCaptureHeaders(Class configClass) .hasKind(CONSUMER) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank), equalTo( stringArrayKey("messaging.header.test_message_header"), @@ -171,13 +172,13 @@ void shouldCaptureHeaders(Class configClass) .hasKind(CONSUMER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank), equalTo( stringArrayKey("messaging.header.test_message_header"), diff --git a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringListenerSuppressReceiveSpansTest.java b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringListenerSuppressReceiveSpansTest.java index 6d7a66fcfa71..043cf148ab9b 100644 --- a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringListenerSuppressReceiveSpansTest.java +++ b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringListenerSuppressReceiveSpansTest.java @@ -10,7 +10,7 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import org.assertj.core.api.AbstractStringAssert; class SpringListenerSuppressReceiveSpansTest extends AbstractSpringJmsListenerTest { @@ -26,13 +26,13 @@ void assertSpringJmsListener() { .hasKind(PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank)), span -> span.hasName("spring-jms-listener process") @@ -40,13 +40,13 @@ void assertSpringJmsListener() { .hasParent(trace.getSpan(1)) .hasTotalRecordedLinks(0) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "jms"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "spring-jms-listener"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_ID, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID, AbstractStringAssert::isNotBlank)), span -> span.hasName("consumer").hasParent(trace.getSpan(2)))); } diff --git a/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java b/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java index a58f3f1eefbe..2a398cb441b6 100644 --- a/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java +++ b/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java @@ -20,7 +20,7 @@ import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import io.opentelemetry.testing.AbstractSpringKafkaTest; import java.util.ArrayList; import java.util.Arrays; @@ -72,18 +72,20 @@ void shouldCreateSpansForSingleRecordProcess() { .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testSingleTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")))); producer.set(trace.getSpan(1)); @@ -95,42 +97,46 @@ void shouldCreateSpansForSingleRecordProcess() { .hasKind(SpanKind.CONSUMER) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testSingleTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), equalTo( - SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testSingleListener"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), - equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1)), + equalTo( + MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1)), span -> span.hasName("testSingleTopic process") .hasKind(SpanKind.CONSUMER) .hasParent(trace.getSpan(0)) .hasLinks(LinkData.create(producer.get().getSpanContext())) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testSingleTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), equalTo( - SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testSingleListener"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), satisfies( longKey("kafka.record.queue_time_ms"), @@ -156,32 +162,37 @@ void shouldHandleFailureInKafkaListener() { .hasKind(SpanKind.CONSUMER) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testSingleTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), equalTo( - SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testSingleListener"), + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, + "testSingleListener"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), - equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1)); + equalTo(MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1)); List processAttributes = Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative), + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, + AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), - equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testSingleListener"), + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testSingleListener"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), satisfies(longKey("kafka.record.queue_time_ms"), AbstractLongAssert::isNotNegative)); @@ -196,18 +207,20 @@ void shouldHandleFailureInKafkaListener() { .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testSingleTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")))); producer.set(trace.getSpan(1)); @@ -268,36 +281,40 @@ void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testBatchTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer"))), span -> span.hasName("testBatchTopic publish") .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testBatchTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "20"), + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "20"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")))); producer1.set(trace.getSpan(1)); @@ -310,17 +327,19 @@ void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { .hasKind(SpanKind.CONSUMER) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testBatchTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), equalTo( - SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testBatchListener"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), - equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 2)), + equalTo( + MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 2)), span -> span.hasName("testBatchTopic process") .hasKind(SpanKind.CONSUMER) @@ -329,17 +348,19 @@ void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { LinkData.create(producer1.get().getSpanContext()), LinkData.create(producer2.get().getSpanContext())) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testBatchTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), equalTo( - SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testBatchListener"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), - equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 2)), + equalTo( + MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 2)), span -> span.hasName("consumer").hasParent(trace.getSpan(1)))); } @@ -367,18 +388,20 @@ void shouldHandleFailureInKafkaBatchListener() { .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testBatchTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")))); producer.set(trace.getSpan(1)); @@ -425,14 +448,15 @@ private static void assertReceiveSpan(SpanDataAssert span) { .hasKind(SpanKind.CONSUMER) .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"), - equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testBatchListener"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "receive"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testBatchListener"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), - equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1)); + equalTo(MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1)); } private static void assertProcessSpan( @@ -442,14 +466,15 @@ private static void assertProcessSpan( .hasParent(trace.getSpan(0)) .hasLinks(LinkData.create(producer.getSpanContext())) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), - equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testBatchListener"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testBatchListener"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), - equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1)); + equalTo(MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1)); if (failed) { span.hasStatus(StatusData.error()).hasException(new IllegalArgumentException("boom")); } diff --git a/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaNoReceiveTelemetryTest.java b/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaNoReceiveTelemetryTest.java index 10e00c5d7d35..2655c54135dd 100644 --- a/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaNoReceiveTelemetryTest.java +++ b/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaNoReceiveTelemetryTest.java @@ -14,7 +14,7 @@ import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -50,46 +50,54 @@ void shouldCreateSpansForSingleRecordProcess() { .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes + .MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10")), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, + "10")), span -> span.hasName("testSingleTopic process") .hasKind(SpanKind.CONSUMER) .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes + .MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), equalTo( - SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, + "10"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testSingleListener"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer"))), span -> span.hasName("consumer").hasParent(trace.getSpan(2)))); } @@ -109,21 +117,23 @@ void shouldHandleFailureInKafkaListener() { List processAttributes = Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative), + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, + AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), - equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testSingleListener"), + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testSingleListener"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer"))); testing() @@ -136,21 +146,25 @@ void shouldHandleFailureInKafkaListener() { .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes + .MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10")), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, + "10")), span -> span.hasName("testSingleTopic process") .hasKind(SpanKind.CONSUMER) @@ -197,39 +211,46 @@ void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testBatchTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes + .MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10")), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10")), span -> span.hasName("testBatchTopic publish") .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testBatchTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes + .MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "20"))); + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, + "20"))); producer1.set(trace.getSpan(1)); producer2.set(trace.getSpan(2)); @@ -245,18 +266,21 @@ void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { producer1.get().getSpanContext(), producer2.get().getSpanContext())) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), equalTo( - SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, + MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testBatchListener"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), - equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 2)), + equalTo( + MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, + 2)), span -> span.hasName("consumer").hasParent(trace.getSpan(0)))); } @@ -277,14 +301,15 @@ void shouldHandleFailureInKafkaBatchListener() { List processAttributes = Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), - equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testBatchListener"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "testBatchListener"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), - equalTo(SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1)); + equalTo(MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, 1)); testing() .waitAndAssertSortedTraces( @@ -297,20 +322,24 @@ void shouldHandleFailureInKafkaBatchListener() { .hasKind(SpanKind.PRODUCER) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), equalTo( - SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, + "testBatchTopic"), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes + .MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, "10"))); + equalTo( + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, + "10"))); producer.set(trace.getSpan(1)); }, diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java index 0312a6b9a1d4..984be5b7fb73 100644 --- a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java +++ b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/ContextPropagationTest.java @@ -19,7 +19,7 @@ import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; @@ -97,13 +97,13 @@ private static List getAssertions( List assertions = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "rabbitmq"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, destination), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rabbitmq"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, destination), satisfies( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative))); if (operation != null) { - assertions.add(equalTo(SemanticAttributes.MESSAGING_OPERATION, operation)); + assertions.add(equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, operation)); } if (peerAddress != null) { assertions.add(equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4")); @@ -114,7 +114,7 @@ private static List getAssertions( if (routingKey) { assertions.add( satisfies( - SemanticAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY, + MessagingIncubatingAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY, AbstractStringAssert::isNotBlank)); } if (testHeaders) { @@ -212,7 +212,7 @@ public void test(boolean testHeaders) throws Exception { satisfies( NetworkAttributes.NETWORK_PEER_PORT, AbstractLongAssert::isNotNegative), - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "rabbitmq"))); + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rabbitmq"))); }); } } diff --git a/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy b/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy index 47050fdaf25d..3841eca90b56 100644 --- a/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy +++ b/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy @@ -7,9 +7,9 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import org.springframework.boot.SpringApplication import org.springframework.context.ConfigurableApplicationContext import org.springframework.context.annotation.Bean diff --git a/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy b/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy index dca4b8bda8b7..9201970fb04e 100644 --- a/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy +++ b/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy @@ -7,8 +7,8 @@ import com.google.common.util.concurrent.MoreExecutors import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import net.spy.memcached.CASResponse import net.spy.memcached.ConnectionFactory import net.spy.memcached.ConnectionFactoryBuilder diff --git a/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java b/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java index 72e218b38dbb..cad2b516e017 100644 --- a/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java +++ b/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; import io.vertx.core.Vertx; @@ -199,21 +199,22 @@ protected static List sendAttributes( List assertions = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, record.topic()), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "publish"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, record.topic()), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "publish"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("producer")), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative))); String messageKey = record.key(); if (messageKey != null) { - assertions.add(equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, messageKey)); + assertions.add( + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, messageKey)); } return assertions; } @@ -230,18 +231,18 @@ private static List batchConsumerAttributes(String topic, St List assertions = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, topic), - equalTo(SemanticAttributes.MESSAGING_OPERATION, operation), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, topic), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, operation), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), satisfies( - SemanticAttributes.MESSAGING_BATCH_MESSAGE_COUNT, + MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT, AbstractLongAssert::isPositive))); // consumer group is not available in version 0.11 if (Boolean.getBoolean("testLatestDeps")) { - assertions.add(equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test")); + assertions.add(equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test")); } return assertions; } @@ -251,17 +252,17 @@ protected static List processAttributes( List assertions = new ArrayList<>( Arrays.asList( - equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"), - equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, record.topic()), - equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"), + equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"), + equalTo(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME, record.topic()), + equalTo(MessagingIncubatingAttributes.MESSAGING_OPERATION, "process"), satisfies( - SemanticAttributes.MESSAGING_CLIENT_ID, + MessagingIncubatingAttributes.MESSAGING_CLIENT_ID, stringAssert -> stringAssert.startsWith("consumer")), satisfies( - SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, + MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, AbstractLongAssert::isNotNegative), satisfies( - SemanticAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, + MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative))); if (Boolean.getBoolean("otel.instrumentation.kafka.experimental-span-attributes")) { assertions.add( @@ -271,17 +272,18 @@ protected static List processAttributes( } // consumer group is not available in version 0.11 if (Boolean.getBoolean("testLatestDeps")) { - assertions.add(equalTo(SemanticAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test")); + assertions.add(equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP, "test")); } String messageKey = record.key(); if (messageKey != null) { - assertions.add(equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_KEY, messageKey)); + assertions.add( + equalTo(MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY, messageKey)); } String messageValue = record.value(); if (messageValue != null) { assertions.add( equalTo( - SemanticAttributes.MESSAGING_MESSAGE_BODY_SIZE, + MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE, messageValue.getBytes(StandardCharsets.UTF_8).length)); } return assertions; diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesExtractor.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesExtractor.java index 3235953f6d72..5203ed1e96b8 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesExtractor.java +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesExtractor.java @@ -10,7 +10,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import javax.annotation.Nullable; enum VertxRedisClientAttributesExtractor diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java index 3d05feb5c09b..4d3859991b5a 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.vertx.core.Vertx; diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy index 18dac6580681..ed43fd5e48cd 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy @@ -11,13 +11,13 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy index 18dac6580681..ed43fd5e48cd 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy @@ -11,13 +11,13 @@ import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes -import io.opentelemetry.semconv.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes diff --git a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java index 25ef59f98685..99a97d9f8a7c 100644 --- a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java +++ b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java @@ -7,11 +7,11 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_NAME; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.DbIncubatingAttributes.DB_USER; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_MESSAGE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_STACKTRACE; diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index 9000177ebe82..1518c52517e1 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -13,66 +13,15 @@ import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import io.opentelemetry.semconv.incubating.PeerIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; -import java.util.List; public class SemanticAttributes { private SemanticAttributes() {} - public static final AttributeKey MESSAGING_BATCH_MESSAGE_COUNT = - MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT; - public static final AttributeKey MESSAGING_CLIENT_ID = - MessagingIncubatingAttributes.MESSAGING_CLIENT_ID; - public static final AttributeKey MESSAGING_DESTINATION_ANONYMOUS = - MessagingIncubatingAttributes.MESSAGING_DESTINATION_ANONYMOUS; - @Deprecated public static final AttributeKey MESSAGING_DESTINATION = AttributeKey.stringKey("messaging.destination"); - public static final AttributeKey MESSAGING_DESTINATION_NAME = - MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME; - public static final AttributeKey MESSAGING_DESTINATION_TEMPLATE = - MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPLATE; - public static final AttributeKey MESSAGING_DESTINATION_TEMPORARY = - MessagingIncubatingAttributes.MESSAGING_DESTINATION_TEMPORARY; - public static final AttributeKey MESSAGING_KAFKA_CONSUMER_GROUP = - MessagingIncubatingAttributes.MESSAGING_KAFKA_CONSUMER_GROUP; - public static final AttributeKey MESSAGING_KAFKA_DESTINATION_PARTITION = - MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION; - public static final AttributeKey MESSAGING_KAFKA_MESSAGE_KEY = - MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_KEY; - public static final AttributeKey MESSAGING_KAFKA_MESSAGE_OFFSET = - MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_OFFSET; - public static final AttributeKey MESSAGING_KAFKA_MESSAGE_TOMBSTONE = - MessagingIncubatingAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE; - public static final AttributeKey MESSAGING_MESSAGE_BODY_SIZE = - MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE; - public static final AttributeKey MESSAGING_MESSAGE_CONVERSATION_ID = - MessagingIncubatingAttributes.MESSAGING_MESSAGE_CONVERSATION_ID; - public static final AttributeKey MESSAGING_MESSAGE_ENVELOPE_SIZE = - MessagingIncubatingAttributes.MESSAGING_MESSAGE_ENVELOPE_SIZE; - public static final AttributeKey MESSAGING_MESSAGE_ID = - MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID; - public static final AttributeKey MESSAGING_OPERATION = - MessagingIncubatingAttributes.MESSAGING_OPERATION; - public static final AttributeKey MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY = - MessagingIncubatingAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY; - public static final AttributeKey MESSAGING_ROCKETMQ_CLIENT_GROUP = - MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_CLIENT_GROUP; - public static final AttributeKey MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP = - MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP; - public static final AttributeKey MESSAGING_ROCKETMQ_MESSAGE_GROUP = - MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_GROUP; - public static final AttributeKey> MESSAGING_ROCKETMQ_MESSAGE_KEYS = - MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_KEYS; - public static final AttributeKey MESSAGING_ROCKETMQ_MESSAGE_TAG = - MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG; - public static final AttributeKey MESSAGING_ROCKETMQ_MESSAGE_TYPE = - MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TYPE; - public static final AttributeKey MESSAGING_SYSTEM = - MessagingIncubatingAttributes.MESSAGING_SYSTEM; - public static final class MessagingRocketmqMessageTypeValues { public static final String NORMAL = MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.NORMAL; diff --git a/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java b/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java index fc11162d7084..c15842cf4767 100644 --- a/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java @@ -32,7 +32,7 @@ import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.export.SpanExporter; -import io.opentelemetry.semconv.DbIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.spring.smoketest.OtelSpringStarterSmokeTestApplication; From 03f5ccba9ca4a6507cfae591c9ccd519febefd89 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 21:52:17 +0200 Subject: [PATCH 16/52] CODE_* --- .../otelannotations/AbstractWithSpanTest.java | 4 +- .../semconv/code/CodeAttributesExtractor.java | 6 +- .../code/CodeAttributesExtractorTest.java | 6 +- .../v2_2/TracingExecutionInterceptor.java | 2 +- ...AbstractAws2ClientRecordHttpErrorTest.java | 2 +- .../src/test/java/CassandraClientTest.java | 2 +- .../v4/common/AbstractCassandraTest.java | 6 +- .../v4_0/CassandraAttributesExtractor.java | 2 +- .../v4_4/CassandraAttributesExtractor.java | 2 +- .../v4_4/AbstractCassandra44Test.java | 6 +- .../apiclient/ElasticsearchClientTest.java | 2 +- .../rest/v5_0/ElasticsearchRest5Test.java | 2 +- .../rest/v6_4/ElasticsearchRest6Test.java | 2 +- .../rest/v7_0/ElasticsearchRest7Test.java | 2 +- .../rest/v7_0/ElasticsearchRest7Test.java | 2 +- ...Elasticsearch53SpringRepositoryTest.groovy | 30 +++---- .../ConfiguredTraceAnnotationsTest.java | 6 +- .../extannotations/TraceAnnotationsTest.java | 39 ++++++---- .../extannotations/TraceProvidersTest.java | 8 +- .../TracedMethodsExclusionTest.java | 7 +- .../finatra/FinatraServerLatestTest.scala | 3 +- .../finatra/FinatraServerTest.scala | 3 +- .../reactive/v1_0/HibernateReactiveTest.java | 4 +- .../reactive/v2_0/HibernateReactiveTest.java | 4 +- ...axRsAnnotations1InstrumentationTest.groovy | 7 +- .../src/test/groovy/JerseyTest.groovy | 10 ++- ...JaxrsAnnotationsInstrumentationTest.groovy | 6 +- ...JaxrsAnnotationsInstrumentationTest.groovy | 6 +- .../groovy/AbstractJaxRsFilterTest.groovy | 14 ++-- .../groovy/AbstractJaxRsHttpServerTest.groovy | 6 +- .../java/AbstractArquillianJaxWsTest.java | 6 +- .../src/main/groovy/AbstractJaxWsTest.groovy | 6 +- .../jaxws/v2_0/JaxWsAnnotationsTest.groovy | 6 +- .../src/main/groovy/AbstractJaxWsTest.groovy | 6 +- .../jaxws/jws/v1_1/JwsAnnotationsTest.groovy | 14 ++-- .../groovy/JdbcInstrumentationTest.groovy | 10 ++- .../OpenTelemetryDataSourceTest.java | 7 +- .../jedis/v1_4/JedisClientTest.java | 2 +- .../jedis/v3_0/Jedis30ClientTest.java | 2 +- .../jedis/v4_0/Jedis40ClientTest.java | 2 +- .../KotlinCoroutinesInstrumentationTest.kt | 14 ++-- .../LettuceConnectAttributesExtractor.java | 1 - .../lettuce/v4_0/LettuceAsyncClientTest.java | 2 +- .../lettuce/v4_0/LettuceSyncClientTest.java | 2 +- .../LettuceConnectAttributesExtractor.java | 1 - .../lettuce/v5_0/LettuceAsyncClientTest.java | 2 +- .../lettuce/v5_0/LettuceSyncClientTest.java | 2 +- .../v5_1/LettuceReactiveClientTest.java | 2 +- .../lettuce/v5_1/OpenTelemetryTracing.java | 1 - .../v5_1/AbstractLettuceAsyncClientTest.java | 2 +- .../AbstractLettuceReactiveClientTest.java | 2 +- .../AbstractLettuceSyncClientAuthTest.java | 2 +- .../v5_1/AbstractLettuceSyncClientTest.java | 2 +- .../logback/appender/v1_0/LogbackTest.java | 33 ++++---- .../v1_0/internal/LoggingEventMapper.java | 9 ++- .../AbstractOpenTelemetryAppenderTest.java | 9 ++- .../instrumentation/methods/MethodTest.java | 4 +- .../mybatis/v3_2/MyBatisTest.java | 8 +- .../src/test/java/OpenSearchRestTest.java | 2 +- .../src/test/groovy/ContextBridgeTest.groovy | 10 ++- .../WithSpanInstrumentationTest.java | 78 ++++++++++--------- ...dingSpanAttributesInstrumentationTest.java | 6 +- .../WithSpanInstrumentationTest.java | 78 ++++++++++--------- .../quartz/v2_0/AbstractQuartzTest.java | 11 +-- .../v1_0/AbstractR2dbcStatementTest.java | 4 +- .../reactor/v3_1/BaseFluxWithSpanTest.java | 4 +- .../reactor/v3_1/BaseMonoWithSpanTest.java | 4 +- .../AbstractRedissonAsyncClientTest.java | 2 +- .../redisson/AbstractRedissonClientTest.java | 2 +- .../RocketMqProducerAttributeExtractor.java | 8 +- ...RocketMqClientSuppressReceiveSpanTest.java | 2 +- .../v5_0/AbstractRocketMqClientTest.java | 6 +- .../test/java/BaseRxJava2WithSpanTest.java | 4 +- .../common/AbstractRxJava3WithSpanTest.java | 4 +- .../groovy/HttpServletResponseTest.groovy | 14 ++-- .../src/test/groovy/JettyServlet2Test.groovy | 6 +- .../groovy/HttpServletResponseTest.groovy | 14 ++-- .../InstrumentationWithSpanAspectTest.java | 4 +- .../data/v3_0/ReactiveSpringDataTest.java | 8 +- .../src/main/java/AbstractSpringJpaTest.java | 35 +++++---- .../scheduling/v3_1/SpringSchedulingTest.java | 4 +- .../boot/AbstractSpringBootBasedTest.groovy | 6 +- .../test/groovy/test/boot/SpringWsTest.groovy | 6 +- .../test/groovy/Struts2ActionSpanTest.groovy | 6 +- .../v4_0/redis/VertxRedisClientTest.java | 2 +- .../vertx/v4_0/sql/VertxSqlClientTest.java | 10 +-- .../semconv/SemanticAttributes.java | 6 -- .../smoketest/OtelSpringStarterSmokeTest.java | 6 +- 88 files changed, 386 insertions(+), 326 deletions(-) diff --git a/instrumentation-annotations-support-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/AbstractWithSpanTest.java b/instrumentation-annotations-support-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/AbstractWithSpanTest.java index 9627483d2680..b76df0283042 100644 --- a/instrumentation-annotations-support-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/AbstractWithSpanTest.java +++ b/instrumentation-annotations-support-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/AbstractWithSpanTest.java @@ -7,8 +7,8 @@ import static io.opentelemetry.api.common.AttributeKey.booleanKey; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_FUNCTION; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_NAMESPACE; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractor.java index 2766432f0c7b..ededeae6686d 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractor.java @@ -10,7 +10,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import javax.annotation.Nullable; /** @@ -37,9 +37,9 @@ private CodeAttributesExtractor(CodeAttributesGetter getter) { public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) { Class cls = getter.getCodeClass(request); if (cls != null) { - internalSet(attributes, SemanticAttributes.CODE_NAMESPACE, cls.getName()); + internalSet(attributes, CodeIncubatingAttributes.CODE_NAMESPACE, cls.getName()); } - internalSet(attributes, SemanticAttributes.CODE_FUNCTION, getter.getMethodName(request)); + internalSet(attributes, CodeIncubatingAttributes.CODE_FUNCTION, getter.getMethodName(request)); } @Override diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractorTest.java index 941f0b28917d..1e399b0aa95a 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractorTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractorTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -59,8 +59,8 @@ void shouldExtractAllAttributes() { // then assertThat(startAttributes.build()) .containsOnly( - entry(SemanticAttributes.CODE_NAMESPACE, TestClass.class.getName()), - entry(SemanticAttributes.CODE_FUNCTION, "doSomething")); + entry(CodeIncubatingAttributes.CODE_NAMESPACE, TestClass.class.getName()), + entry(CodeIncubatingAttributes.CODE_FUNCTION, "doSomething")); assertThat(endAttributes.build().isEmpty()).isTrue(); } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java index af487ade5aec..83d0fc9ec8cb 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java @@ -17,8 +17,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.internal.InstrumenterUtil; import io.opentelemetry.instrumentation.api.internal.Timer; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java index d5275a796ed5..dbe02fe9272c 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java @@ -12,9 +12,9 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpResponse; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java index 1cde8e6cc115..30142b4ef1e5 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/src/test/java/CassandraClientTest.java @@ -12,9 +12,9 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.net.InetSocketAddress; import java.time.Duration; import java.util.concurrent.Executor; diff --git a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java index e86c575f380a..768282f18a83 100644 --- a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java +++ b/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java @@ -7,6 +7,9 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_DC; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_ID; @@ -18,9 +21,6 @@ import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; -import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE; -import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; -import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Named.named; diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java index 2b5b184fdaa0..3904af69ec95 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraAttributesExtractor.java @@ -13,8 +13,8 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.net.InetSocketAddress; import java.net.SocketAddress; import javax.annotation.Nullable; diff --git a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java index d6faf68ec320..b617e8be0396 100644 --- a/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java +++ b/instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java @@ -16,8 +16,8 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.lang.reflect.Field; import java.net.InetSocketAddress; import java.util.logging.Level; diff --git a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java index e3a5ff4db120..2ab1e4370b8e 100644 --- a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java +++ b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java @@ -7,6 +7,9 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_CONSISTENCY_LEVEL; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_DC; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CASSANDRA_COORDINATOR_ID; @@ -18,9 +21,6 @@ import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; -import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_TYPE; -import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; -import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Named.named; diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java index 1f354e5e1a6b..698320035221 100644 --- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java +++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java @@ -18,11 +18,11 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.io.IOException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java index 54b49fa5b44e..15b3a23ec8c7 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java @@ -11,11 +11,11 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.io.IOException; import java.util.Map; import java.util.concurrent.CountDownLatch; diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java index b8ece84a90b5..ff3ccc15d302 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java @@ -11,11 +11,11 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.io.IOException; import java.util.Map; import java.util.concurrent.CountDownLatch; diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index c0fa82c352ce..517a7a821f48 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -11,11 +11,11 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index 2e79a44bb9b7..09e74606b735 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -11,10 +11,10 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy index d981e40407cb..8e66db1358a3 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy @@ -7,6 +7,8 @@ package springdata import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.junit.jupiter.api.Assumptions @@ -91,8 +93,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat name "DocRepository.findAll" kind INTERNAL attributes { - "$SemanticAttributes.CODE_NAMESPACE" DocRepository.name - "$SemanticAttributes.CODE_FUNCTION" "findAll" + "$CodeIncubatingAttributes.CODE_NAMESPACE" DocRepository.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "findAll" } } span(1) { @@ -129,8 +131,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat name "DocRepository.index" kind INTERNAL attributes { - "$SemanticAttributes.CODE_NAMESPACE" DocRepository.name - "$SemanticAttributes.CODE_FUNCTION" "index" + "$CodeIncubatingAttributes.CODE_NAMESPACE" DocRepository.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "index" } } span(1) { @@ -180,8 +182,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat name "DocRepository.findById" kind INTERNAL attributes { - "$SemanticAttributes.CODE_NAMESPACE" DocRepository.name - "$SemanticAttributes.CODE_FUNCTION" "findById" + "$CodeIncubatingAttributes.CODE_NAMESPACE" DocRepository.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "findById" } } span(1) { @@ -217,8 +219,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat name "DocRepository.index" kind INTERNAL attributes { - "$SemanticAttributes.CODE_NAMESPACE" DocRepository.name - "$SemanticAttributes.CODE_FUNCTION" "index" + "$CodeIncubatingAttributes.CODE_NAMESPACE" DocRepository.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "index" } } span(1) { @@ -260,8 +262,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat name "DocRepository.findById" kind INTERNAL attributes { - "$SemanticAttributes.CODE_NAMESPACE" DocRepository.name - "$SemanticAttributes.CODE_FUNCTION" "findById" + "$CodeIncubatingAttributes.CODE_NAMESPACE" DocRepository.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "findById" } } span(1) { @@ -296,8 +298,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat name "DocRepository.deleteById" kind INTERNAL attributes { - "$SemanticAttributes.CODE_NAMESPACE" DocRepository.name - "$SemanticAttributes.CODE_FUNCTION" "deleteById" + "$CodeIncubatingAttributes.CODE_NAMESPACE" DocRepository.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "deleteById" } } span(1) { @@ -339,8 +341,8 @@ class Elasticsearch53SpringRepositoryTest extends AgentInstrumentationSpecificat name "DocRepository.findAll" kind INTERNAL attributes { - "$SemanticAttributes.CODE_NAMESPACE" DocRepository.name - "$SemanticAttributes.CODE_FUNCTION" "findAll" + "$CodeIncubatingAttributes.CODE_NAMESPACE" DocRepository.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "findAll" } } span(1) { diff --git a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/ConfiguredTraceAnnotationsTest.java b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/ConfiguredTraceAnnotationsTest.java index bed9698490cd..220a050b007f 100644 --- a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/ConfiguredTraceAnnotationsTest.java +++ b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/ConfiguredTraceAnnotationsTest.java @@ -10,7 +10,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import java.util.concurrent.Callable; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -36,9 +36,9 @@ void testMethodWithAnnotationShouldBeTraced() { span.hasName("AnnotationTracedCallable.call") .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, AnnotationTracedCallable.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "call")))); + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "call")))); } static class AnnotationTracedCallable implements Callable { diff --git a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceAnnotationsTest.java b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceAnnotationsTest.java index 74ba9a2598c7..4bdc9aa6e089 100644 --- a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceAnnotationsTest.java +++ b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceAnnotationsTest.java @@ -12,7 +12,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import io.opentracing.contrib.dropwizard.Trace; import java.util.concurrent.Callable; import org.junit.jupiter.api.Test; @@ -36,8 +36,9 @@ void testSimpleCaseAnnotations() { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.CODE_NAMESPACE, SayTracedHello.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "sayHello"), + CodeIncubatingAttributes.CODE_NAMESPACE, + SayTracedHello.class.getName()), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "sayHello"), equalTo(stringKey("myattr"), "test")))); } @@ -54,24 +55,27 @@ void testComplexCaseAnnotations() { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.CODE_NAMESPACE, SayTracedHello.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "sayHelloSayHa"), + CodeIncubatingAttributes.CODE_NAMESPACE, + SayTracedHello.class.getName()), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "sayHelloSayHa"), equalTo(stringKey("myattr"), "test2")), span -> span.hasName("SayTracedHello.sayHello") .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.CODE_NAMESPACE, SayTracedHello.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "sayHello"), + CodeIncubatingAttributes.CODE_NAMESPACE, + SayTracedHello.class.getName()), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "sayHello"), equalTo(stringKey("myattr"), "test")), span -> span.hasName("SayTracedHello.sayHello") .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.CODE_NAMESPACE, SayTracedHello.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "sayHello"), + CodeIncubatingAttributes.CODE_NAMESPACE, + SayTracedHello.class.getName()), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "sayHello"), equalTo(stringKey("myattr"), "test")))); } @@ -88,8 +92,9 @@ void testExceptionExit() { .hasException(thrown) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.CODE_NAMESPACE, SayTracedHello.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "sayError")))); + CodeIncubatingAttributes.CODE_NAMESPACE, + SayTracedHello.class.getName()), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "sayError")))); } @Test @@ -104,9 +109,9 @@ void testAnonymousClassAnnotations() { span.hasName("SayTracedHello$1.call") .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, SayTracedHello.class.getName() + "$1"), - equalTo(SemanticAttributes.CODE_FUNCTION, "call")))); + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "call")))); // Test anonymous classes with no package new Callable() { @@ -124,17 +129,17 @@ public String call() { span.hasName("SayTracedHello$1.call") .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, SayTracedHello.class.getName() + "$1"), - equalTo(SemanticAttributes.CODE_FUNCTION, "call"))), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "call"))), trace -> trace.hasSpansSatisfyingExactly( span -> span.hasName("TraceAnnotationsTest$1.call") .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TraceAnnotationsTest.class.getName() + "$1"), - equalTo(SemanticAttributes.CODE_FUNCTION, "call")))); + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "call")))); } } diff --git a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceProvidersTest.java b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceProvidersTest.java index 5c044b349a5f..6fba3ee5ff65 100644 --- a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceProvidersTest.java +++ b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceProvidersTest.java @@ -10,7 +10,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import java.util.Locale; import java.util.function.Consumer; import org.junit.jupiter.api.extension.RegisterExtension; @@ -34,8 +34,10 @@ void testShouldSupportProvider(TraceProvider provider) { span.hasName("SayTracedHello." + provider.testMethodName()) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.CODE_NAMESPACE, SayTracedHello.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, provider.testMethodName()), + CodeIncubatingAttributes.CODE_NAMESPACE, + SayTracedHello.class.getName()), + equalTo( + CodeIncubatingAttributes.CODE_FUNCTION, provider.testMethodName()), equalTo(stringKey("providerAttr"), provider.name())))); } diff --git a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TracedMethodsExclusionTest.java b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TracedMethodsExclusionTest.java index 8756e654e5d3..d6aab0be7006 100644 --- a/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TracedMethodsExclusionTest.java +++ b/instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TracedMethodsExclusionTest.java @@ -10,7 +10,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import io.opentracing.contrib.dropwizard.Trace; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -31,8 +31,9 @@ void testCallingTheseMethodsShouldBeTraced() { span -> span.hasName("TestClass.annotated") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.CODE_NAMESPACE, TestClass.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "annotated")))); + equalTo( + CodeIncubatingAttributes.CODE_NAMESPACE, TestClass.class.getName()), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "annotated")))); } @Test diff --git a/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala b/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala index 91b5ca2c10d2..fc427b298f22 100644 --- a/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala +++ b/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala @@ -18,6 +18,7 @@ import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo import io.opentelemetry.sdk.testing.assertj.SpanDataAssert import io.opentelemetry.sdk.trace.data.StatusData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import org.junit.jupiter.api.extension.RegisterExtension import java.util.concurrent.Executors @@ -70,7 +71,7 @@ class FinatraServerLatestTest extends AbstractHttpServerTest[HttpServer] { .hasKind(SpanKind.INTERNAL) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, "io.opentelemetry.javaagent.instrumentation.finatra.FinatraController" ) ) diff --git a/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala b/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala index 1ecd06dd8c36..9f4e9457f2ae 100644 --- a/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala +++ b/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala @@ -18,6 +18,7 @@ import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo import io.opentelemetry.sdk.testing.assertj.SpanDataAssert import io.opentelemetry.sdk.trace.data.StatusData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import org.junit.jupiter.api.extension.RegisterExtension import java.util.concurrent.Executors @@ -71,7 +72,7 @@ class FinatraServerTest extends AbstractHttpServerTest[HttpServer] { .hasKind(SpanKind.INTERNAL) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, "io.opentelemetry.javaagent.instrumentation.finatra.FinatraController" ) ) diff --git a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java index f38d14f295ff..45b61c5ec9c9 100644 --- a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java +++ b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java @@ -6,13 +6,13 @@ package io.opentelemetry.javaagent.instrumentation.hibernate.reactive.v1_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; -import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; -import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanKind; diff --git a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java index 5d2ba72cd60a..d98f25129059 100644 --- a/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java +++ b/instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive2Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v2_0/HibernateReactiveTest.java @@ -6,13 +6,13 @@ package io.opentelemetry.javaagent.instrumentation.hibernate.reactive.v2_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; -import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; -import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanKind; diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy index b2f48d02cf72..375cb13cdfdf 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy +++ b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy @@ -4,10 +4,9 @@ */ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import spock.lang.Unroll import javax.ws.rs.DELETE @@ -47,8 +46,8 @@ class JaxRsAnnotations1InstrumentationTest extends AgentInstrumentationSpecifica name "${className}.call" childOf span(0) attributes { - "$SemanticAttributes.CODE_NAMESPACE" obj.getClass().getName() - "$SemanticAttributes.CODE_FUNCTION" "call" + "$CodeIncubatingAttributes.CODE_NAMESPACE" obj.getClass().getName() + "$CodeIncubatingAttributes.CODE_FUNCTION" "call" } } } diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy index 8ec8bf4868e8..d5228ae509a9 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy +++ b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy @@ -6,6 +6,8 @@ import io.dropwizard.testing.junit.ResourceTestRule import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -53,8 +55,8 @@ class JerseyTest extends AgentInstrumentationSpecification { childOf span(0) name controllerName attributes { - "$SemanticAttributes.CODE_NAMESPACE" ~/Resource[$]Test*/ - "$SemanticAttributes.CODE_FUNCTION" "hello" + "$CodeIncubatingAttributes.CODE_NAMESPACE" ~/Resource[$]Test*/ + "$CodeIncubatingAttributes.CODE_FUNCTION" "hello" } } } @@ -94,8 +96,8 @@ class JerseyTest extends AgentInstrumentationSpecification { name controller1Name kind INTERNAL attributes { - "$SemanticAttributes.CODE_NAMESPACE" ~/Resource[$]Test*/ - "$SemanticAttributes.CODE_FUNCTION" "nested" + "$CodeIncubatingAttributes.CODE_NAMESPACE" ~/Resource[$]Test*/ + "$CodeIncubatingAttributes.CODE_FUNCTION" "nested" } } } diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy index dbdc29cb0f39..a55b55663690 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy @@ -5,6 +5,8 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -47,8 +49,8 @@ class JaxrsAnnotationsInstrumentationTest extends AgentInstrumentationSpecificat name "${className}.call" childOf span(0) attributes { - "$SemanticAttributes.CODE_NAMESPACE" obj.getClass().getName() - "$SemanticAttributes.CODE_FUNCTION" "call" + "$CodeIncubatingAttributes.CODE_NAMESPACE" obj.getClass().getName() + "$CodeIncubatingAttributes.CODE_FUNCTION" "call" } } } diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy index ac1965ebc0ad..2798ba1108df 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy @@ -5,6 +5,8 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -47,8 +49,8 @@ class JaxrsAnnotationsInstrumentationTest extends AgentInstrumentationSpecificat name "${className}.call" childOf span(0) attributes { - "$SemanticAttributes.CODE_NAMESPACE" obj.getClass().getName() - "$SemanticAttributes.CODE_FUNCTION" "call" + "$CodeIncubatingAttributes.CODE_NAMESPACE" obj.getClass().getName() + "$CodeIncubatingAttributes.CODE_FUNCTION" "call" } } } diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy index b7b8e859702e..ea043dee2c7b 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy @@ -5,6 +5,8 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes @@ -82,13 +84,13 @@ abstract class AbstractJaxRsFilterTest extends AgentInstrumentationSpecification name controllerName if (abortPrematch) { attributes { - "$SemanticAttributes.CODE_NAMESPACE" "JaxRsFilterTest\$PrematchRequestFilter" - "$SemanticAttributes.CODE_FUNCTION" "filter" + "$CodeIncubatingAttributes.CODE_NAMESPACE" "JaxRsFilterTest\$PrematchRequestFilter" + "$CodeIncubatingAttributes.CODE_FUNCTION" "filter" } } else { attributes { - "$SemanticAttributes.CODE_NAMESPACE" ~/Resource[$]Test*/ - "$SemanticAttributes.CODE_FUNCTION" "hello" + "$CodeIncubatingAttributes.CODE_NAMESPACE" ~/Resource[$]Test*/ + "$CodeIncubatingAttributes.CODE_FUNCTION" "hello" } } } @@ -144,8 +146,8 @@ abstract class AbstractJaxRsFilterTest extends AgentInstrumentationSpecification name controller1Name kind INTERNAL attributes { - "$SemanticAttributes.CODE_NAMESPACE" ~/Resource[$]Test*/ - "$SemanticAttributes.CODE_FUNCTION" "nested" + "$CodeIncubatingAttributes.CODE_NAMESPACE" ~/Resource[$]Test*/ + "$CodeIncubatingAttributes.CODE_FUNCTION" "nested" } } } diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy index 3d3265491bd8..612d57f33f61 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy @@ -10,6 +10,8 @@ import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes @@ -342,8 +344,8 @@ abstract class AbstractJaxRsHttpServerTest extends HttpServerTest implemen } childOf((SpanData) parent) attributes { - "$SemanticAttributes.CODE_NAMESPACE" "test.JaxRsTestResource" - "$SemanticAttributes.CODE_FUNCTION" methodName + "$CodeIncubatingAttributes.CODE_NAMESPACE" "test.JaxRsTestResource" + "$CodeIncubatingAttributes.CODE_FUNCTION" methodName if (isCancelled) { "jaxrs.canceled" true } diff --git a/instrumentation/jaxws/jaxws-2.0-arquillian-testing/src/main/java/AbstractArquillianJaxWsTest.java b/instrumentation/jaxws/jaxws-2.0-arquillian-testing/src/main/java/AbstractArquillianJaxWsTest.java index e9c3f0a11527..b93e4b31e99e 100644 --- a/instrumentation/jaxws/jaxws-2.0-arquillian-testing/src/main/java/AbstractArquillianJaxWsTest.java +++ b/instrumentation/jaxws/jaxws-2.0-arquillian-testing/src/main/java/AbstractArquillianJaxWsTest.java @@ -10,7 +10,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import io.opentelemetry.testing.internal.armeria.client.WebClient; import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse; import java.net.URI; @@ -123,7 +123,7 @@ private static SpanDataAssert assertAnnotationHandlerSpan( return span.hasName(service + "Impl." + methodName) .hasKind(SpanKind.INTERNAL) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.CODE_NAMESPACE, "test." + service + "Impl"), - equalTo(SemanticAttributes.CODE_FUNCTION, methodName)); + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, "test." + service + "Impl"), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, methodName)); } } diff --git a/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy b/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy index 6358bf90265b..6275a2c3ad94 100644 --- a/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy +++ b/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy @@ -8,6 +8,8 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.test.hello_web_service.Hello2Request import io.opentelemetry.test.hello_web_service.HelloRequest import org.eclipse.jetty.server.Server @@ -199,8 +201,8 @@ abstract class AbstractJaxWsTest extends AgentInstrumentationSpecification imple errorEvent(exception.class, exception.message) } attributes { - "$SemanticAttributes.CODE_NAMESPACE" "hello.HelloServiceImpl" - "$SemanticAttributes.CODE_FUNCTION" methodName + "$CodeIncubatingAttributes.CODE_NAMESPACE" "hello.HelloServiceImpl" + "$CodeIncubatingAttributes.CODE_FUNCTION" methodName } } } diff --git a/instrumentation/jaxws/jaxws-2.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsAnnotationsTest.groovy b/instrumentation/jaxws/jaxws-2.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsAnnotationsTest.groovy index 03bbd4b01747..531d938cf4c4 100644 --- a/instrumentation/jaxws/jaxws-2.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsAnnotationsTest.groovy +++ b/instrumentation/jaxws/jaxws-2.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsAnnotationsTest.groovy @@ -7,6 +7,8 @@ package io.opentelemetry.javaagent.instrumentation.jaxws.v2_0 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes class JaxWsAnnotationsTest extends AgentInstrumentationSpecification { @@ -20,8 +22,8 @@ class JaxWsAnnotationsTest extends AgentInstrumentationSpecification { span(0) { name "SoapProvider.invoke" attributes { - "$SemanticAttributes.CODE_NAMESPACE" "io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.SoapProvider" - "$SemanticAttributes.CODE_FUNCTION" "invoke" + "$CodeIncubatingAttributes.CODE_NAMESPACE" "io.opentelemetry.javaagent.instrumentation.jaxws.v2_0.SoapProvider" + "$CodeIncubatingAttributes.CODE_FUNCTION" "invoke" } } } diff --git a/instrumentation/jaxws/jaxws-3.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy b/instrumentation/jaxws/jaxws-3.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy index b1ce89abb00d..b10b886071b2 100644 --- a/instrumentation/jaxws/jaxws-3.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy +++ b/instrumentation/jaxws/jaxws-3.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy @@ -8,6 +8,8 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.test.hello_web_service.Hello2Request import io.opentelemetry.test.hello_web_service.HelloRequest import org.eclipse.jetty.server.Server @@ -179,8 +181,8 @@ abstract class AbstractJaxWsTest extends AgentInstrumentationSpecification imple errorEvent(exception.class, exception.message) } attributes { - "$SemanticAttributes.CODE_NAMESPACE" "hello.HelloServiceImpl" - "$SemanticAttributes.CODE_FUNCTION" methodName + "$CodeIncubatingAttributes.CODE_NAMESPACE" "hello.HelloServiceImpl" + "$CodeIncubatingAttributes.CODE_FUNCTION" methodName } } } diff --git a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.groovy b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.groovy index 2fa7f1f6c923..297573f048e8 100644 --- a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.groovy +++ b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.groovy @@ -7,6 +7,8 @@ package io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import java.lang.reflect.Proxy @@ -24,8 +26,8 @@ class JwsAnnotationsTest extends AgentInstrumentationSpecification { span(0) { name "WebServiceClass.doSomethingPublic" attributes { - "$SemanticAttributes.CODE_NAMESPACE" "io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1.WebServiceClass" - "$SemanticAttributes.CODE_FUNCTION" "doSomethingPublic" + "$CodeIncubatingAttributes.CODE_NAMESPACE" "io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1.WebServiceClass" + "$CodeIncubatingAttributes.CODE_FUNCTION" "doSomethingPublic" } } } @@ -44,8 +46,8 @@ class JwsAnnotationsTest extends AgentInstrumentationSpecification { span(0) { name "WebServiceFromInterface.partOfPublicInterface" attributes { - "$SemanticAttributes.CODE_NAMESPACE" "io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1.WebServiceFromInterface" - "$SemanticAttributes.CODE_FUNCTION" "partOfPublicInterface" + "$CodeIncubatingAttributes.CODE_NAMESPACE" "io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1.WebServiceFromInterface" + "$CodeIncubatingAttributes.CODE_FUNCTION" "partOfPublicInterface" } } } @@ -68,8 +70,8 @@ class JwsAnnotationsTest extends AgentInstrumentationSpecification { span(0) { name "WebServiceFromInterface.partOfPublicInterface" attributes { - "$SemanticAttributes.CODE_NAMESPACE" "io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1.WebServiceFromInterface" - "$SemanticAttributes.CODE_FUNCTION" "partOfPublicInterface" + "$CodeIncubatingAttributes.CODE_NAMESPACE" "io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1.WebServiceFromInterface" + "$CodeIncubatingAttributes.CODE_FUNCTION" "partOfPublicInterface" } } } diff --git a/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy b/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy index 89c48de168e9..ee295abf40d4 100644 --- a/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy +++ b/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy @@ -12,6 +12,8 @@ import io.opentelemetry.instrumentation.jdbc.TestDriver import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.javaagent.instrumentation.jdbc.test.ProxyStatementFactory import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes @@ -590,8 +592,8 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { kind INTERNAL childOf span(0) attributes { - "$SemanticAttributes.CODE_NAMESPACE" datasource.class.name - "$SemanticAttributes.CODE_FUNCTION" "getConnection" + "$CodeIncubatingAttributes.CODE_NAMESPACE" datasource.class.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "getConnection" "$DbIncubatingAttributes.DB_SYSTEM" system "$DbIncubatingAttributes.DB_USER" { user == null | user == it } "$DbIncubatingAttributes.DB_NAME" "jdbcunittest" @@ -604,8 +606,8 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { kind INTERNAL childOf span(1) attributes { - "$SemanticAttributes.CODE_NAMESPACE" datasource.class.name - "$SemanticAttributes.CODE_FUNCTION" "getConnection" + "$CodeIncubatingAttributes.CODE_NAMESPACE" datasource.class.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "getConnection" "$DbIncubatingAttributes.DB_SYSTEM" system "$DbIncubatingAttributes.DB_USER" { user == null | user == it } "$DbIncubatingAttributes.DB_NAME" "jdbcunittest" diff --git a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java index 621456de6c07..f36015fa827a 100644 --- a/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java +++ b/instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/OpenTelemetryDataSourceTest.java @@ -15,8 +15,8 @@ import io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import java.sql.Connection; import java.sql.SQLException; import java.util.stream.Stream; @@ -51,8 +51,9 @@ void shouldEmitGetConnectionSpans(GetConnectionFunction getConnection) throws SQ .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.CODE_NAMESPACE, TestDataSource.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "getConnection"), + CodeIncubatingAttributes.CODE_NAMESPACE, + TestDataSource.class.getName()), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "getConnection"), equalTo(DbIncubatingAttributes.DB_SYSTEM, "postgresql"), equalTo(DbIncubatingAttributes.DB_NAME, "dbname"), equalTo( diff --git a/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java b/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java index f97b8c12c320..031d94bdca8c 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java +++ b/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java @@ -11,8 +11,8 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java index 28efe8d23933..fe97e8e7a379 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java +++ b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java @@ -12,9 +12,9 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import org.assertj.core.api.AbstractLongAssert; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java b/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java index 974e2f45bb6e..04b44e38a0f7 100644 --- a/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java +++ b/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java @@ -11,8 +11,8 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/instrumentation/kotlinx-coroutines/javaagent/src/test/kotlin/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationTest.kt b/instrumentation/kotlinx-coroutines/javaagent/src/test/kotlin/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationTest.kt index a545a862b932..3be67e1077de 100644 --- a/instrumentation/kotlinx-coroutines/javaagent/src/test/kotlin/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationTest.kt +++ b/instrumentation/kotlinx-coroutines/javaagent/src/test/kotlin/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationTest.kt @@ -19,7 +19,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtens import io.opentelemetry.instrumentation.testing.util.TelemetryDataUtil.orderByRootSpanName import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo import io.opentelemetry.sdk.testing.assertj.TraceAssert -import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope @@ -512,16 +512,16 @@ class KotlinCoroutinesInstrumentationTest { it.hasName("a1") .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.CODE_NAMESPACE, this.javaClass.name), - equalTo(SemanticAttributes.CODE_FUNCTION, "annotated1") + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, this.javaClass.name), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "annotated1") ) }, { it.hasName("KotlinCoroutinesInstrumentationTest.annotated2") .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.CODE_NAMESPACE, this.javaClass.name), - equalTo(SemanticAttributes.CODE_FUNCTION, "annotated2"), + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, this.javaClass.name), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "annotated2"), equalTo(AttributeKey.longKey("byteValue"), 1), equalTo(AttributeKey.longKey("intValue"), 4), equalTo(AttributeKey.longKey("longValue"), 5), @@ -574,8 +574,8 @@ class KotlinCoroutinesInstrumentationTest { it.hasName("ClazzWithDefaultConstructorArguments.sayHello") .hasNoParent() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.CODE_NAMESPACE, ClazzWithDefaultConstructorArguments::class.qualifiedName), - equalTo(SemanticAttributes.CODE_FUNCTION, "sayHello") + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, ClazzWithDefaultConstructorArguments::class.qualifiedName), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "sayHello") ) } ) diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java index 0c12619ca9e2..7609edbc402c 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java @@ -10,7 +10,6 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import javax.annotation.Nullable; final class LettuceConnectAttributesExtractor implements AttributesExtractor { diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java index f8fd44ebebc2..74bc895b59a9 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceAsyncClientTest.java @@ -30,8 +30,8 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.Map; import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java index 24dbdfa96396..49fa0ba716ee 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceSyncClientTest.java @@ -20,8 +20,8 @@ import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.Map; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java index 0a660d5dbe9b..142e7b15abb6 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java @@ -10,7 +10,6 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import javax.annotation.Nullable; final class LettuceConnectAttributesExtractor implements AttributesExtractor { diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java index af1cdd92a2ee..c932c8a98998 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java @@ -28,8 +28,8 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.Map; import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java index 9b1efe50e0a8..1701ea5be571 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java @@ -19,8 +19,8 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.Map; import org.assertj.core.api.AbstractAssert; import org.junit.jupiter.api.AfterAll; diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java index c040c882c102..03cf863a8bcb 100644 --- a/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java @@ -13,9 +13,9 @@ import io.opentelemetry.instrumentation.lettuce.v5_1.AbstractLettuceReactiveClientTest; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java index 5bb61d148eb7..55b7833f3f0f 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java +++ b/instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java @@ -29,7 +29,6 @@ import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesExtractor; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.time.Instant; diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java index 40a5a9bd5804..f75945f89544 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceAsyncClientTest.java @@ -21,9 +21,9 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java index 76bc2d11483f..3da789e82124 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceReactiveClientTest.java @@ -12,9 +12,9 @@ import io.lettuce.core.api.sync.RedisCommands; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java index 4fc003bd3611..bb7a793153e3 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java @@ -10,9 +10,9 @@ import io.lettuce.core.api.sync.RedisCommands; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java index 34641bc2ff02..c9ba90f9c5c7 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java @@ -20,9 +20,9 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.test.utils.PortUtils; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.util.Base64; import java.util.Map; import org.junit.jupiter.api.AfterAll; diff --git a/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java b/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java index 5b1798e3980f..a8d23bef5858 100644 --- a/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java +++ b/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java @@ -16,6 +16,7 @@ import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import java.util.Arrays; import java.util.stream.Stream; import org.assertj.core.api.AbstractLongAssert; @@ -144,10 +145,10 @@ private static void test( .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), - equalTo(SemanticAttributes.CODE_NAMESPACE, LogbackTest.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "performLogging"), - satisfies(SemanticAttributes.CODE_LINENO, AbstractLongAssert::isPositive), - equalTo(SemanticAttributes.CODE_FILEPATH, "LogbackTest.java"), + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, LogbackTest.class.getName()), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "performLogging"), + satisfies(CodeIncubatingAttributes.CODE_LINENO, AbstractLongAssert::isPositive), + equalTo(CodeIncubatingAttributes.CODE_FILEPATH, "LogbackTest.java"), equalTo(SemanticAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( @@ -158,10 +159,10 @@ private static void test( .hasAttributesSatisfyingExactly( equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), - equalTo(SemanticAttributes.CODE_NAMESPACE, LogbackTest.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "performLogging"), - satisfies(SemanticAttributes.CODE_LINENO, AbstractLongAssert::isPositive), - equalTo(SemanticAttributes.CODE_FILEPATH, "LogbackTest.java")); + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, LogbackTest.class.getName()), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "performLogging"), + satisfies(CodeIncubatingAttributes.CODE_LINENO, AbstractLongAssert::isPositive), + equalTo(CodeIncubatingAttributes.CODE_FILEPATH, "LogbackTest.java")); } if (withParent) { @@ -197,10 +198,10 @@ void testMdc() { equalTo(AttributeKey.stringKey("key2"), "val2"), equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), - equalTo(SemanticAttributes.CODE_NAMESPACE, LogbackTest.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "testMdc"), - satisfies(SemanticAttributes.CODE_LINENO, AbstractLongAssert::isPositive), - equalTo(SemanticAttributes.CODE_FILEPATH, "LogbackTest.java")); + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, LogbackTest.class.getName()), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "testMdc"), + satisfies(CodeIncubatingAttributes.CODE_LINENO, AbstractLongAssert::isPositive), + equalTo(CodeIncubatingAttributes.CODE_FILEPATH, "LogbackTest.java")); } @Test @@ -217,10 +218,10 @@ public void testMarker() { equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), equalTo(AttributeKey.stringArrayKey("logback.marker"), Arrays.asList(markerName)), - equalTo(SemanticAttributes.CODE_NAMESPACE, LogbackTest.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "testMarker"), - satisfies(SemanticAttributes.CODE_LINENO, AbstractLongAssert::isPositive), - equalTo(SemanticAttributes.CODE_FILEPATH, "LogbackTest.java")); + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, LogbackTest.class.getName()), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "testMarker"), + satisfies(CodeIncubatingAttributes.CODE_LINENO, AbstractLongAssert::isPositive), + equalTo(CodeIncubatingAttributes.CODE_FILEPATH, "LogbackTest.java")); } private static void performLogging( diff --git a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java index b0980b8c06f3..e193a49665ae 100644 --- a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java +++ b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java @@ -21,6 +21,7 @@ import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.tooling.muzzle.NoMuzzle; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; import java.util.ArrayList; @@ -136,13 +137,13 @@ private void mapLoggingEvent( StackTraceElement firstStackElement = callerData[0]; String fileName = firstStackElement.getFileName(); if (fileName != null) { - attributes.put(SemanticAttributes.CODE_FILEPATH, fileName); + attributes.put(CodeIncubatingAttributes.CODE_FILEPATH, fileName); } - attributes.put(SemanticAttributes.CODE_NAMESPACE, firstStackElement.getClassName()); - attributes.put(SemanticAttributes.CODE_FUNCTION, firstStackElement.getMethodName()); + attributes.put(CodeIncubatingAttributes.CODE_NAMESPACE, firstStackElement.getClassName()); + attributes.put(CodeIncubatingAttributes.CODE_FUNCTION, firstStackElement.getMethodName()); int lineNumber = firstStackElement.getLineNumber(); if (lineNumber > 0) { - attributes.put(SemanticAttributes.CODE_LINENO, lineNumber); + attributes.put(CodeIncubatingAttributes.CODE_LINENO, lineNumber); } } } diff --git a/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java b/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java index 5d2e6a1c2e3b..6f239a4c87a1 100644 --- a/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java +++ b/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java @@ -19,6 +19,7 @@ import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.testing.exporter.InMemoryLogRecordExporter; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.time.Instant; @@ -132,16 +133,16 @@ void logWithExtras() { assertThat(logData.getAttributes().get(SemanticAttributes.EXCEPTION_STACKTRACE)) .contains("logWithExtras"); - String file = logData.getAttributes().get(SemanticAttributes.CODE_FILEPATH); + String file = logData.getAttributes().get(CodeIncubatingAttributes.CODE_FILEPATH); assertThat(file).isEqualTo(AbstractOpenTelemetryAppenderTest.class.getSimpleName() + ".java"); - String codeClass = logData.getAttributes().get(SemanticAttributes.CODE_NAMESPACE); + String codeClass = logData.getAttributes().get(CodeIncubatingAttributes.CODE_NAMESPACE); assertThat(codeClass).isEqualTo(AbstractOpenTelemetryAppenderTest.class.getName()); - String method = logData.getAttributes().get(SemanticAttributes.CODE_FUNCTION); + String method = logData.getAttributes().get(CodeIncubatingAttributes.CODE_FUNCTION); assertThat(method).isEqualTo("logWithExtras"); - Long lineNumber = logData.getAttributes().get(SemanticAttributes.CODE_LINENO); + Long lineNumber = logData.getAttributes().get(CodeIncubatingAttributes.CODE_LINENO); assertThat(lineNumber).isGreaterThan(1); List logMarker = diff --git a/instrumentation/methods/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/methods/MethodTest.java b/instrumentation/methods/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/methods/MethodTest.java index ea59f27f532d..846ec64410e7 100644 --- a/instrumentation/methods/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/methods/MethodTest.java +++ b/instrumentation/methods/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/methods/MethodTest.java @@ -7,8 +7,8 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_FUNCTION; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_NAMESPACE; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanKind; diff --git a/instrumentation/mybatis-3.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mybatis/v3_2/MyBatisTest.java b/instrumentation/mybatis-3.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mybatis/v3_2/MyBatisTest.java index 42b81e0b1ee0..a4ca40a00987 100644 --- a/instrumentation/mybatis-3.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mybatis/v3_2/MyBatisTest.java +++ b/instrumentation/mybatis-3.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mybatis/v3_2/MyBatisTest.java @@ -10,7 +10,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import org.apache.ibatis.mapping.Environment; import org.apache.ibatis.session.Configuration; import org.apache.ibatis.session.SqlSession; @@ -58,7 +58,9 @@ void testSelect() { span.hasKind(SpanKind.INTERNAL) .hasName("TestMapper.select") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.CODE_NAMESPACE, TestMapper.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "select")))); + equalTo( + CodeIncubatingAttributes.CODE_NAMESPACE, + TestMapper.class.getName()), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "select")))); } } diff --git a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java index 3221374c47a8..6806c43a817b 100644 --- a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java +++ b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/test/java/OpenSearchRestTest.java @@ -7,11 +7,11 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.io.IOException; import java.security.KeyManagementException; import java.security.KeyStoreException; diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/ContextBridgeTest.groovy b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/ContextBridgeTest.groovy index edf609b6806c..e9160c90b924 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/ContextBridgeTest.groovy +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/ContextBridgeTest.groovy @@ -11,6 +11,8 @@ import io.opentelemetry.context.ContextKey import io.opentelemetry.instrumentation.annotations.WithSpan import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import java.util.concurrent.CountDownLatch import java.util.concurrent.Executors @@ -62,8 +64,8 @@ class ContextBridgeTest extends AgentInstrumentationSpecification { name "test" hasNoParent() attributes { - "$SemanticAttributes.CODE_NAMESPACE" runnable.class.name - "$SemanticAttributes.CODE_FUNCTION" "run" + "$CodeIncubatingAttributes.CODE_NAMESPACE" runnable.class.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "run" "cat" "yes" } } @@ -125,8 +127,8 @@ class ContextBridgeTest extends AgentInstrumentationSpecification { name "test" hasNoParent() attributes { - "$SemanticAttributes.CODE_NAMESPACE" runnable.class.name - "$SemanticAttributes.CODE_FUNCTION" "run" + "$CodeIncubatingAttributes.CODE_NAMESPACE" runnable.class.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "run" "cat" "yes" } } diff --git a/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/test/java/io/opentelemetry/test/annotation/WithSpanInstrumentationTest.java b/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/test/java/io/opentelemetry/test/annotation/WithSpanInstrumentationTest.java index 910ad39bb178..c82608d2a89c 100644 --- a/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/test/java/io/opentelemetry/test/annotation/WithSpanInstrumentationTest.java +++ b/instrumentation/opentelemetry-extension-annotations-1.0/javaagent/src/test/java/io/opentelemetry/test/annotation/WithSpanInstrumentationTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import java.lang.reflect.Modifier; import java.util.concurrent.CompletableFuture; import net.bytebuddy.ByteBuddy; @@ -54,9 +54,11 @@ void deriveAutomaticName() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), - entry(SemanticAttributes.CODE_FUNCTION, "otel"))))); + entry( + CodeIncubatingAttributes.CODE_FUNCTION, + "otel"))))); } @Test @@ -79,10 +81,10 @@ void manualName() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "namedOtel"))))); } @@ -106,10 +108,10 @@ void manualKind() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "someKind"))))); } @@ -133,9 +135,11 @@ void multipleSpans() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), - entry(SemanticAttributes.CODE_FUNCTION, "server"))), + entry( + CodeIncubatingAttributes.CODE_FUNCTION, + "server"))), span -> assertThat(span) .hasName("TracedWithSpan.otel") @@ -146,9 +150,11 @@ void multipleSpans() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), - entry(SemanticAttributes.CODE_FUNCTION, "otel"))))); + entry( + CodeIncubatingAttributes.CODE_FUNCTION, + "otel"))))); } @Test @@ -181,10 +187,10 @@ void completedCompletionStage() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completionStage"))))); } @@ -211,10 +217,10 @@ void exceptionallyCompletedCompletionStage() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completionStage"))))); } @@ -238,10 +244,10 @@ void nullCompletionStage() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completionStage"))))); } @@ -271,10 +277,10 @@ void completingCompletionStage() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completionStage"))))); } @@ -305,10 +311,10 @@ void exceptionallyCompletingCompletionStage() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completionStage"))))); } @@ -333,10 +339,10 @@ void completedCompletableFuture() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completableFuture"))))); } @@ -363,10 +369,10 @@ void exceptionallyCompletedCompletableFuture() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completableFuture"))))); } @@ -390,10 +396,10 @@ void nullCompletableFuture() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completableFuture"))))); } @@ -423,10 +429,10 @@ void completingCompletableFuture() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completableFuture"))))); } @@ -457,10 +463,10 @@ void exceptionallyCompletingCompletableFuture() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completableFuture"))))); } @@ -484,10 +490,10 @@ void captureAttributes() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "withSpanAttributes"), entry( AttributeKey.stringKey("implicitName"), "foo"), @@ -550,9 +556,11 @@ public void run() { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, "GeneratedJava6TestClass"), - entry(SemanticAttributes.CODE_FUNCTION, "run"))), + entry( + CodeIncubatingAttributes.CODE_FUNCTION, + "run"))), span -> assertThat(span) .hasName("intercept") diff --git a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/AddingSpanAttributesInstrumentationTest.java b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/AddingSpanAttributesInstrumentationTest.java index 8e524c343490..686a8264f92e 100644 --- a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/AddingSpanAttributesInstrumentationTest.java +++ b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/AddingSpanAttributesInstrumentationTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.trace.SpanId; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -53,11 +53,11 @@ void captureAttributesInNewSpan() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, ExtractAttributesUsingAddingSpanAttributes.class .getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "withSpanTakesPrecedence"), entry( AttributeKey.stringKey("implicitName"), "foo"), diff --git a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/WithSpanInstrumentationTest.java b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/WithSpanInstrumentationTest.java index d8fd78699ae5..aa15a47c5ce6 100644 --- a/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/WithSpanInstrumentationTest.java +++ b/instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/WithSpanInstrumentationTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.instrumentation.annotations.WithSpan; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import java.lang.reflect.Modifier; import java.util.concurrent.CompletableFuture; import net.bytebuddy.ByteBuddy; @@ -55,9 +55,11 @@ void deriveAutomaticName() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), - entry(SemanticAttributes.CODE_FUNCTION, "otel"))))); + entry( + CodeIncubatingAttributes.CODE_FUNCTION, + "otel"))))); } @Test @@ -80,10 +82,10 @@ void manualName() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "namedOtel"))))); } @@ -107,10 +109,10 @@ void manualKind() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "someKind"))))); } @@ -134,9 +136,11 @@ void multipleSpans() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), - entry(SemanticAttributes.CODE_FUNCTION, "server"))), + entry( + CodeIncubatingAttributes.CODE_FUNCTION, + "server"))), span -> assertThat(span) .hasName("TracedWithSpan.otel") @@ -147,9 +151,11 @@ void multipleSpans() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), - entry(SemanticAttributes.CODE_FUNCTION, "otel"))))); + entry( + CodeIncubatingAttributes.CODE_FUNCTION, + "otel"))))); } @Test @@ -182,10 +188,10 @@ void completedCompletionStage() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completionStage"))))); } @@ -212,10 +218,10 @@ void exceptionallyCompletedCompletionStage() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completionStage"))))); } @@ -239,10 +245,10 @@ void nullCompletionStage() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completionStage"))))); } @@ -272,10 +278,10 @@ void completingCompletionStage() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completionStage"))))); } @@ -306,10 +312,10 @@ void exceptionallyCompletingCompletionStage() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completionStage"))))); } @@ -334,10 +340,10 @@ void completedCompletableFuture() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completableFuture"))))); } @@ -364,10 +370,10 @@ void exceptionallyCompletedCompletableFuture() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completableFuture"))))); } @@ -391,10 +397,10 @@ void nullCompletableFuture() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completableFuture"))))); } @@ -424,10 +430,10 @@ void completingCompletableFuture() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completableFuture"))))); } @@ -458,10 +464,10 @@ void exceptionallyCompletingCompletableFuture() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "completableFuture"))))); } @@ -485,10 +491,10 @@ void captureAttributes() throws Exception { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, TracedWithSpan.class.getName()), entry( - SemanticAttributes.CODE_FUNCTION, + CodeIncubatingAttributes.CODE_FUNCTION, "withSpanAttributes"), entry( AttributeKey.stringKey("implicitName"), "foo"), @@ -548,9 +554,11 @@ public void run() { assertThat(attributes) .containsOnly( entry( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, "GeneratedJava6TestClass"), - entry(SemanticAttributes.CODE_FUNCTION, "run"))), + entry( + CodeIncubatingAttributes.CODE_FUNCTION, + "run"))), span -> assertThat(span) .hasName("intercept") diff --git a/instrumentation/quartz-2.0/testing/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/AbstractQuartzTest.java b/instrumentation/quartz-2.0/testing/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/AbstractQuartzTest.java index 72027b17d296..49a33c0f1e31 100644 --- a/instrumentation/quartz-2.0/testing/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/AbstractQuartzTest.java +++ b/instrumentation/quartz-2.0/testing/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/AbstractQuartzTest.java @@ -14,7 +14,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; @@ -71,9 +71,9 @@ void successfulJob() throws Exception { .hasAttributesSatisfyingExactly( equalTo(AttributeKey.stringKey("job.system"), "quartz"), equalTo( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, SuccessfulJob.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "execute")), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "execute")), span -> span.hasName("child") .hasKind(SpanKind.INTERNAL) @@ -101,8 +101,9 @@ void failingJob() throws Exception { .hasAttributesSatisfyingExactly( equalTo(AttributeKey.stringKey("job.system"), "quartz"), equalTo( - SemanticAttributes.CODE_NAMESPACE, FailingJob.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "execute")))); + CodeIncubatingAttributes.CODE_NAMESPACE, + FailingJob.class.getName()), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "execute")))); } private static Scheduler createScheduler(String name) throws Exception { diff --git a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java index 3709b0145762..d03e72c1ee63 100644 --- a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java +++ b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java @@ -6,6 +6,8 @@ package io.opentelemetry.instrumentation.r2dbc.v1_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; @@ -13,8 +15,6 @@ import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; -import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; -import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.r2dbc.spi.ConnectionFactoryOptions.DATABASE; import static io.r2dbc.spi.ConnectionFactoryOptions.DRIVER; import static io.r2dbc.spi.ConnectionFactoryOptions.HOST; diff --git a/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseFluxWithSpanTest.java b/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseFluxWithSpanTest.java index 5e7ca3b3f77a..1c3eb39f5650 100644 --- a/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseFluxWithSpanTest.java +++ b/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseFluxWithSpanTest.java @@ -6,8 +6,8 @@ package io.opentelemetry.javaagent.instrumentation.reactor.v3_1; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_FUNCTION; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_NAMESPACE; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.SpanKind; diff --git a/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseMonoWithSpanTest.java b/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseMonoWithSpanTest.java index dba79f59e3f2..b090a74bea28 100644 --- a/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseMonoWithSpanTest.java +++ b/instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/BaseMonoWithSpanTest.java @@ -6,8 +6,8 @@ package io.opentelemetry.javaagent.instrumentation.reactor.v3_1; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_FUNCTION; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_NAMESPACE; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.SpanKind; diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java index 760c04de734b..13e0a35c2a0d 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java @@ -16,8 +16,8 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.util.concurrent.Callable; diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java index 11d44ed44373..a7a7af81990a 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java +++ b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java @@ -17,8 +17,8 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.TraceAssert; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.HashMap; diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java index d688818f38ab..da93c47738e8 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java @@ -5,15 +5,15 @@ package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v5_0; +import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.DELAY; +import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.FIFO; +import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.NORMAL; +import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.TRANSACTION; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_GROUP; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_KEYS; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TYPE; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.DELAY; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.FIFO; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.NORMAL; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.TRANSACTION; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java index 65a2d22c9c0e..980a170a31cb 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java @@ -6,6 +6,7 @@ package io.opentelemetry.instrumentation.rocketmqclient.v5_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; +import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.NORMAL; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID; @@ -15,7 +16,6 @@ import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TYPE; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.NORMAL; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java index 12200052039a..ac6c10b0c6a5 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java @@ -7,6 +7,9 @@ import static io.opentelemetry.instrumentation.testing.util.TelemetryDataUtil.orderByRootSpanKind; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; +import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.DELAY; +import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.FIFO; +import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.NORMAL; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE; @@ -19,9 +22,6 @@ import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_TYPE; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.DELAY; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.FIFO; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.NORMAL; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; diff --git a/instrumentation/rxjava/rxjava-2.0/javaagent/src/test/java/BaseRxJava2WithSpanTest.java b/instrumentation/rxjava/rxjava-2.0/javaagent/src/test/java/BaseRxJava2WithSpanTest.java index 8ae3cecf0309..b57ea2532c60 100644 --- a/instrumentation/rxjava/rxjava-2.0/javaagent/src/test/java/BaseRxJava2WithSpanTest.java +++ b/instrumentation/rxjava/rxjava-2.0/javaagent/src/test/java/BaseRxJava2WithSpanTest.java @@ -5,8 +5,8 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_FUNCTION; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_NAMESPACE; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.AttributeKey; diff --git a/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java b/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java index 7f7a6d9fe2cb..1f06824c8fea 100644 --- a/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java +++ b/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java @@ -7,8 +7,8 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_FUNCTION; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_NAMESPACE; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.AttributeKey; diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/HttpServletResponseTest.groovy b/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/HttpServletResponseTest.groovy index bdf2f09834bf..d4c2c44b6a53 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/HttpServletResponseTest.groovy +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/HttpServletResponseTest.groovy @@ -6,6 +6,8 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import javax.servlet.http.HttpServlet import spock.lang.Subject @@ -68,24 +70,24 @@ class HttpServletResponseTest extends AgentInstrumentationSpecification { name "TestResponse.sendError" childOf span(0) attributes { - "$SemanticAttributes.CODE_NAMESPACE" TestResponse.name - "$SemanticAttributes.CODE_FUNCTION" "sendError" + "$CodeIncubatingAttributes.CODE_NAMESPACE" TestResponse.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "sendError" } } span(2) { name "TestResponse.sendError" childOf span(0) attributes { - "$SemanticAttributes.CODE_NAMESPACE" TestResponse.name - "$SemanticAttributes.CODE_FUNCTION" "sendError" + "$CodeIncubatingAttributes.CODE_NAMESPACE" TestResponse.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "sendError" } } span(3) { name "TestResponse.sendRedirect" childOf span(0) attributes { - "$SemanticAttributes.CODE_NAMESPACE" TestResponse.name - "$SemanticAttributes.CODE_FUNCTION" "sendRedirect" + "$CodeIncubatingAttributes.CODE_NAMESPACE" TestResponse.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "sendRedirect" } } } diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/JettyServlet2Test.groovy b/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/JettyServlet2Test.groovy index dfdb773473bb..8f1b6601d800 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/JettyServlet2Test.groovy +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/JettyServlet2Test.groovy @@ -11,6 +11,8 @@ import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import org.eclipse.jetty.server.Response import org.eclipse.jetty.server.Server import org.eclipse.jetty.server.handler.ErrorHandler @@ -126,8 +128,8 @@ class JettyServlet2Test extends HttpServerTest implements AgentTestTrait kind INTERNAL childOf((SpanData) parent) attributes { - "$SemanticAttributes.CODE_NAMESPACE" Response.name - "$SemanticAttributes.CODE_FUNCTION" responseMethod + "$CodeIncubatingAttributes.CODE_NAMESPACE" Response.name + "$CodeIncubatingAttributes.CODE_FUNCTION" responseMethod } } } diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/HttpServletResponseTest.groovy b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/HttpServletResponseTest.groovy index fba4593c83f4..0c9b1e027129 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/HttpServletResponseTest.groovy +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/HttpServletResponseTest.groovy @@ -6,6 +6,8 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import javax.servlet.http.HttpServlet import spock.lang.Subject @@ -68,24 +70,24 @@ class HttpServletResponseTest extends AgentInstrumentationSpecification { name "TestResponse.sendError" childOf span(0) attributes { - "$SemanticAttributes.CODE_NAMESPACE" TestResponse.name - "$SemanticAttributes.CODE_FUNCTION" "sendError" + "$CodeIncubatingAttributes.CODE_NAMESPACE" TestResponse.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "sendError" } } span(2) { name "TestResponse.sendError" childOf span(0) attributes { - "$SemanticAttributes.CODE_NAMESPACE" TestResponse.name - "$SemanticAttributes.CODE_FUNCTION" "sendError" + "$CodeIncubatingAttributes.CODE_NAMESPACE" TestResponse.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "sendError" } } span(3) { name "TestResponse.sendRedirect" childOf span(0) attributes { - "$SemanticAttributes.CODE_NAMESPACE" TestResponse.name - "$SemanticAttributes.CODE_FUNCTION" "sendRedirect" + "$CodeIncubatingAttributes.CODE_NAMESPACE" TestResponse.name + "$CodeIncubatingAttributes.CODE_FUNCTION" "sendRedirect" } } } diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/annotations/InstrumentationWithSpanAspectTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/annotations/InstrumentationWithSpanAspectTest.java index 634c92105f05..69f71af6d71b 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/annotations/InstrumentationWithSpanAspectTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/annotations/InstrumentationWithSpanAspectTest.java @@ -10,8 +10,8 @@ import static io.opentelemetry.api.trace.SpanKind.INTERNAL; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.TracesAssert.assertThat; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_FUNCTION; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_NAMESPACE; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE; import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.OpenTelemetry; diff --git a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java index 26461c257d12..7d082359a0b0 100644 --- a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java +++ b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java @@ -6,6 +6,7 @@ package io.opentelemetry.javaagent.instrumentation.spring.data.v3_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; +import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; @@ -13,7 +14,6 @@ import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; -import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanKind; @@ -21,7 +21,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.javaagent.instrumentation.spring.data.v3_0.repository.CustomerRepository; import io.opentelemetry.javaagent.instrumentation.spring.data.v3_0.repository.PersistenceConfig; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import java.time.Duration; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -67,9 +67,9 @@ void testFindAll() { .hasKind(SpanKind.INTERNAL) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.CODE_NAMESPACE, + CodeIncubatingAttributes.CODE_NAMESPACE, CustomerRepository.class.getName()), - equalTo(SemanticAttributes.CODE_FUNCTION, "findAll")), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "findAll")), span -> span.hasName("SELECT db.CUSTOMER") .hasKind(SpanKind.CLIENT) diff --git a/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java b/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java index e9da98550a17..29452690628e 100644 --- a/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java +++ b/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java @@ -17,8 +17,8 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.TraceAssert; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import java.util.List; import java.util.Optional; import org.hibernate.Version; @@ -72,8 +72,8 @@ static void assertHibernate4Trace(TraceAssert trace, String repoClassName) { span.hasName("JpaCustomerRepository.save") .hasKind(SpanKind.INTERNAL) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.CODE_NAMESPACE, repoClassName), - equalTo(SemanticAttributes.CODE_FUNCTION, "save")), + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, repoClassName), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "save")), span -> span.hasName("INSERT test.JpaCustomer") .hasKind(SpanKind.CLIENT) @@ -95,8 +95,8 @@ static void assertHibernateTrace(TraceAssert trace, String repoClassName) { span.hasName("JpaCustomerRepository.save") .hasKind(SpanKind.INTERNAL) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.CODE_NAMESPACE, repoClassName), - equalTo(SemanticAttributes.CODE_FUNCTION, "save")), + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, repoClassName), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "save")), span -> span.hasName("CALL test") .hasKind(SpanKind.CLIENT) @@ -142,8 +142,8 @@ void testCrud() { span.hasName("JpaCustomerRepository.findAll") .hasKind(SpanKind.INTERNAL) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.CODE_NAMESPACE, repoClassName), - equalTo(SemanticAttributes.CODE_FUNCTION, "findAll")), + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, repoClassName), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "findAll")), span -> span.hasName("SELECT test.JpaCustomer") .hasKind(SpanKind.CLIENT) @@ -180,8 +180,8 @@ void testCrud() { span.hasName("JpaCustomerRepository.save") .hasKind(SpanKind.INTERNAL) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.CODE_NAMESPACE, repoClassName), - equalTo(SemanticAttributes.CODE_FUNCTION, "save")), + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, repoClassName), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "save")), span -> span.hasName("SELECT test.JpaCustomer") .hasKind(SpanKind.CLIENT) @@ -220,8 +220,8 @@ void testCrud() { span.hasName("JpaCustomerRepository.findByLastName") .hasKind(SpanKind.INTERNAL) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.CODE_NAMESPACE, repoClassName), - equalTo(SemanticAttributes.CODE_FUNCTION, "findByLastName")), + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, repoClassName), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "findByLastName")), span -> span.hasName("SELECT test.JpaCustomer") .hasKind(SpanKind.CLIENT) @@ -246,8 +246,8 @@ void testCrud() { span.hasName("JpaCustomerRepository.delete") .hasKind(SpanKind.INTERNAL) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.CODE_NAMESPACE, repoClassName), - equalTo(SemanticAttributes.CODE_FUNCTION, "delete")), + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, repoClassName), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "delete")), span -> span.hasName("SELECT test.JpaCustomer") .hasKind(SpanKind.CLIENT) @@ -293,8 +293,9 @@ void testCustomRepositoryMethod() { span.hasName("JpaCustomerRepository.findSpecialCustomers") .hasKind(SpanKind.INTERNAL) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.CODE_NAMESPACE, repoClassName), - equalTo(SemanticAttributes.CODE_FUNCTION, "findSpecialCustomers")), + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, repoClassName), + equalTo( + CodeIncubatingAttributes.CODE_FUNCTION, "findSpecialCustomers")), span -> span.hasName("SELECT test.JpaCustomer") .hasKind(SpanKind.CLIENT) @@ -339,8 +340,8 @@ void testFailedRepositoryMethod() { .hasStatus(StatusData.error()) .hasException(expectedException) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.CODE_NAMESPACE, repoClassName), - equalTo(SemanticAttributes.CODE_FUNCTION, "findOneByLastName")), + equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, repoClassName), + equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "findOneByLastName")), span -> span.hasName("SELECT test.JpaCustomer") .hasKind(SpanKind.CLIENT) diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java index a1ef7a229a34..d1260b0d9eff 100644 --- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java +++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java @@ -8,8 +8,8 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_FUNCTION; -import static io.opentelemetry.semconv.SemanticAttributes.CODE_NAMESPACE; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION; +import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/groovy/boot/AbstractSpringBootBasedTest.groovy b/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/groovy/boot/AbstractSpringBootBasedTest.groovy index 47f7082e84e8..efcfc14b4d55 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/groovy/boot/AbstractSpringBootBasedTest.groovy +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/groovy/boot/AbstractSpringBootBasedTest.groovy @@ -13,6 +13,8 @@ import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest import io.opentelemetry.testing.internal.armeria.common.HttpData import io.opentelemetry.testing.internal.armeria.common.MediaType @@ -172,12 +174,12 @@ abstract class AbstractSpringBootBasedTest extends HttpServerTest implements AgentTestT } def expectedMethodName = endpoint.name().toLowerCase() attributes { - "$SemanticAttributes.CODE_NAMESPACE" "io.opentelemetry.struts.GreetingAction" - "$SemanticAttributes.CODE_FUNCTION" expectedMethodName + "$CodeIncubatingAttributes.CODE_NAMESPACE" "io.opentelemetry.struts.GreetingAction" + "$CodeIncubatingAttributes.CODE_FUNCTION" expectedMethodName } childOf((SpanData) parent) } diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java index 4d3859991b5a..be0f085e368d 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java @@ -12,9 +12,9 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.vertx.core.Vertx; import io.vertx.redis.client.Redis; import io.vertx.redis.client.RedisAPI; diff --git a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java index 99a97d9f8a7c..ffd05a4bc54b 100644 --- a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java +++ b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java @@ -7,17 +7,17 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; -import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_MESSAGE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_STACKTRACE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; +import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension; diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index 1518c52517e1..5bd76a27bb5b 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -6,7 +6,6 @@ package io.opentelemetry.semconv; import io.opentelemetry.api.common.AttributeKey; -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes; @@ -35,11 +34,6 @@ public static final class MessagingRocketmqMessageTypeValues { private MessagingRocketmqMessageTypeValues() {} } - public static final AttributeKey CODE_FILEPATH = CodeIncubatingAttributes.CODE_FILEPATH; - public static final AttributeKey CODE_FUNCTION = CodeIncubatingAttributes.CODE_FUNCTION; - public static final AttributeKey CODE_LINENO = CodeIncubatingAttributes.CODE_LINENO; - public static final AttributeKey CODE_NAMESPACE = CodeIncubatingAttributes.CODE_NAMESPACE; - public static final AttributeKey PEER_SERVICE = PeerIncubatingAttributes.PEER_SERVICE; public static final AttributeKey MESSAGE_ID = MessageIncubatingAttributes.MESSAGE_ID; diff --git a/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java b/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java index c15842cf4767..845c69c3dbea 100644 --- a/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/src/test/java/io/opentelemetry/smoketest/OtelSpringStarterSmokeTest.java @@ -32,9 +32,9 @@ import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.export.SpanExporter; -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes; import io.opentelemetry.spring.smoketest.OtelSpringStarterSmokeTestApplication; import io.opentelemetry.spring.smoketest.OtelSpringStarterSmokeTestController; import java.util.Collections; @@ -227,6 +227,6 @@ void shouldSendTelemetry() throws InterruptedException { assertThat(firstLog.getAttributes().asMap()) .as("Should capture code attributes") .containsEntry( - SemanticAttributes.CODE_NAMESPACE, "org.springframework.boot.StartupInfoLogger"); + CodeIncubatingAttributes.CODE_NAMESPACE, "org.springframework.boot.StartupInfoLogger"); } } From 3477e311895c5a393a2bf336f90d0719b8c64907 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 21:53:55 +0200 Subject: [PATCH 17/52] PEER_* --- .../http/HttpClientPeerServiceAttributesExtractor.java | 4 ++-- .../incubator/semconv/net/PeerServiceAttributesExtractor.java | 4 ++-- .../http/HttpClientPeerServiceAttributesExtractorTest.java | 4 ++-- .../semconv/net/PeerServiceAttributesExtractorTest.java | 4 ++-- .../apachedubbo/v2_7/DubboTelemetryBuilder.java | 4 ++-- .../instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java | 4 ++-- .../instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java | 4 ++-- .../java/io/opentelemetry/semconv/SemanticAttributes.java | 3 --- 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientPeerServiceAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientPeerServiceAttributesExtractor.java index ef53216b9e53..2a2dee45fc07 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientPeerServiceAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientPeerServiceAttributesExtractor.java @@ -11,7 +11,7 @@ import io.opentelemetry.instrumentation.api.incubator.semconv.net.internal.UrlParser; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.PeerIncubatingAttributes; import java.util.function.Supplier; import javax.annotation.Nullable; @@ -67,7 +67,7 @@ public void onEnd( Supplier pathSupplier = () -> getUrlPath(attributesGetter, request); String peerService = mapToPeerService(serverAddress, serverPort, pathSupplier); if (peerService != null) { - attributes.put(SemanticAttributes.PEER_SERVICE, peerService); + attributes.put(PeerIncubatingAttributes.PEER_SERVICE, peerService); } } diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/net/PeerServiceAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/net/PeerServiceAttributesExtractor.java index 24b74c54dcc3..b910fb1d9d9e 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/net/PeerServiceAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/net/PeerServiceAttributesExtractor.java @@ -9,7 +9,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.PeerIncubatingAttributes; import javax.annotation.Nullable; /** @@ -60,7 +60,7 @@ public void onEnd( Integer serverPort = attributesGetter.getServerPort(request); String peerService = mapToPeerService(serverAddress, serverPort); if (peerService != null) { - attributes.put(SemanticAttributes.PEER_SERVICE, peerService); + attributes.put(PeerIncubatingAttributes.PEER_SERVICE, peerService); } } diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientPeerServiceAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientPeerServiceAttributesExtractorTest.java index 9ee57fcdd408..c450a8add835 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientPeerServiceAttributesExtractorTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpClientPeerServiceAttributesExtractorTest.java @@ -17,7 +17,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.incubator.semconv.net.PeerServiceResolver; import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.PeerIncubatingAttributes; import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.Test; @@ -101,6 +101,6 @@ void shouldSetPeerNameIfItMatches() { // then assertThat(startAttributes.build()).isEmpty(); assertThat(endAttributes.build()) - .containsOnly(entry(SemanticAttributes.PEER_SERVICE, "myService")); + .containsOnly(entry(PeerIncubatingAttributes.PEER_SERVICE, "myService")); } } diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/net/PeerServiceAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/net/PeerServiceAttributesExtractorTest.java index 78fda31c375e..4c20771af4bd 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/net/PeerServiceAttributesExtractorTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/net/PeerServiceAttributesExtractorTest.java @@ -16,7 +16,7 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.PeerIncubatingAttributes; import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.Test; @@ -97,6 +97,6 @@ void shouldSetPeerNameIfItMatches() { // then assertThat(startAttributes.build()).isEmpty(); assertThat(endAttributes.build()) - .containsOnly(entry(SemanticAttributes.PEER_SERVICE, "myService")); + .containsOnly(entry(PeerIncubatingAttributes.PEER_SERVICE, "myService")); } } diff --git a/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java index ebf219ca72cf..851d3216f5d4 100644 --- a/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java +++ b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java @@ -17,7 +17,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor; import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesExtractor; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.PeerIncubatingAttributes; import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; @@ -82,7 +82,7 @@ public DubboTelemetry build() { if (peerService != null) { clientInstrumenterBuilder.addAttributesExtractor( - AttributesExtractor.constant(SemanticAttributes.PEER_SERVICE, peerService)); + AttributesExtractor.constant(PeerIncubatingAttributes.PEER_SERVICE, peerService)); } return new DubboTelemetry( diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java index 055f0505e732..d962ba560581 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java +++ b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java @@ -30,7 +30,7 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder; import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor; import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaHttpClientAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.PeerIncubatingAttributes; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -243,7 +243,7 @@ public ArmeriaTelemetry build() { if (peerService != null) { clientInstrumenterBuilder.addAttributesExtractor( - AttributesExtractor.constant(SemanticAttributes.PEER_SERVICE, peerService)); + AttributesExtractor.constant(PeerIncubatingAttributes.PEER_SERVICE, peerService)); } if (emitExperimentalHttpClientMetrics) { clientInstrumenterBuilder diff --git a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java index 7c0e2dfcca54..c839a057ef4d 100644 --- a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java +++ b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java @@ -20,7 +20,7 @@ import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor; import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesExtractor; import io.opentelemetry.instrumentation.grpc.v1_6.internal.GrpcClientNetworkAttributesGetter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.PeerIncubatingAttributes; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -197,7 +197,7 @@ public GrpcTelemetry build() { if (peerService != null) { clientInstrumenterBuilder.addAttributesExtractor( - AttributesExtractor.constant(SemanticAttributes.PEER_SERVICE, peerService)); + AttributesExtractor.constant(PeerIncubatingAttributes.PEER_SERVICE, peerService)); } return new GrpcTelemetry( diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index 5bd76a27bb5b..93bae0928a2c 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -10,7 +10,6 @@ import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; -import io.opentelemetry.semconv.incubating.PeerIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; public class SemanticAttributes { @@ -34,8 +33,6 @@ public static final class MessagingRocketmqMessageTypeValues { private MessagingRocketmqMessageTypeValues() {} } - public static final AttributeKey PEER_SERVICE = PeerIncubatingAttributes.PEER_SERVICE; - public static final AttributeKey MESSAGE_ID = MessageIncubatingAttributes.MESSAGE_ID; public static final AttributeKey MESSAGE_TYPE = MessageIncubatingAttributes.MESSAGE_TYPE; From 2f13237d3c466081c0c54972eb0c1561eb5d5e4e Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 21:56:27 +0200 Subject: [PATCH 18/52] MESSAGE_* --- .../grpc/v1_6/TracingClientInterceptor.java | 14 +- .../grpc/v1_6/TracingServerInterceptor.java | 14 +- .../grpc/v1_6/AbstractGrpcStreamingTest.java | 6 +- .../grpc/v1_6/AbstractGrpcTest.java | 174 +++++++++++------- .../semconv/SemanticAttributes.java | 11 -- 5 files changed, 126 insertions(+), 93 deletions(-) diff --git a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingClientInterceptor.java b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingClientInterceptor.java index 0e45cedcee7a..475d529b23fd 100644 --- a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingClientInterceptor.java +++ b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingClientInterceptor.java @@ -21,7 +21,7 @@ import io.opentelemetry.context.Scope; import io.opentelemetry.context.propagation.ContextPropagators; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes; import java.util.concurrent.atomic.AtomicLongFieldUpdater; final class TracingClientInterceptor implements ClientInterceptor { @@ -111,9 +111,9 @@ public void sendMessage(REQUEST message) { Span span = Span.fromContext(context); Attributes attributes = Attributes.of( - SemanticAttributes.MESSAGE_TYPE, - SemanticAttributes.MessageTypeValues.SENT, - SemanticAttributes.MESSAGE_ID, + MessageIncubatingAttributes.MESSAGE_TYPE, + MessageIncubatingAttributes.MessageTypeValues.SENT, + MessageIncubatingAttributes.MESSAGE_ID, MESSAGE_ID_UPDATER.incrementAndGet(this)); span.addEvent("message", attributes); } @@ -141,9 +141,9 @@ public void onMessage(RESPONSE message) { Span span = Span.fromContext(context); Attributes attributes = Attributes.of( - SemanticAttributes.MESSAGE_TYPE, - SemanticAttributes.MessageTypeValues.RECEIVED, - SemanticAttributes.MESSAGE_ID, + MessageIncubatingAttributes.MESSAGE_TYPE, + MessageIncubatingAttributes.MessageTypeValues.RECEIVED, + MessageIncubatingAttributes.MESSAGE_ID, MESSAGE_ID_UPDATER.incrementAndGet(TracingClientCall.this)); span.addEvent("message", attributes); try (Scope ignored = context.makeCurrent()) { diff --git a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingServerInterceptor.java b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingServerInterceptor.java index 468114c4d358..a40b6886bb23 100644 --- a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingServerInterceptor.java +++ b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingServerInterceptor.java @@ -19,7 +19,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes; import java.util.concurrent.atomic.AtomicLongFieldUpdater; final class TracingServerInterceptor implements ServerInterceptor { @@ -92,9 +92,9 @@ public void sendMessage(RESPONSE message) { Span span = Span.fromContext(context); Attributes attributes = Attributes.of( - SemanticAttributes.MESSAGE_TYPE, - SemanticAttributes.MessageTypeValues.SENT, - SemanticAttributes.MESSAGE_ID, + MessageIncubatingAttributes.MESSAGE_TYPE, + MessageIncubatingAttributes.MessageTypeValues.SENT, + MessageIncubatingAttributes.MESSAGE_ID, MESSAGE_ID_UPDATER.incrementAndGet(this)); span.addEvent("message", attributes); } @@ -125,9 +125,9 @@ final class TracingServerCallListener public void onMessage(REQUEST message) { Attributes attributes = Attributes.of( - SemanticAttributes.MESSAGE_TYPE, - SemanticAttributes.MessageTypeValues.RECEIVED, - SemanticAttributes.MESSAGE_ID, + MessageIncubatingAttributes.MESSAGE_TYPE, + MessageIncubatingAttributes.MessageTypeValues.RECEIVED, + MessageIncubatingAttributes.MESSAGE_ID, MESSAGE_ID_UPDATER.incrementAndGet(TracingServerCall.this)); Span.fromContext(context).addEvent("message", attributes); delegate().onMessage(message); diff --git a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java index 7ea2791de176..8c8e3701de2e 100644 --- a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java +++ b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java @@ -24,8 +24,8 @@ import io.opentelemetry.instrumentation.testing.util.ThrowingRunnable; import io.opentelemetry.sdk.testing.assertj.EventDataAssert; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes; import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.util.ArrayList; import java.util.List; @@ -161,13 +161,13 @@ public void onCompleted() { assertThat(attrs) .hasSize(2) .hasEntrySatisfying( - SemanticAttributes.MESSAGE_TYPE, + MessageIncubatingAttributes.MESSAGE_TYPE, val -> assertThat(val) .satisfiesAnyOf( v -> assertThat(v).isEqualTo("RECEIVED"), v -> assertThat(v).isEqualTo("SENT"))) - .containsEntry(SemanticAttributes.MESSAGE_ID, messageId))); + .containsEntry(MessageIncubatingAttributes.MESSAGE_ID, messageId))); } testing() diff --git a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java index 6d4da4e2dc28..0e41014eb4c3 100644 --- a/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java +++ b/instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java @@ -49,8 +49,8 @@ import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; +import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes; import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.util.ArrayList; import java.util.Arrays; @@ -149,14 +149,17 @@ public void sayHello( event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 2L))), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, + "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), span -> span.hasName("example.Greeter/SayHello") .hasKind(SpanKind.SERVER) @@ -180,14 +183,17 @@ public void sayHello( event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, + "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 2L))))); + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))))); testing() .waitAndAssertMetrics( "io.opentelemetry.grpc-1.6", @@ -311,14 +317,17 @@ public void sayHello( event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 2L))), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, + "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), span -> span.hasName("example.Greeter/SayHello") .hasKind(SpanKind.SERVER) @@ -342,14 +351,17 @@ public void sayHello( event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, + "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 2L))), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), span -> span.hasName("child") .hasKind(SpanKind.INTERNAL) @@ -485,14 +497,17 @@ public void onCompleted() { event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 2L))), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, + "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), span -> span.hasName("example.Greeter/SayHello") .hasKind(SpanKind.SERVER) @@ -516,14 +531,17 @@ public void onCompleted() { event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, + "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 2L))), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), span -> span.hasName("child") .hasKind(SpanKind.INTERNAL) @@ -634,8 +652,9 @@ public void sayHello( event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L))), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L))), span -> span.hasName("example.Greeter/SayHello") .hasKind(SpanKind.SERVER) @@ -661,8 +680,9 @@ public void sayHello( assertThat(events.get(0)) .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)); + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)); if (status.getCause() == null) { assertThat(events).hasSize(1); } else { @@ -784,8 +804,9 @@ public void sayHello( event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L))), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L))), span -> span.hasName("example.Greeter/SayHello") .hasKind(SpanKind.SERVER) @@ -811,8 +832,9 @@ public void sayHello( assertThat(events.get(0)) .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)); + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)); span.hasException(status.asRuntimeException()); }))); testing() @@ -1030,14 +1052,17 @@ public void onCompleted() { event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 2L))), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, + "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), span -> span.hasName("example.Greeter/SayHello") .hasKind(SpanKind.SERVER) @@ -1061,14 +1086,17 @@ public void onCompleted() { event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, + "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 2L))))); + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))))); } @Test @@ -1148,13 +1176,14 @@ public void onCompleted() { assertThat(events.get(0)) .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)); + equalTo(MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)); assertThat(events.get(1)) .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 2L)); + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L)); span.hasException(thrown); }), span -> @@ -1180,14 +1209,17 @@ public void onCompleted() { event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, + "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 2L))))); + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))))); } @Test @@ -1265,14 +1297,17 @@ public void onCompleted() { event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 2L))), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, + "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), span -> span.hasName( "grpc.reflection.v1alpha.ServerReflection/ServerReflectionInfo") @@ -1299,14 +1334,17 @@ public void onCompleted() { event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, + "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 2L))))); + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))))); } @Test @@ -1369,14 +1407,17 @@ public void sayHello( event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 2L))), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, + "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))), span -> span.hasName("example.Greeter/SayHello") .hasKind(SpanKind.SERVER) @@ -1400,14 +1441,17 @@ public void sayHello( event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "RECEIVED"), - equalTo(SemanticAttributes.MESSAGE_ID, 1L)), + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, + "RECEIVED"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 1L)), event -> event .hasName("message") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.MESSAGE_TYPE, "SENT"), - equalTo(SemanticAttributes.MESSAGE_ID, 2L))))); + equalTo( + MessageIncubatingAttributes.MESSAGE_TYPE, "SENT"), + equalTo(MessageIncubatingAttributes.MESSAGE_ID, 2L))))); } // Regression test for diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index 93bae0928a2c..defa5d2dc273 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -8,7 +8,6 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; -import io.opentelemetry.semconv.incubating.MessageIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; @@ -33,16 +32,6 @@ public static final class MessagingRocketmqMessageTypeValues { private MessagingRocketmqMessageTypeValues() {} } - public static final AttributeKey MESSAGE_ID = MessageIncubatingAttributes.MESSAGE_ID; - public static final AttributeKey MESSAGE_TYPE = MessageIncubatingAttributes.MESSAGE_TYPE; - - public static final class MessageTypeValues { - public static final String SENT = MessageIncubatingAttributes.MessageTypeValues.SENT; - public static final String RECEIVED = MessageIncubatingAttributes.MessageTypeValues.RECEIVED; - - private MessageTypeValues() {} - } - public static final AttributeKey THREAD_ID = ThreadIncubatingAttributes.THREAD_ID; public static final AttributeKey THREAD_NAME = ThreadIncubatingAttributes.THREAD_NAME; From f206f7abc5330bbc0e50cbc5c8a0eb8ac4da08e7 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 2 Apr 2024 21:59:04 +0200 Subject: [PATCH 19/52] THREAD_* --- .../jul/JavaUtilLoggingHelper.java | 5 ++-- .../jul/JavaUtilLoggingTest.java | 9 +++--- .../appender/v1_1/LoggingEventMapper.java | 5 ++-- .../appender/v1_1/JbossLogmanagerTest.java | 13 +++++---- .../log4j/appender/v1_2/LogEventMapper.java | 5 ++-- .../log4j/appender/v1_2/Log4j1Test.java | 13 +++++---- .../log4j/appender/v2_17/Log4j2Test.java | 29 ++++++++++--------- .../appender/v2_17/Slf4jToLog4jTest.java | 17 ++++++----- .../v2_17/internal/LogEventMapper.java | 5 ++-- .../logback/appender/v1_0/LogbackTest.java | 17 ++++++----- .../v1_0/internal/LoggingEventMapper.java | 5 ++-- .../AddThreadDetailsSpanProcessorTest.groovy | 6 ++-- .../semconv/SemanticAttributes.java | 4 --- 13 files changed, 71 insertions(+), 62 deletions(-) diff --git a/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java b/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java index fd279cfe680b..4237cfc427f7 100644 --- a/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java +++ b/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java @@ -14,6 +14,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; import java.util.concurrent.TimeUnit; @@ -95,8 +96,8 @@ private static void mapLogRecord(LogRecordBuilder builder, LogRecord logRecord) if (captureExperimentalAttributes) { Thread currentThread = Thread.currentThread(); - attributes.put(SemanticAttributes.THREAD_NAME, currentThread.getName()); - attributes.put(SemanticAttributes.THREAD_ID, currentThread.getId()); + attributes.put(ThreadIncubatingAttributes.THREAD_NAME, currentThread.getName()); + attributes.put(ThreadIncubatingAttributes.THREAD_ID, currentThread.getId()); } builder.setAllAttributes(attributes.build()); diff --git a/instrumentation/java-util-logging/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingTest.java b/instrumentation/java-util-logging/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingTest.java index e0c508b095d6..86d1e0947a09 100644 --- a/instrumentation/java-util-logging/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingTest.java +++ b/instrumentation/java-util-logging/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingTest.java @@ -15,6 +15,7 @@ import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Stream; @@ -114,8 +115,8 @@ private static void test( if (logException) { assertThat(log) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), equalTo(SemanticAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( @@ -124,8 +125,8 @@ private static void test( } else { assertThat(log) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId())); } if (withParent) { diff --git a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java index e028324b6bdd..02989148c9c2 100644 --- a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java +++ b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java @@ -18,6 +18,7 @@ import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; import java.util.List; @@ -92,8 +93,8 @@ public void capture(Logger logger, ExtLogRecord record) { if (captureExperimentalAttributes) { Thread currentThread = Thread.currentThread(); - attributes.put(SemanticAttributes.THREAD_NAME, currentThread.getName()); - attributes.put(SemanticAttributes.THREAD_ID, currentThread.getId()); + attributes.put(ThreadIncubatingAttributes.THREAD_NAME, currentThread.getName()); + attributes.put(ThreadIncubatingAttributes.THREAD_ID, currentThread.getId()); } builder.setAllAttributes(attributes.build()); diff --git a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java index b74459aa8269..80455d0527f2 100644 --- a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java +++ b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.time.Instant; import java.util.stream.Stream; import org.jboss.logmanager.Level; @@ -140,8 +141,8 @@ private static void test( if (logException) { assertThat(log) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), equalTo(SemanticAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( @@ -150,8 +151,8 @@ private static void test( } else { assertThat(log) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId())); } if (withParent) { @@ -207,8 +208,8 @@ void testMdc() { .hasAttributesSatisfyingExactly( equalTo(AttributeKey.stringKey("key1"), "val1"), equalTo(AttributeKey.stringKey("key2"), "val2"), - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId())); } @FunctionalInterface diff --git a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java index d051fe832b43..8a2a372d53a1 100644 --- a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java +++ b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java @@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; import java.time.Instant; @@ -99,8 +100,8 @@ public void capture(Category logger, Priority level, Object message, Throwable t if (captureExperimentalAttributes) { Thread currentThread = Thread.currentThread(); - attributes.put(SemanticAttributes.THREAD_NAME, currentThread.getName()); - attributes.put(SemanticAttributes.THREAD_ID, currentThread.getId()); + attributes.put(ThreadIncubatingAttributes.THREAD_NAME, currentThread.getName()); + attributes.put(ThreadIncubatingAttributes.THREAD_ID, currentThread.getId()); } builder.setAllAttributes(attributes.build()); diff --git a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java index eec3b5ba4254..ac9f7c6d33ba 100644 --- a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java +++ b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java @@ -17,6 +17,7 @@ import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.lang.reflect.Field; import java.time.Instant; import java.util.stream.Stream; @@ -111,8 +112,8 @@ private static void test( if (logException) { assertThat(log) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), equalTo(SemanticAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( @@ -121,8 +122,8 @@ private static void test( } else { assertThat(log) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId())); } if (withParent) { @@ -157,8 +158,8 @@ void testMdc() { .hasAttributesSatisfyingExactly( equalTo(AttributeKey.stringKey("key1"), "val1"), equalTo(AttributeKey.stringKey("key2"), "val2"), - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId())); } private static void performLogging( diff --git a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java index bd78aec7b580..374fed82a284 100644 --- a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java +++ b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java @@ -17,6 +17,7 @@ import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.time.Instant; import java.util.stream.Stream; import org.apache.logging.log4j.LogManager; @@ -100,8 +101,8 @@ private static void test( if (logException) { assertThat(log) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), equalTo(SemanticAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( @@ -110,8 +111,8 @@ private static void test( } else { assertThat(log) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId())); } if (withParent) { @@ -145,8 +146,8 @@ void testContextData() { .hasAttributesSatisfyingExactly( equalTo(AttributeKey.stringKey("key1"), "val1"), equalTo(AttributeKey.stringKey("key2"), "val2"), - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId())); } @Test @@ -165,8 +166,8 @@ void testStringMapMessage() { .hasAttributesSatisfyingExactly( equalTo(AttributeKey.stringKey("log4j.map_message.key1"), "val1"), equalTo(AttributeKey.stringKey("log4j.map_message.key2"), "val2"), - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId())); } @Test @@ -184,8 +185,8 @@ void testStringMapMessageWithSpecialAttribute() { .hasSeverityText("INFO") .hasAttributesSatisfyingExactly( equalTo(AttributeKey.stringKey("log4j.map_message.key1"), "val1"), - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId())); } @Test @@ -204,8 +205,8 @@ void testStructuredDataMapMessage() { .hasAttributesSatisfyingExactly( equalTo(AttributeKey.stringKey("log4j.map_message.key1"), "val1"), equalTo(AttributeKey.stringKey("log4j.map_message.key2"), "val2"), - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId())); } @Test @@ -219,8 +220,8 @@ public void testMarker() { LogRecordData log = testing.waitForLogRecords(1).get(0); assertThat(log) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), equalTo(AttributeKey.stringKey("log4j.marker"), markerName)); } diff --git a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java index 877298562f03..923dbb79f2a0 100644 --- a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java +++ b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java @@ -16,6 +16,7 @@ import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.util.stream.Stream; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -89,8 +90,8 @@ private static void test( if (logException) { assertThat(log) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), equalTo(SemanticAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( @@ -99,8 +100,8 @@ private static void test( } else { assertThat(log) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId())); } if (withParent) { @@ -134,8 +135,8 @@ void testMdc() { .hasAttributesSatisfyingExactly( equalTo(AttributeKey.stringKey("key1"), "val1"), equalTo(AttributeKey.stringKey("key2"), "val2"), - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId())); + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId())); } @Test @@ -149,8 +150,8 @@ public void testMarker() { LogRecordData log = testing.waitForLogRecords(1).get(0); assertThat(log) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), equalTo(AttributeKey.stringKey("log4j.marker"), markerName)); } diff --git a/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java b/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java index 121250b19d04..7237ba19c33f 100644 --- a/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java +++ b/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java @@ -13,6 +13,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; import java.util.List; @@ -107,8 +108,8 @@ public void mapLogEvent( captureContextDataAttributes(attributes, contextData); if (captureExperimentalAttributes) { - attributes.put(SemanticAttributes.THREAD_NAME, threadName); - attributes.put(SemanticAttributes.THREAD_ID, threadId); + attributes.put(ThreadIncubatingAttributes.THREAD_NAME, threadName); + attributes.put(ThreadIncubatingAttributes.THREAD_ID, threadId); } builder.setAllAttributes(attributes.build()); diff --git a/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java b/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java index a8d23bef5858..f4a3844c178f 100644 --- a/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java +++ b/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java @@ -17,6 +17,7 @@ import io.opentelemetry.sdk.logs.data.LogRecordData; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; +import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.util.Arrays; import java.util.stream.Stream; import org.assertj.core.api.AbstractLongAssert; @@ -143,8 +144,8 @@ private static void test( if (logException) { assertThat(log) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, LogbackTest.class.getName()), equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "performLogging"), satisfies(CodeIncubatingAttributes.CODE_LINENO, AbstractLongAssert::isPositive), @@ -157,8 +158,8 @@ private static void test( } else { assertThat(log) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, LogbackTest.class.getName()), equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "performLogging"), satisfies(CodeIncubatingAttributes.CODE_LINENO, AbstractLongAssert::isPositive), @@ -196,8 +197,8 @@ void testMdc() { .hasAttributesSatisfyingExactly( equalTo(AttributeKey.stringKey("key1"), "val1"), equalTo(AttributeKey.stringKey("key2"), "val2"), - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, LogbackTest.class.getName()), equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "testMdc"), satisfies(CodeIncubatingAttributes.CODE_LINENO, AbstractLongAssert::isPositive), @@ -215,8 +216,8 @@ public void testMarker() { LogRecordData log = testing.waitForLogRecords(1).get(0); assertThat(log) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.THREAD_NAME, Thread.currentThread().getName()), - equalTo(SemanticAttributes.THREAD_ID, Thread.currentThread().getId()), + equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), + equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), equalTo(AttributeKey.stringArrayKey("logback.marker"), Arrays.asList(markerName)), equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, LogbackTest.class.getName()), equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "testMarker"), diff --git a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java index e193a49665ae..e7aad0f822f6 100644 --- a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java +++ b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java @@ -22,6 +22,7 @@ import io.opentelemetry.javaagent.tooling.muzzle.NoMuzzle; import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; +import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; import java.util.ArrayList; @@ -125,9 +126,9 @@ private void mapLoggingEvent( captureMdcAttributes(attributes, loggingEvent.getMDCPropertyMap()); if (captureExperimentalAttributes) { - attributes.put(SemanticAttributes.THREAD_NAME, loggingEvent.getThreadName()); + attributes.put(ThreadIncubatingAttributes.THREAD_NAME, loggingEvent.getThreadName()); if (threadId != -1) { - attributes.put(SemanticAttributes.THREAD_ID, threadId); + attributes.put(ThreadIncubatingAttributes.THREAD_ID, threadId); } } diff --git a/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessorTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessorTest.groovy index 29040f5f561d..a79170fc7666 100644 --- a/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessorTest.groovy +++ b/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessorTest.groovy @@ -8,6 +8,8 @@ package io.opentelemetry.javaagent.tooling import io.opentelemetry.context.Context import io.opentelemetry.sdk.trace.ReadWriteSpan import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes +import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes import spock.lang.Specification class AddThreadDetailsSpanProcessorTest extends Specification { @@ -29,7 +31,7 @@ class AddThreadDetailsSpanProcessorTest extends Specification { processor.onStart(Context.root(), span) then: - 1 * span.setAttribute(SemanticAttributes.THREAD_ID, currentThreadId) - 1 * span.setAttribute(SemanticAttributes.THREAD_NAME, currentThreadName) + 1 * span.setAttribute(ThreadIncubatingAttributes.THREAD_ID, currentThreadId) + 1 * span.setAttribute(ThreadIncubatingAttributes.THREAD_NAME, currentThreadName) } } diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index defa5d2dc273..61f119fe98f5 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -9,7 +9,6 @@ import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; -import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; public class SemanticAttributes { @@ -32,9 +31,6 @@ public static final class MessagingRocketmqMessageTypeValues { private MessagingRocketmqMessageTypeValues() {} } - public static final AttributeKey THREAD_ID = ThreadIncubatingAttributes.THREAD_ID; - public static final AttributeKey THREAD_NAME = ThreadIncubatingAttributes.THREAD_NAME; - public static final AttributeKey EXCEPTION_MESSAGE = ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; public static final AttributeKey EXCEPTION_STACKTRACE = From afe52032cb988f824da1bf2b9b3da8491846d76c Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:36:53 +0200 Subject: [PATCH 20/52] EXCEPTION_* --- .../OpenTelemetryInstrumentationHelper.java | 6 ++++-- .../graphql/AbstractGraphqlTest.java | 10 +++++---- .../hibernate/v3_3/SessionTest.java | 6 +++--- .../jul/JavaUtilLoggingHelper.java | 8 +++---- .../jul/JavaUtilLoggingTest.java | 10 +++++---- .../appender/v1_1/LoggingEventMapper.java | 8 +++---- .../appender/v1_1/JbossLogmanagerTest.java | 10 +++++---- .../JspInstrumentationBasicTests.groovy | 17 +++++++-------- .../log4j/appender/v1_2/LogEventMapper.java | 8 +++---- .../log4j/appender/v1_2/Log4j1Test.java | 10 +++++---- .../log4j/appender/v2_17/Log4j2Test.java | 10 +++++---- .../appender/v2_17/Slf4jToLog4jTest.java | 10 +++++---- .../v2_17/internal/LogEventMapper.java | 8 +++---- .../AbstractOpenTelemetryAppenderTest.java | 12 +++++++---- .../logback/appender/v1_0/LogbackTest.java | 10 +++++---- .../v1_0/internal/LoggingEventMapper.java | 8 +++---- .../AbstractOpenTelemetryAppenderTest.java | 8 +++---- .../src/test/groovy/TracerTest.groovy | 10 ++++----- .../rabbitmq/RabbitMqTest.java | 9 +++++--- .../v1_0/ReactorNettyClientSslTest.java | 10 ++++++--- .../instrumentation/rmi/RmiTest.java | 15 +++++++------ .../src/test/groovy/SpringRmiTest.groovy | 21 +++++++++---------- .../scheduling/v3_1/SpringSchedulingTest.java | 9 +++++--- .../v5_0/server/SpringWebfluxTest.java | 6 +++--- .../ControllerSpringWebFluxServerTest.java | 6 +++--- .../base/HandlerSpringWebFluxServerTest.java | 6 +++--- .../vertx/v4_0/sql/VertxSqlClientTest.java | 6 +++--- .../semconv/SemanticAttributes.java | 8 ------- .../test/asserts/SpanAssert.groovy | 13 ++++++------ 29 files changed, 150 insertions(+), 128 deletions(-) diff --git a/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java b/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java index 46b66fd72ca1..268ff10d29b1 100644 --- a/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java +++ b/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java @@ -36,6 +36,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder; import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import java.util.Locale; /** @@ -95,8 +96,9 @@ public InstrumentationContext beginExecution( Span span = Span.fromContext(context); for (GraphQLError error : result.getErrors()) { AttributesBuilder attributes = Attributes.builder(); - attributes.put(SemanticAttributes.EXCEPTION_TYPE, String.valueOf(error.getErrorType())); - attributes.put(SemanticAttributes.EXCEPTION_MESSAGE, error.getMessage()); + attributes.put( + ExceptionIncubatingAttributes.EXCEPTION_TYPE, String.valueOf(error.getErrorType())); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, error.getMessage()); span.addEvent(SemanticAttributes.EXCEPTION_EVENT_NAME, attributes.build()); } diff --git a/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java b/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java index 9b7afba9101e..961c677fb8d6 100644 --- a/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java +++ b/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java @@ -25,6 +25,7 @@ import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; @@ -207,9 +208,10 @@ void parseError() { .hasName(SemanticAttributes.EXCEPTION_EVENT_NAME) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.EXCEPTION_TYPE, "InvalidSyntax"), + ExceptionIncubatingAttributes.EXCEPTION_TYPE, + "InvalidSyntax"), satisfies( - SemanticAttributes.EXCEPTION_MESSAGE, + ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, message -> message.startsWithIgnoringCase( "Invalid Syntax")))))); @@ -248,10 +250,10 @@ void validationError() { .hasName(SemanticAttributes.EXCEPTION_EVENT_NAME) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.EXCEPTION_TYPE, + ExceptionIncubatingAttributes.EXCEPTION_TYPE, "ValidationError"), satisfies( - SemanticAttributes.EXCEPTION_MESSAGE, + ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, message -> message.startsWith("Validation error")))))); } diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java index 98e6e3e5abb3..a9a8a1d04f24 100644 --- a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java +++ b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java @@ -7,10 +7,10 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_TYPE; import static org.junit.jupiter.api.Named.named; import io.opentelemetry.api.common.AttributeKey; diff --git a/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java b/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java index 4237cfc427f7..533372392391 100644 --- a/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java +++ b/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.logs.Severity; import io.opentelemetry.context.Context; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; @@ -87,11 +87,11 @@ private static void mapLogRecord(LogRecordBuilder builder, LogRecord logRecord) if (throwable != null) { // TODO (trask) extract method for recording exception into // io.opentelemetry:opentelemetry-api - attributes.put(SemanticAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); - attributes.put(SemanticAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); StringWriter writer = new StringWriter(); throwable.printStackTrace(new PrintWriter(writer)); - attributes.put(SemanticAttributes.EXCEPTION_STACKTRACE, writer.toString()); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, writer.toString()); } if (captureExperimentalAttributes) { diff --git a/instrumentation/java-util-logging/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingTest.java b/instrumentation/java-util-logging/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingTest.java index 86d1e0947a09..155d0c25e46d 100644 --- a/instrumentation/java-util-logging/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingTest.java +++ b/instrumentation/java-util-logging/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingTest.java @@ -14,7 +14,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.util.logging.Level; import java.util.logging.Logger; @@ -117,10 +117,12 @@ private static void test( .hasAttributesSatisfyingExactly( equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), - equalTo(SemanticAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), - equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "hello"), + equalTo( + ExceptionIncubatingAttributes.EXCEPTION_TYPE, + IllegalStateException.class.getName()), + equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( - SemanticAttributes.EXCEPTION_STACKTRACE, + ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, v -> v.contains(JavaUtilLoggingTest.class.getName()))); } else { assertThat(log) diff --git a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java index 02989148c9c2..3cc962a0eddf 100644 --- a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java +++ b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java @@ -17,7 +17,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; @@ -83,11 +83,11 @@ public void capture(Logger logger, ExtLogRecord record) { if (throwable != null) { // TODO (trask) extract method for recording exception into // io.opentelemetry:opentelemetry-api - attributes.put(SemanticAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); - attributes.put(SemanticAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); StringWriter writer = new StringWriter(); throwable.printStackTrace(new PrintWriter(writer)); - attributes.put(SemanticAttributes.EXCEPTION_STACKTRACE, writer.toString()); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, writer.toString()); } captureMdcAttributes(attributes); diff --git a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java index 80455d0527f2..4b0d58fc9c87 100644 --- a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java +++ b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java @@ -17,7 +17,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.time.Instant; import java.util.stream.Stream; @@ -143,10 +143,12 @@ private static void test( .hasAttributesSatisfyingExactly( equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), - equalTo(SemanticAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), - equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "hello"), + equalTo( + ExceptionIncubatingAttributes.EXCEPTION_TYPE, + IllegalStateException.class.getName()), + equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( - SemanticAttributes.EXCEPTION_STACKTRACE, + ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, v -> v.contains(JbossLogmanagerTest.class.getName()))); } else { assertThat(log) diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy index 81c1199a8212..ee343e98ba0a 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy @@ -3,18 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.ServerAttributes +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient @@ -264,13 +261,13 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { event(0) { eventName(SemanticAttributes.EXCEPTION_EVENT_NAME) attributes { - "$SemanticAttributes.EXCEPTION_TYPE" { String tagExceptionType -> + "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" { String tagExceptionType -> return tagExceptionType == exceptionClass.getName() || tagExceptionType.contains(exceptionClass.getSimpleName()) } - "$SemanticAttributes.EXCEPTION_MESSAGE" { String tagErrorMsg -> + "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" { String tagErrorMsg -> return errorMessageOptional || tagErrorMsg instanceof String } - "$SemanticAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String } } attributes { @@ -304,13 +301,13 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { event(0) { eventName(SemanticAttributes.EXCEPTION_EVENT_NAME) attributes { - "$SemanticAttributes.EXCEPTION_TYPE" { String tagExceptionType -> + "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" { String tagExceptionType -> return tagExceptionType == exceptionClass.getName() || tagExceptionType.contains(exceptionClass.getSimpleName()) } - "$SemanticAttributes.EXCEPTION_MESSAGE" { String tagErrorMsg -> + "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" { String tagErrorMsg -> return errorMessageOptional || tagErrorMsg instanceof String } - "$SemanticAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String } } attributes { diff --git a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java index 8a2a372d53a1..3ea37e564186 100644 --- a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java +++ b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java @@ -16,7 +16,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; @@ -89,11 +89,11 @@ public void capture(Category logger, Priority level, Object message, Throwable t if (throwable != null) { // TODO (trask) extract method for recording exception into // io.opentelemetry:opentelemetry-api - attributes.put(SemanticAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); - attributes.put(SemanticAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); StringWriter writer = new StringWriter(); throwable.printStackTrace(new PrintWriter(writer)); - attributes.put(SemanticAttributes.EXCEPTION_STACKTRACE, writer.toString()); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, writer.toString()); } captureMdcAttributes(attributes); diff --git a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java index ac9f7c6d33ba..bc20c61e1677 100644 --- a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java +++ b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java @@ -16,7 +16,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.lang.reflect.Field; import java.time.Instant; @@ -114,10 +114,12 @@ private static void test( .hasAttributesSatisfyingExactly( equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), - equalTo(SemanticAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), - equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "hello"), + equalTo( + ExceptionIncubatingAttributes.EXCEPTION_TYPE, + IllegalStateException.class.getName()), + equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( - SemanticAttributes.EXCEPTION_STACKTRACE, + ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, v -> v.contains(Log4j1Test.class.getName()))); } else { assertThat(log) diff --git a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java index 374fed82a284..2e8a07993b58 100644 --- a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java +++ b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java @@ -16,7 +16,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.time.Instant; import java.util.stream.Stream; @@ -103,10 +103,12 @@ private static void test( .hasAttributesSatisfyingExactly( equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), - equalTo(SemanticAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), - equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "hello"), + equalTo( + ExceptionIncubatingAttributes.EXCEPTION_TYPE, + IllegalStateException.class.getName()), + equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( - SemanticAttributes.EXCEPTION_STACKTRACE, + ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, v -> v.contains(Log4j2Test.class.getName()))); } else { assertThat(log) diff --git a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java index 923dbb79f2a0..db924cb481be 100644 --- a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java +++ b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.util.stream.Stream; import org.junit.jupiter.api.Test; @@ -92,10 +92,12 @@ private static void test( .hasAttributesSatisfyingExactly( equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), - equalTo(SemanticAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), - equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "hello"), + equalTo( + ExceptionIncubatingAttributes.EXCEPTION_TYPE, + IllegalStateException.class.getName()), + equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( - SemanticAttributes.EXCEPTION_STACKTRACE, + ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, v -> v.contains(Slf4jToLog4jTest.class.getName()))); } else { assertThat(log) diff --git a/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java b/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java index 7237ba19c33f..9b8bc0863936 100644 --- a/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java +++ b/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.logs.Severity; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.internal.cache.Cache; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; @@ -188,11 +188,11 @@ public static AttributeKey getMapMessageAttributeKey(String key) { private static void setThrowable(AttributesBuilder attributes, Throwable throwable) { // TODO (trask) extract method for recording exception into // io.opentelemetry:opentelemetry-api - attributes.put(SemanticAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); - attributes.put(SemanticAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); StringWriter writer = new StringWriter(); throwable.printStackTrace(new PrintWriter(writer)); - attributes.put(SemanticAttributes.EXCEPTION_STACKTRACE, writer.toString()); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, writer.toString()); } private static Severity levelToSeverity(Level level) { diff --git a/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java b/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java index 9378bccf3c1f..5aafe497032e 100644 --- a/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java +++ b/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java @@ -22,7 +22,7 @@ import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.testing.exporter.InMemoryLogRecordExporter; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import java.time.Instant; import java.util.List; import org.apache.logging.log4j.LogManager; @@ -138,9 +138,13 @@ void logWithExtras() { .hasSeverity(Severity.INFO) .hasSeverityText("INFO") .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), - equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "Error!"), - satisfies(SemanticAttributes.EXCEPTION_STACKTRACE, v -> v.contains("logWithExtras"))); + equalTo( + ExceptionIncubatingAttributes.EXCEPTION_TYPE, + IllegalStateException.class.getName()), + equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, "Error!"), + satisfies( + ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, + v -> v.contains("logWithExtras"))); assertThat(logDataList.get(0).getTimestampEpochNanos()) .isGreaterThanOrEqualTo(MILLISECONDS.toNanos(start.toEpochMilli())) diff --git a/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java b/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java index f4a3844c178f..4a8a1357792a 100644 --- a/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java +++ b/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java @@ -15,8 +15,8 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.util.Arrays; import java.util.stream.Stream; @@ -150,10 +150,12 @@ private static void test( equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "performLogging"), satisfies(CodeIncubatingAttributes.CODE_LINENO, AbstractLongAssert::isPositive), equalTo(CodeIncubatingAttributes.CODE_FILEPATH, "LogbackTest.java"), - equalTo(SemanticAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), - equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "hello"), + equalTo( + ExceptionIncubatingAttributes.EXCEPTION_TYPE, + IllegalStateException.class.getName()), + equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( - SemanticAttributes.EXCEPTION_STACKTRACE, + ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, v -> v.contains(LogbackTest.class.getName()))); } else { assertThat(log) diff --git a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java index e7aad0f822f6..c82e74a583af 100644 --- a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java +++ b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java @@ -20,8 +20,8 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.tooling.muzzle.NoMuzzle; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; @@ -191,11 +191,11 @@ public static AttributeKey getMdcAttributeKey(String key) { private static void setThrowable(AttributesBuilder attributes, Throwable throwable) { // TODO (trask) extract method for recording exception into // io.opentelemetry:opentelemetry-api - attributes.put(SemanticAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); - attributes.put(SemanticAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); StringWriter writer = new StringWriter(); throwable.printStackTrace(new PrintWriter(writer)); - attributes.put(SemanticAttributes.EXCEPTION_STACKTRACE, writer.toString()); + attributes.put(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, writer.toString()); } private static Severity levelToSeverity(Level level) { diff --git a/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java b/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java index 6f239a4c87a1..b9612ab9014c 100644 --- a/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java +++ b/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java @@ -18,8 +18,8 @@ import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.testing.exporter.InMemoryLogRecordExporter; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.time.Instant; @@ -126,11 +126,11 @@ void logWithExtras() { assertThat(logData.getSeverityText()).isEqualTo("INFO"); assertThat(logData.getAttributes().size()) .isEqualTo(3 + 4 + 1); // 3 exception attributes, 4 code attributes, 1 marker attribute - assertThat(logData.getAttributes().get(SemanticAttributes.EXCEPTION_TYPE)) + assertThat(logData.getAttributes().get(ExceptionIncubatingAttributes.EXCEPTION_TYPE)) .isEqualTo(IllegalStateException.class.getName()); - assertThat(logData.getAttributes().get(SemanticAttributes.EXCEPTION_MESSAGE)) + assertThat(logData.getAttributes().get(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE)) .isEqualTo("Error!"); - assertThat(logData.getAttributes().get(SemanticAttributes.EXCEPTION_STACKTRACE)) + assertThat(logData.getAttributes().get(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE)) .contains("logWithExtras"); String file = logData.getAttributes().get(CodeIncubatingAttributes.CODE_FILEPATH); diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/TracerTest.groovy b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/TracerTest.groovy index 8172e8ca79ee..21180e497928 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/TracerTest.groovy +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/TracerTest.groovy @@ -9,7 +9,7 @@ import io.opentelemetry.api.trace.Span import io.opentelemetry.context.Context import io.opentelemetry.context.Scope import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes import static io.opentelemetry.api.trace.SpanKind.PRODUCER import static io.opentelemetry.api.trace.StatusCode.ERROR @@ -235,8 +235,8 @@ class TracerTest extends AgentInstrumentationSpecification { event(0) { eventName("exception") attributes { - "$SemanticAttributes.EXCEPTION_TYPE" "java.lang.IllegalStateException" - "$SemanticAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" "java.lang.IllegalStateException" + "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String } } attributes { @@ -263,8 +263,8 @@ class TracerTest extends AgentInstrumentationSpecification { event(0) { eventName("exception") attributes { - "$SemanticAttributes.EXCEPTION_TYPE" "java.lang.IllegalStateException" - "$SemanticAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" "java.lang.IllegalStateException" + "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String "dog" "bark" } } diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java index de1e720d2610..b90dd5d1e6ba 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java @@ -31,6 +31,7 @@ import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.io.FileNotFoundException; import java.io.IOException; @@ -891,10 +892,12 @@ private static void verifyException(SpanDataAssert span, Throwable exception, St assertThat(events.get(0)) .hasName(SemanticAttributes.EXCEPTION_EVENT_NAME) .hasAttributesSatisfying( - equalTo(SemanticAttributes.EXCEPTION_TYPE, exception.getClass().getName()), - equalTo(SemanticAttributes.EXCEPTION_MESSAGE, errorMsg), + equalTo( + ExceptionIncubatingAttributes.EXCEPTION_TYPE, + exception.getClass().getName()), + equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, errorMsg), satisfies( - SemanticAttributes.EXCEPTION_STACKTRACE, + ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))); }); } diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java index 4278b56782eb..9494abfa3549 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java @@ -26,6 +26,7 @@ import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import java.util.List; import javax.annotation.Nullable; import javax.net.ssl.SSLException; @@ -228,9 +229,12 @@ private static void isSslHandshakeException(List events) { assertThat(event) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.EXCEPTION_TYPE, + ExceptionIncubatingAttributes.EXCEPTION_TYPE, SSLHandshakeException.class.getCanonicalName()), - satisfies(SemanticAttributes.EXCEPTION_MESSAGE, s -> s.isNotEmpty()), - satisfies(SemanticAttributes.EXCEPTION_STACKTRACE, s -> s.isNotEmpty()))); + satisfies( + ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, s -> s.isNotEmpty()), + satisfies( + ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, + s -> s.isNotEmpty()))); } } diff --git a/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java b/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java index 1668ba922bef..ea180c531ff2 100644 --- a/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java +++ b/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java @@ -16,6 +16,7 @@ import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.rmi.registry.LocateRegistry; import java.rmi.registry.Registry; @@ -150,13 +151,14 @@ void serviceThrownException() throws Exception { .hasName(SemanticAttributes.EXCEPTION_EVENT_NAME) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.EXCEPTION_TYPE, + ExceptionIncubatingAttributes.EXCEPTION_TYPE, thrown.getClass().getCanonicalName()), equalTo( - SemanticAttributes.EXCEPTION_MESSAGE, + ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, thrown.getMessage()), satisfies( - SemanticAttributes.EXCEPTION_STACKTRACE, + ExceptionIncubatingAttributes + .EXCEPTION_STACKTRACE, AbstractAssert::isNotNull))) .hasAttributesSatisfyingExactly( equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "java_rmi"), @@ -172,13 +174,14 @@ void serviceThrownException() throws Exception { .hasName(SemanticAttributes.EXCEPTION_EVENT_NAME) .hasAttributesSatisfyingExactly( equalTo( - SemanticAttributes.EXCEPTION_TYPE, + ExceptionIncubatingAttributes.EXCEPTION_TYPE, thrown.getClass().getCanonicalName()), equalTo( - SemanticAttributes.EXCEPTION_MESSAGE, + ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, thrown.getMessage()), satisfies( - SemanticAttributes.EXCEPTION_STACKTRACE, + ExceptionIncubatingAttributes + .EXCEPTION_STACKTRACE, AbstractAssert::isNotNull))) .hasAttributesSatisfyingExactly( equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "java_rmi"), diff --git a/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy b/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy index 3841eca90b56..f7bc11bc7e10 100644 --- a/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy +++ b/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy @@ -7,8 +7,7 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import org.springframework.boot.SpringApplication import org.springframework.context.ConfigurableApplicationContext @@ -133,9 +132,9 @@ class SpringRmiTest extends AgentInstrumentationSpecification { event(0) { eventName("$SemanticAttributes.EXCEPTION_EVENT_NAME") attributes { - "$SemanticAttributes.EXCEPTION_TYPE" error.getClass().getCanonicalName() - "$SemanticAttributes.EXCEPTION_MESSAGE" error.getMessage() - "$SemanticAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" error.getClass().getCanonicalName() + "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" error.getMessage() + "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String } } } @@ -147,9 +146,9 @@ class SpringRmiTest extends AgentInstrumentationSpecification { event(0) { eventName("$SemanticAttributes.EXCEPTION_EVENT_NAME") attributes { - "$SemanticAttributes.EXCEPTION_TYPE" error.getClass().getCanonicalName() - "$SemanticAttributes.EXCEPTION_MESSAGE" error.getMessage() - "$SemanticAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" error.getClass().getCanonicalName() + "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" error.getMessage() + "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String } } attributes { @@ -166,9 +165,9 @@ class SpringRmiTest extends AgentInstrumentationSpecification { event(0) { eventName("$SemanticAttributes.EXCEPTION_EVENT_NAME") attributes { - "$SemanticAttributes.EXCEPTION_TYPE" error.getClass().getCanonicalName() - "$SemanticAttributes.EXCEPTION_MESSAGE" error.getMessage() - "$SemanticAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" error.getClass().getCanonicalName() + "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" error.getMessage() + "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String } } attributes { diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java index d1260b0d9eff..9c27f06f6859 100644 --- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java +++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java @@ -27,6 +27,7 @@ import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.service.LambdaTaskConfigurer; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -166,11 +167,13 @@ void taskWithErrorTest() throws InterruptedException { .hasName(SemanticAttributes.EXCEPTION_EVENT_NAME) .hasAttributesSatisfying( equalTo( - SemanticAttributes.EXCEPTION_TYPE, + ExceptionIncubatingAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), - equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "failure"), + equalTo( + ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, + "failure"), satisfies( - SemanticAttributes.EXCEPTION_STACKTRACE, + ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, value -> value.isInstanceOf(String.class)))), span -> span.hasName("error-handler").hasParent(trace.getSpan(0)))); } diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java index 2f2be1de9572..fe020ba0b8eb 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java @@ -11,14 +11,14 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; import static io.opentelemetry.semconv.ClientAttributes.CLIENT_ADDRESS; import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE; +import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD; import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; import static io.opentelemetry.semconv.HttpAttributes.HTTP_ROUTE; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PROTOCOL_VERSION; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.UserAgentAttributes.USER_AGENT_ORIGINAL; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java index 9de16a7aee66..cd6da9257623 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java @@ -9,10 +9,10 @@ import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.NOT_FOUND; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_TYPE; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java index 936d4d715621..33dae9dd3ab0 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java @@ -9,10 +9,10 @@ import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.NOT_FOUND; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_TYPE; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.api.internal.HttpConstants; diff --git a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java index ffd05a4bc54b..371b85b38a47 100644 --- a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java +++ b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java @@ -7,10 +7,10 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index 61f119fe98f5..d8fd8392133e 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -7,7 +7,6 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; public class SemanticAttributes { @@ -31,13 +30,6 @@ public static final class MessagingRocketmqMessageTypeValues { private MessagingRocketmqMessageTypeValues() {} } - public static final AttributeKey EXCEPTION_MESSAGE = - ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; - public static final AttributeKey EXCEPTION_STACKTRACE = - ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; - public static final AttributeKey EXCEPTION_TYPE = - ExceptionIncubatingAttributes.EXCEPTION_TYPE; - public static final String EXCEPTION_EVENT_NAME = "exception"; public static final AttributeKey FAAS_TRIGGER = ResourceAttributes.FAAS_TRIGGER; diff --git a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy index ba2f6f6e69cd..f09819e6ce2e 100644 --- a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy +++ b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy @@ -13,6 +13,7 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.api.trace.StatusCode import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.SemanticAttributes +import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes import java.util.regex.Pattern @@ -149,9 +150,9 @@ class SpanAssert { event(0) { eventName(SemanticAttributes.EXCEPTION_EVENT_NAME) attributes { - "$SemanticAttributes.EXCEPTION_TYPE" expectedClass.canonicalName - "$SemanticAttributes.EXCEPTION_STACKTRACE" String - "$SemanticAttributes.EXCEPTION_MESSAGE" { it != null } + "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" expectedClass.canonicalName + "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" { it != null } } } } @@ -164,10 +165,10 @@ class SpanAssert { event(index) { eventName(SemanticAttributes.EXCEPTION_EVENT_NAME) attributes { - "$SemanticAttributes.EXCEPTION_TYPE" errorClass.canonicalName - "$SemanticAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" errorClass.canonicalName + "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String if (expectedMessage != null) { - "$SemanticAttributes.EXCEPTION_MESSAGE" expectedMessage + "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" expectedMessage } } } From bb005b07d792d529796f5011ecddd151af95c68b Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:37:33 +0200 Subject: [PATCH 21/52] remove duplication in groovy imports --- .../apachedubbo/v2_7/AbstractDubboTest.groovy | 5 ----- .../v2_7/AbstractDubboTraceChainTest.groovy | 5 ----- .../javaagent/src/test/groovy/S3TracingTest.groovy | 6 ------ .../javaagent/src/test/groovy/SnsTracingTest.groovy | 6 ------ .../awssdk/v1_11/Aws1ClientTest.groovy | 3 --- .../test_before_1_11_106/groovy/Aws0ClientTest.groovy | 5 ----- .../awssdk/v1_11/AbstractAws1ClientTest.groovy | 5 ----- .../awssdk/v2_2/AbstractAws2ClientCoreTest.groovy | 6 ------ .../awssdk/v2_2/AbstractAws2ClientTest.groovy | 8 -------- .../AbstractAws2SqsSuppressReceiveSpansTest.groovy | 6 ------ .../awssdk/v2_2/AbstractAws2SqsTracingTest.groovy | 7 ------- .../src/test/groovy/CouchbaseSpanUtil.groovy | 5 ----- .../src/main/groovy/util/AbstractCouchbaseTest.groovy | 4 ---- .../test/groovy/Elasticsearch53NodeClientTest.groovy | 2 -- .../groovy/Elasticsearch53TransportClientTest.groovy | 2 -- .../Elasticsearch53SpringRepositoryTest.groovy | 3 --- .../Elasticsearch53SpringTemplateTest.groovy | 2 -- .../test/groovy/Elasticsearch6NodeClientTest.groovy | 2 -- .../groovy/Elasticsearch6TransportClientTest.groovy | 3 --- .../src/test/groovy/SpringJpaTest.groovy | 7 ------- .../src/test/groovy/JaxRsClientTest.groovy | 4 ---- .../javaagent/src/test/groovy/JerseyTest.groovy | 3 --- .../groovy/JaxrsAnnotationsInstrumentationTest.groovy | 3 --- .../groovy/JaxrsAnnotationsInstrumentationTest.groovy | 3 --- .../src/main/groovy/AbstractJaxRsFilterTest.groovy | 3 --- .../main/groovy/AbstractJaxRsHttpServerTest.groovy | 6 ------ .../src/main/groovy/AbstractJaxWsTest.groovy | 2 -- .../jaxws/v2_0/JaxWsAnnotationsTest.groovy | 2 -- .../src/main/groovy/AbstractJaxWsTest.groovy | 2 -- .../jaxws/jws/v1_1/JwsAnnotationsTest.groovy | 2 -- .../src/test/groovy/JdbcInstrumentationTest.groovy | 8 -------- .../jdbc/OpenTelemetryConnectionTest.groovy | 8 -------- .../testing/src/main/groovy/BaseJsfTest.groovy | 5 ----- .../test/groovy/JspInstrumentationForwardTests.groovy | 5 ----- .../src/test/groovy/KafkaStreamsDefaultTest.groovy | 11 +---------- .../KafkaStreamsSuppressReceiveSpansTest.groovy | 10 +--------- .../mongo/testing/AbstractMongoClientTest.groovy | 7 ------- .../src/test/groovy/Netty41ClientSslTest.groovy | 4 ---- .../src/test/groovy/Netty41ConnectionSpanTest.groovy | 4 ---- .../src/test/groovy/ContextBridgeTest.groovy | 2 -- .../src/main/groovy/PlayWsClientTestBaseBase.groovy | 2 -- .../ratpack/server/AbstractRatpackRoutesTest.groovy | 5 ----- .../ratpack/v1_7/server/RatpackServerTest.groovy | 3 --- .../src/test/groovy/RediscalaClientTest.groovy | 2 -- .../src/test/groovy/HttpServletResponseTest.groovy | 2 -- .../src/test/groovy/JettyServlet2Test.groovy | 2 -- .../src/test/groovy/HttpServletResponseTest.groovy | 2 -- .../test/groovy/SpringIntegrationAndRabbitTest.groovy | 7 ------- .../src/test/groovy/SpringListenerTest.groovy | 5 ----- .../groovy/boot/AbstractSpringBootBasedTest.groovy | 2 -- .../src/test/groovy/test/boot/SpringWsTest.groovy | 2 -- .../javaagent/src/test/groovy/SpymemcachedTest.groovy | 2 -- .../src/test/groovy/Struts2ActionSpanTest.groovy | 2 -- .../src/test/groovy/test/TwilioClientTest.groovy | 2 -- .../src/test/groovy/UndertowServerTest.groovy | 5 ----- .../groovy/VertxReactivePropagationTest.groovy | 11 ----------- .../groovy/VertxReactivePropagationTest.groovy | 11 ----------- .../client/VertxRxCircuitBreakerWebClientTest.groovy | 2 -- .../groovy/client/VertxRxWebClientTest.groovy | 2 -- .../tooling/AddThreadDetailsSpanProcessorTest.groovy | 2 -- 60 files changed, 2 insertions(+), 257 deletions(-) diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy index fad12dfe9c3f..6cd2d132a41d 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy @@ -10,12 +10,7 @@ import io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService import io.opentelemetry.instrumentation.apachedubbo.v2_7.impl.HelloServiceImpl import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils -import io.opentelemetry.semconv.NetworkAttributes -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes import org.apache.dubbo.common.utils.NetUtils diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy index 7402fb3a601a..a7e2f6150b67 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.groovy @@ -10,14 +10,9 @@ import io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService import io.opentelemetry.instrumentation.apachedubbo.v2_7.api.MiddleService import io.opentelemetry.instrumentation.apachedubbo.v2_7.impl.HelloServiceImpl import io.opentelemetry.instrumentation.apachedubbo.v2_7.impl.MiddleServiceImpl -import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes import org.apache.dubbo.common.utils.NetUtils diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy index 546fb51d9e9d..85687e4cbd9f 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy @@ -4,14 +4,8 @@ */ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes -import io.opentelemetry.semconv.ServerAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy index 17dbaed4cf6b..9372bb00afbb 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SnsTracingTest.groovy @@ -4,14 +4,8 @@ */ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes -import io.opentelemetry.semconv.ServerAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy index d689a37bb552..8aabe4ffdff3 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws1ClientTest.groovy @@ -19,9 +19,6 @@ import io.opentelemetry.api.trace.Span import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.awssdk.v1_11.AbstractAws1ClientTest import io.opentelemetry.instrumentation.test.AgentTestTrait -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy index 20078ecc9b76..78baace09f5c 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy @@ -24,15 +24,10 @@ import com.amazonaws.services.s3.AmazonS3Client import com.amazonaws.services.s3.S3ClientOptions import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.HttpResponse diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy index a512fb1c336f..81a3c4243b2f 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy @@ -31,16 +31,11 @@ import com.amazonaws.services.sns.AmazonSNSClientBuilder import com.amazonaws.services.sns.model.PublishRequest import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.test.InstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.HttpResponse diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy index 9d7b42c67405..a73122bc1af9 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.groovy @@ -7,15 +7,9 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil import io.opentelemetry.instrumentation.test.InstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes -import io.opentelemetry.semconv.ServerAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.HttpResponse diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy index fd30744ba557..8225c64f7f0e 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy @@ -6,18 +6,10 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.HttpData import io.opentelemetry.testing.internal.armeria.common.HttpResponse diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy index a5887dc1989f..58125c676e54 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsSuppressReceiveSpansTest.groovy @@ -6,14 +6,8 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.test.InstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes -import io.opentelemetry.semconv.ServerAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes import org.elasticmq.rest.sqs.SQSRestServerBuilder diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy index ab5b7ab8095e..4281b002fc44 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2SqsTracingTest.groovy @@ -7,16 +7,9 @@ package io.opentelemetry.instrumentation.awssdk.v2_2 import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes import org.elasticmq.rest.sqs.SQSRestServerBuilder import software.amazon.awssdk.auth.credentials.AwsBasicCredentials diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy index df49e2976f0b..0686c76da4b4 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy @@ -3,13 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.NetworkAttributes diff --git a/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy index 8ef3194fe351..e669562f1917 100644 --- a/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy +++ b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy @@ -19,10 +19,6 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import spock.lang.Shared diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy index 0afab3e572e6..81cdeb4376eb 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy @@ -3,8 +3,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.Client diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy index b045e2b71fb3..ad97aa15b5a5 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy @@ -4,8 +4,6 @@ */ import io.opentelemetry.semconv.NetworkAttributes -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.transport.TransportClient diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy index 8e66db1358a3..d75b13be9bd3 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy @@ -6,10 +6,7 @@ package springdata import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.junit.jupiter.api.Assumptions import org.springframework.context.annotation.AnnotationConfigApplicationContext diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy index 6d0170e4fc50..009f5e7067ab 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy @@ -6,8 +6,6 @@ package springdata import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.action.search.SearchResponse diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy index 0926e58da4c7..457f4ac68928 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy @@ -3,8 +3,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest import org.elasticsearch.client.Client diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy index 119bbf2eab14..0fafe46112e4 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy @@ -3,9 +3,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.semconv.NetworkAttributes -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.NetworkAttributes import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest diff --git a/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy b/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy index 6d88bc1bb189..d49d2b53f82d 100644 --- a/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy +++ b/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy @@ -4,13 +4,6 @@ */ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.hibernate.Version import org.springframework.context.annotation.AnnotationConfigApplicationContext diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy index 486745a5609d..b41a8efeea62 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/groovy/JaxRsClientTest.groovy @@ -3,17 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy index d5228ae509a9..57305fd90486 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy +++ b/instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JerseyTest.groovy @@ -5,12 +5,9 @@ import io.dropwizard.testing.junit.ResourceTestRule import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import org.junit.ClassRule import spock.lang.Shared import spock.lang.Unroll diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy index a55b55663690..a5e10807fec1 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy @@ -4,12 +4,9 @@ */ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import spock.lang.Unroll import javax.ws.rs.DELETE diff --git a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy index 2798ba1108df..66519712839c 100644 --- a/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy +++ b/instrumentation/jaxrs/jaxrs-3.0/jaxrs-3.0-annotations/javaagent/src/test/groovy/JaxrsAnnotationsInstrumentationTest.groovy @@ -4,12 +4,9 @@ */ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import spock.lang.Unroll import jakarta.ws.rs.DELETE diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy index ea043dee2c7b..8b880f6c02e7 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsFilterTest.groovy @@ -4,12 +4,9 @@ */ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import org.junit.jupiter.api.Assumptions import spock.lang.Unroll diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy index 612d57f33f61..3edcb91b5b44 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy @@ -3,23 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import spock.lang.Unroll diff --git a/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy b/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy index 6275a2c3ad94..5f8040ae13d8 100644 --- a/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy +++ b/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy @@ -7,8 +7,6 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.test.hello_web_service.Hello2Request import io.opentelemetry.test.hello_web_service.HelloRequest diff --git a/instrumentation/jaxws/jaxws-2.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsAnnotationsTest.groovy b/instrumentation/jaxws/jaxws-2.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsAnnotationsTest.groovy index 531d938cf4c4..2bbf561d9a80 100644 --- a/instrumentation/jaxws/jaxws-2.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsAnnotationsTest.groovy +++ b/instrumentation/jaxws/jaxws-2.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsAnnotationsTest.groovy @@ -6,8 +6,6 @@ package io.opentelemetry.javaagent.instrumentation.jaxws.v2_0 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes class JaxWsAnnotationsTest extends AgentInstrumentationSpecification { diff --git a/instrumentation/jaxws/jaxws-3.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy b/instrumentation/jaxws/jaxws-3.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy index b10b886071b2..ff0dac6a25e5 100644 --- a/instrumentation/jaxws/jaxws-3.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy +++ b/instrumentation/jaxws/jaxws-3.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy @@ -7,8 +7,6 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.test.hello_web_service.Hello2Request import io.opentelemetry.test.hello_web_service.HelloRequest diff --git a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.groovy b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.groovy index 297573f048e8..9498fb9b6bc1 100644 --- a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.groovy +++ b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsTest.groovy @@ -6,8 +6,6 @@ package io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import java.lang.reflect.Proxy diff --git a/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy b/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy index ee295abf40d4..f062a3962747 100644 --- a/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy +++ b/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy @@ -11,15 +11,7 @@ import io.opentelemetry.instrumentation.jdbc.TestConnection import io.opentelemetry.instrumentation.jdbc.TestDriver import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.javaagent.instrumentation.jdbc.test.ProxyStatementFactory -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import org.apache.derby.jdbc.EmbeddedDataSource diff --git a/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy b/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy index 4f89a3725352..55d527e2758c 100644 --- a/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy +++ b/instrumentation/jdbc/library/src/test/groovy/io/opentelemetry/instrumentation/jdbc/OpenTelemetryConnectionTest.groovy @@ -16,15 +16,7 @@ import io.opentelemetry.instrumentation.jdbc.internal.OpenTelemetryStatement import io.opentelemetry.instrumentation.jdbc.internal.dbinfo.DbInfo import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.LibraryTestTrait -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import static io.opentelemetry.api.trace.SpanKind.CLIENT diff --git a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy index c9e96555e5a4..8eec22ce6c76 100644 --- a/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy +++ b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy @@ -4,19 +4,14 @@ */ import io.opentelemetry.api.trace.SpanKind -import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy index 7dd358ed62cc..baaa5bc4f8f9 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy @@ -3,18 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy index f9b3a062a905..3e5526a89d76 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy @@ -3,21 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ + import io.opentelemetry.api.trace.Span import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator import io.opentelemetry.context.Context import io.opentelemetry.context.propagation.TextMapGetter import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import org.apache.kafka.clients.producer.ProducerRecord import org.apache.kafka.common.header.Headers diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy index 6f993bac1f8c..0339684ff952 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy @@ -3,20 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ + import io.opentelemetry.api.trace.Span import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator import io.opentelemetry.context.Context import io.opentelemetry.context.propagation.TextMapGetter import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import org.apache.kafka.clients.producer.ProducerRecord import org.apache.kafka.common.header.Headers diff --git a/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy b/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy index 4f265f0b86b9..e01a4afb49a1 100644 --- a/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy +++ b/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy @@ -9,14 +9,7 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import org.slf4j.LoggerFactory import org.testcontainers.containers.GenericContainer diff --git a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy index ce0039b3dd90..5cd08cefdcc4 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy +++ b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientSslTest.groovy @@ -20,15 +20,11 @@ import io.netty.handler.codec.http.HttpVersion import io.netty.handler.ssl.SslContext import io.netty.handler.ssl.SslContextBuilder import io.netty.handler.ssl.SslHandler -import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.netty.v4_1.ClientHandler import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes -import io.opentelemetry.semconv.NetworkAttributes import spock.lang.Shared import javax.net.ssl.SSLEngine diff --git a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy index 9d59b9116af2..c938b053c84b 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy +++ b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ConnectionSpanTest.groovy @@ -16,17 +16,13 @@ import io.netty.handler.codec.http.HttpClientCodec import io.netty.handler.codec.http.HttpHeaderNames import io.netty.handler.codec.http.HttpMethod import io.netty.handler.codec.http.HttpVersion -import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.netty.v4_1.ClientHandler import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestServer -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes -import io.opentelemetry.semconv.NetworkAttributes import spock.lang.Shared import java.util.concurrent.CompletableFuture diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/ContextBridgeTest.groovy b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/ContextBridgeTest.groovy index e9160c90b924..3b3778b25374 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/ContextBridgeTest.groovy +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/ContextBridgeTest.groovy @@ -10,8 +10,6 @@ import io.opentelemetry.context.Context import io.opentelemetry.context.ContextKey import io.opentelemetry.instrumentation.annotations.WithSpan import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import java.util.concurrent.CountDownLatch diff --git a/instrumentation/play/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy b/instrumentation/play/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy index d27970362766..20df768f7b10 100644 --- a/instrumentation/play/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy +++ b/instrumentation/play/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy @@ -9,8 +9,6 @@ import akka.stream.ActorMaterializerSettings import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes import play.shaded.ahc.io.netty.resolver.InetNameResolver diff --git a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy index 629ec6bb2c90..cbe8b560fd4a 100644 --- a/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy +++ b/instrumentation/ratpack/ratpack-1.4/testing/src/main/groovy/io/opentelemetry/instrumentation/ratpack/server/AbstractRatpackRoutesTest.groovy @@ -5,17 +5,12 @@ package io.opentelemetry.instrumentation.ratpack.server -import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.groovy b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.groovy index 72fe5f729030..f04d97f458ee 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.groovy +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/groovy/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.groovy @@ -13,9 +13,6 @@ import io.opentelemetry.sdk.OpenTelemetrySdk import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter import io.opentelemetry.sdk.trace.SdkTracerProvider import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.UrlAttributes import ratpack.exec.Blocking diff --git a/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy b/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy index c2f4265e2b5e..694a60b62fcf 100644 --- a/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy +++ b/instrumentation/rediscala-1.8/javaagent/src/test/groovy/RediscalaClientTest.groovy @@ -4,8 +4,6 @@ */ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.testcontainers.containers.GenericContainer import redis.ByteStringDeserializerDefault diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/HttpServletResponseTest.groovy b/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/HttpServletResponseTest.groovy index d4c2c44b6a53..82e2fef4e27c 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/HttpServletResponseTest.groovy +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/HttpServletResponseTest.groovy @@ -5,8 +5,6 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import javax.servlet.http.HttpServlet diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/JettyServlet2Test.groovy b/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/JettyServlet2Test.groovy index 8f1b6601d800..ea904600b175 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/JettyServlet2Test.groovy +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/JettyServlet2Test.groovy @@ -10,8 +10,6 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import org.eclipse.jetty.server.Response import org.eclipse.jetty.server.Server diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/HttpServletResponseTest.groovy b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/HttpServletResponseTest.groovy index 0c9b1e027129..bb5f494a35e7 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/HttpServletResponseTest.groovy +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/HttpServletResponseTest.groovy @@ -5,8 +5,6 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import javax.servlet.http.HttpServlet diff --git a/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy b/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy index 8aed7d62cda1..33fc7906b3bf 100644 --- a/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy +++ b/instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy @@ -3,14 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.NetworkAttributes diff --git a/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/test/groovy/SpringListenerTest.groovy b/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/test/groovy/SpringListenerTest.groovy index 397cc154ea8a..a22fa2594e48 100644 --- a/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/test/groovy/SpringListenerTest.groovy +++ b/instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/test/groovy/SpringListenerTest.groovy @@ -6,11 +6,6 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes import listener.AnnotatedListenerConfig import listener.ManualListenerConfig diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/groovy/boot/AbstractSpringBootBasedTest.groovy b/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/groovy/boot/AbstractSpringBootBasedTest.groovy index efcfc14b4d55..59c5fb7885c5 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/groovy/boot/AbstractSpringBootBasedTest.groovy +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/groovy/boot/AbstractSpringBootBasedTest.groovy @@ -12,8 +12,6 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest import io.opentelemetry.testing.internal.armeria.common.HttpData diff --git a/instrumentation/spring/spring-ws-2.0/javaagent/src/test/groovy/test/boot/SpringWsTest.groovy b/instrumentation/spring/spring-ws-2.0/javaagent/src/test/groovy/test/boot/SpringWsTest.groovy index 8f5c22b91a1d..c14e073cf0aa 100644 --- a/instrumentation/spring/spring-ws-2.0/javaagent/src/test/groovy/test/boot/SpringWsTest.groovy +++ b/instrumentation/spring/spring-ws-2.0/javaagent/src/test/groovy/test/boot/SpringWsTest.groovy @@ -10,8 +10,6 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTestTrait import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.test.hello_web_service.HelloRequest import io.opentelemetry.test.hello_web_service.HelloRequestSoapAction diff --git a/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy b/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy index 9201970fb04e..fed320ec30b2 100644 --- a/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy +++ b/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy @@ -6,8 +6,6 @@ import com.google.common.util.concurrent.MoreExecutors import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import net.spy.memcached.CASResponse import net.spy.memcached.ConnectionFactory diff --git a/instrumentation/struts-2.3/javaagent/src/test/groovy/Struts2ActionSpanTest.groovy b/instrumentation/struts-2.3/javaagent/src/test/groovy/Struts2ActionSpanTest.groovy index c448b4614d73..b01c6aa05c73 100644 --- a/instrumentation/struts-2.3/javaagent/src/test/groovy/Struts2ActionSpanTest.groovy +++ b/instrumentation/struts-2.3/javaagent/src/test/groovy/Struts2ActionSpanTest.groovy @@ -11,8 +11,6 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import io.opentelemetry.struts.GreetingServlet import org.eclipse.jetty.server.Server diff --git a/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy b/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy index 646e3ccbabe2..6c00a4790876 100644 --- a/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy +++ b/instrumentation/twilio-6.6/javaagent/src/test/groovy/test/TwilioClientTest.groovy @@ -17,11 +17,9 @@ import com.twilio.rest.api.v2010.account.Message import com.twilio.type.PhoneNumber import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import org.apache.http.HttpEntity diff --git a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy index 9c80a74482c1..883bd655ac1e 100644 --- a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy +++ b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy @@ -7,18 +7,13 @@ import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.api.trace.Span import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.api.trace.StatusCode -import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy index ed43fd5e48cd..b47cb1887bbb 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy @@ -7,24 +7,13 @@ import io.opentelemetry.api.GlobalOpenTelemetry import io.opentelemetry.api.trace.Span import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.context.Context -import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy index ed43fd5e48cd..b47cb1887bbb 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy @@ -7,24 +7,13 @@ import io.opentelemetry.api.GlobalOpenTelemetry import io.opentelemetry.api.trace.Span import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.context.Context -import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes -import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes import io.opentelemetry.testing.internal.armeria.client.WebClient diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy index 52aae40d28db..e7168361c0e4 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy @@ -10,8 +10,6 @@ import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes import io.vertx.circuitbreaker.CircuitBreakerOptions diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy index 87b9dcc334e8..695687584e85 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/client/VertxRxWebClientTest.groovy @@ -10,8 +10,6 @@ import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.NetworkAttributes import io.vertx.core.VertxOptions diff --git a/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessorTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessorTest.groovy index a79170fc7666..d3a8a8c933db 100644 --- a/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessorTest.groovy +++ b/javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/AddThreadDetailsSpanProcessorTest.groovy @@ -7,8 +7,6 @@ package io.opentelemetry.javaagent.tooling import io.opentelemetry.context.Context import io.opentelemetry.sdk.trace.ReadWriteSpan -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes import spock.lang.Specification From 8aa4120b1d3efcccabef8b2b3920066d1dd16c85 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:45:37 +0200 Subject: [PATCH 22/52] FAAW_* --- .../awslambdacore/v1_0/AwsLambdaTest.java | 6 +-- .../AwsLambdaFunctionAttributesExtractor.java | 5 +- ...ambdaStreamWrapperHttpPropagationTest.java | 5 +- .../v1_0/AwsLambdaStreamWrapperTest.java | 5 +- .../v1_0/AbstractAwsLambdaTest.java | 8 ++-- .../ApiGatewayProxyAttributesExtractor.java | 6 +-- .../v2_2/AwsLambdaApiGatewayWrapperTest.java | 22 ++++----- .../v2_2/AwsLambdaSqsEventWrapperTest.java | 3 +- .../v2_2/AwsLambdaSqsMessageHandlerTest.java | 4 +- .../v2_2/AwsLambdaWrapperTest.java | 9 ++-- .../AbstractAwsLambdaSqsEventHandlerTest.java | 6 +-- .../semconv/ResourceAttributes.java | 48 ------------------- .../semconv/SemanticAttributes.java | 10 ---- 13 files changed, 38 insertions(+), 99 deletions(-) diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java index 5b3678f0c6f8..922a2dd22de0 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.instrumentation.awslambdacore.v1_0.AbstractAwsLambdaTest; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ResourceAttributes; import lambdainternal.AwsLambdaLegacyInternalRequestHandler; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -55,7 +55,7 @@ void awsLambdaInternalHandlerIgnoredAndUserHandlerTraced() { span.hasName("my_function") .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @Test @@ -72,7 +72,7 @@ void awsLambdaLegacyInternalHandlerIgnoredAndUserHandlerTraced() { span.hasName("my_function") .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } private static final class TestRequestHandler implements RequestHandler { diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java index 43fa958659ef..0c3b4096f71a 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java @@ -7,12 +7,13 @@ import static io.opentelemetry.semconv.ResourceAttributes.CLOUD_ACCOUNT_ID; import static io.opentelemetry.semconv.ResourceAttributes.CLOUD_RESOURCE_ID; -import static io.opentelemetry.semconv.SemanticAttributes.FAAS_INVOCATION_ID; import com.amazonaws.services.lambda.runtime.Context; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaRequest; +import io.opentelemetry.semconv.ResourceAttributes; + import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -49,7 +50,7 @@ public void onStart( io.opentelemetry.context.Context parentContext, AwsLambdaRequest request) { Context awsContext = request.getAwsContext(); - attributes.put(FAAS_INVOCATION_ID, awsContext.getAwsRequestId()); + attributes.put(ResourceAttributes.FAAS_INVOCATION_ID, awsContext.getAwsRequestId()); String arn = getFunctionArn(awsContext); if (arn != null) { attributes.put(CLOUD_RESOURCE_ID, arn); diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java index 3b9f9f968b45..9f1681635dbe 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java @@ -21,7 +21,6 @@ import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.ResourceAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import java.io.BufferedWriter; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -94,7 +93,7 @@ void handlerTraced() throws Exception { ResourceAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @Test @@ -131,7 +130,7 @@ void handlerTracedWithException() { ResourceAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } public static final class TestRequestHandler implements RequestStreamHandler { diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java index 68e107fc93aa..9db8a46c037f 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java @@ -18,7 +18,6 @@ import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.ResourceAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.ByteArrayInputStream; @@ -84,7 +83,7 @@ void handlerTraced() throws Exception { ResourceAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @Test @@ -112,7 +111,7 @@ void handlerTracedWithException() { ResourceAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } public static final class TestRequestHandler implements RequestStreamHandler { diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AbstractAwsLambdaTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AbstractAwsLambdaTest.java index 32cfe1742e6d..d8b9b442476d 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AbstractAwsLambdaTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AbstractAwsLambdaTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ResourceAttributes; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -68,7 +68,7 @@ void handlerTraced() { span.hasName("my_function") .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @Test @@ -86,7 +86,7 @@ void handlerTracedWithException() { .hasStatus(StatusData.error()) .hasException(thrown) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } /** @@ -111,6 +111,6 @@ void handlerDoesNotLinkToActiveTracingSpan() { .hasNoParent() .hasLinks() .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } } diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java index 536f80dbbf60..1d9b20dee297 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java @@ -10,7 +10,6 @@ import static io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.MapUtils.emptyIfNull; import static io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.MapUtils.lowercaseMap; import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; -import static io.opentelemetry.semconv.SemanticAttributes.FAAS_TRIGGER; import static io.opentelemetry.semconv.UserAgentAttributes.USER_AGENT_ORIGINAL; import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent; @@ -20,8 +19,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaRequest; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; +import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -42,7 +41,8 @@ final class ApiGatewayProxyAttributesExtractor public void onStart( AttributesBuilder attributes, Context parentContext, AwsLambdaRequest request) { if (request.getInput() instanceof APIGatewayProxyRequestEvent) { - attributes.put(FAAS_TRIGGER, SemanticAttributes.FaasTriggerValues.HTTP); + attributes.put(FaasIncubatingAttributes.FAAS_TRIGGER, + FaasIncubatingAttributes.FaasTriggerValues.HTTP); onRequest(attributes, (APIGatewayProxyRequestEvent) request.getInput()); } } diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java index 21b10bd04144..87cf3035be7f 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java @@ -19,11 +19,11 @@ import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.ResourceAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.semconv.UserAgentAttributes; import java.util.HashMap; import java.util.Map; +import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -103,8 +103,8 @@ void tracedWithHttpPropagation() { ResourceAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"), - equalTo(SemanticAttributes.FAAS_TRIGGER, "http"), + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333"), + equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UserAgentAttributes.USER_AGENT_ORIGINAL, "Test Client"), equalTo( @@ -139,8 +139,8 @@ void handlerTraced_empty() { ResourceAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"), - equalTo(SemanticAttributes.FAAS_TRIGGER, "http")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333"), + equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http")))); } @Test @@ -170,8 +170,8 @@ void handlerTraced_string() { ResourceAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"), - equalTo(SemanticAttributes.FAAS_TRIGGER, "http")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333"), + equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http")))); } @Test @@ -201,8 +201,8 @@ void handlerTraced_integer() { ResourceAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"), - equalTo(SemanticAttributes.FAAS_TRIGGER, "http")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333"), + equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http")))); } @Test @@ -235,8 +235,8 @@ void handlerTraced_customType() { ResourceAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"), - equalTo(SemanticAttributes.FAAS_TRIGGER, "http")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333"), + equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http")))); } public static class TestRequestHandlerApiGateway diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java index 588424559c78..f3ecdf4d00f6 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java @@ -17,7 +17,6 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.semconv.ResourceAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.lang.reflect.Constructor; import java.util.Collections; @@ -79,7 +78,7 @@ void eventTraced() { ResourceAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")), + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")), span -> span.hasName("otel process") .hasKind(SpanKind.CONSUMER) diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java index c4bd9333bb03..7f6be5c3cce7 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java @@ -19,7 +19,7 @@ import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.trace.data.LinkData; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.lang.reflect.Constructor; import java.util.Arrays; @@ -80,7 +80,7 @@ void processSpans() { span.hasName("my_function") .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")), + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")), span -> span.hasName("queue1 process") .hasKind(SpanKind.CONSUMER) diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java index 1fc9e363a645..494a145602f1 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java @@ -18,7 +18,6 @@ import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.ResourceAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -74,7 +73,7 @@ void handlerTraced() { ResourceAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @Test @@ -104,7 +103,7 @@ void handlerTracedWithException() { ResourceAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @Test @@ -132,7 +131,7 @@ void handlerTraced_integer() { ResourceAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @Test @@ -163,7 +162,7 @@ void handlerTraced_custom() { ResourceAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } public static final class TestRequestHandlerString implements RequestHandler { diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java index 6181fae1463b..b9a19e149fde 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java @@ -14,7 +14,7 @@ import com.amazonaws.services.lambda.runtime.events.SQSEvent; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.lang.reflect.Constructor; import java.util.Arrays; @@ -74,7 +74,7 @@ void sameSource() { span.hasName("my_function") .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")), + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")), span -> span.hasName("queue1 process") .hasKind(SpanKind.CONSUMER) @@ -122,7 +122,7 @@ void differentSource() { span.hasName("my_function") .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( - equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")), + equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")), span -> span.hasName("multiple_sources process") .hasKind(SpanKind.CONSUMER) diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java index 8c7f629c8ef0..ae8f4c7c1f39 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java @@ -247,54 +247,6 @@ public static final class HostArchValues { private HostArchValues() {} } - public static final AttributeKey FAAS_COLDSTART = - FaasIncubatingAttributes.FAAS_COLDSTART; - public static final AttributeKey FAAS_CRON = FaasIncubatingAttributes.FAAS_CRON; - public static final AttributeKey FAAS_DOCUMENT_COLLECTION = - FaasIncubatingAttributes.FAAS_DOCUMENT_COLLECTION; - public static final AttributeKey FAAS_DOCUMENT_NAME = - FaasIncubatingAttributes.FAAS_DOCUMENT_NAME; - public static final AttributeKey FAAS_DOCUMENT_OPERATION = - FaasIncubatingAttributes.FAAS_DOCUMENT_OPERATION; - public static final AttributeKey FAAS_DOCUMENT_TIME = - FaasIncubatingAttributes.FAAS_DOCUMENT_TIME; - public static final AttributeKey FAAS_INSTANCE = FaasIncubatingAttributes.FAAS_INSTANCE; - public static final AttributeKey FAAS_INVOCATION_ID = - FaasIncubatingAttributes.FAAS_INVOCATION_ID; - public static final AttributeKey FAAS_INVOKED_NAME = - FaasIncubatingAttributes.FAAS_INVOKED_NAME; - public static final AttributeKey FAAS_INVOKED_PROVIDER = - FaasIncubatingAttributes.FAAS_INVOKED_PROVIDER; - public static final AttributeKey FAAS_INVOKED_REGION = - FaasIncubatingAttributes.FAAS_INVOKED_REGION; - public static final AttributeKey FAAS_MAX_MEMORY = FaasIncubatingAttributes.FAAS_MAX_MEMORY; - public static final AttributeKey FAAS_NAME = FaasIncubatingAttributes.FAAS_NAME; - public static final AttributeKey FAAS_TIME = FaasIncubatingAttributes.FAAS_TIME; - public static final AttributeKey FAAS_TRIGGER = FaasIncubatingAttributes.FAAS_TRIGGER; - public static final AttributeKey FAAS_VERSION = FaasIncubatingAttributes.FAAS_VERSION; - - public static final class FaasTriggerValues { - public static final String DATASOURCE = FaasIncubatingAttributes.FaasTriggerValues.DATASOURCE; - public static final String HTTP = FaasIncubatingAttributes.FaasTriggerValues.HTTP; - public static final String PUBSUB = FaasIncubatingAttributes.FaasTriggerValues.PUBSUB; - public static final String TIMER = FaasIncubatingAttributes.FaasTriggerValues.TIMER; - public static final String OTHER = FaasIncubatingAttributes.FaasTriggerValues.OTHER; - - private FaasTriggerValues() {} - } - - public static final class FaasInvokedProviderValues { - public static final String ALIBABA_CLOUD = - FaasIncubatingAttributes.FaasInvokedProviderValues.ALIBABA_CLOUD; - public static final String AWS = FaasIncubatingAttributes.FaasInvokedProviderValues.AWS; - public static final String AZURE = FaasIncubatingAttributes.FaasInvokedProviderValues.AZURE; - public static final String GCP = FaasIncubatingAttributes.FaasInvokedProviderValues.GCP; - public static final String TENCENT_CLOUD = - FaasIncubatingAttributes.FaasInvokedProviderValues.TENCENT_CLOUD; - - private FaasInvokedProviderValues() {} - } - public static final class FaasDocumentOperationValues { public static final String INSERT = FaasIncubatingAttributes.FaasDocumentOperationValues.INSERT; public static final String EDIT = FaasIncubatingAttributes.FaasDocumentOperationValues.EDIT; diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index d8fd8392133e..a0c198b132ed 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -32,16 +32,6 @@ private MessagingRocketmqMessageTypeValues() {} public static final String EXCEPTION_EVENT_NAME = "exception"; - public static final AttributeKey FAAS_TRIGGER = ResourceAttributes.FAAS_TRIGGER; - public static final AttributeKey FAAS_INVOCATION_ID = - ResourceAttributes.FAAS_INVOCATION_ID; - - public static final class FaasTriggerValues { - private FaasTriggerValues() {} - - public static final String HTTP = ResourceAttributes.FaasTriggerValues.HTTP; - } - public static final AttributeKey ENDUSER_ID = EnduserIncubatingAttributes.ENDUSER_ID; public static final AttributeKey ENDUSER_ROLE = EnduserIncubatingAttributes.ENDUSER_ROLE; public static final AttributeKey ENDUSER_SCOPE = From 7c371f6a12cf70804e67acfce5ee3281756d584e Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:47:58 +0200 Subject: [PATCH 23/52] ENDUSER_* --- .../servlet/BaseServletHelper.java | 6 +-- .../ServletAdditionalAttributesExtractor.java | 5 ++- .../v6_0/EnduserAttributesCapturer.java | 9 ++-- .../v6_0/EnduserAttributesCapturerTest.java | 45 ++++++++++--------- ...rAttributesCapturingServletFilterTest.java | 8 ++-- ...duserAttributesCapturingWebFilterTest.java | 9 ++-- .../semconv/SemanticAttributes.java | 5 --- 7 files changed, 43 insertions(+), 44 deletions(-) diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/BaseServletHelper.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/BaseServletHelper.java index d82ed2885683..b71fee7b5ea3 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/BaseServletHelper.java +++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/BaseServletHelper.java @@ -18,7 +18,7 @@ import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge; import io.opentelemetry.javaagent.bootstrap.servlet.MappingResolver; import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; import java.security.Principal; import java.util.function.Function; @@ -128,7 +128,7 @@ private void captureRequestParameters(Span serverSpan, REQUEST request) { } /** - * Capture {@link SemanticAttributes#ENDUSER_ID} as span attributes when SERVER span is not create + * Capture {@link EnduserIncubatingAttributes#ENDUSER_ID} as span attributes when SERVER span is not create * by servlet instrumentation. * *

When SERVER span is created by servlet instrumentation we register {@link @@ -144,7 +144,7 @@ private void captureEnduserId(Span serverSpan, REQUEST request) { if (principal != null) { String name = principal.getName(); if (name != null) { - serverSpan.setAttribute(SemanticAttributes.ENDUSER_ID, name); + serverSpan.setAttribute(EnduserIncubatingAttributes.ENDUSER_ID, name); } } } diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletAdditionalAttributesExtractor.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletAdditionalAttributesExtractor.java index ce6eb514fb23..9e9ff4e6eeb9 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletAdditionalAttributesExtractor.java +++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletAdditionalAttributesExtractor.java @@ -13,7 +13,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; + import java.security.Principal; import javax.annotation.Nullable; @@ -49,7 +50,7 @@ public void onEnd( if (principal != null) { String name = principal.getName(); if (name != null) { - attributes.put(SemanticAttributes.ENDUSER_ID, name); + attributes.put(EnduserIncubatingAttributes.ENDUSER_ID, name); } } } diff --git a/instrumentation/spring/spring-security-config-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturer.java b/instrumentation/spring/spring-security-config-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturer.java index 7e7ab3ef0af9..18479ae5a315 100644 --- a/instrumentation/spring/spring-security-config-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturer.java +++ b/instrumentation/spring/spring-security-config-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturer.java @@ -8,8 +8,9 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.LocalRootSpan; -import io.opentelemetry.semconv.SemanticAttributes; import java.util.Objects; + +import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; @@ -67,7 +68,7 @@ public void captureEnduserAttributes(Context otelContext, Authentication authent Span localRootSpan = LocalRootSpan.fromContext(otelContext); if (enduserIdEnabled && authentication.getName() != null) { - localRootSpan.setAttribute(SemanticAttributes.ENDUSER_ID, authentication.getName()); + localRootSpan.setAttribute(EnduserIncubatingAttributes.ENDUSER_ID, authentication.getName()); } StringBuilder roleBuilder = null; @@ -84,10 +85,10 @@ public void captureEnduserAttributes(Context otelContext, Authentication authent } } if (roleBuilder != null) { - localRootSpan.setAttribute(SemanticAttributes.ENDUSER_ROLE, roleBuilder.toString()); + localRootSpan.setAttribute(EnduserIncubatingAttributes.ENDUSER_ROLE, roleBuilder.toString()); } if (scopeBuilder != null) { - localRootSpan.setAttribute(SemanticAttributes.ENDUSER_SCOPE, scopeBuilder.toString()); + localRootSpan.setAttribute(EnduserIncubatingAttributes.ENDUSER_SCOPE, scopeBuilder.toString()); } } } diff --git a/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturerTest.java b/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturerTest.java index 42720f9a3834..0676e1950756 100644 --- a/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturerTest.java +++ b/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturerTest.java @@ -11,9 +11,10 @@ import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.trace.data.SpanData; -import io.opentelemetry.semconv.SemanticAttributes; import java.util.Arrays; import java.util.function.Consumer; + +import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; import org.assertj.core.api.Condition; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -43,9 +44,9 @@ void nothingEnabled() { capturer, authentication, span -> - span.doesNotHave(attribute(SemanticAttributes.ENDUSER_ID)) - .doesNotHave(attribute(SemanticAttributes.ENDUSER_ROLE)) - .doesNotHave(attribute(SemanticAttributes.ENDUSER_SCOPE))); + span.doesNotHave(attribute(EnduserIncubatingAttributes.ENDUSER_ID)) + .doesNotHave(attribute(EnduserIncubatingAttributes.ENDUSER_ROLE)) + .doesNotHave(attribute(EnduserIncubatingAttributes.ENDUSER_SCOPE))); } @Test @@ -67,9 +68,9 @@ void allEnabledButNoRoles() { capturer, authentication, span -> - span.hasAttribute(SemanticAttributes.ENDUSER_ID, "principal") - .doesNotHave(attribute(SemanticAttributes.ENDUSER_ROLE)) - .hasAttribute(SemanticAttributes.ENDUSER_SCOPE, "scope1,scope2")); + span.hasAttribute(EnduserIncubatingAttributes.ENDUSER_ID, "principal") + .doesNotHave(attribute(EnduserIncubatingAttributes.ENDUSER_ROLE)) + .hasAttribute(EnduserIncubatingAttributes.ENDUSER_SCOPE, "scope1,scope2")); } @Test @@ -91,9 +92,9 @@ void allEnabledButNoScopes() { capturer, authentication, span -> - span.hasAttribute(SemanticAttributes.ENDUSER_ID, "principal") - .hasAttribute(SemanticAttributes.ENDUSER_ROLE, "role1,role2") - .doesNotHave(attribute(SemanticAttributes.ENDUSER_SCOPE))); + span.hasAttribute(EnduserIncubatingAttributes.ENDUSER_ID, "principal") + .hasAttribute(EnduserIncubatingAttributes.ENDUSER_ROLE, "role1,role2") + .doesNotHave(attribute(EnduserIncubatingAttributes.ENDUSER_SCOPE))); } @Test @@ -115,9 +116,9 @@ void onlyEnduserIdEnabled() { capturer, authentication, span -> - span.hasAttribute(SemanticAttributes.ENDUSER_ID, "principal") - .doesNotHave(attribute(SemanticAttributes.ENDUSER_ROLE)) - .doesNotHave(attribute(SemanticAttributes.ENDUSER_SCOPE))); + span.hasAttribute(EnduserIncubatingAttributes.ENDUSER_ID, "principal") + .doesNotHave(attribute(EnduserIncubatingAttributes.ENDUSER_ROLE)) + .doesNotHave(attribute(EnduserIncubatingAttributes.ENDUSER_SCOPE))); } @Test @@ -139,9 +140,9 @@ void onlyEnduserRoleEnabled() { capturer, authentication, span -> - span.doesNotHave(attribute(SemanticAttributes.ENDUSER_ID)) - .hasAttribute(SemanticAttributes.ENDUSER_ROLE, "role1,role2") - .doesNotHave(attribute(SemanticAttributes.ENDUSER_SCOPE))); + span.doesNotHave(attribute(EnduserIncubatingAttributes.ENDUSER_ID)) + .hasAttribute(EnduserIncubatingAttributes.ENDUSER_ROLE, "role1,role2") + .doesNotHave(attribute(EnduserIncubatingAttributes.ENDUSER_SCOPE))); } @Test @@ -163,9 +164,9 @@ void onlyEnduserScopeEnabled() { capturer, authentication, span -> - span.doesNotHave(attribute(SemanticAttributes.ENDUSER_ID)) - .doesNotHave(attribute(SemanticAttributes.ENDUSER_ROLE)) - .hasAttribute(SemanticAttributes.ENDUSER_SCOPE, "scope1,scope2")); + span.doesNotHave(attribute(EnduserIncubatingAttributes.ENDUSER_ID)) + .doesNotHave(attribute(EnduserIncubatingAttributes.ENDUSER_ROLE)) + .hasAttribute(EnduserIncubatingAttributes.ENDUSER_SCOPE, "scope1,scope2")); } @Test @@ -191,9 +192,9 @@ void allEnabledAndAlternatePrefix() { capturer, authentication, span -> - span.hasAttribute(SemanticAttributes.ENDUSER_ID, "principal") - .hasAttribute(SemanticAttributes.ENDUSER_ROLE, "role1,role2") - .hasAttribute(SemanticAttributes.ENDUSER_SCOPE, "scope1,scope2")); + span.hasAttribute(EnduserIncubatingAttributes.ENDUSER_ID, "principal") + .hasAttribute(EnduserIncubatingAttributes.ENDUSER_ROLE, "role1,role2") + .hasAttribute(EnduserIncubatingAttributes.ENDUSER_SCOPE, "scope1,scope2")); } void test( diff --git a/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/servlet/EnduserAttributesCapturingServletFilterTest.java b/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/servlet/EnduserAttributesCapturingServletFilterTest.java index 792764047412..0d8b2150d4f6 100644 --- a/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/servlet/EnduserAttributesCapturingServletFilterTest.java +++ b/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/servlet/EnduserAttributesCapturingServletFilterTest.java @@ -8,7 +8,7 @@ import io.opentelemetry.instrumentation.spring.security.config.v6_0.EnduserAttributesCapturer; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; +import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; @@ -75,8 +75,8 @@ void test() throws Exception { trace -> trace.hasSpansSatisfyingExactly( span -> - span.hasAttribute(SemanticAttributes.ENDUSER_ID, "principal") - .hasAttribute(SemanticAttributes.ENDUSER_ROLE, "role1,role2") - .hasAttribute(SemanticAttributes.ENDUSER_SCOPE, "scope1,scope2"))); + span.hasAttribute(EnduserIncubatingAttributes.ENDUSER_ID, "principal") + .hasAttribute(EnduserIncubatingAttributes.ENDUSER_ROLE, "role1,role2") + .hasAttribute(EnduserIncubatingAttributes.ENDUSER_SCOPE, "scope1,scope2"))); } } diff --git a/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/webflux/EnduserAttributesCapturingWebFilterTest.java b/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/webflux/EnduserAttributesCapturingWebFilterTest.java index 1db46c41c6e2..13f3d4d065c4 100644 --- a/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/webflux/EnduserAttributesCapturingWebFilterTest.java +++ b/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/webflux/EnduserAttributesCapturingWebFilterTest.java @@ -10,9 +10,10 @@ import io.opentelemetry.instrumentation.spring.security.config.v6_0.EnduserAttributesCapturer; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; import java.util.Arrays; import java.util.Collections; + +import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.mock.http.server.reactive.MockServerHttpRequest; @@ -73,8 +74,8 @@ void test() { trace -> trace.hasSpansSatisfyingExactly( span -> - span.hasAttribute(SemanticAttributes.ENDUSER_ID, "principal") - .hasAttribute(SemanticAttributes.ENDUSER_ROLE, "role1,role2") - .hasAttribute(SemanticAttributes.ENDUSER_SCOPE, "scope1,scope2"))); + span.hasAttribute(EnduserIncubatingAttributes.ENDUSER_ID, "principal") + .hasAttribute(EnduserIncubatingAttributes.ENDUSER_ROLE, "role1,role2") + .hasAttribute(EnduserIncubatingAttributes.ENDUSER_SCOPE, "scope1,scope2"))); } } diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index a0c198b132ed..d20efb94d211 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -6,7 +6,6 @@ package io.opentelemetry.semconv; import io.opentelemetry.api.common.AttributeKey; -import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; public class SemanticAttributes { @@ -32,8 +31,4 @@ private MessagingRocketmqMessageTypeValues() {} public static final String EXCEPTION_EVENT_NAME = "exception"; - public static final AttributeKey ENDUSER_ID = EnduserIncubatingAttributes.ENDUSER_ID; - public static final AttributeKey ENDUSER_ROLE = EnduserIncubatingAttributes.ENDUSER_ROLE; - public static final AttributeKey ENDUSER_SCOPE = - EnduserIncubatingAttributes.ENDUSER_SCOPE; } From 2dee576f236460ef76b19caa7d1d0d7887732dee Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:48:53 +0200 Subject: [PATCH 24/52] messaging rocketmq --- .../RocketMqProducerAttributeExtractor.java | 17 +++++++++-------- ...ctRocketMqClientSuppressReceiveSpanTest.java | 5 +++-- .../v5_0/AbstractRocketMqClientTest.java | 13 +++++++------ .../semconv/SemanticAttributes.java | 14 -------------- 4 files changed, 19 insertions(+), 30 deletions(-) diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java index da93c47738e8..5641ae1613ac 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java @@ -5,10 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.rocketmqclient.v5_0; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.DELAY; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.FIFO; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.NORMAL; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.TRANSACTION; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_GROUP; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_ROCKETMQ_MESSAGE_KEYS; @@ -20,6 +16,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import java.util.ArrayList; import javax.annotation.Nullable; + +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import org.apache.rocketmq.client.java.impl.producer.SendReceiptImpl; import org.apache.rocketmq.client.java.message.PublishingMessageImpl; @@ -38,16 +36,19 @@ public void onStart( attributes.put(MESSAGING_ROCKETMQ_MESSAGE_KEYS, new ArrayList<>(message.getKeys())); switch (message.getMessageType()) { case FIFO: - attributes.put(MESSAGING_ROCKETMQ_MESSAGE_TYPE, FIFO); + attributes.put(MESSAGING_ROCKETMQ_MESSAGE_TYPE, + MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.FIFO); break; case DELAY: - attributes.put(MESSAGING_ROCKETMQ_MESSAGE_TYPE, DELAY); + attributes.put(MESSAGING_ROCKETMQ_MESSAGE_TYPE, + MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.DELAY); break; case TRANSACTION: - attributes.put(MESSAGING_ROCKETMQ_MESSAGE_TYPE, TRANSACTION); + attributes.put(MESSAGING_ROCKETMQ_MESSAGE_TYPE, + MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.TRANSACTION); break; default: - attributes.put(MESSAGING_ROCKETMQ_MESSAGE_TYPE, NORMAL); + attributes.put(MESSAGING_ROCKETMQ_MESSAGE_TYPE, MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.NORMAL); } } diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java index 980a170a31cb..041bcf02f925 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java @@ -6,7 +6,6 @@ package io.opentelemetry.instrumentation.rocketmqclient.v5_0; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.NORMAL; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID; @@ -25,6 +24,8 @@ import java.time.Duration; import java.util.Arrays; import java.util.Collections; + +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import org.apache.rocketmq.client.apis.ClientConfiguration; import org.apache.rocketmq.client.apis.ClientServiceProvider; import org.apache.rocketmq.client.apis.consumer.ConsumeResult; @@ -114,7 +115,7 @@ void testSendAndConsumeMessage() throws Throwable { .hasAttributesSatisfyingExactly( equalTo(MESSAGING_ROCKETMQ_MESSAGE_TAG, tag), equalTo(MESSAGING_ROCKETMQ_MESSAGE_KEYS, Arrays.asList(keys)), - equalTo(MESSAGING_ROCKETMQ_MESSAGE_TYPE, NORMAL), + equalTo(MESSAGING_ROCKETMQ_MESSAGE_TYPE, MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.NORMAL), equalTo(MESSAGING_MESSAGE_BODY_SIZE, (long) body.length), equalTo(MESSAGING_SYSTEM, "rocketmq"), equalTo( diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java index ac6c10b0c6a5..5e4151c8cfa0 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java @@ -7,9 +7,6 @@ import static io.opentelemetry.instrumentation.testing.util.TelemetryDataUtil.orderByRootSpanKind; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.DELAY; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.FIFO; -import static io.opentelemetry.semconv.SemanticAttributes.MessagingRocketmqMessageTypeValues.NORMAL; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_BATCH_MESSAGE_COUNT; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME; import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_BODY_SIZE; @@ -42,6 +39,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; + +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import org.apache.rocketmq.client.apis.ClientConfiguration; import org.apache.rocketmq.client.apis.ClientException; import org.apache.rocketmq.client.apis.ClientServiceProvider; @@ -415,7 +414,7 @@ private static SpanDataAssert assertProducerSpan( Arrays.asList( equalTo(MESSAGING_ROCKETMQ_MESSAGE_TAG, tag), equalTo(MESSAGING_ROCKETMQ_MESSAGE_KEYS, Arrays.asList(keys)), - equalTo(MESSAGING_ROCKETMQ_MESSAGE_TYPE, NORMAL), + equalTo(MESSAGING_ROCKETMQ_MESSAGE_TYPE, MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.NORMAL), equalTo(MESSAGING_MESSAGE_BODY_SIZE, (long) body.length), equalTo(MESSAGING_SYSTEM, "rocketmq"), equalTo(MESSAGING_MESSAGE_ID, sendReceipt.getMessageId().toString()), @@ -444,7 +443,8 @@ private static SpanDataAssert assertProducerSpanWithFifoMessage( equalTo(MESSAGING_ROCKETMQ_MESSAGE_TAG, tag), equalTo(MESSAGING_ROCKETMQ_MESSAGE_KEYS, Arrays.asList(keys)), equalTo(MESSAGING_ROCKETMQ_MESSAGE_GROUP, messageGroup), - equalTo(MESSAGING_ROCKETMQ_MESSAGE_TYPE, FIFO), + equalTo(MESSAGING_ROCKETMQ_MESSAGE_TYPE, + MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.FIFO), equalTo(MESSAGING_MESSAGE_BODY_SIZE, (long) body.length), equalTo(MESSAGING_SYSTEM, "rocketmq"), equalTo(MESSAGING_MESSAGE_ID, sendReceipt.getMessageId().toString()), @@ -473,7 +473,8 @@ private static SpanDataAssert assertProducerSpanWithDelayMessage( equalTo(MESSAGING_ROCKETMQ_MESSAGE_TAG, tag), equalTo(MESSAGING_ROCKETMQ_MESSAGE_KEYS, Arrays.asList(keys)), equalTo(MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP, deliveryTimestamp), - equalTo(MESSAGING_ROCKETMQ_MESSAGE_TYPE, DELAY), + equalTo(MESSAGING_ROCKETMQ_MESSAGE_TYPE, + MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.DELAY), equalTo(MESSAGING_MESSAGE_BODY_SIZE, (long) body.length), equalTo(MESSAGING_SYSTEM, "rocketmq"), equalTo(MESSAGING_MESSAGE_ID, sendReceipt.getMessageId().toString()), diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index d20efb94d211..724cb0ed1862 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -6,7 +6,6 @@ package io.opentelemetry.semconv; import io.opentelemetry.api.common.AttributeKey; -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; public class SemanticAttributes { @@ -16,19 +15,6 @@ private SemanticAttributes() {} public static final AttributeKey MESSAGING_DESTINATION = AttributeKey.stringKey("messaging.destination"); - public static final class MessagingRocketmqMessageTypeValues { - public static final String NORMAL = - MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.NORMAL; - public static final String FIFO = - MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.FIFO; - public static final String DELAY = - MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.DELAY; - public static final String TRANSACTION = - MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.TRANSACTION; - - private MessagingRocketmqMessageTypeValues() {} - } - public static final String EXCEPTION_EVENT_NAME = "exception"; } From 3d013dd49c8a82d4c1e67fef25091aa2d3142d1f Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:52:58 +0200 Subject: [PATCH 25/52] remove messaging.destination --- .../javaagent/instrumentation/rabbitmq/RabbitMqTest.java | 5 ++--- .../java/io/opentelemetry/semconv/SemanticAttributes.java | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java index b90dd5d1e6ba..8dedda065d95 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java @@ -743,7 +743,7 @@ private static void verifySpan( attrs -> { String routingKeyAttr = attrs.get( - SemanticAttributes + MessagingIncubatingAttributes .MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY); assertTrue( routingKeyAttr == null @@ -817,7 +817,6 @@ private static void verifySpan( } // Ignoring deprecation warning for use of SemanticAttributes - @SuppressWarnings("deprecation") private static void verifyMessagingAttributes( SpanDataAssert span, String exchange, String routingKey, String operation) { span.hasAttribute(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "rabbitmq") @@ -827,7 +826,7 @@ private static void verifyMessagingAttributes( .satisfies( attrs -> { String destinationName = - attrs.get(SemanticAttributes.MESSAGING_DESTINATION); + attrs.get(MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME); assertTrue(destinationName == null || destinationName.equals(exchange)); String routingKeyAttr = attrs.get( diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index 724cb0ed1862..0bbdd9e26fa3 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -11,10 +11,6 @@ public class SemanticAttributes { private SemanticAttributes() {} - @Deprecated - public static final AttributeKey MESSAGING_DESTINATION = - AttributeKey.stringKey("messaging.destination"); - public static final String EXCEPTION_EVENT_NAME = "exception"; } From 3504520b1b5ca535df80d4cb8299ad127f4378ee Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:53:29 +0200 Subject: [PATCH 26/52] reformat --- .../AwsLambdaFunctionAttributesExtractor.java | 1 - .../ApiGatewayProxyAttributesExtractor.java | 4 ++-- .../v2_2/AwsLambdaApiGatewayWrapperTest.java | 2 +- .../test/groovy/KafkaStreamsDefaultTest.groovy | 1 - .../KafkaStreamsSuppressReceiveSpansTest.groovy | 1 - .../v5_0/RocketMqProducerAttributeExtractor.java | 16 ++++++++++------ ...actRocketMqClientSuppressReceiveSpanTest.java | 8 +++++--- .../v5_0/AbstractRocketMqClientTest.java | 13 ++++++++----- .../servlet/BaseServletHelper.java | 4 ++-- .../ServletAdditionalAttributesExtractor.java | 1 - .../config/v6_0/EnduserAttributesCapturer.java | 12 +++++++----- .../v6_0/EnduserAttributesCapturerTest.java | 3 +-- .../EnduserAttributesCapturingWebFilterTest.java | 3 +-- .../semconv/SemanticAttributes.java | 3 --- 14 files changed, 37 insertions(+), 35 deletions(-) diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java index 0c3b4096f71a..1c74b1d038e6 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java @@ -13,7 +13,6 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaRequest; import io.opentelemetry.semconv.ResourceAttributes; - import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java index 1d9b20dee297..1a6b2935bd82 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/ApiGatewayProxyAttributesExtractor.java @@ -41,8 +41,8 @@ final class ApiGatewayProxyAttributesExtractor public void onStart( AttributesBuilder attributes, Context parentContext, AwsLambdaRequest request) { if (request.getInput() instanceof APIGatewayProxyRequestEvent) { - attributes.put(FaasIncubatingAttributes.FAAS_TRIGGER, - FaasIncubatingAttributes.FaasTriggerValues.HTTP); + attributes.put( + FaasIncubatingAttributes.FAAS_TRIGGER, FaasIncubatingAttributes.FaasTriggerValues.HTTP); onRequest(attributes, (APIGatewayProxyRequestEvent) request.getInput()); } } diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java index 87cf3035be7f..1dc1f3d782c9 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java @@ -21,9 +21,9 @@ import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.semconv.UserAgentAttributes; +import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import java.util.HashMap; import java.util.Map; -import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy index 3e5526a89d76..08402d0818ac 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy @@ -3,7 +3,6 @@ * SPDX-License-Identifier: Apache-2.0 */ - import io.opentelemetry.api.trace.Span import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator import io.opentelemetry.context.Context diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy index 0339684ff952..054067aae6dc 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy @@ -3,7 +3,6 @@ * SPDX-License-Identifier: Apache-2.0 */ - import io.opentelemetry.api.trace.Span import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator import io.opentelemetry.context.Context diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java index 5641ae1613ac..8c77a20ba899 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rocketmqclient/v5_0/RocketMqProducerAttributeExtractor.java @@ -14,10 +14,9 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.util.ArrayList; import javax.annotation.Nullable; - -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import org.apache.rocketmq.client.java.impl.producer.SendReceiptImpl; import org.apache.rocketmq.client.java.message.PublishingMessageImpl; @@ -36,19 +35,24 @@ public void onStart( attributes.put(MESSAGING_ROCKETMQ_MESSAGE_KEYS, new ArrayList<>(message.getKeys())); switch (message.getMessageType()) { case FIFO: - attributes.put(MESSAGING_ROCKETMQ_MESSAGE_TYPE, + attributes.put( + MESSAGING_ROCKETMQ_MESSAGE_TYPE, MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.FIFO); break; case DELAY: - attributes.put(MESSAGING_ROCKETMQ_MESSAGE_TYPE, + attributes.put( + MESSAGING_ROCKETMQ_MESSAGE_TYPE, MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.DELAY); break; case TRANSACTION: - attributes.put(MESSAGING_ROCKETMQ_MESSAGE_TYPE, + attributes.put( + MESSAGING_ROCKETMQ_MESSAGE_TYPE, MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.TRANSACTION); break; default: - attributes.put(MESSAGING_ROCKETMQ_MESSAGE_TYPE, MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.NORMAL); + attributes.put( + MESSAGING_ROCKETMQ_MESSAGE_TYPE, + MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.NORMAL); } } diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java index 041bcf02f925..c9b0557e79a5 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java @@ -20,12 +20,11 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.util.ThrowingSupplier; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.Arrays; import java.util.Collections; - -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import org.apache.rocketmq.client.apis.ClientConfiguration; import org.apache.rocketmq.client.apis.ClientServiceProvider; import org.apache.rocketmq.client.apis.consumer.ConsumeResult; @@ -115,7 +114,10 @@ void testSendAndConsumeMessage() throws Throwable { .hasAttributesSatisfyingExactly( equalTo(MESSAGING_ROCKETMQ_MESSAGE_TAG, tag), equalTo(MESSAGING_ROCKETMQ_MESSAGE_KEYS, Arrays.asList(keys)), - equalTo(MESSAGING_ROCKETMQ_MESSAGE_TYPE, MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.NORMAL), + equalTo( + MESSAGING_ROCKETMQ_MESSAGE_TYPE, + MessagingIncubatingAttributes + .MessagingRocketmqMessageTypeValues.NORMAL), equalTo(MESSAGING_MESSAGE_BODY_SIZE, (long) body.length), equalTo(MESSAGING_SYSTEM, "rocketmq"), equalTo( diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java index 5e4151c8cfa0..ee30c511944b 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java @@ -29,6 +29,7 @@ import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -39,8 +40,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; - -import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import org.apache.rocketmq.client.apis.ClientConfiguration; import org.apache.rocketmq.client.apis.ClientException; import org.apache.rocketmq.client.apis.ClientServiceProvider; @@ -414,7 +413,9 @@ private static SpanDataAssert assertProducerSpan( Arrays.asList( equalTo(MESSAGING_ROCKETMQ_MESSAGE_TAG, tag), equalTo(MESSAGING_ROCKETMQ_MESSAGE_KEYS, Arrays.asList(keys)), - equalTo(MESSAGING_ROCKETMQ_MESSAGE_TYPE, MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.NORMAL), + equalTo( + MESSAGING_ROCKETMQ_MESSAGE_TYPE, + MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.NORMAL), equalTo(MESSAGING_MESSAGE_BODY_SIZE, (long) body.length), equalTo(MESSAGING_SYSTEM, "rocketmq"), equalTo(MESSAGING_MESSAGE_ID, sendReceipt.getMessageId().toString()), @@ -443,7 +444,8 @@ private static SpanDataAssert assertProducerSpanWithFifoMessage( equalTo(MESSAGING_ROCKETMQ_MESSAGE_TAG, tag), equalTo(MESSAGING_ROCKETMQ_MESSAGE_KEYS, Arrays.asList(keys)), equalTo(MESSAGING_ROCKETMQ_MESSAGE_GROUP, messageGroup), - equalTo(MESSAGING_ROCKETMQ_MESSAGE_TYPE, + equalTo( + MESSAGING_ROCKETMQ_MESSAGE_TYPE, MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.FIFO), equalTo(MESSAGING_MESSAGE_BODY_SIZE, (long) body.length), equalTo(MESSAGING_SYSTEM, "rocketmq"), @@ -473,7 +475,8 @@ private static SpanDataAssert assertProducerSpanWithDelayMessage( equalTo(MESSAGING_ROCKETMQ_MESSAGE_TAG, tag), equalTo(MESSAGING_ROCKETMQ_MESSAGE_KEYS, Arrays.asList(keys)), equalTo(MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP, deliveryTimestamp), - equalTo(MESSAGING_ROCKETMQ_MESSAGE_TYPE, + equalTo( + MESSAGING_ROCKETMQ_MESSAGE_TYPE, MessagingIncubatingAttributes.MessagingRocketmqMessageTypeValues.DELAY), equalTo(MESSAGING_MESSAGE_BODY_SIZE, (long) body.length), equalTo(MESSAGING_SYSTEM, "rocketmq"), diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/BaseServletHelper.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/BaseServletHelper.java index b71fee7b5ea3..d485a2f7ea2b 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/BaseServletHelper.java +++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/BaseServletHelper.java @@ -128,8 +128,8 @@ private void captureRequestParameters(Span serverSpan, REQUEST request) { } /** - * Capture {@link EnduserIncubatingAttributes#ENDUSER_ID} as span attributes when SERVER span is not create - * by servlet instrumentation. + * Capture {@link EnduserIncubatingAttributes#ENDUSER_ID} as span attributes when SERVER span is + * not create by servlet instrumentation. * *

When SERVER span is created by servlet instrumentation we register {@link * ServletAdditionalAttributesExtractor} as an attribute extractor. When SERVER span is not diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletAdditionalAttributesExtractor.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletAdditionalAttributesExtractor.java index 9e9ff4e6eeb9..f39f3b9f2f1d 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletAdditionalAttributesExtractor.java +++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletAdditionalAttributesExtractor.java @@ -14,7 +14,6 @@ import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; - import java.security.Principal; import javax.annotation.Nullable; diff --git a/instrumentation/spring/spring-security-config-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturer.java b/instrumentation/spring/spring-security-config-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturer.java index 18479ae5a315..7abfc954b75a 100644 --- a/instrumentation/spring/spring-security-config-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturer.java +++ b/instrumentation/spring/spring-security-config-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturer.java @@ -8,9 +8,8 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.LocalRootSpan; -import java.util.Objects; - import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; +import java.util.Objects; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; @@ -68,7 +67,8 @@ public void captureEnduserAttributes(Context otelContext, Authentication authent Span localRootSpan = LocalRootSpan.fromContext(otelContext); if (enduserIdEnabled && authentication.getName() != null) { - localRootSpan.setAttribute(EnduserIncubatingAttributes.ENDUSER_ID, authentication.getName()); + localRootSpan.setAttribute( + EnduserIncubatingAttributes.ENDUSER_ID, authentication.getName()); } StringBuilder roleBuilder = null; @@ -85,10 +85,12 @@ public void captureEnduserAttributes(Context otelContext, Authentication authent } } if (roleBuilder != null) { - localRootSpan.setAttribute(EnduserIncubatingAttributes.ENDUSER_ROLE, roleBuilder.toString()); + localRootSpan.setAttribute( + EnduserIncubatingAttributes.ENDUSER_ROLE, roleBuilder.toString()); } if (scopeBuilder != null) { - localRootSpan.setAttribute(EnduserIncubatingAttributes.ENDUSER_SCOPE, scopeBuilder.toString()); + localRootSpan.setAttribute( + EnduserIncubatingAttributes.ENDUSER_SCOPE, scopeBuilder.toString()); } } } diff --git a/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturerTest.java b/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturerTest.java index 0676e1950756..56bc62e1657f 100644 --- a/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturerTest.java +++ b/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturerTest.java @@ -11,10 +11,9 @@ import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.trace.data.SpanData; +import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; import java.util.Arrays; import java.util.function.Consumer; - -import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; import org.assertj.core.api.Condition; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/webflux/EnduserAttributesCapturingWebFilterTest.java b/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/webflux/EnduserAttributesCapturingWebFilterTest.java index 13f3d4d065c4..3d0e7be94d83 100644 --- a/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/webflux/EnduserAttributesCapturingWebFilterTest.java +++ b/instrumentation/spring/spring-security-config-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/webflux/EnduserAttributesCapturingWebFilterTest.java @@ -10,10 +10,9 @@ import io.opentelemetry.instrumentation.spring.security.config.v6_0.EnduserAttributesCapturer; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; +import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; import java.util.Arrays; import java.util.Collections; - -import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.mock.http.server.reactive.MockServerHttpRequest; diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index 0bbdd9e26fa3..b856da9b57a3 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -5,12 +5,9 @@ package io.opentelemetry.semconv; -import io.opentelemetry.api.common.AttributeKey; - public class SemanticAttributes { private SemanticAttributes() {} public static final String EXCEPTION_EVENT_NAME = "exception"; - } From 1d9649ffd525dbf4c535ffe608506ccb6f9d5bea Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:05:04 +0200 Subject: [PATCH 27/52] inline SemanticAttributes.EXCEPTION_EVENT_NAME --- .../internal/OpenTelemetryInstrumentationHelper.java | 2 +- .../instrumentation/graphql/AbstractGraphqlTest.java | 4 ++-- .../instrumentation/hibernate/v3_3/SessionTest.java | 3 +-- .../src/test/groovy/JspInstrumentationBasicTests.groovy | 4 ++-- .../javaagent/instrumentation/rabbitmq/RabbitMqTest.java | 2 +- .../reactornetty/v1_0/ReactorNettyClientSslTest.java | 2 +- .../javaagent/instrumentation/rmi/RmiTest.java | 4 ++-- .../javaagent/src/test/groovy/SpringRmiTest.groovy | 6 +++--- .../spring/scheduling/v3_1/SpringSchedulingTest.java | 2 +- .../spring/webflux/v5_0/server/SpringWebfluxTest.java | 7 +++---- .../server/base/ControllerSpringWebFluxServerTest.java | 7 +++---- .../v5_0/server/base/HandlerSpringWebFluxServerTest.java | 7 +++---- .../instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java | 3 +-- .../java/io/opentelemetry/semconv/SemanticAttributes.java | 1 - .../groovy/io/opentelemetry/smoketest/AppServerTest.groovy | 1 - .../groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy | 1 - .../instrumentation/test/asserts/SpanAssert.groovy | 5 ++--- 17 files changed, 26 insertions(+), 35 deletions(-) diff --git a/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java b/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java index 268ff10d29b1..6d1d0c41ab32 100644 --- a/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java +++ b/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java @@ -100,7 +100,7 @@ public InstrumentationContext beginExecution( ExceptionIncubatingAttributes.EXCEPTION_TYPE, String.valueOf(error.getErrorType())); attributes.put(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, error.getMessage()); - span.addEvent(SemanticAttributes.EXCEPTION_EVENT_NAME, attributes.build()); + span.addEvent("exception", attributes.build()); } instrumenter.end(context, state, result, throwable); diff --git a/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java b/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java index 961c677fb8d6..57bef8fa3232 100644 --- a/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java +++ b/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java @@ -205,7 +205,7 @@ void parseError() { .hasEventsSatisfyingExactly( event -> event - .hasName(SemanticAttributes.EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfyingExactly( equalTo( ExceptionIncubatingAttributes.EXCEPTION_TYPE, @@ -247,7 +247,7 @@ void validationError() { .hasEventsSatisfyingExactly( event -> event - .hasName(SemanticAttributes.EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfyingExactly( equalTo( ExceptionIncubatingAttributes.EXCEPTION_TYPE, diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java index a9a8a1d04f24..3f0802b212da 100644 --- a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java +++ b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java @@ -10,7 +10,6 @@ import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_TYPE; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; import static org.junit.jupiter.api.Named.named; import io.opentelemetry.api.common.AttributeKey; @@ -160,7 +159,7 @@ void testHibernateFailedReplicate() { .hasEventsSatisfyingExactly( event -> event - .hasName(EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfyingExactly( equalTo(EXCEPTION_TYPE, "org.hibernate.MappingException"), equalTo( diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy index ee343e98ba0a..cf5f8785cbdf 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy @@ -259,7 +259,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { kind SERVER status ERROR event(0) { - eventName(SemanticAttributes.EXCEPTION_EVENT_NAME) + eventName("exception") attributes { "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" { String tagExceptionType -> return tagExceptionType == exceptionClass.getName() || tagExceptionType.contains(exceptionClass.getSimpleName()) @@ -299,7 +299,7 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { name "Render /$jspFileName" status ERROR event(0) { - eventName(SemanticAttributes.EXCEPTION_EVENT_NAME) + eventName("exception") attributes { "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" { String tagExceptionType -> return tagExceptionType == exceptionClass.getName() || tagExceptionType.contains(exceptionClass.getSimpleName()) diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java index 8dedda065d95..57cb2271dc5b 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java @@ -889,7 +889,7 @@ private static void verifyException(SpanDataAssert span, Throwable exception, St .hasEventsSatisfying( events -> { assertThat(events.get(0)) - .hasName(SemanticAttributes.EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfying( equalTo( ExceptionIncubatingAttributes.EXCEPTION_TYPE, diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java index 9494abfa3549..25e1190545c0 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java @@ -223,7 +223,7 @@ private static HttpClient createHttpClient(@Nullable String enabledProtocol) thr private static void isSslHandshakeException(List events) { assertThat(events) - .filteredOn(event -> event.getName().equals(SemanticAttributes.EXCEPTION_EVENT_NAME)) + .filteredOn(event -> event.getName().equals("exception")) .satisfiesExactly( event -> assertThat(event) diff --git a/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java b/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java index ea180c531ff2..b069c093786f 100644 --- a/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java +++ b/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java @@ -148,7 +148,7 @@ void serviceThrownException() throws Exception { .hasEventsSatisfyingExactly( event -> event - .hasName(SemanticAttributes.EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfyingExactly( equalTo( ExceptionIncubatingAttributes.EXCEPTION_TYPE, @@ -171,7 +171,7 @@ void serviceThrownException() throws Exception { .hasEventsSatisfyingExactly( event -> event - .hasName(SemanticAttributes.EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfyingExactly( equalTo( ExceptionIncubatingAttributes.EXCEPTION_TYPE, diff --git a/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy b/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy index f7bc11bc7e10..43524f9dbec3 100644 --- a/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy +++ b/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy @@ -130,7 +130,7 @@ class SpringRmiTest extends AgentInstrumentationSpecification { status ERROR hasNoParent() event(0) { - eventName("$SemanticAttributes.EXCEPTION_EVENT_NAME") + eventName("exception") attributes { "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" error.getClass().getCanonicalName() "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" error.getMessage() @@ -144,7 +144,7 @@ class SpringRmiTest extends AgentInstrumentationSpecification { status ERROR childOf span(0) event(0) { - eventName("$SemanticAttributes.EXCEPTION_EVENT_NAME") + eventName("exception") attributes { "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" error.getClass().getCanonicalName() "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" error.getMessage() @@ -163,7 +163,7 @@ class SpringRmiTest extends AgentInstrumentationSpecification { childOf span(1) status ERROR event(0) { - eventName("$SemanticAttributes.EXCEPTION_EVENT_NAME") + eventName("exception") attributes { "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" error.getClass().getCanonicalName() "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" error.getMessage() diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java index 9c27f06f6859..9d5aa868f9d1 100644 --- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java +++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java @@ -164,7 +164,7 @@ void taskWithErrorTest() throws InterruptedException { .hasEventsSatisfyingExactly( event -> event - .hasName(SemanticAttributes.EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfying( equalTo( ExceptionIncubatingAttributes.EXCEPTION_TYPE, diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java index fe020ba0b8eb..13d44423d3e8 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java @@ -18,7 +18,6 @@ import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; import static io.opentelemetry.semconv.HttpAttributes.HTTP_ROUTE; import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PROTOCOL_VERSION; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.UserAgentAttributes.USER_AGENT_ORIGINAL; @@ -443,7 +442,7 @@ void get404Test() { private static void resource404Exception(EventDataAssert event) { if (Boolean.getBoolean("testLatestDeps")) { event - .hasName(EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfyingExactly( equalTo( EXCEPTION_TYPE, @@ -452,7 +451,7 @@ private static void resource404Exception(EventDataAssert event) { satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))); } else { event - .hasName(EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfyingExactly( equalTo(EXCEPTION_TYPE, "org.springframework.web.server.ResponseStatusException"), equalTo(EXCEPTION_MESSAGE, "Response status 404"), @@ -547,7 +546,7 @@ void getToBadEndpointTest(Parameter parameter) { .hasEventsSatisfyingExactly( event -> event - .hasName(EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfyingExactly( equalTo(EXCEPTION_TYPE, "java.lang.IllegalStateException"), equalTo(EXCEPTION_MESSAGE, "bad things happen"), diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java index cd6da9257623..b23edb617edc 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java @@ -12,7 +12,6 @@ import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_TYPE; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; @@ -37,7 +36,7 @@ protected SpanDataAssert assertHandlerSpan( span.hasEventsSatisfyingExactly( event -> event - .hasName(EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfyingExactly( equalTo(EXCEPTION_TYPE, "java.lang.IllegalStateException"), equalTo(EXCEPTION_MESSAGE, EXCEPTION.getBody()), @@ -48,7 +47,7 @@ protected SpanDataAssert assertHandlerSpan( span.hasEventsSatisfyingExactly( event -> event - .hasName(EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfyingExactly( equalTo( EXCEPTION_TYPE, @@ -60,7 +59,7 @@ protected SpanDataAssert assertHandlerSpan( span.hasEventsSatisfyingExactly( event -> event - .hasName(EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfyingExactly( equalTo( EXCEPTION_TYPE, diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java index 33dae9dd3ab0..18e362a80997 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java @@ -12,7 +12,6 @@ import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_TYPE; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.api.internal.HttpConstants; @@ -36,7 +35,7 @@ protected SpanDataAssert assertHandlerSpan( span.hasEventsSatisfyingExactly( event -> event - .hasName(EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfyingExactly( equalTo(EXCEPTION_TYPE, "java.lang.IllegalStateException"), equalTo(EXCEPTION_MESSAGE, EXCEPTION.getBody()), @@ -47,7 +46,7 @@ protected SpanDataAssert assertHandlerSpan( span.hasEventsSatisfyingExactly( event -> event - .hasName(EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfyingExactly( equalTo( EXCEPTION_TYPE, @@ -59,7 +58,7 @@ protected SpanDataAssert assertHandlerSpan( span.hasEventsSatisfyingExactly( event -> event - .hasName(EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfyingExactly( equalTo( EXCEPTION_TYPE, diff --git a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java index 371b85b38a47..ff9023638601 100644 --- a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java +++ b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java @@ -10,7 +10,6 @@ import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_TYPE; -import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; @@ -182,7 +181,7 @@ void testInvalidQuery() throws Exception { .hasEventsSatisfyingExactly( event -> event - .hasName(EXCEPTION_EVENT_NAME) + .hasName("exception") .hasAttributesSatisfyingExactly( equalTo(EXCEPTION_TYPE, PgException.class.getName()), satisfies( diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java index b856da9b57a3..2bf2571d8c3e 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java @@ -9,5 +9,4 @@ public class SemanticAttributes { private SemanticAttributes() {} - public static final String EXCEPTION_EVENT_NAME = "exception"; } diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy index 1c46719889c0..605b27ae05e8 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy @@ -6,7 +6,6 @@ package io.opentelemetry.smoketest import io.opentelemetry.proto.trace.v1.Span -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.NetworkAttributes import io.opentelemetry.semconv.UrlAttributes diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy index 8355a0eda8e6..51a0a39ed808 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy @@ -6,7 +6,6 @@ package io.opentelemetry.smoketest import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.HttpAttributes import spock.lang.IgnoreIf diff --git a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy index f09819e6ce2e..bfa2003b0a3c 100644 --- a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy +++ b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy @@ -12,7 +12,6 @@ import io.opentelemetry.api.trace.SpanId import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.api.trace.StatusCode import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes import java.util.regex.Pattern @@ -148,7 +147,7 @@ class SpanAssert { def errorEventWithAnyMessage(Class expectedClass) { event(0) { - eventName(SemanticAttributes.EXCEPTION_EVENT_NAME) + eventName("exception") attributes { "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" expectedClass.canonicalName "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String @@ -163,7 +162,7 @@ class SpanAssert { def errorEvent(Class errorClass, expectedMessage, int index) { event(index) { - eventName(SemanticAttributes.EXCEPTION_EVENT_NAME) + eventName("exception") attributes { "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" errorClass.canonicalName "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String From e8c62e36851323bc582a3c32ebab34d9b391ec38 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:06:41 +0200 Subject: [PATCH 28/52] remove SemanticAttributes --- .../AbstractHttpServerInstrumentationTest.scala | 1 - .../groovy/Elasticsearch5NodeClientTest.groovy | 2 -- .../Elasticsearch5TransportClientTest.groovy | 2 -- .../finatra/FinatraServerLatestTest.scala | 1 - .../finatra/FinatraServerTest.scala | 1 - .../OpenTelemetryInstrumentationHelper.java | 1 - .../graphql/AbstractGraphqlTest.java | 1 - .../groovy/GrizzlyFilterchainServerTest.groovy | 1 - .../javaagent/src/test/groovy/GrizzlyTest.groovy | 1 - .../src/test/groovy/JaxRsClientV1Test.groovy | 1 - .../instrumentation/scalaexecutors/SlickTest.scala | 14 +------------- .../groovy/JspInstrumentationBasicTests.groovy | 1 - .../AbstractHttpServerInstrumentationTest.scala | 1 - .../groovy/client/PlayWsClientTest.groovy | 1 - .../play24Test/groovy/server/PlayServerTest.groovy | 1 - .../src/test/groovy/server/PlayServerTest.groovy | 1 - .../instrumentation/rabbitmq/RabbitMqTest.java | 1 - .../v1_0/ReactorNettyClientSslTest.java | 1 - .../javaagent/instrumentation/rmi/RmiTest.java | 1 - .../src/test/groovy/AbstractServlet3Test.groovy | 1 - .../src/test/groovy/JettyServletHandlerTest.groovy | 1 - .../src/test/groovy/JettyServletHandlerTest.groovy | 1 - .../main/groovy/test/AbstractServlet5Test.groovy | 1 - .../javaagent/src/test/groovy/SpringRmiTest.groovy | 1 - .../scheduling/v3_1/SpringSchedulingTest.java | 1 - .../test/groovy/UndertowServerDispatchTest.groovy | 1 - .../opentelemetry/semconv/SemanticAttributes.java | 12 ------------ .../test/base/HttpServerTest.groovy | 1 - 28 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AbstractHttpServerInstrumentationTest.scala b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AbstractHttpServerInstrumentationTest.scala index afc72c2b3ec6..785ccf8f5f6b 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AbstractHttpServerInstrumentationTest.scala +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AbstractHttpServerInstrumentationTest.scala @@ -11,7 +11,6 @@ import io.opentelemetry.instrumentation.testing.junit.http.{ HttpServerTestOptions, ServerEndpoint } -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.HttpAttributes import java.util diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy index 9e3eeecd64ae..b18a0c09654a 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy @@ -3,8 +3,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.elasticsearch.client.Client import org.elasticsearch.common.io.FileSystemUtils diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy index e73c4fdadb14..11728f2c3e45 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy @@ -4,8 +4,6 @@ */ import io.opentelemetry.semconv.NetworkAttributes -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.common.io.FileSystemUtils diff --git a/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala b/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala index fc427b298f22..95719e122f96 100644 --- a/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala +++ b/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala @@ -17,7 +17,6 @@ import io.opentelemetry.instrumentation.testing.junit.http.{ import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo import io.opentelemetry.sdk.testing.assertj.SpanDataAssert import io.opentelemetry.sdk.trace.data.StatusData -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import org.junit.jupiter.api.extension.RegisterExtension diff --git a/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala b/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala index 9f4e9457f2ae..73e6ff556888 100644 --- a/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala +++ b/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala @@ -17,7 +17,6 @@ import io.opentelemetry.instrumentation.testing.junit.http.{ import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo import io.opentelemetry.sdk.testing.assertj.SpanDataAssert import io.opentelemetry.sdk.trace.data.StatusData -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes import org.junit.jupiter.api.extension.RegisterExtension diff --git a/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java b/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java index 6d1d0c41ab32..fb24119ee795 100644 --- a/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java +++ b/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java @@ -35,7 +35,6 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder; import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import java.util.Locale; diff --git a/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java b/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java index 57bef8fa3232..f9efde37f4e5 100644 --- a/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java +++ b/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java @@ -24,7 +24,6 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import java.io.IOException; import java.io.InputStreamReader; diff --git a/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyFilterchainServerTest.groovy b/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyFilterchainServerTest.groovy index d0eaa74c96e8..9924891803ac 100644 --- a/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyFilterchainServerTest.groovy +++ b/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyFilterchainServerTest.groovy @@ -7,7 +7,6 @@ import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.HttpAttributes import org.glassfish.grizzly.filterchain.BaseFilter import org.glassfish.grizzly.filterchain.FilterChain diff --git a/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyTest.groovy b/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyTest.groovy index e6fb782d4fbe..eeddf36f0ebf 100644 --- a/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyTest.groovy +++ b/instrumentation/grizzly-2.3/javaagent/src/test/groovy/GrizzlyTest.groovy @@ -7,7 +7,6 @@ import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.HttpAttributes import org.glassfish.grizzly.http.server.HttpHandler import org.glassfish.grizzly.http.server.HttpServer diff --git a/instrumentation/jaxrs-client/jaxrs-client-1.1-testing/src/test/groovy/JaxRsClientV1Test.groovy b/instrumentation/jaxrs-client/jaxrs-client-1.1-testing/src/test/groovy/JaxRsClientV1Test.groovy index 2256145f4164..58478731e1ae 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-1.1-testing/src/test/groovy/JaxRsClientV1Test.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-1.1-testing/src/test/groovy/JaxRsClientV1Test.groovy @@ -12,7 +12,6 @@ import com.sun.jersey.api.client.filter.LoggingFilter import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.NetworkAttributes import spock.lang.Shared diff --git a/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala b/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala index 8ff8a0e31dd9..dc1ff375acc6 100644 --- a/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala +++ b/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala @@ -13,20 +13,8 @@ import io.opentelemetry.instrumentation.testing.junit.{ import io.opentelemetry.javaagent.testing.common.Java8BytecodeBridge import io.opentelemetry.sdk.testing.assertj.{SpanDataAssert, TraceAssert} import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo -import io.opentelemetry.semconv.SemanticAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.SemanticAttributes.DbSystemValues -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes -import io.opentelemetry.semconv.incubating.DbIncubatingAttributes import io.opentelemetry.semconv.incubating.DbIncubatingAttributes +import io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemValues import java.util.function.Consumer import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.{Test, TestInstance} diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy index cf5f8785cbdf..5f7d34cbb23d 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy @@ -5,7 +5,6 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/AbstractHttpServerInstrumentationTest.scala b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/AbstractHttpServerInstrumentationTest.scala index 77e8b482641d..5d14a42a8521 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/AbstractHttpServerInstrumentationTest.scala +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/AbstractHttpServerInstrumentationTest.scala @@ -11,7 +11,6 @@ import io.opentelemetry.instrumentation.testing.junit.http.{ HttpServerTestOptions, ServerEndpoint } -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.HttpAttributes import java.util diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/client/PlayWsClientTest.groovy b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/client/PlayWsClientTest.groovy index 8ec6d3e7d527..1cfe325aca58 100644 --- a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/client/PlayWsClientTest.groovy +++ b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/client/PlayWsClientTest.groovy @@ -10,7 +10,6 @@ import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.NetworkAttributes import play.libs.ws.WS import play.libs.ws.WSRequest diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/server/PlayServerTest.groovy b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/server/PlayServerTest.groovy index 2f96ebeac089..69383be02d11 100644 --- a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/server/PlayServerTest.groovy +++ b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/server/PlayServerTest.groovy @@ -12,7 +12,6 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.HttpAttributes import play.libs.F.Function0 import play.mvc.Results diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/groovy/server/PlayServerTest.groovy b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/groovy/server/PlayServerTest.groovy index ea23156a44da..101890bd7068 100644 --- a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/groovy/server/PlayServerTest.groovy +++ b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/groovy/server/PlayServerTest.groovy @@ -12,7 +12,6 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.HttpAttributes import play.mvc.Results import play.routing.RoutingDsl diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java index 57cb2271dc5b..16e55d77f8d1 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java @@ -30,7 +30,6 @@ import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.io.FileNotFoundException; diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java index 25e1190545c0..524aa8cda5f0 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java @@ -23,7 +23,6 @@ import io.opentelemetry.semconv.ErrorAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; diff --git a/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java b/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java index b069c093786f..1bf332325fc5 100644 --- a/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java +++ b/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java @@ -15,7 +15,6 @@ import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.rmi.registry.LocateRegistry; diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy index 22308266678e..7f990d7118ca 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy @@ -10,7 +10,6 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.javaagent.bootstrap.servlet.ExperimentalSnippetHolder -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.HttpAttributes import javax.servlet.Servlet diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy index c52547e3d768..f681852649f4 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy @@ -6,7 +6,6 @@ import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.HttpAttributes import org.eclipse.jetty.server.Server import org.eclipse.jetty.server.handler.ErrorHandler diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy index 22512e06286b..820bc8b8c57e 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/JettyServletHandlerTest.groovy @@ -5,7 +5,6 @@ import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.HttpAttributes import jakarta.servlet.Servlet import jakarta.servlet.ServletException diff --git a/instrumentation/servlet/servlet-5.0/testing/src/main/groovy/test/AbstractServlet5Test.groovy b/instrumentation/servlet/servlet-5.0/testing/src/main/groovy/test/AbstractServlet5Test.groovy index 9a86a6d57955..2fd99b291082 100644 --- a/instrumentation/servlet/servlet-5.0/testing/src/main/groovy/test/AbstractServlet5Test.groovy +++ b/instrumentation/servlet/servlet-5.0/testing/src/main/groovy/test/AbstractServlet5Test.groovy @@ -12,7 +12,6 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.javaagent.bootstrap.servlet.ExperimentalSnippetHolder -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.HttpAttributes import jakarta.servlet.Servlet diff --git a/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy b/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy index 43524f9dbec3..1c74da23e0ad 100644 --- a/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy +++ b/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy @@ -6,7 +6,6 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import org.springframework.boot.SpringApplication diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java index 9d5aa868f9d1..6059d187efed 100644 --- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java +++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java @@ -26,7 +26,6 @@ import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.config.TriggerTaskConfig; import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.service.LambdaTaskConfigurer; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.SemanticAttributes; import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerDispatchTest.groovy b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerDispatchTest.groovy index 9d9b4d6940ae..13a125c2d8e6 100644 --- a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerDispatchTest.groovy +++ b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerDispatchTest.groovy @@ -7,7 +7,6 @@ import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.HttpAttributes import io.undertow.Handlers import io.undertow.Undertow diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java deleted file mode 100644 index 2bf2571d8c3e..000000000000 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.semconv; - -public class SemanticAttributes { - - private SemanticAttributes() {} - -} diff --git a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy index 979fc37a369d..5b3369301389 100644 --- a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy +++ b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy @@ -19,7 +19,6 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.SemanticAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest import io.opentelemetry.testing.internal.armeria.common.HttpMethod From 31157c976b4832462e17b7f6a5ebc0418a6dcdcd Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:10:46 +0200 Subject: [PATCH 29/52] remove unused stuff in ResourceAttributes --- .../semconv/ResourceAttributes.java | 186 +----------------- 1 file changed, 2 insertions(+), 184 deletions(-) diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java index ae8f4c7c1f39..591e2e695eb9 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java @@ -23,97 +23,15 @@ private ResourceAttributes() {} public static final AttributeKey CLOUD_ACCOUNT_ID = CloudIncubatingAttributes.CLOUD_ACCOUNT_ID; - public static final AttributeKey CLOUD_AVAILABILITY_ZONE = - CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE; - public static final AttributeKey CLOUD_PLATFORM = - CloudIncubatingAttributes.CLOUD_PLATFORM; - public static final AttributeKey CLOUD_PROVIDER = - CloudIncubatingAttributes.CLOUD_PROVIDER; - public static final AttributeKey CLOUD_REGION = CloudIncubatingAttributes.CLOUD_REGION; public static final AttributeKey CLOUD_RESOURCE_ID = CloudIncubatingAttributes.CLOUD_RESOURCE_ID; - public static final class CloudProviderValues { - public static final String ALIBABA_CLOUD = - CloudIncubatingAttributes.CloudProviderValues.ALIBABA_CLOUD; - public static final String AWS = CloudIncubatingAttributes.CloudProviderValues.AWS; - public static final String AZURE = CloudIncubatingAttributes.CloudProviderValues.AZURE; - public static final String GCP = CloudIncubatingAttributes.CloudProviderValues.GCP; - public static final String HEROKU = CloudIncubatingAttributes.CloudProviderValues.HEROKU; - public static final String IBM_CLOUD = CloudIncubatingAttributes.CloudProviderValues.IBM_CLOUD; - public static final String TENCENT_CLOUD = - CloudIncubatingAttributes.CloudProviderValues.TENCENT_CLOUD; - - private CloudProviderValues() {} - } - - public static final class CloudPlatformValues { - public static final String ALIBABA_CLOUD_ECS = - CloudIncubatingAttributes.CloudPlatformValues.ALIBABA_CLOUD_ECS; - public static final String ALIBABA_CLOUD_FC = - CloudIncubatingAttributes.CloudPlatformValues.ALIBABA_CLOUD_FC; - public static final String ALIBABA_CLOUD_OPENSHIFT = - CloudIncubatingAttributes.CloudPlatformValues.ALIBABA_CLOUD_OPENSHIFT; - public static final String AWS_EC2 = CloudIncubatingAttributes.CloudPlatformValues.AWS_EC2; - public static final String AWS_ECS = CloudIncubatingAttributes.CloudPlatformValues.AWS_ECS; - public static final String AWS_EKS = CloudIncubatingAttributes.CloudPlatformValues.AWS_EKS; - public static final String AWS_LAMBDA = - CloudIncubatingAttributes.CloudPlatformValues.AWS_LAMBDA; - public static final String AWS_ELASTIC_BEANSTALK = - CloudIncubatingAttributes.CloudPlatformValues.AWS_ELASTIC_BEANSTALK; - public static final String AWS_APP_RUNNER = - CloudIncubatingAttributes.CloudPlatformValues.AWS_APP_RUNNER; - public static final String AWS_OPENSHIFT = - CloudIncubatingAttributes.CloudPlatformValues.AWS_OPENSHIFT; - public static final String AZURE_VM = CloudIncubatingAttributes.CloudPlatformValues.AZURE_VM; - public static final String AZURE_CONTAINER_INSTANCES = - CloudIncubatingAttributes.CloudPlatformValues.AZURE_CONTAINER_INSTANCES; - public static final String AZURE_AKS = CloudIncubatingAttributes.CloudPlatformValues.AZURE_AKS; - public static final String AZURE_FUNCTIONS = - CloudIncubatingAttributes.CloudPlatformValues.AZURE_FUNCTIONS; - public static final String AZURE_APP_SERVICE = - CloudIncubatingAttributes.CloudPlatformValues.AZURE_APP_SERVICE; - public static final String AZURE_OPENSHIFT = - CloudIncubatingAttributes.CloudPlatformValues.AZURE_OPENSHIFT; - public static final String GCP_BARE_METAL_SOLUTION = - CloudIncubatingAttributes.CloudPlatformValues.GCP_BARE_METAL_SOLUTION; - public static final String GCP_COMPUTE_ENGINE = - CloudIncubatingAttributes.CloudPlatformValues.GCP_COMPUTE_ENGINE; - public static final String GCP_CLOUD_RUN = - CloudIncubatingAttributes.CloudPlatformValues.GCP_CLOUD_RUN; - public static final String GCP_KUBERNETES_ENGINE = - CloudIncubatingAttributes.CloudPlatformValues.GCP_KUBERNETES_ENGINE; - public static final String GCP_CLOUD_FUNCTIONS = - CloudIncubatingAttributes.CloudPlatformValues.GCP_CLOUD_FUNCTIONS; - public static final String GCP_APP_ENGINE = - CloudIncubatingAttributes.CloudPlatformValues.GCP_APP_ENGINE; - public static final String GCP_OPENSHIFT = - CloudIncubatingAttributes.CloudPlatformValues.GCP_OPENSHIFT; - public static final String IBM_CLOUD_OPENSHIFT = - CloudIncubatingAttributes.CloudPlatformValues.IBM_CLOUD_OPENSHIFT; - public static final String TENCENT_CLOUD_CVM = - CloudIncubatingAttributes.CloudPlatformValues.TENCENT_CLOUD_CVM; - public static final String TENCENT_CLOUD_EKS = - CloudIncubatingAttributes.CloudPlatformValues.TENCENT_CLOUD_EKS; - public static final String TENCENT_CLOUD_SCF = - CloudIncubatingAttributes.CloudPlatformValues.TENCENT_CLOUD_SCF; - - private CloudPlatformValues() {} - } - - public static final AttributeKey SERVICE_INSTANCE_ID = - ServiceIncubatingAttributes.SERVICE_INSTANCE_ID; public static final AttributeKey SERVICE_NAME = ServiceIncubatingAttributes.SERVICE_NAME; - public static final AttributeKey SERVICE_NAMESPACE = - ServiceIncubatingAttributes.SERVICE_NAMESPACE; public static final AttributeKey SERVICE_VERSION = ServiceIncubatingAttributes.SERVICE_VERSION; - public static final AttributeKey OS_BUILD_ID = OsIncubatingAttributes.OS_BUILD_ID; public static final AttributeKey OS_DESCRIPTION = OsIncubatingAttributes.OS_DESCRIPTION; - public static final AttributeKey OS_NAME = OsIncubatingAttributes.OS_NAME; public static final AttributeKey OS_TYPE = OsIncubatingAttributes.OS_TYPE; - public static final AttributeKey OS_VERSION = OsIncubatingAttributes.OS_VERSION; public static final class OsTypeValues { public static final String WINDOWS = OsIncubatingAttributes.OsTypeValues.WINDOWS; @@ -131,77 +49,12 @@ public static final class OsTypeValues { private OsTypeValues() {} } - public static final AttributeKey TELEMETRY_DISTRO_NAME = - TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME; - public static final AttributeKey TELEMETRY_DISTRO_VERSION = - TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION; - public static final AttributeKey TELEMETRY_SDK_LANGUAGE = - TelemetryIncubatingAttributes.TELEMETRY_SDK_LANGUAGE; - public static final AttributeKey TELEMETRY_SDK_NAME = - TelemetryIncubatingAttributes.TELEMETRY_SDK_NAME; - public static final AttributeKey TELEMETRY_SDK_VERSION = - TelemetryIncubatingAttributes.TELEMETRY_SDK_VERSION; - - public static final class TelemetrySdkLanguageValues { - public static final String CPP = TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.CPP; - public static final String DOTNET = - TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.DOTNET; - public static final String ERLANG = - TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.ERLANG; - public static final String GO = TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.GO; - public static final String JAVA = TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.JAVA; - public static final String NODEJS = - TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.NODEJS; - public static final String PHP = TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.PHP; - public static final String PYTHON = - TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.PYTHON; - public static final String RUBY = TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.RUBY; - public static final String RUST = TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.RUST; - public static final String SWIFT = - TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.SWIFT; - public static final String WEBJS = - TelemetryIncubatingAttributes.TelemetrySdkLanguageValues.WEBJS; - - private TelemetrySdkLanguageValues() {} - } - - public static final AttributeKey CONTAINER_COMMAND = - ContainerIncubatingAttributes.CONTAINER_COMMAND; - public static final AttributeKey> CONTAINER_COMMAND_ARGS = - ContainerIncubatingAttributes.CONTAINER_COMMAND_ARGS; - public static final AttributeKey CONTAINER_COMMAND_LINE = - ContainerIncubatingAttributes.CONTAINER_COMMAND_LINE; - public static final AttributeKey CONTAINER_ID = - ContainerIncubatingAttributes.CONTAINER_ID; - public static final AttributeKey CONTAINER_IMAGE_ID = - ContainerIncubatingAttributes.CONTAINER_IMAGE_ID; - public static final AttributeKey CONTAINER_IMAGE_NAME = - ContainerIncubatingAttributes.CONTAINER_IMAGE_NAME; - public static final AttributeKey> CONTAINER_IMAGE_REPO_DIGESTS = - ContainerIncubatingAttributes.CONTAINER_IMAGE_REPO_DIGESTS; - public static final AttributeKey> CONTAINER_IMAGE_TAGS = - ContainerIncubatingAttributes.CONTAINER_IMAGE_TAGS; - public static final AttributeKeyTemplate CONTAINER_LABELS = - ContainerIncubatingAttributes.CONTAINER_LABELS; - public static final AttributeKey CONTAINER_NAME = - ContainerIncubatingAttributes.CONTAINER_NAME; - public static final AttributeKey CONTAINER_RUNTIME = - ContainerIncubatingAttributes.CONTAINER_RUNTIME; - - public static final AttributeKey PROCESS_COMMAND = - ProcessIncubatingAttributes.PROCESS_COMMAND; public static final AttributeKey> PROCESS_COMMAND_ARGS = ProcessIncubatingAttributes.PROCESS_COMMAND_ARGS; public static final AttributeKey PROCESS_COMMAND_LINE = ProcessIncubatingAttributes.PROCESS_COMMAND_LINE; - public static final AttributeKey PROCESS_EXECUTABLE_NAME = - ProcessIncubatingAttributes.PROCESS_EXECUTABLE_NAME; public static final AttributeKey PROCESS_EXECUTABLE_PATH = ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH; - public static final AttributeKey PROCESS_OWNER = - ProcessIncubatingAttributes.PROCESS_OWNER; - public static final AttributeKey PROCESS_PARENT_PID = - ProcessIncubatingAttributes.PROCESS_PARENT_PID; public static final AttributeKey PROCESS_PID = ProcessIncubatingAttributes.PROCESS_PID; public static final AttributeKey PROCESS_RUNTIME_DESCRIPTION = ProcessIncubatingAttributes.PROCESS_RUNTIME_DESCRIPTION; @@ -211,47 +64,12 @@ private TelemetrySdkLanguageValues() {} ProcessIncubatingAttributes.PROCESS_RUNTIME_VERSION; public static final AttributeKey HOST_ARCH = HostIncubatingAttributes.HOST_ARCH; - public static final AttributeKey HOST_CPU_CACHE_L2_SIZE = - HostIncubatingAttributes.HOST_CPU_CACHE_L2_SIZE; - public static final AttributeKey HOST_CPU_FAMILY = - HostIncubatingAttributes.HOST_CPU_FAMILY; - public static final AttributeKey HOST_CPU_MODEL_ID = - HostIncubatingAttributes.HOST_CPU_MODEL_ID; - public static final AttributeKey HOST_CPU_MODEL_NAME = - HostIncubatingAttributes.HOST_CPU_MODEL_NAME; - public static final AttributeKey HOST_CPU_STEPPING = - HostIncubatingAttributes.HOST_CPU_STEPPING; - public static final AttributeKey HOST_CPU_VENDOR_ID = - HostIncubatingAttributes.HOST_CPU_VENDOR_ID; + public static final AttributeKey HOST_ID = HostIncubatingAttributes.HOST_ID; - public static final AttributeKey HOST_IMAGE_ID = HostIncubatingAttributes.HOST_IMAGE_ID; - public static final AttributeKey HOST_IMAGE_NAME = - HostIncubatingAttributes.HOST_IMAGE_NAME; - public static final AttributeKey HOST_IMAGE_VERSION = - HostIncubatingAttributes.HOST_IMAGE_VERSION; - public static final AttributeKey> HOST_IP = HostIncubatingAttributes.HOST_IP; - public static final AttributeKey> HOST_MAC = HostIncubatingAttributes.HOST_MAC; + public static final AttributeKey HOST_NAME = HostIncubatingAttributes.HOST_NAME; - public static final AttributeKey HOST_TYPE = HostIncubatingAttributes.HOST_TYPE; - public static final class HostArchValues { - public static final String AMD64 = HostIncubatingAttributes.HostArchValues.AMD64; - public static final String ARM32 = HostIncubatingAttributes.HostArchValues.ARM32; - public static final String ARM64 = HostIncubatingAttributes.HostArchValues.ARM64; - public static final String IA64 = HostIncubatingAttributes.HostArchValues.IA64; - public static final String PPC32 = HostIncubatingAttributes.HostArchValues.PPC32; - public static final String PPC64 = HostIncubatingAttributes.HostArchValues.PPC64; - public static final String S390X = HostIncubatingAttributes.HostArchValues.S390X; - public static final String X86 = HostIncubatingAttributes.HostArchValues.X86; - private HostArchValues() {} - } - public static final class FaasDocumentOperationValues { - public static final String INSERT = FaasIncubatingAttributes.FaasDocumentOperationValues.INSERT; - public static final String EDIT = FaasIncubatingAttributes.FaasDocumentOperationValues.EDIT; - public static final String DELETE = FaasIncubatingAttributes.FaasDocumentOperationValues.DELETE; - private FaasDocumentOperationValues() {} - } } From aa44403558e94480a4b1af1cbe74fa8796379943 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:11:33 +0200 Subject: [PATCH 30/52] CLOUD_* --- .../AwsLambdaFunctionAttributesExtractor.java | 9 ++++---- ...ambdaStreamWrapperHttpPropagationTest.java | 10 +++++---- .../v1_0/AwsLambdaStreamWrapperTest.java | 10 +++++---- .../v2_2/AwsLambdaApiGatewayWrapperTest.java | 21 ++++++++++--------- .../v2_2/AwsLambdaSqsEventWrapperTest.java | 5 +++-- .../v2_2/AwsLambdaWrapperTest.java | 17 ++++++++------- .../semconv/ResourceAttributes.java | 9 -------- 7 files changed, 39 insertions(+), 42 deletions(-) diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java index 1c74b1d038e6..cb8f589fbf94 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java @@ -5,14 +5,13 @@ package io.opentelemetry.instrumentation.awslambdacore.v1_0.internal; -import static io.opentelemetry.semconv.ResourceAttributes.CLOUD_ACCOUNT_ID; -import static io.opentelemetry.semconv.ResourceAttributes.CLOUD_RESOURCE_ID; - import com.amazonaws.services.lambda.runtime.Context; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaRequest; import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; + import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -52,8 +51,8 @@ public void onStart( attributes.put(ResourceAttributes.FAAS_INVOCATION_ID, awsContext.getAwsRequestId()); String arn = getFunctionArn(awsContext); if (arn != null) { - attributes.put(CLOUD_RESOURCE_ID, arn); - attributes.put(CLOUD_ACCOUNT_ID, getAccountId(arn)); + attributes.put(CloudIncubatingAttributes.CLOUD_RESOURCE_ID, arn); + attributes.put(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, getAccountId(arn)); } } diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java index 9f1681635dbe..c2660e7bb0d8 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java @@ -29,6 +29,8 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; + +import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -90,9 +92,9 @@ void handlerTraced() throws Exception { .hasParentSpanId("0000000000000456") .hasAttributesSatisfyingExactly( equalTo( - ResourceAttributes.CLOUD_RESOURCE_ID, + CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), - equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), + equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @@ -127,9 +129,9 @@ void handlerTracedWithException() { .hasException(thrown) .hasAttributesSatisfyingExactly( equalTo( - ResourceAttributes.CLOUD_RESOURCE_ID, + CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), - equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), + equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java index 9db8a46c037f..8e86f1a2a0a8 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java @@ -28,6 +28,8 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; + +import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -80,9 +82,9 @@ void handlerTraced() throws Exception { .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( equalTo( - ResourceAttributes.CLOUD_RESOURCE_ID, + CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), - equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), + equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @@ -108,9 +110,9 @@ void handlerTracedWithException() { .hasException(thrown) .hasAttributesSatisfyingExactly( equalTo( - ResourceAttributes.CLOUD_RESOURCE_ID, + CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), - equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), + equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java index 1dc1f3d782c9..cb77216fcd3f 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java @@ -21,6 +21,7 @@ import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.semconv.UserAgentAttributes; +import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import java.util.HashMap; import java.util.Map; @@ -100,9 +101,9 @@ void tracedWithHttpPropagation() { .hasParentSpanId("0000000000000456") .hasAttributesSatisfyingExactly( equalTo( - ResourceAttributes.CLOUD_RESOURCE_ID, + CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), - equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), + equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333"), equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), @@ -136,9 +137,9 @@ void handlerTraced_empty() { .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( equalTo( - ResourceAttributes.CLOUD_RESOURCE_ID, + CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), - equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), + equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333"), equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http")))); } @@ -167,9 +168,9 @@ void handlerTraced_string() { .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( equalTo( - ResourceAttributes.CLOUD_RESOURCE_ID, + CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), - equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), + equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333"), equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http")))); } @@ -198,9 +199,9 @@ void handlerTraced_integer() { .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( equalTo( - ResourceAttributes.CLOUD_RESOURCE_ID, + CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), - equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), + equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333"), equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http")))); } @@ -232,9 +233,9 @@ void handlerTraced_customType() { .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( equalTo( - ResourceAttributes.CLOUD_RESOURCE_ID, + CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), - equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), + equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333"), equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http")))); } diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java index f3ecdf4d00f6..63852dbd6fc3 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java @@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.lang.reflect.Constructor; import java.util.Collections; @@ -75,9 +76,9 @@ void eventTraced() { .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( equalTo( - ResourceAttributes.CLOUD_RESOURCE_ID, + CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), - equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), + equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")), span -> span.hasName("otel process") diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java index 494a145602f1..a79c627f70f5 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -70,9 +71,9 @@ void handlerTraced() { .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( equalTo( - ResourceAttributes.CLOUD_RESOURCE_ID, + CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), - equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), + equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @@ -100,9 +101,9 @@ void handlerTracedWithException() { .hasException(thrown) .hasAttributesSatisfyingExactly( equalTo( - ResourceAttributes.CLOUD_RESOURCE_ID, + CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), - equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), + equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @@ -128,9 +129,9 @@ void handlerTraced_integer() { .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( equalTo( - ResourceAttributes.CLOUD_RESOURCE_ID, + CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), - equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), + equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @@ -159,9 +160,9 @@ void handlerTraced_custom() { .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( equalTo( - ResourceAttributes.CLOUD_RESOURCE_ID, + CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), - equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"), + equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java index 591e2e695eb9..315dd10d4d09 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java @@ -6,14 +6,10 @@ package io.opentelemetry.semconv; import io.opentelemetry.api.common.AttributeKey; -import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; -import io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes; -import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; import io.opentelemetry.semconv.incubating.OsIncubatingAttributes; import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; -import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes; import java.util.List; public final class ResourceAttributes { @@ -21,11 +17,6 @@ private ResourceAttributes() {} public static final String SCHEMA_URL = SchemaUrls.V1_24_0; - public static final AttributeKey CLOUD_ACCOUNT_ID = - CloudIncubatingAttributes.CLOUD_ACCOUNT_ID; - public static final AttributeKey CLOUD_RESOURCE_ID = - CloudIncubatingAttributes.CLOUD_RESOURCE_ID; - public static final AttributeKey SERVICE_NAME = ServiceIncubatingAttributes.SERVICE_NAME; public static final AttributeKey SERVICE_VERSION = ServiceIncubatingAttributes.SERVICE_VERSION; From d3a58ceea7becda9dc011aa0fac2707d94d206dd Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:13:00 +0200 Subject: [PATCH 31/52] SERVICE_* --- .../resources/AttributeResourceProvider.java | 5 +++-- .../resources/JarServiceNameDetector.java | 9 +++++---- .../resources/ManifestResourceProvider.java | 7 ++++--- .../resources/JarServiceNameDetectorTest.java | 9 +++++---- .../resources/ManifestResourceProviderTest.java | 10 +++++----- .../resources/SpringResourceProvider.java | 9 +++++---- .../resources/SpringResourceProviderTest.java | 11 +++++------ .../spring/resources/TestBootInfClassesResource.java | 4 ++-- .../resources/SpringBootServiceNameDetector.java | 9 +++++---- .../resources/SpringBootServiceVersionDetector.java | 5 +++-- .../resources/SpringBootServiceNameDetectorTest.java | 9 +++++---- .../SpringBootServiceVersionDetectorTest.java | 5 +++-- .../io/opentelemetry/semconv/ResourceAttributes.java | 5 ----- .../opentelemetry/smoketest/QuarkusSmokeTest.groovy | 4 ++-- 14 files changed, 52 insertions(+), 49 deletions(-) diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java index 95fbc8520887..070ca854f03d 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java @@ -12,7 +12,8 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; + import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -101,7 +102,7 @@ private static boolean shouldUpdate( Object value = existing.getAttribute(key); - if (key.equals(ResourceAttributes.SERVICE_NAME)) { + if (key.equals(ServiceIncubatingAttributes.SERVICE_NAME)) { return config.getString("otel.service.name") == null && "unknown_service:java".equals(value); } diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetector.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetector.java index ab855705e272..7abe38605485 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetector.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetector.java @@ -13,7 +13,8 @@ import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; + import java.nio.file.Path; import java.util.Map; import java.util.Optional; @@ -53,7 +54,7 @@ public Resource createResource(ConfigProperties config) { String serviceName = getServiceName(jarPath); logger.log( FINE, "Auto-detected service name from the jar file name: {0}", serviceName); - return Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, serviceName)); + return Resource.create(Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, serviceName)); }) .orElseGet(Resource::empty); } @@ -63,8 +64,8 @@ public boolean shouldApply(ConfigProperties config, Resource existing) { String serviceName = config.getString("otel.service.name"); Map resourceAttributes = config.getMap("otel.resource.attributes"); return serviceName == null - && !resourceAttributes.containsKey(ResourceAttributes.SERVICE_NAME.getKey()) - && "unknown_service:java".equals(existing.getAttribute(ResourceAttributes.SERVICE_NAME)); + && !resourceAttributes.containsKey(ServiceIncubatingAttributes.SERVICE_NAME.getKey()) + && "unknown_service:java".equals(existing.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)); } private static String getServiceName(Path jarPath) { diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ManifestResourceProvider.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ManifestResourceProvider.java index 910d3f29aafc..650970ee0f80 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ManifestResourceProvider.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ManifestResourceProvider.java @@ -9,7 +9,8 @@ import com.google.auto.service.AutoService; import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; + import java.io.IOException; import java.nio.file.Path; import java.util.Optional; @@ -46,14 +47,14 @@ public Optional readData() { public void registerAttributes(Builder builder) { builder .add( - ResourceAttributes.SERVICE_NAME, + ServiceIncubatingAttributes.SERVICE_NAME, manifest -> { String serviceName = manifest.getMainAttributes().getValue("Implementation-Title"); return Optional.ofNullable(serviceName); }) .add( - ResourceAttributes.SERVICE_VERSION, + ServiceIncubatingAttributes.SERVICE_VERSION, manifest -> { String serviceVersion = manifest.getMainAttributes().getValue("Implementation-Version"); diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetectorTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetectorTest.java index bb4d6c9d16ae..a6f484b0f237 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetectorTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetectorTest.java @@ -10,12 +10,13 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; import java.nio.file.Path; import java.nio.file.Paths; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Stream; + +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtensionContext; @@ -70,7 +71,7 @@ void createResource_processHandleJar() { assertThat(resource.getAttributes()) .hasSize(1) - .containsEntry(ResourceAttributes.SERVICE_NAME, "my-service"); + .containsEntry(ServiceIncubatingAttributes.SERVICE_NAME, "my-service"); } @Test @@ -82,7 +83,7 @@ void createResource_processHandleJarWithoutExtension() { assertThat(resource.getAttributes()) .hasSize(1) - .containsEntry(ResourceAttributes.SERVICE_NAME, "my-service"); + .containsEntry(ServiceIncubatingAttributes.SERVICE_NAME, "my-service"); } static String[] getArgs(String jarName) { @@ -104,7 +105,7 @@ void createResource_sunCommandLine(String commandLine, Path jarPath) { assertThat(resource.getAttributes()) .hasSize(1) - .containsEntry(ResourceAttributes.SERVICE_NAME, "my-service"); + .containsEntry(ServiceIncubatingAttributes.SERVICE_NAME, "my-service"); } // regression test for diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java index d61b53a43e50..425e6c929792 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java @@ -5,8 +5,6 @@ package io.opentelemetry.instrumentation.resources; -import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME; -import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_VERSION; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.common.Attributes; @@ -20,6 +18,8 @@ import java.util.jar.Manifest; import java.util.stream.Collectors; import java.util.stream.Stream; + +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.TestFactory; @@ -69,7 +69,7 @@ Collection createResource() { null, "0.0.1-SNAPSHOT", openClasspathResource("MANIFEST.MF"), - Resource.create(Attributes.of(SERVICE_NAME, "old")))) + Resource.create(Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, "old")))) .map( t -> DynamicTest.dynamicTest( @@ -93,8 +93,8 @@ Collection createResource() { provider.shouldApply(config, t.existing); Resource resource = provider.createResource(config); - assertThat(resource.getAttribute(SERVICE_NAME)).isEqualTo(t.expectedName); - assertThat(resource.getAttribute(SERVICE_VERSION)) + assertThat(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)).isEqualTo(t.expectedName); + assertThat(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_VERSION)) .isEqualTo(t.expectedVersion); })) .collect(Collectors.toList()); diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProvider.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProvider.java index baf76a586ce2..85027d7b88b9 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProvider.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProvider.java @@ -10,8 +10,9 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; import java.util.Optional; + +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import org.springframework.boot.info.BuildProperties; public class SpringResourceProvider implements ResourceProvider { @@ -27,16 +28,16 @@ public Resource createResource(ConfigProperties configProperties) { AttributesBuilder attributesBuilder = Attributes.builder(); buildProperties .map(BuildProperties::getName) - .ifPresent(v -> attributesBuilder.put(ResourceAttributes.SERVICE_NAME, v)); + .ifPresent(v -> attributesBuilder.put(ServiceIncubatingAttributes.SERVICE_NAME, v)); String springApplicationName = configProperties.getString("spring.application.name"); if (springApplicationName != null) { - attributesBuilder.put(ResourceAttributes.SERVICE_NAME, springApplicationName); + attributesBuilder.put(ServiceIncubatingAttributes.SERVICE_NAME, springApplicationName); } buildProperties .map(BuildProperties::getVersion) - .ifPresent(v -> attributesBuilder.put(ResourceAttributes.SERVICE_VERSION, v)); + .ifPresent(v -> attributesBuilder.put(ServiceIncubatingAttributes.SERVICE_VERSION, v)); return Resource.create(attributesBuilder.build()); } diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProviderTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProviderTest.java index ed5aad0bbe90..1f426565c06c 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProviderTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProviderTest.java @@ -5,9 +5,6 @@ package io.opentelemetry.instrumentation.spring.autoconfigure.resources; -import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME; -import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_VERSION; - import io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration; import io.opentelemetry.instrumentation.spring.autoconfigure.properties.OtelResourceProperties; import io.opentelemetry.instrumentation.spring.autoconfigure.properties.OtlpExporterProperties; @@ -19,6 +16,8 @@ import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions; import java.util.Collections; import java.util.Properties; + +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; @@ -43,7 +42,7 @@ void shouldDetermineServiceNameBySpringApplicationName() { .withPropertyValues("spring.application.name=myapp-backend") .run( context -> - assertResourceAttributes(context).containsEntry(SERVICE_NAME, "myapp-backend")); + assertResourceAttributes(context).containsEntry(ServiceIncubatingAttributes.SERVICE_NAME, "myapp-backend")); } @Test @@ -58,8 +57,8 @@ void shouldDetermineServiceNameAndVersionBySpringApplicationVersion() { .run( context -> assertResourceAttributes(context) - .containsEntry(SERVICE_NAME, "demo") - .containsEntry(SERVICE_VERSION, "0.3")); + .containsEntry(ServiceIncubatingAttributes.SERVICE_NAME, "demo") + .containsEntry(ServiceIncubatingAttributes.SERVICE_VERSION, "0.3")); } private static AttributesAssert assertResourceAttributes(AssertableApplicationContext context) { diff --git a/instrumentation/spring/spring-boot-resources/javaagent-unit-tests/src/test/java/io/opentelemetry/instrumentation/spring/resources/TestBootInfClassesResource.java b/instrumentation/spring/spring-boot-resources/javaagent-unit-tests/src/test/java/io/opentelemetry/instrumentation/spring/resources/TestBootInfClassesResource.java index ac3f3b74c3cb..79994cd07eb6 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent-unit-tests/src/test/java/io/opentelemetry/instrumentation/spring/resources/TestBootInfClassesResource.java +++ b/instrumentation/spring/spring-boot-resources/javaagent-unit-tests/src/test/java/io/opentelemetry/instrumentation/spring/resources/TestBootInfClassesResource.java @@ -5,11 +5,11 @@ package io.opentelemetry.instrumentation.spring.resources; -import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.resources.Resource; +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -28,6 +28,6 @@ void testServiceName() { SpringBootServiceNameDetector guesser = new SpringBootServiceNameDetector(); Resource result = guesser.createResource(config); - assertThat(result.getAttribute(SERVICE_NAME)).isEqualTo("otel-spring-test-app"); + assertThat(result.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)).isEqualTo("otel-spring-test-app"); } } diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java index 6ec01260aeaa..364cc725bbe2 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java @@ -13,7 +13,6 @@ import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; import java.io.IOException; import java.io.InputStream; import java.util.Map; @@ -26,6 +25,8 @@ import java.util.regex.Pattern; import java.util.stream.Stream; import javax.annotation.Nullable; + +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import org.snakeyaml.engine.v2.api.Load; import org.snakeyaml.engine.v2.api.LoadSettings; @@ -99,7 +100,7 @@ public Resource createResource(ConfigProperties config) { .map( serviceName -> { logger.log(FINE, "Auto-detected Spring Boot service name: {0}", serviceName); - return Resource.builder().put(ResourceAttributes.SERVICE_NAME, serviceName).build(); + return Resource.builder().put(ServiceIncubatingAttributes.SERVICE_NAME, serviceName).build(); }) .orElseGet(Resource::empty); } @@ -111,8 +112,8 @@ public boolean shouldApply(ConfigProperties config, Resource resource) { String serviceName = config.getString("otel.service.name"); Map resourceAttributes = config.getMap("otel.resource.attributes"); return serviceName == null - && !resourceAttributes.containsKey(ResourceAttributes.SERVICE_NAME.getKey()) - && "unknown_service:java".equals(resource.getAttribute(ResourceAttributes.SERVICE_NAME)); + && !resourceAttributes.containsKey(ServiceIncubatingAttributes.SERVICE_NAME.getKey()) + && "unknown_service:java".equals(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)); } @Override diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java index b858e28e8acd..f067da4301cb 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java @@ -11,7 +11,8 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; + import java.io.IOException; import java.io.InputStream; import java.util.Optional; @@ -45,7 +46,7 @@ public Resource createResource(ConfigProperties config) { .map( version -> { logger.log(FINE, "Auto-detected Spring Boot service version: {0}", version); - return Resource.builder().put(ResourceAttributes.SERVICE_VERSION, version).build(); + return Resource.builder().put(ServiceIncubatingAttributes.SERVICE_VERSION, version).build(); }) .orElseGet(Resource::empty); } diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetectorTest.java b/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetectorTest.java index 935cfab9a998..5eea619cb1dc 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetectorTest.java +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetectorTest.java @@ -5,7 +5,6 @@ package io.opentelemetry.instrumentation.spring.resources; -import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Collections.singletonMap; import static org.assertj.core.api.Assertions.assertThat; @@ -20,6 +19,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; + +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; @@ -173,7 +174,7 @@ void shouldApply() { void shouldNotApplyWhenResourceHasServiceName() { SpringBootServiceNameDetector guesser = new SpringBootServiceNameDetector(system); Resource resource = - Resource.getDefault().merge(Resource.create(Attributes.of(SERVICE_NAME, "test-service"))); + Resource.getDefault().merge(Resource.create(Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, "test-service"))); assertThat(guesser.shouldApply(config, resource)).isFalse(); } @@ -188,12 +189,12 @@ void shouldNotApplyIfConfigHasServiceName() { void shouldNotApplyIfConfigHasServiceNameResourceAttribute() { SpringBootServiceNameDetector guesser = new SpringBootServiceNameDetector(system); when(config.getMap("otel.resource.attributes")) - .thenReturn(singletonMap(SERVICE_NAME.getKey(), "test-service")); + .thenReturn(singletonMap(ServiceIncubatingAttributes.SERVICE_NAME.getKey(), "test-service")); assertThat(guesser.shouldApply(config, Resource.getDefault())).isFalse(); } private static void expectServiceName(Resource result, String expected) { - assertThat(result.getAttribute(SERVICE_NAME)).isEqualTo(expected); + assertThat(result.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)).isEqualTo(expected); } private static void writeString(Path path, String value) throws Exception { diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java b/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java index 9bce16b4fcd2..f69b1dd63155 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java @@ -5,13 +5,14 @@ package io.opentelemetry.instrumentation.spring.resources; -import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_VERSION; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.resources.Resource; import java.io.InputStream; + +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -33,7 +34,7 @@ void givenBuildVersionIsPresentInBuildInfProperties_thenReturnBuildVersion() { SpringBootServiceVersionDetector guesser = new SpringBootServiceVersionDetector(system); Resource result = guesser.createResource(config); - assertThat(result.getAttribute(SERVICE_VERSION)).isEqualTo("0.0.2"); + assertThat(result.getAttribute(ServiceIncubatingAttributes.SERVICE_VERSION)).isEqualTo("0.0.2"); } @Test diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java index 315dd10d4d09..a3ea846098a5 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java @@ -9,7 +9,6 @@ import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; import io.opentelemetry.semconv.incubating.OsIncubatingAttributes; import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import java.util.List; public final class ResourceAttributes { @@ -17,10 +16,6 @@ private ResourceAttributes() {} public static final String SCHEMA_URL = SchemaUrls.V1_24_0; - public static final AttributeKey SERVICE_NAME = ServiceIncubatingAttributes.SERVICE_NAME; - public static final AttributeKey SERVICE_VERSION = - ServiceIncubatingAttributes.SERVICE_VERSION; - public static final AttributeKey OS_DESCRIPTION = OsIncubatingAttributes.OS_DESCRIPTION; public static final AttributeKey OS_TYPE = OsIncubatingAttributes.OS_TYPE; diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy index 9279197eefb2..4dcfa7093ac3 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy @@ -5,7 +5,7 @@ package io.opentelemetry.smoketest -import io.opentelemetry.semconv.ResourceAttributes +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes import spock.lang.IgnoreIf import spock.lang.Unroll @@ -50,7 +50,7 @@ class QuarkusSmokeTest extends SmokeTest { traces.countFilteredResourceAttributes("telemetry.distro.version", currentAgentVersion) == 1 and: "service.name is detected from manifest" - traces.countFilteredResourceAttributes(ResourceAttributes.SERVICE_NAME.key, "smoke-test-quarkus-images") == 1 + traces.countFilteredResourceAttributes(ServiceIncubatingAttributes.SERVICE_NAME.key, "smoke-test-quarkus-images") == 1 cleanup: stopTarget() From 272d40045a3bd3de79c1b39e17c2357990152a8c Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:15:38 +0200 Subject: [PATCH 32/52] OS_* --- .../instrumentation/resources/OsResource.java | 28 ++++---- .../resources/OsResourceTest.java | 71 ++++++++++--------- .../semconv/ResourceAttributes.java | 20 ------ .../smoketest/AppServerTest.groovy | 6 +- 4 files changed, 54 insertions(+), 71 deletions(-) diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java index 700f0d63b622..027ea9ebddfd 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java @@ -9,6 +9,8 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.OsIncubatingAttributes; + import java.util.Locale; import javax.annotation.Nullable; @@ -44,7 +46,7 @@ static Resource buildResource() { String osName = getOs(os); if (osName != null) { - attributes.put(ResourceAttributes.OS_TYPE, osName); + attributes.put(OsIncubatingAttributes.OS_TYPE, osName); } String version = null; @@ -54,7 +56,7 @@ static Resource buildResource() { // Ignore } String osDescription = version != null ? os + ' ' + version : os; - attributes.put(ResourceAttributes.OS_DESCRIPTION, osDescription); + attributes.put(OsIncubatingAttributes.OS_DESCRIPTION, osDescription); return Resource.create(attributes.build(), ResourceAttributes.SCHEMA_URL); } @@ -63,27 +65,27 @@ static Resource buildResource() { private static String getOs(String os) { os = os.toLowerCase(Locale.ROOT); if (os.startsWith("windows")) { - return ResourceAttributes.OsTypeValues.WINDOWS; + return OsIncubatingAttributes.OsTypeValues.WINDOWS; } else if (os.startsWith("linux")) { - return ResourceAttributes.OsTypeValues.LINUX; + return OsIncubatingAttributes.OsTypeValues.LINUX; } else if (os.startsWith("mac")) { - return ResourceAttributes.OsTypeValues.DARWIN; + return OsIncubatingAttributes.OsTypeValues.DARWIN; } else if (os.startsWith("freebsd")) { - return ResourceAttributes.OsTypeValues.FREEBSD; + return OsIncubatingAttributes.OsTypeValues.FREEBSD; } else if (os.startsWith("netbsd")) { - return ResourceAttributes.OsTypeValues.NETBSD; + return OsIncubatingAttributes.OsTypeValues.NETBSD; } else if (os.startsWith("openbsd")) { - return ResourceAttributes.OsTypeValues.OPENBSD; + return OsIncubatingAttributes.OsTypeValues.OPENBSD; } else if (os.startsWith("dragonflybsd")) { - return ResourceAttributes.OsTypeValues.DRAGONFLYBSD; + return OsIncubatingAttributes.OsTypeValues.DRAGONFLYBSD; } else if (os.startsWith("hp-ux")) { - return ResourceAttributes.OsTypeValues.HPUX; + return OsIncubatingAttributes.OsTypeValues.HPUX; } else if (os.startsWith("aix")) { - return ResourceAttributes.OsTypeValues.AIX; + return OsIncubatingAttributes.OsTypeValues.AIX; } else if (os.startsWith("solaris")) { - return ResourceAttributes.OsTypeValues.SOLARIS; + return OsIncubatingAttributes.OsTypeValues.SOLARIS; } else if (os.startsWith("z/os")) { - return ResourceAttributes.OsTypeValues.Z_OS; + return OsIncubatingAttributes.OsTypeValues.Z_OS; } return null; } diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/OsResourceTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/OsResourceTest.java index 5ae2103778c5..a221638ad2fc 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/OsResourceTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/OsResourceTest.java @@ -9,6 +9,7 @@ import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.OsIncubatingAttributes; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; @@ -24,9 +25,9 @@ class OsResourceTest { void linux() { Resource resource = OsResource.buildResource(); assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); - assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE)) - .isEqualTo(ResourceAttributes.OsTypeValues.LINUX); - assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty(); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) + .isEqualTo(OsIncubatingAttributes.OsTypeValues.LINUX); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); } @Test @@ -34,9 +35,9 @@ void linux() { void macos() { Resource resource = OsResource.buildResource(); assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); - assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE)) - .isEqualTo(ResourceAttributes.OsTypeValues.DARWIN); - assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty(); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) + .isEqualTo(OsIncubatingAttributes.OsTypeValues.DARWIN); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); } @Test @@ -44,9 +45,9 @@ void macos() { void windows() { Resource resource = OsResource.buildResource(); assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); - assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE)) - .isEqualTo(ResourceAttributes.OsTypeValues.WINDOWS); - assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty(); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) + .isEqualTo(OsIncubatingAttributes.OsTypeValues.WINDOWS); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); } @Test @@ -54,9 +55,9 @@ void windows() { void freebsd() { Resource resource = OsResource.buildResource(); assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); - assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE)) - .isEqualTo(ResourceAttributes.OsTypeValues.FREEBSD); - assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty(); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) + .isEqualTo(OsIncubatingAttributes.OsTypeValues.FREEBSD); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); } @Test @@ -64,9 +65,9 @@ void freebsd() { void netbsd() { Resource resource = OsResource.buildResource(); assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); - assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE)) - .isEqualTo(ResourceAttributes.OsTypeValues.NETBSD); - assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty(); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) + .isEqualTo(OsIncubatingAttributes.OsTypeValues.NETBSD); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); } @Test @@ -74,9 +75,9 @@ void netbsd() { void openbsd() { Resource resource = OsResource.buildResource(); assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); - assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE)) - .isEqualTo(ResourceAttributes.OsTypeValues.OPENBSD); - assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty(); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) + .isEqualTo(OsIncubatingAttributes.OsTypeValues.OPENBSD); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); } @Test @@ -84,9 +85,9 @@ void openbsd() { void dragonflybsd() { Resource resource = OsResource.buildResource(); assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); - assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE)) - .isEqualTo(ResourceAttributes.OsTypeValues.DRAGONFLYBSD); - assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty(); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) + .isEqualTo(OsIncubatingAttributes.OsTypeValues.DRAGONFLYBSD); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); } @Test @@ -94,9 +95,9 @@ void dragonflybsd() { void hpux() { Resource resource = OsResource.buildResource(); assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); - assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE)) - .isEqualTo(ResourceAttributes.OsTypeValues.HPUX); - assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty(); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) + .isEqualTo(OsIncubatingAttributes.OsTypeValues.HPUX); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); } @Test @@ -104,9 +105,9 @@ void hpux() { void aix() { Resource resource = OsResource.buildResource(); assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); - assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE)) - .isEqualTo(ResourceAttributes.OsTypeValues.AIX); - assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty(); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) + .isEqualTo(OsIncubatingAttributes.OsTypeValues.AIX); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); } @Test @@ -114,9 +115,9 @@ void aix() { void solaris() { Resource resource = OsResource.buildResource(); assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); - assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE)) - .isEqualTo(ResourceAttributes.OsTypeValues.SOLARIS); - assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty(); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) + .isEqualTo(OsIncubatingAttributes.OsTypeValues.SOLARIS); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); } @Test @@ -124,9 +125,9 @@ void solaris() { void zos() { Resource resource = OsResource.buildResource(); assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); - assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE)) - .isEqualTo(ResourceAttributes.OsTypeValues.Z_OS); - assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty(); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) + .isEqualTo(OsIncubatingAttributes.OsTypeValues.Z_OS); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); } @Test @@ -134,8 +135,8 @@ void zos() { void unknown() { Resource resource = OsResource.buildResource(); assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); - assertThat(resource.getAttribute(ResourceAttributes.OS_TYPE)).isNull(); - assertThat(resource.getAttribute(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty(); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)).isNull(); + assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); } @Nested diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java index a3ea846098a5..0ee39533115d 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java @@ -7,7 +7,6 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; -import io.opentelemetry.semconv.incubating.OsIncubatingAttributes; import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; import java.util.List; @@ -16,25 +15,6 @@ private ResourceAttributes() {} public static final String SCHEMA_URL = SchemaUrls.V1_24_0; - public static final AttributeKey OS_DESCRIPTION = OsIncubatingAttributes.OS_DESCRIPTION; - public static final AttributeKey OS_TYPE = OsIncubatingAttributes.OS_TYPE; - - public static final class OsTypeValues { - public static final String WINDOWS = OsIncubatingAttributes.OsTypeValues.WINDOWS; - public static final String LINUX = OsIncubatingAttributes.OsTypeValues.LINUX; - public static final String DARWIN = OsIncubatingAttributes.OsTypeValues.DARWIN; - public static final String FREEBSD = OsIncubatingAttributes.OsTypeValues.FREEBSD; - public static final String NETBSD = OsIncubatingAttributes.OsTypeValues.NETBSD; - public static final String OPENBSD = OsIncubatingAttributes.OsTypeValues.OPENBSD; - public static final String DRAGONFLYBSD = OsIncubatingAttributes.OsTypeValues.DRAGONFLYBSD; - public static final String HPUX = OsIncubatingAttributes.OsTypeValues.HPUX; - public static final String AIX = OsIncubatingAttributes.OsTypeValues.AIX; - public static final String SOLARIS = OsIncubatingAttributes.OsTypeValues.SOLARIS; - public static final String Z_OS = OsIncubatingAttributes.OsTypeValues.Z_OS; - - private OsTypeValues() {} - } - public static final AttributeKey> PROCESS_COMMAND_ARGS = ProcessIncubatingAttributes.PROCESS_COMMAND_ARGS; public static final AttributeKey PROCESS_COMMAND_LINE = diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy index 605b27ae05e8..bbb520c764fe 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy @@ -15,9 +15,9 @@ import spock.lang.Unroll import java.util.jar.Attributes import java.util.jar.JarFile -import static io.opentelemetry.semconv.ResourceAttributes.OS_TYPE -import static io.opentelemetry.semconv.ResourceAttributes.OsTypeValues.LINUX -import static io.opentelemetry.semconv.ResourceAttributes.OsTypeValues.WINDOWS +import static io.opentelemetry.semconv.incubating.OsIncubatingAttributes.OS_TYPE +import static io.opentelemetry.semconv.incubating.OsIncubatingAttributes.OsTypeValues.LINUX +import static io.opentelemetry.semconv.incubating.OsIncubatingAttributes.OsTypeValues.WINDOWS import static org.junit.Assume.assumeFalse import static org.junit.Assume.assumeTrue From c90168836b44dd257ca9a0ba47f8eacaf2fdb4cc Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:16:19 +0200 Subject: [PATCH 33/52] PROCESS_* --- .../resources/ProcessResource.java | 10 ++++++---- .../resources/ProcessRuntimeResource.java | 11 ++++------- .../resources/ProcessResourceTest.java | 19 ++++++++++--------- .../resources/ProcessRuntimeResourceTest.java | 7 ++++--- .../semconv/ResourceAttributes.java | 16 ---------------- 5 files changed, 24 insertions(+), 39 deletions(-) diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java index 9fcee650db42..5bc0aa610ec7 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java @@ -9,6 +9,8 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; + import java.io.File; import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; @@ -55,7 +57,7 @@ private static Resource doBuildResource() { long pid = ProcessPid.getPid(); if (pid >= 0) { - attributes.put(ResourceAttributes.PROCESS_PID, pid); + attributes.put(ProcessIncubatingAttributes.PROCESS_PID, pid); } String javaHome = null; @@ -77,7 +79,7 @@ private static Resource doBuildResource() { executablePath.append(".exe"); } - attributes.put(ResourceAttributes.PROCESS_EXECUTABLE_PATH, executablePath.toString()); + attributes.put(ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH, executablePath.toString()); String[] args = ProcessArguments.getProcessArguments(); // This will only work with Java 9+ but provides everything except the executablePath. @@ -85,7 +87,7 @@ private static Resource doBuildResource() { List commandArgs = new ArrayList<>(args.length + 1); commandArgs.add(executablePath.toString()); commandArgs.addAll(Arrays.asList(args)); - attributes.put(ResourceAttributes.PROCESS_COMMAND_ARGS, commandArgs); + attributes.put(ProcessIncubatingAttributes.PROCESS_COMMAND_ARGS, commandArgs); } else { // Java 8 StringBuilder commandLine = new StringBuilder(executablePath); for (String arg : runtime.getInputArguments()) { @@ -101,7 +103,7 @@ private static Resource doBuildResource() { } commandLine.append(' ').append(javaCommand); } - attributes.put(ResourceAttributes.PROCESS_COMMAND_LINE, commandLine.toString()); + attributes.put(ProcessIncubatingAttributes.PROCESS_COMMAND_LINE, commandLine.toString()); } } diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java index 72a90f9e88a4..f0cb3e321d55 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java @@ -5,13 +5,10 @@ package io.opentelemetry.instrumentation.resources; -import static io.opentelemetry.semconv.ResourceAttributes.PROCESS_RUNTIME_DESCRIPTION; -import static io.opentelemetry.semconv.ResourceAttributes.PROCESS_RUNTIME_NAME; -import static io.opentelemetry.semconv.ResourceAttributes.PROCESS_RUNTIME_VERSION; - import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; /** Factory of a {@link Resource} which provides information about the Java runtime. */ public final class ProcessRuntimeResource { @@ -37,11 +34,11 @@ static Resource buildResource() { return Resource.create( Attributes.of( - PROCESS_RUNTIME_NAME, + ProcessIncubatingAttributes.PROCESS_RUNTIME_NAME, name, - PROCESS_RUNTIME_VERSION, + ProcessIncubatingAttributes.PROCESS_RUNTIME_VERSION, version, - PROCESS_RUNTIME_DESCRIPTION, + ProcessIncubatingAttributes.PROCESS_RUNTIME_DESCRIPTION, description), ResourceAttributes.SCHEMA_URL); } catch (SecurityException ignored) { diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java index bfe20783c1e6..7d0ed11e34e5 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java @@ -10,6 +10,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; @@ -27,10 +28,10 @@ void notWindows() { assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); Attributes attributes = resource.getAttributes(); - assertThat(attributes.get(ResourceAttributes.PROCESS_PID)).isGreaterThan(1); - assertThat(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH)).matches(".*[/\\\\]java"); - assertThat(attributes.get(ResourceAttributes.PROCESS_COMMAND_LINE)) - .contains(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH)); + assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_PID)).isGreaterThan(1); + assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH)).matches(".*[/\\\\]java"); + assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_COMMAND_LINE)) + .contains(attributes.get(ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH)); // With Java 9+ and a compiled jar, ResourceAttributes.PROCESS_COMMAND_ARGS // will be set instead of ResourceAttributes.PROCESS_COMMAND_LINE } @@ -42,11 +43,11 @@ void windows() { assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); Attributes attributes = resource.getAttributes(); - assertThat(attributes.get(ResourceAttributes.PROCESS_PID)).isGreaterThan(1); - assertThat(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH)) + assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_PID)).isGreaterThan(1); + assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH)) .matches(".*[/\\\\]java\\.exe"); - assertThat(attributes.get(ResourceAttributes.PROCESS_COMMAND_LINE)) - .contains(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH)); + assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_COMMAND_LINE)) + .contains(attributes.get(ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH)); // With Java 9+ and a compiled jar, ResourceAttributes.PROCESS_COMMAND_ARGS // will be set instead of ResourceAttributes.PROCESS_COMMAND_LINE } @@ -61,7 +62,7 @@ static class SecurityManagerEnabled { @Test void empty() { Attributes attributes = ProcessResource.buildResource().getAttributes(); - assertThat(attributes.asMap()).containsOnlyKeys(ResourceAttributes.PROCESS_PID); + assertThat(attributes.asMap()).containsOnlyKeys(ProcessIncubatingAttributes.PROCESS_PID); } } } diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java index c072ef0d458f..9b2cec0551b0 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java @@ -10,6 +10,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; @@ -26,9 +27,9 @@ void shouldCreateRuntimeAttributes() { // then assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); - assertThat(attributes.get(ResourceAttributes.PROCESS_RUNTIME_NAME)).isNotBlank(); - assertThat(attributes.get(ResourceAttributes.PROCESS_RUNTIME_VERSION)).isNotBlank(); - assertThat(attributes.get(ResourceAttributes.PROCESS_RUNTIME_DESCRIPTION)).isNotBlank(); + assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_RUNTIME_NAME)).isNotBlank(); + assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_RUNTIME_VERSION)).isNotBlank(); + assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_RUNTIME_DESCRIPTION)).isNotBlank(); } @Nested diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java index 0ee39533115d..aa753dd96999 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java @@ -7,28 +7,12 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; -import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; -import java.util.List; public final class ResourceAttributes { private ResourceAttributes() {} public static final String SCHEMA_URL = SchemaUrls.V1_24_0; - public static final AttributeKey> PROCESS_COMMAND_ARGS = - ProcessIncubatingAttributes.PROCESS_COMMAND_ARGS; - public static final AttributeKey PROCESS_COMMAND_LINE = - ProcessIncubatingAttributes.PROCESS_COMMAND_LINE; - public static final AttributeKey PROCESS_EXECUTABLE_PATH = - ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH; - public static final AttributeKey PROCESS_PID = ProcessIncubatingAttributes.PROCESS_PID; - public static final AttributeKey PROCESS_RUNTIME_DESCRIPTION = - ProcessIncubatingAttributes.PROCESS_RUNTIME_DESCRIPTION; - public static final AttributeKey PROCESS_RUNTIME_NAME = - ProcessIncubatingAttributes.PROCESS_RUNTIME_NAME; - public static final AttributeKey PROCESS_RUNTIME_VERSION = - ProcessIncubatingAttributes.PROCESS_RUNTIME_VERSION; - public static final AttributeKey HOST_ARCH = HostIncubatingAttributes.HOST_ARCH; public static final AttributeKey HOST_ID = HostIncubatingAttributes.HOST_ID; From e15d5fee68c30bc2bd5638667973a04e584fc646 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:16:41 +0200 Subject: [PATCH 34/52] HOST_* --- .../resources/HostIdResourceProvider.java | 11 ++++++----- .../instrumentation/resources/HostResource.java | 6 ++++-- .../resources/HostIdResourceProviderTest.java | 5 +++-- .../instrumentation/resources/HostResourceTest.java | 7 ++++--- .../io/opentelemetry/semconv/ResourceAttributes.java | 11 ----------- 5 files changed, 17 insertions(+), 23 deletions(-) diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostIdResourceProvider.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostIdResourceProvider.java index 1c7b366ce04c..e43c3ee4158e 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostIdResourceProvider.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostIdResourceProvider.java @@ -12,7 +12,8 @@ import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -97,7 +98,7 @@ private Resource readLinuxMachineId() { if (lines.isEmpty()) { return Resource.empty(); } - return Resource.create(Attributes.of(ResourceAttributes.HOST_ID, lines.get(0))); + return Resource.create(Attributes.of(HostIncubatingAttributes.HOST_ID, lines.get(0))); } private static List readMachineIdFile(Path path) { @@ -120,7 +121,7 @@ private Resource readWindowsGuid() { if (line.contains("MachineGuid")) { String[] parts = line.trim().split("\\s+"); if (parts.length == 3) { - return Resource.create(Attributes.of(ResourceAttributes.HOST_ID, parts[2])); + return Resource.create(Attributes.of(HostIncubatingAttributes.HOST_ID, parts[2])); } } } @@ -172,8 +173,8 @@ public static List getProcessOutput(Process process) throws IOException public boolean shouldApply(ConfigProperties config, Resource existing) { return !config .getMap("otel.resource.attributes") - .containsKey(ResourceAttributes.HOST_ID.getKey()) - && existing.getAttribute(ResourceAttributes.HOST_ID) == null; + .containsKey(HostIncubatingAttributes.HOST_ID.getKey()) + && existing.getAttribute(HostIncubatingAttributes.HOST_ID) == null; } @Override diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java index 98a440b0a6bb..6d3384f221f7 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java @@ -9,6 +9,8 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; + import java.net.InetAddress; import java.net.UnknownHostException; @@ -26,7 +28,7 @@ public static Resource get() { static Resource buildResource() { AttributesBuilder attributes = Attributes.builder(); try { - attributes.put(ResourceAttributes.HOST_NAME, InetAddress.getLocalHost().getHostName()); + attributes.put(HostIncubatingAttributes.HOST_NAME, InetAddress.getLocalHost().getHostName()); } catch (UnknownHostException e) { // Ignore } @@ -37,7 +39,7 @@ static Resource buildResource() { // Ignore } if (hostArch != null) { - attributes.put(ResourceAttributes.HOST_ARCH, hostArch); + attributes.put(HostIncubatingAttributes.HOST_ARCH, hostArch); } return Resource.create(attributes.build(), ResourceAttributes.SCHEMA_URL); diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostIdResourceProviderTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostIdResourceProviderTest.java index 100b8cab2a53..be3bb43da153 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostIdResourceProviderTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostIdResourceProviderTest.java @@ -10,7 +10,6 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; import java.nio.file.Path; import java.util.Arrays; import java.util.Collection; @@ -20,6 +19,8 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; + +import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; import org.assertj.core.api.MapAssert; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.Test; @@ -103,7 +104,7 @@ private static void assertHostId(String expectedValue, HostIdResourceProvider pr if (expectedValue == null) { that.isEmpty(); } else { - that.containsEntry(ResourceAttributes.HOST_ID, expectedValue); + that.containsEntry(HostIncubatingAttributes.HOST_ID, expectedValue); } } diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostResourceTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostResourceTest.java index ad1a80c93836..0dbec086917a 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostResourceTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostResourceTest.java @@ -10,6 +10,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; @@ -26,8 +27,8 @@ void shouldCreateRuntimeAttributes() { // then assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); - assertThat(attributes.get(ResourceAttributes.HOST_NAME)).isNotBlank(); - assertThat(attributes.get(ResourceAttributes.HOST_ARCH)).isNotBlank(); + assertThat(attributes.get(HostIncubatingAttributes.HOST_NAME)).isNotBlank(); + assertThat(attributes.get(HostIncubatingAttributes.HOST_ARCH)).isNotBlank(); } @Nested @@ -40,7 +41,7 @@ static class SecurityManagerEnabled { @Test void empty() { Attributes attributes = HostResource.buildResource().getAttributes(); - assertThat(attributes.asMap()).containsOnlyKeys(ResourceAttributes.HOST_NAME); + assertThat(attributes.asMap()).containsOnlyKeys(HostIncubatingAttributes.HOST_NAME); } } } diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java index aa753dd96999..aa578d34fbfc 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java @@ -5,21 +5,10 @@ package io.opentelemetry.semconv; -import io.opentelemetry.api.common.AttributeKey; -import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; - public final class ResourceAttributes { private ResourceAttributes() {} public static final String SCHEMA_URL = SchemaUrls.V1_24_0; - public static final AttributeKey HOST_ARCH = HostIncubatingAttributes.HOST_ARCH; - - public static final AttributeKey HOST_ID = HostIncubatingAttributes.HOST_ID; - - public static final AttributeKey HOST_NAME = HostIncubatingAttributes.HOST_NAME; - - - } From 3bd5d484ee9a269c41bc477f9b605d9d5e2eb832 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:17:29 +0200 Subject: [PATCH 35/52] SCHEMA_URL --- .../resources/HostResource.java | 4 +-- .../instrumentation/resources/OsResource.java | 4 +-- .../resources/ProcessResource.java | 4 +-- .../resources/ProcessRuntimeResource.java | 4 +-- .../resources/HostResourceTest.java | 4 +-- .../resources/OsResourceTest.java | 26 +++++++++---------- .../resources/ProcessResourceTest.java | 6 ++--- .../resources/ProcessRuntimeResourceTest.java | 4 +-- .../semconv/ResourceAttributes.java | 2 -- 9 files changed, 28 insertions(+), 30 deletions(-) diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java index 6d3384f221f7..357bc6560d5c 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java @@ -8,7 +8,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.SchemaUrls; import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; import java.net.InetAddress; @@ -42,7 +42,7 @@ static Resource buildResource() { attributes.put(HostIncubatingAttributes.HOST_ARCH, hostArch); } - return Resource.create(attributes.build(), ResourceAttributes.SCHEMA_URL); + return Resource.create(attributes.build(), SchemaUrls.V1_24_0); } private HostResource() {} diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java index 027ea9ebddfd..0ea064aba55a 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java @@ -8,7 +8,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.SchemaUrls; import io.opentelemetry.semconv.incubating.OsIncubatingAttributes; import java.util.Locale; @@ -58,7 +58,7 @@ static Resource buildResource() { String osDescription = version != null ? os + ' ' + version : os; attributes.put(OsIncubatingAttributes.OS_DESCRIPTION, osDescription); - return Resource.create(attributes.build(), ResourceAttributes.SCHEMA_URL); + return Resource.create(attributes.build(), SchemaUrls.V1_24_0); } @Nullable diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java index 5bc0aa610ec7..86f6e2ec07f6 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java @@ -8,7 +8,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.SchemaUrls; import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; import java.io.File; @@ -107,7 +107,7 @@ private static Resource doBuildResource() { } } - return Resource.create(attributes.build(), ResourceAttributes.SCHEMA_URL); + return Resource.create(attributes.build(), SchemaUrls.V1_24_0); } private ProcessResource() {} diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java index f0cb3e321d55..32a7309e3a16 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java @@ -7,7 +7,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.SchemaUrls; import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; /** Factory of a {@link Resource} which provides information about the Java runtime. */ @@ -40,7 +40,7 @@ static Resource buildResource() { version, ProcessIncubatingAttributes.PROCESS_RUNTIME_DESCRIPTION, description), - ResourceAttributes.SCHEMA_URL); + SchemaUrls.V1_24_0); } catch (SecurityException ignored) { return Resource.empty(); } diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostResourceTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostResourceTest.java index 0dbec086917a..4c2e0ca45514 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostResourceTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostResourceTest.java @@ -9,7 +9,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.SchemaUrls; import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -26,7 +26,7 @@ void shouldCreateRuntimeAttributes() { Attributes attributes = resource.getAttributes(); // then - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); assertThat(attributes.get(HostIncubatingAttributes.HOST_NAME)).isNotBlank(); assertThat(attributes.get(HostIncubatingAttributes.HOST_ARCH)).isNotBlank(); } diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/OsResourceTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/OsResourceTest.java index a221638ad2fc..682de97565a1 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/OsResourceTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/OsResourceTest.java @@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.SchemaUrls; import io.opentelemetry.semconv.incubating.OsIncubatingAttributes; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -24,7 +24,7 @@ class OsResourceTest { @SetSystemProperty(key = "os.name", value = "Linux 4.11") void linux() { Resource resource = OsResource.buildResource(); - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) .isEqualTo(OsIncubatingAttributes.OsTypeValues.LINUX); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); @@ -34,7 +34,7 @@ void linux() { @SetSystemProperty(key = "os.name", value = "MacOS X 11") void macos() { Resource resource = OsResource.buildResource(); - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) .isEqualTo(OsIncubatingAttributes.OsTypeValues.DARWIN); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); @@ -44,7 +44,7 @@ void macos() { @SetSystemProperty(key = "os.name", value = "Windows 10") void windows() { Resource resource = OsResource.buildResource(); - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) .isEqualTo(OsIncubatingAttributes.OsTypeValues.WINDOWS); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); @@ -54,7 +54,7 @@ void windows() { @SetSystemProperty(key = "os.name", value = "FreeBSD 10") void freebsd() { Resource resource = OsResource.buildResource(); - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) .isEqualTo(OsIncubatingAttributes.OsTypeValues.FREEBSD); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); @@ -64,7 +64,7 @@ void freebsd() { @SetSystemProperty(key = "os.name", value = "NetBSD 10") void netbsd() { Resource resource = OsResource.buildResource(); - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) .isEqualTo(OsIncubatingAttributes.OsTypeValues.NETBSD); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); @@ -74,7 +74,7 @@ void netbsd() { @SetSystemProperty(key = "os.name", value = "OpenBSD 10") void openbsd() { Resource resource = OsResource.buildResource(); - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) .isEqualTo(OsIncubatingAttributes.OsTypeValues.OPENBSD); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); @@ -84,7 +84,7 @@ void openbsd() { @SetSystemProperty(key = "os.name", value = "DragonFlyBSD 10") void dragonflybsd() { Resource resource = OsResource.buildResource(); - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) .isEqualTo(OsIncubatingAttributes.OsTypeValues.DRAGONFLYBSD); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); @@ -94,7 +94,7 @@ void dragonflybsd() { @SetSystemProperty(key = "os.name", value = "HP-UX 10") void hpux() { Resource resource = OsResource.buildResource(); - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) .isEqualTo(OsIncubatingAttributes.OsTypeValues.HPUX); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); @@ -104,7 +104,7 @@ void hpux() { @SetSystemProperty(key = "os.name", value = "AIX 10") void aix() { Resource resource = OsResource.buildResource(); - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) .isEqualTo(OsIncubatingAttributes.OsTypeValues.AIX); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); @@ -114,7 +114,7 @@ void aix() { @SetSystemProperty(key = "os.name", value = "Solaris 10") void solaris() { Resource resource = OsResource.buildResource(); - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) .isEqualTo(OsIncubatingAttributes.OsTypeValues.SOLARIS); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); @@ -124,7 +124,7 @@ void solaris() { @SetSystemProperty(key = "os.name", value = "Z/OS 10") void zos() { Resource resource = OsResource.buildResource(); - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)) .isEqualTo(OsIncubatingAttributes.OsTypeValues.Z_OS); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); @@ -134,7 +134,7 @@ void zos() { @SetSystemProperty(key = "os.name", value = "RagOS 10") void unknown() { Resource resource = OsResource.buildResource(); - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_TYPE)).isNull(); assertThat(resource.getAttribute(OsIncubatingAttributes.OS_DESCRIPTION)).isNotEmpty(); } diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java index 7d0ed11e34e5..4fdceebd4687 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java @@ -9,7 +9,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.SchemaUrls; import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ class ProcessResourceTest { @SetSystemProperty(key = "os.name", value = "Linux 4.12") void notWindows() { Resource resource = ProcessResource.buildResource(); - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); Attributes attributes = resource.getAttributes(); assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_PID)).isGreaterThan(1); @@ -40,7 +40,7 @@ void notWindows() { @SetSystemProperty(key = "os.name", value = "Windows 10") void windows() { Resource resource = ProcessResource.buildResource(); - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); Attributes attributes = resource.getAttributes(); assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_PID)).isGreaterThan(1); diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java index 9b2cec0551b0..177255772ae5 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java @@ -9,7 +9,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.SchemaUrls; import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -26,7 +26,7 @@ void shouldCreateRuntimeAttributes() { Attributes attributes = resource.getAttributes(); // then - assertThat(resource.getSchemaUrl()).isEqualTo(ResourceAttributes.SCHEMA_URL); + assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_RUNTIME_NAME)).isNotBlank(); assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_RUNTIME_VERSION)).isNotBlank(); assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_RUNTIME_DESCRIPTION)).isNotBlank(); diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java index aa578d34fbfc..10661c6cc3b5 100644 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java +++ b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java @@ -8,7 +8,5 @@ public final class ResourceAttributes { private ResourceAttributes() {} - public static final String SCHEMA_URL = SchemaUrls.V1_24_0; - } From 9cffdf1c10e8ac2d5a2ec767d53b5b10491e5a57 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:21:03 +0200 Subject: [PATCH 36/52] fix remaining ResourceAttributes references --- .../awslambdacore/v1_0/AwsLambdaTest.java | 5 +++-- .../AwsLambdaStreamWrapperHttpPropagationTest.java | 5 +++-- .../awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java | 5 +++-- .../v2_2/AwsLambdaApiGatewayWrapperTest.java | 10 +++++----- .../v2_2/AwsLambdaSqsEventWrapperTest.java | 3 ++- .../v2_2/AwsLambdaSqsMessageHandlerTest.java | 3 ++- .../awslambdaevents/v2_2/AwsLambdaWrapperTest.java | 9 +++++---- .../instrumentation/resources/ContainerResource.java | 2 -- .../resources/ContainerResourceTest.java | 2 +- 9 files changed, 24 insertions(+), 20 deletions(-) diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java index 922a2dd22de0..5feacf925e7f 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java @@ -16,6 +16,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import lambdainternal.AwsLambdaLegacyInternalRequestHandler; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -55,7 +56,7 @@ void awsLambdaInternalHandlerIgnoredAndUserHandlerTraced() { span.hasName("my_function") .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @Test @@ -72,7 +73,7 @@ void awsLambdaLegacyInternalHandlerIgnoredAndUserHandlerTraced() { span.hasName("my_function") .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } private static final class TestRequestHandler implements RequestHandler { diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java index c2660e7bb0d8..b495770c5c9e 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java @@ -31,6 +31,7 @@ import java.nio.charset.StandardCharsets; import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; +import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -95,7 +96,7 @@ void handlerTraced() throws Exception { CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @Test @@ -132,7 +133,7 @@ void handlerTracedWithException() { CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } public static final class TestRequestHandler implements RequestStreamHandler { diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java index 8e86f1a2a0a8..1192c9532db3 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java @@ -30,6 +30,7 @@ import java.nio.charset.StandardCharsets; import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; +import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -85,7 +86,7 @@ void handlerTraced() throws Exception { CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @Test @@ -113,7 +114,7 @@ void handlerTracedWithException() { CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } public static final class TestRequestHandler implements RequestStreamHandler { diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java index cb77216fcd3f..459c65f7d83d 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java @@ -104,7 +104,7 @@ void tracedWithHttpPropagation() { CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333"), + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333"), equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http"), equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"), equalTo(UserAgentAttributes.USER_AGENT_ORIGINAL, "Test Client"), @@ -140,7 +140,7 @@ void handlerTraced_empty() { CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333"), + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333"), equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http")))); } @@ -171,7 +171,7 @@ void handlerTraced_string() { CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333"), + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333"), equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http")))); } @@ -202,7 +202,7 @@ void handlerTraced_integer() { CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333"), + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333"), equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http")))); } @@ -236,7 +236,7 @@ void handlerTraced_customType() { CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333"), + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333"), equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http")))); } diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java index 63852dbd6fc3..09db5a49f79e 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; +import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.lang.reflect.Constructor; import java.util.Collections; @@ -79,7 +80,7 @@ void eventTraced() { CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")), + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")), span -> span.hasName("otel process") .hasKind(SpanKind.CONSUMER) diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java index 7f6be5c3cce7..017578d33b18 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java @@ -20,6 +20,7 @@ import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.lang.reflect.Constructor; import java.util.Arrays; @@ -80,7 +81,7 @@ void processSpans() { span.hasName("my_function") .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")), + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")), span -> span.hasName("queue1 process") .hasKind(SpanKind.CONSUMER) diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java index a79c627f70f5..6ca8d5a32790 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java @@ -19,6 +19,7 @@ import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; +import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -74,7 +75,7 @@ void handlerTraced() { CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @Test @@ -104,7 +105,7 @@ void handlerTracedWithException() { CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @Test @@ -132,7 +133,7 @@ void handlerTraced_integer() { CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @Test @@ -163,7 +164,7 @@ void handlerTraced_custom() { CloudIncubatingAttributes.CLOUD_RESOURCE_ID, "arn:aws:lambda:us-east-1:123456789:function:test"), equalTo(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, "123456789"), - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } public static final class TestRequestHandlerString implements RequestHandler { diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ContainerResource.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ContainerResource.java index 54aa0cad593d..52d04c14f3f8 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ContainerResource.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ContainerResource.java @@ -5,8 +5,6 @@ package io.opentelemetry.instrumentation.resources; -import static io.opentelemetry.semconv.ResourceAttributes.CONTAINER_ID; - import com.google.errorprone.annotations.MustBeClosed; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.resources.Resource; diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ContainerResourceTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ContainerResourceTest.java index f8be027495c1..8e826a6f2b6c 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ContainerResourceTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ContainerResourceTest.java @@ -5,7 +5,7 @@ package io.opentelemetry.instrumentation.resources; -import static io.opentelemetry.semconv.ResourceAttributes.CONTAINER_ID; +import static io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes.CONTAINER_ID; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; From 9f718882b0ff794f87e0e335a8feec0e16db8377 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:23:03 +0200 Subject: [PATCH 37/52] remove ResourceAttributes --- .../awslambdacore/v1_0/AwsLambdaTest.java | 1 - .../AwsLambdaFunctionAttributesExtractor.java | 4 ++-- .../AwsLambdaStreamWrapperHttpPropagationTest.java | 1 - .../v1_0/AwsLambdaStreamWrapperTest.java | 1 - .../awslambdacore/v1_0/AbstractAwsLambdaTest.java | 8 ++++---- .../v2_2/AwsLambdaApiGatewayWrapperTest.java | 1 - .../v2_2/AwsLambdaSqsEventWrapperTest.java | 1 - .../v2_2/AwsLambdaSqsMessageHandlerTest.java | 1 - .../awslambdaevents/v2_2/AwsLambdaWrapperTest.java | 1 - .../v2_2/AbstractAwsLambdaSqsEventHandlerTest.java | 6 +++--- .../io/opentelemetry/semconv/ResourceAttributes.java | 12 ------------ 11 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java index 5feacf925e7f..575a553fbfb0 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdacore/v1_0/AwsLambdaTest.java @@ -15,7 +15,6 @@ import io.opentelemetry.instrumentation.awslambdacore.v1_0.AbstractAwsLambdaTest; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import lambdainternal.AwsLambdaLegacyInternalRequestHandler; import org.junit.jupiter.api.AfterEach; diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java index cb8f589fbf94..128feba580d7 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java @@ -9,8 +9,8 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaRequest; -import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; +import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -48,7 +48,7 @@ public void onStart( io.opentelemetry.context.Context parentContext, AwsLambdaRequest request) { Context awsContext = request.getAwsContext(); - attributes.put(ResourceAttributes.FAAS_INVOCATION_ID, awsContext.getAwsRequestId()); + attributes.put(FaasIncubatingAttributes.FAAS_INVOCATION_ID, awsContext.getAwsRequestId()); String arn = getFunctionArn(awsContext); if (arn != null) { attributes.put(CloudIncubatingAttributes.CLOUD_RESOURCE_ID, arn); diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java index b495770c5c9e..9c5da215eba9 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java @@ -20,7 +20,6 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.ResourceAttributes; import java.io.BufferedWriter; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java index 1192c9532db3..2856766c76ca 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java @@ -17,7 +17,6 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.ResourceAttributes; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.ByteArrayInputStream; diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AbstractAwsLambdaTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AbstractAwsLambdaTest.java index d8b9b442476d..fc47b394969c 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AbstractAwsLambdaTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/testing/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AbstractAwsLambdaTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -68,7 +68,7 @@ void handlerTraced() { span.hasName("my_function") .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } @Test @@ -86,7 +86,7 @@ void handlerTracedWithException() { .hasStatus(StatusData.error()) .hasException(thrown) .hasAttributesSatisfyingExactly( - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } /** @@ -111,6 +111,6 @@ void handlerDoesNotLinkToActiveTracingSpan() { .hasNoParent() .hasLinks() .hasAttributesSatisfyingExactly( - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")))); + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")))); } } diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java index 459c65f7d83d..0e70a0d6db46 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayWrapperTest.java @@ -18,7 +18,6 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.semconv.HttpAttributes; -import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.UrlAttributes; import io.opentelemetry.semconv.UserAgentAttributes; import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java index 09db5a49f79e..c3ab67024ea0 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsEventWrapperTest.java @@ -16,7 +16,6 @@ import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.WrappedLambda; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; -import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java index 017578d33b18..ff66553b1dfa 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java @@ -19,7 +19,6 @@ import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.trace.data.LinkData; -import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.lang.reflect.Constructor; diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java index 6ca8d5a32790..87cb651713ba 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaWrapperTest.java @@ -17,7 +17,6 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.ResourceAttributes; import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import org.junit.jupiter.api.AfterEach; diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java index b9a19e149fde..34bc9acf7c9b 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AbstractAwsLambdaSqsEventHandlerTest.java @@ -14,7 +14,7 @@ import com.amazonaws.services.lambda.runtime.events.SQSEvent; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.lang.reflect.Constructor; import java.util.Arrays; @@ -74,7 +74,7 @@ void sameSource() { span.hasName("my_function") .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")), + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")), span -> span.hasName("queue1 process") .hasKind(SpanKind.CONSUMER) @@ -122,7 +122,7 @@ void differentSource() { span.hasName("my_function") .hasKind(SpanKind.SERVER) .hasAttributesSatisfyingExactly( - equalTo(ResourceAttributes.FAAS_INVOCATION_ID, "1-22-333")), + equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-333")), span -> span.hasName("multiple_sources process") .hasKind(SpanKind.CONSUMER) diff --git a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java b/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java deleted file mode 100644 index 10661c6cc3b5..000000000000 --- a/semconv-migration/src/main/java/io/opentelemetry/semconv/ResourceAttributes.java +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.semconv; - -public final class ResourceAttributes { - private ResourceAttributes() {} - - -} From 650de3fbfafb77e947a4e9967cda980a1f5cc7b9 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:24:11 +0200 Subject: [PATCH 38/52] remove semconv-migration module --- instrumentation-api-incubator/build.gradle.kts | 1 - instrumentation-api/build.gradle.kts | 1 - semconv-migration/build.gradle.kts | 12 ------------ settings.gradle.kts | 2 -- 4 files changed, 16 deletions(-) delete mode 100644 semconv-migration/build.gradle.kts diff --git a/instrumentation-api-incubator/build.gradle.kts b/instrumentation-api-incubator/build.gradle.kts index db660d4adcc0..a6dae014eaec 100644 --- a/instrumentation-api-incubator/build.gradle.kts +++ b/instrumentation-api-incubator/build.gradle.kts @@ -13,7 +13,6 @@ group = "io.opentelemetry.instrumentation" dependencies { api("io.opentelemetry.semconv:opentelemetry-semconv") api("io.opentelemetry.semconv:opentelemetry-semconv-incubating") - api(project(":semconv-migration")) api(project(":instrumentation-api")) implementation("io.opentelemetry:opentelemetry-extension-incubator") diff --git a/instrumentation-api/build.gradle.kts b/instrumentation-api/build.gradle.kts index 1107b9f540fd..e8d79ade17f6 100644 --- a/instrumentation-api/build.gradle.kts +++ b/instrumentation-api/build.gradle.kts @@ -16,7 +16,6 @@ dependencies { implementation("io.opentelemetry:opentelemetry-extension-incubator") implementation("io.opentelemetry.semconv:opentelemetry-semconv") implementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating") - implementation(project(":semconv-migration")) compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") diff --git a/semconv-migration/build.gradle.kts b/semconv-migration/build.gradle.kts deleted file mode 100644 index 4d2b69a08213..000000000000 --- a/semconv-migration/build.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -plugins { - id("otel.java-conventions") - id("otel.publish-conventions") -} - -group = "io.opentelemetry.javaagent" - -dependencies { - implementation("io.opentelemetry.semconv:opentelemetry-semconv") - implementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating") - implementation("io.opentelemetry:opentelemetry-api") -} diff --git a/settings.gradle.kts b/settings.gradle.kts index 571e7f59c02a..aecfe18ce134 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -87,8 +87,6 @@ include(":custom-checks") include(":muzzle") -include(":semconv-migration") - // agent projects include(":opentelemetry-api-shaded-for-instrumenting") include(":opentelemetry-ext-annotations-shaded-for-instrumenting") From c549087ab38ce6a01cacc85292b3aa06d108575d Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:40:49 +0200 Subject: [PATCH 39/52] fix few things and javadoc --- .../api/incubator/semconv/db/SqlClientAttributesExtractor.java | 2 +- .../semconv/db/SqlClientAttributesExtractorBuilder.java | 2 +- .../instrumentation/resources/ContainerResource.java | 3 ++- .../v2_2/Servlet2HttpServletResponseInstrumentation.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java index a66ec6cf2eea..adebae1aad93 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java @@ -19,7 +19,7 @@ * attributes. This class is designed with SQL (or SQL-like) database clients in mind. * *

It sets the same set of attributes as {@link DbClientAttributesExtractor} plus an additional - * {@linkplain DbIncubatingAttributes.DB_SQL_TABLE db.sql.table} attribute. The raw SQL + * {@link DbIncubatingAttributes#DB_SQL_TABLE} attribute. The raw SQL * statements returned by the {@link SqlClientAttributesGetter#getRawStatement(Object)} method are * sanitized before use, all statement parameters are removed. */ diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorBuilder.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorBuilder.java index b590ef458c1d..083cfa503e7e 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorBuilder.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorBuilder.java @@ -26,7 +26,7 @@ public final class SqlClientAttributesExtractorBuilder { /** * Configures the extractor to set the table value extracted by the {@link * SqlClientAttributesExtractor} under the {@code dbTableAttribute} key. By default, the - * {@linkplain DbIncubatingAttributes.DB_SQL_TABLE db.sql.table} attribute is used. + * {@link DbIncubatingAttributes#DB_SQL_TABLE} attribute is used. * * @param dbTableAttribute The {@link AttributeKey} under which the table extracted by the {@link * SqlClientAttributesExtractor} will be stored. diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ContainerResource.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ContainerResource.java index 52d04c14f3f8..1bc88b327f9a 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ContainerResource.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ContainerResource.java @@ -8,6 +8,7 @@ import com.google.errorprone.annotations.MustBeClosed; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.resources.Resource; +import io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -47,7 +48,7 @@ private ContainerResource() { // Visible for testing Resource buildResource() { return getContainerId() - .map(id -> Resource.create(Attributes.of(CONTAINER_ID, id))) + .map(id -> Resource.create(Attributes.of(ContainerIncubatingAttributes.CONTAINER_ID, id))) .orElseGet(Resource::empty); } diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java index 44b937c5b877..478fbd1c2d61 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpServletResponseInstrumentation.java @@ -27,7 +27,7 @@ /** * Class javax.servlet.http.HttpServletResponse got method getStatus only * in Servlet specification version 3.0. This means that we cannot set {@link - * io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE} attribute on the created span + * io.opentelemetry.semconv.HttpAttributes#HTTP_RESPONSE_STATUS_CODE} attribute on the created span * using just response object. * *

This instrumentation intercepts status setting methods from Servlet 2.0 specification and From 4e04f66b6d05dd613de7ad5073d90b8dd2545e0a Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 11:41:24 +0200 Subject: [PATCH 40/52] make spotless happy --- .../semconv/db/SqlClientAttributesExtractor.java | 6 +++--- .../AwsLambdaFunctionAttributesExtractor.java | 1 - .../AwsLambdaStreamWrapperHttpPropagationTest.java | 5 ++--- .../v1_0/AwsLambdaStreamWrapperTest.java | 5 ++--- .../resources/AttributeResourceProvider.java | 1 - .../resources/HostIdResourceProvider.java | 1 - .../instrumentation/resources/HostResource.java | 1 - .../resources/JarServiceNameDetector.java | 7 ++++--- .../resources/ManifestResourceProvider.java | 3 +-- .../instrumentation/resources/OsResource.java | 1 - .../instrumentation/resources/ProcessResource.java | 4 ++-- .../resources/ProcessRuntimeResource.java | 2 +- .../resources/HostIdResourceProviderTest.java | 3 +-- .../resources/JarServiceNameDetectorTest.java | 3 +-- .../resources/ManifestResourceProviderTest.java | 6 +++--- .../resources/ProcessResourceTest.java | 3 ++- .../resources/ProcessRuntimeResourceTest.java | 3 ++- .../resources/SpringResourceProvider.java | 3 +-- .../resources/SpringResourceProviderTest.java | 6 +++--- .../spring/resources/TestBootInfClassesResource.java | 3 ++- .../resources/SpringBootServiceNameDetector.java | 10 ++++++---- .../resources/SpringBootServiceVersionDetector.java | 5 +++-- .../resources/SpringBootServiceNameDetectorTest.java | 11 +++++++---- .../SpringBootServiceVersionDetectorTest.java | 3 +-- 24 files changed, 47 insertions(+), 49 deletions(-) diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java index adebae1aad93..0b4754ad2ab3 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java @@ -19,9 +19,9 @@ * attributes. This class is designed with SQL (or SQL-like) database clients in mind. * *

It sets the same set of attributes as {@link DbClientAttributesExtractor} plus an additional - * {@link DbIncubatingAttributes#DB_SQL_TABLE} attribute. The raw SQL - * statements returned by the {@link SqlClientAttributesGetter#getRawStatement(Object)} method are - * sanitized before use, all statement parameters are removed. + * {@link DbIncubatingAttributes#DB_SQL_TABLE} attribute. The raw SQL statements + * returned by the {@link SqlClientAttributesGetter#getRawStatement(Object)} method are sanitized + * before use, all statement parameters are removed. */ public final class SqlClientAttributesExtractor extends DbClientCommonAttributesExtractor< diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java index 128feba580d7..51cebaeecc9c 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/AwsLambdaFunctionAttributesExtractor.java @@ -11,7 +11,6 @@ import io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaRequest; import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; - import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java index 9c5da215eba9..45818d860558 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java @@ -20,6 +20,8 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; +import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import java.io.BufferedWriter; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -28,9 +30,6 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; - -import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; -import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java index 2856766c76ca..71ac8db1ed8c 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java @@ -17,6 +17,8 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; +import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.ByteArrayInputStream; @@ -27,9 +29,6 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; - -import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; -import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java index 070ca854f03d..fa4d075f4b26 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java @@ -13,7 +13,6 @@ import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; - import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostIdResourceProvider.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostIdResourceProvider.java index e43c3ee4158e..574bf5f23b83 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostIdResourceProvider.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostIdResourceProvider.java @@ -13,7 +13,6 @@ import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java index 357bc6560d5c..465691e698b2 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/HostResource.java @@ -10,7 +10,6 @@ import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.semconv.SchemaUrls; import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; - import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetector.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetector.java index 7abe38605485..5b538b196598 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetector.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetector.java @@ -14,7 +14,6 @@ import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; - import java.nio.file.Path; import java.util.Map; import java.util.Optional; @@ -54,7 +53,8 @@ public Resource createResource(ConfigProperties config) { String serviceName = getServiceName(jarPath); logger.log( FINE, "Auto-detected service name from the jar file name: {0}", serviceName); - return Resource.create(Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, serviceName)); + return Resource.create( + Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, serviceName)); }) .orElseGet(Resource::empty); } @@ -65,7 +65,8 @@ public boolean shouldApply(ConfigProperties config, Resource existing) { Map resourceAttributes = config.getMap("otel.resource.attributes"); return serviceName == null && !resourceAttributes.containsKey(ServiceIncubatingAttributes.SERVICE_NAME.getKey()) - && "unknown_service:java".equals(existing.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)); + && "unknown_service:java" + .equals(existing.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)); } private static String getServiceName(Path jarPath) { diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ManifestResourceProvider.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ManifestResourceProvider.java index 650970ee0f80..b26ec7d6fe54 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ManifestResourceProvider.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ManifestResourceProvider.java @@ -10,7 +10,6 @@ import com.google.auto.service.AutoService; import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; - import java.io.IOException; import java.nio.file.Path; import java.util.Optional; @@ -47,7 +46,7 @@ public Optional readData() { public void registerAttributes(Builder builder) { builder .add( - ServiceIncubatingAttributes.SERVICE_NAME, + ServiceIncubatingAttributes.SERVICE_NAME, manifest -> { String serviceName = manifest.getMainAttributes().getValue("Implementation-Title"); diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java index 0ea064aba55a..26421513c6de 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/OsResource.java @@ -10,7 +10,6 @@ import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.semconv.SchemaUrls; import io.opentelemetry.semconv.incubating.OsIncubatingAttributes; - import java.util.Locale; import javax.annotation.Nullable; diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java index 86f6e2ec07f6..34f540721b0f 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java @@ -10,7 +10,6 @@ import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.semconv.SchemaUrls; import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; - import java.io.File; import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; @@ -79,7 +78,8 @@ private static Resource doBuildResource() { executablePath.append(".exe"); } - attributes.put(ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH, executablePath.toString()); + attributes.put( + ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH, executablePath.toString()); String[] args = ProcessArguments.getProcessArguments(); // This will only work with Java 9+ but provides everything except the executablePath. diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java index 32a7309e3a16..4a7da125a22e 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResource.java @@ -38,7 +38,7 @@ static Resource buildResource() { name, ProcessIncubatingAttributes.PROCESS_RUNTIME_VERSION, version, - ProcessIncubatingAttributes.PROCESS_RUNTIME_DESCRIPTION, + ProcessIncubatingAttributes.PROCESS_RUNTIME_DESCRIPTION, description), SchemaUrls.V1_24_0); } catch (SecurityException ignored) { diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostIdResourceProviderTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostIdResourceProviderTest.java index be3bb43da153..2b88957b7b32 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostIdResourceProviderTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/HostIdResourceProviderTest.java @@ -10,6 +10,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; import io.opentelemetry.sdk.resources.Resource; +import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; import java.nio.file.Path; import java.util.Arrays; import java.util.Collection; @@ -19,8 +20,6 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; - -import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; import org.assertj.core.api.MapAssert; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.Test; diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetectorTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetectorTest.java index a6f484b0f237..f40f03d83286 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetectorTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetectorTest.java @@ -10,13 +10,12 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.resources.Resource; +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import java.nio.file.Path; import java.nio.file.Paths; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Stream; - -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java index 425e6c929792..56366db95c59 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java @@ -11,6 +11,7 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; import io.opentelemetry.sdk.resources.Resource; +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import java.io.InputStream; import java.util.Collection; import java.util.Collections; @@ -18,8 +19,6 @@ import java.util.jar.Manifest; import java.util.stream.Collectors; import java.util.stream.Stream; - -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.TestFactory; @@ -93,7 +92,8 @@ Collection createResource() { provider.shouldApply(config, t.existing); Resource resource = provider.createResource(config); - assertThat(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)).isEqualTo(t.expectedName); + assertThat(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)) + .isEqualTo(t.expectedName); assertThat(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_VERSION)) .isEqualTo(t.expectedVersion); })) diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java index 4fdceebd4687..27bfe409e2c2 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessResourceTest.java @@ -29,7 +29,8 @@ void notWindows() { Attributes attributes = resource.getAttributes(); assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_PID)).isGreaterThan(1); - assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH)).matches(".*[/\\\\]java"); + assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH)) + .matches(".*[/\\\\]java"); assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_COMMAND_LINE)) .contains(attributes.get(ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH)); // With Java 9+ and a compiled jar, ResourceAttributes.PROCESS_COMMAND_ARGS diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java index 177255772ae5..d8fd1084c009 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ProcessRuntimeResourceTest.java @@ -29,7 +29,8 @@ void shouldCreateRuntimeAttributes() { assertThat(resource.getSchemaUrl()).isEqualTo(SchemaUrls.V1_24_0); assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_RUNTIME_NAME)).isNotBlank(); assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_RUNTIME_VERSION)).isNotBlank(); - assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_RUNTIME_DESCRIPTION)).isNotBlank(); + assertThat(attributes.get(ProcessIncubatingAttributes.PROCESS_RUNTIME_DESCRIPTION)) + .isNotBlank(); } @Nested diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProvider.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProvider.java index 85027d7b88b9..2bb9058312b6 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProvider.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProvider.java @@ -10,9 +10,8 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; import io.opentelemetry.sdk.resources.Resource; -import java.util.Optional; - import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import java.util.Optional; import org.springframework.boot.info.BuildProperties; public class SpringResourceProvider implements ResourceProvider { diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProviderTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProviderTest.java index 1f426565c06c..d988c3b44ec7 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProviderTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProviderTest.java @@ -14,10 +14,9 @@ import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; import io.opentelemetry.sdk.testing.assertj.AttributesAssert; import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions; +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import java.util.Collections; import java.util.Properties; - -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; @@ -42,7 +41,8 @@ void shouldDetermineServiceNameBySpringApplicationName() { .withPropertyValues("spring.application.name=myapp-backend") .run( context -> - assertResourceAttributes(context).containsEntry(ServiceIncubatingAttributes.SERVICE_NAME, "myapp-backend")); + assertResourceAttributes(context) + .containsEntry(ServiceIncubatingAttributes.SERVICE_NAME, "myapp-backend")); } @Test diff --git a/instrumentation/spring/spring-boot-resources/javaagent-unit-tests/src/test/java/io/opentelemetry/instrumentation/spring/resources/TestBootInfClassesResource.java b/instrumentation/spring/spring-boot-resources/javaagent-unit-tests/src/test/java/io/opentelemetry/instrumentation/spring/resources/TestBootInfClassesResource.java index 79994cd07eb6..bebeec596099 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent-unit-tests/src/test/java/io/opentelemetry/instrumentation/spring/resources/TestBootInfClassesResource.java +++ b/instrumentation/spring/spring-boot-resources/javaagent-unit-tests/src/test/java/io/opentelemetry/instrumentation/spring/resources/TestBootInfClassesResource.java @@ -28,6 +28,7 @@ void testServiceName() { SpringBootServiceNameDetector guesser = new SpringBootServiceNameDetector(); Resource result = guesser.createResource(config); - assertThat(result.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)).isEqualTo("otel-spring-test-app"); + assertThat(result.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)) + .isEqualTo("otel-spring-test-app"); } } diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java index 364cc725bbe2..6b21aab3a091 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java @@ -13,6 +13,7 @@ import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider; import io.opentelemetry.sdk.resources.Resource; +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import java.io.IOException; import java.io.InputStream; import java.util.Map; @@ -25,8 +26,6 @@ import java.util.regex.Pattern; import java.util.stream.Stream; import javax.annotation.Nullable; - -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import org.snakeyaml.engine.v2.api.Load; import org.snakeyaml.engine.v2.api.LoadSettings; @@ -100,7 +99,9 @@ public Resource createResource(ConfigProperties config) { .map( serviceName -> { logger.log(FINE, "Auto-detected Spring Boot service name: {0}", serviceName); - return Resource.builder().put(ServiceIncubatingAttributes.SERVICE_NAME, serviceName).build(); + return Resource.builder() + .put(ServiceIncubatingAttributes.SERVICE_NAME, serviceName) + .build(); }) .orElseGet(Resource::empty); } @@ -113,7 +114,8 @@ public boolean shouldApply(ConfigProperties config, Resource resource) { Map resourceAttributes = config.getMap("otel.resource.attributes"); return serviceName == null && !resourceAttributes.containsKey(ServiceIncubatingAttributes.SERVICE_NAME.getKey()) - && "unknown_service:java".equals(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)); + && "unknown_service:java" + .equals(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)); } @Override diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java index f067da4301cb..329066c984c9 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java @@ -12,7 +12,6 @@ import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; - import java.io.IOException; import java.io.InputStream; import java.util.Optional; @@ -46,7 +45,9 @@ public Resource createResource(ConfigProperties config) { .map( version -> { logger.log(FINE, "Auto-detected Spring Boot service version: {0}", version); - return Resource.builder().put(ServiceIncubatingAttributes.SERVICE_VERSION, version).build(); + return Resource.builder() + .put(ServiceIncubatingAttributes.SERVICE_VERSION, version) + .build(); }) .orElseGet(Resource::empty); } diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetectorTest.java b/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetectorTest.java index 5eea619cb1dc..9afb0ee3b213 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetectorTest.java +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetectorTest.java @@ -13,14 +13,13 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.resources.Resource; +import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import java.io.InputStream; import java.io.OutputStream; import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; - -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; @@ -174,7 +173,10 @@ void shouldApply() { void shouldNotApplyWhenResourceHasServiceName() { SpringBootServiceNameDetector guesser = new SpringBootServiceNameDetector(system); Resource resource = - Resource.getDefault().merge(Resource.create(Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, "test-service"))); + Resource.getDefault() + .merge( + Resource.create( + Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, "test-service"))); assertThat(guesser.shouldApply(config, resource)).isFalse(); } @@ -189,7 +191,8 @@ void shouldNotApplyIfConfigHasServiceName() { void shouldNotApplyIfConfigHasServiceNameResourceAttribute() { SpringBootServiceNameDetector guesser = new SpringBootServiceNameDetector(system); when(config.getMap("otel.resource.attributes")) - .thenReturn(singletonMap(ServiceIncubatingAttributes.SERVICE_NAME.getKey(), "test-service")); + .thenReturn( + singletonMap(ServiceIncubatingAttributes.SERVICE_NAME.getKey(), "test-service")); assertThat(guesser.shouldApply(config, Resource.getDefault())).isFalse(); } diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java b/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java index f69b1dd63155..f92b1a2f9ada 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java @@ -10,9 +10,8 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.resources.Resource; -import java.io.InputStream; - import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import java.io.InputStream; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; From 5479fae462a7b257a4a38d96a893c4113eaf6437 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 13:30:10 +0200 Subject: [PATCH 41/52] fix compilation errors --- .../instrumentation/hibernate/v3_3/SessionTest.java | 6 +++--- .../spring/webflux/v5_0/server/SpringWebfluxTest.java | 6 +++--- .../v5_0/server/base/ControllerSpringWebFluxServerTest.java | 6 +++--- .../v5_0/server/base/HandlerSpringWebFluxServerTest.java | 6 +++--- .../instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java index 3f0802b212da..7ba1ff08aa0a 100644 --- a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java +++ b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java @@ -7,9 +7,9 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_TYPE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import static org.junit.jupiter.api.Named.named; import io.opentelemetry.api.common.AttributeKey; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java index 13d44423d3e8..cddf637c4fed 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java @@ -11,9 +11,9 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; import static io.opentelemetry.semconv.ClientAttributes.CLIENT_ADDRESS; import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE; -import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_TYPE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD; import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; import static io.opentelemetry.semconv.HttpAttributes.HTTP_ROUTE; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java index b23edb617edc..721e2a2cc4d0 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java @@ -9,9 +9,9 @@ import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.NOT_FOUND; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_TYPE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java index 18e362a80997..748f8b3e5352 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java @@ -9,9 +9,9 @@ import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.NOT_FOUND; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_TYPE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.api.internal.HttpConstants; diff --git a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java index ff9023638601..612cc1de82e3 100644 --- a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java +++ b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java @@ -7,9 +7,9 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.ExceptionIncubatingAttributes.EXCEPTION_TYPE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; From 435d3aeb022a4ddcb3d8efa885db2205dc1c8e8c Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 13:34:46 +0200 Subject: [PATCH 42/52] remapping url connection update for extensions --- .../javaagent/tooling/RemappingUrlConnection.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/RemappingUrlConnection.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/RemappingUrlConnection.java index b8b22f4fa342..2647e6d51647 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/RemappingUrlConnection.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/RemappingUrlConnection.java @@ -35,6 +35,9 @@ public class RemappingUrlConnection extends URLConnection { rule( "#io.opentelemetry.semconv", "#io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv"), + rule( + "#io.opentelemetry.semconv.incubating", + "#io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv.incubating"), rule( "#io.opentelemetry.extension.incubator", "#io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.incubator"), From bcf1bb85ab28bcf066f92e8e8bd1ddab2e99a0b9 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 14:09:46 +0200 Subject: [PATCH 43/52] spotless again --- .../spring/webflux/v5_0/server/SpringWebfluxTest.java | 6 +++--- .../instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java index cddf637c4fed..3ee07c9b25da 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java @@ -11,9 +11,6 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; import static io.opentelemetry.semconv.ClientAttributes.CLIENT_ADDRESS; import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD; import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; import static io.opentelemetry.semconv.HttpAttributes.HTTP_ROUTE; @@ -21,6 +18,9 @@ import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.UserAgentAttributes.USER_AGENT_ORIGINAL; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import static org.junit.jupiter.api.Named.named; import io.opentelemetry.api.trace.SpanKind; diff --git a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java index 612cc1de82e3..467cc030ae85 100644 --- a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java +++ b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java @@ -7,9 +7,6 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; @@ -17,6 +14,9 @@ import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension; From ed2a79716dc89c5c6dcbda4a64a26dbba6dadd6e Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 3 Apr 2024 16:03:27 +0200 Subject: [PATCH 44/52] fix groovy import --- .../testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy index 3edcb91b5b44..8625ff0d300f 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy @@ -15,6 +15,7 @@ import io.opentelemetry.semconv.UserAgentAttributes import io.opentelemetry.semconv.ErrorAttributes import io.opentelemetry.semconv.HttpAttributes import io.opentelemetry.semconv.NetworkAttributes +import io.opentelemetry.semconv.UrlAttributes import spock.lang.Unroll import java.util.concurrent.TimeUnit From 3cda45dae05f0dc8a926b78d8101b2eb9921f919 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 9 Apr 2024 09:45:34 +0200 Subject: [PATCH 45/52] bump to semconv 1.25.0 --- dependencyManagement/build.gradle.kts | 2 +- licenses/licenses.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 5997276affb0..45adab4b8935 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -46,7 +46,7 @@ val asmVersion = "9.7" val jmhVersion = "1.37" val mockitoVersion = "4.11.0" val slf4jVersion = "2.0.12" -val semConvVersion = "1.24.0-alpha" +val semConvVersion = "1.25.0-alpha" val CORE_DEPENDENCIES = listOf( "io.opentelemetry.semconv:opentelemetry-semconv:${semConvVersion}", diff --git a/licenses/licenses.md b/licenses/licenses.md index b158ffa1996f..1ff8f4c85177 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ # javaagent ## Dependency License Report -_2024-04-02 13:45:04 CEST_ +_2024-04-09 11:58:09 CEST_ ## Apache License, Version 2.0 **1** **Group:** `com.blogspot.mydailyjava` **Name:** `weak-lock-free` **Version:** `0.18` @@ -159,11 +159,11 @@ _2024-04-02 13:45:04 CEST_ > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**36** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv` **Version:** `1.24.0-alpha` +**36** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv` **Version:** `1.25.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/semantic-conventions-java](https://github.com/open-telemetry/semantic-conventions-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**37** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv-incubating` **Version:** `1.24.0-alpha` +**37** **Group:** `io.opentelemetry.semconv` **Name:** `opentelemetry-semconv-incubating` **Version:** `1.25.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/semantic-conventions-java](https://github.com/open-telemetry/semantic-conventions-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) From 969c239bb6f37c1a216be64207bc8c70438447b4 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 9 Apr 2024 10:04:30 +0200 Subject: [PATCH 46/52] deprecation of db.connection_string --- .../semconv/db/DbClientCommonAttributesExtractor.java | 1 + .../semconv/db/DbClientAttributesExtractorTest.java | 1 + .../semconv/db/SqlClientAttributesExtractorTest.java | 1 + .../hibernate/v3_3/AbstractHibernateTest.java | 2 ++ .../instrumentation/hibernate/v4_0/EntityManagerTest.java | 3 +++ .../javaagent/instrumentation/hibernate/v4_0/QueryTest.java | 3 +++ .../instrumentation/hibernate/v4_0/SessionTest.java | 6 ++++++ .../javaagent/src/test/java/spring/jpa/SpringJpaTest.java | 1 + .../instrumentation/hibernate/v6_0/CriteriaTest.java | 1 + .../instrumentation/hibernate/v6_0/EntityManagerTest.java | 3 +++ .../instrumentation/hibernate/v6_0/ProcedureCallTest.java | 1 + .../instrumentation/hibernate/v6_0/SessionTest.java | 3 +++ .../spring-testing/src/test/groovy/SpringJpaTest.groovy | 1 + .../instrumentation/hibernate/v4_3/ProcedureCallTest.java | 1 + .../src/test/groovy/JdbcInstrumentationTest.groovy | 1 + .../instrumentation/scalaexecutors/SlickTest.scala | 3 +++ .../jdbc/internal/DataSourceDbAttributesExtractor.java | 1 + .../instrumentation/jdbc/OpenTelemetryConnectionTest.groovy | 3 +++ .../jdbc/datasource/OpenTelemetryDataSourceTest.java | 1 + .../mongo/testing/AbstractMongoClientTest.groovy | 1 + .../r2dbc/v1_0/AbstractR2dbcStatementTest.java | 1 + .../spring/data/v3_0/ReactiveSpringDataTest.java | 1 + .../testing/src/main/java/AbstractSpringJpaTest.java | 5 +++++ .../groovy/VertxReactivePropagationTest.groovy | 2 ++ .../groovy/VertxReactivePropagationTest.groovy | 1 + 25 files changed, 48 insertions(+) diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java index 0cc3e49044cf..a0055b714901 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java @@ -25,6 +25,7 @@ abstract class DbClientCommonAttributesExtractor< this.getter = getter; } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Override public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) { internalSet(attributes, DbIncubatingAttributes.DB_SYSTEM, getter.getSystem(request)); diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java index bfd71bec9ded..68991d1b813a 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java @@ -52,6 +52,7 @@ public String getOperation(Map map) { } } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Test void shouldExtractAllAvailableAttributes() { // given diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java index 35915028fca7..f782a20b16ff 100644 --- a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java +++ b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java @@ -49,6 +49,7 @@ public String getConnectionString(Map map) { } } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Test void shouldExtractAllAttributes() { // given diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java index 458b16fff71f..7042194917d5 100644 --- a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java +++ b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java @@ -57,6 +57,7 @@ static void cleanUp() { } } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData parent) { return span.hasKind(SpanKind.CLIENT) .hasParent(parent) @@ -70,6 +71,7 @@ static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData parent) { equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData parent, String verb) { return span.hasName(verb.concat(" db1.Value")) .hasKind(SpanKind.CLIENT) diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java index 89c4259f8480..d9402fc439ca 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/EntityManagerTest.java @@ -34,6 +34,7 @@ class EntityManagerTest extends AbstractHibernateTest { static final EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory("test-pu"); + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @ParameterizedTest @MethodSource("provideArgumentsHibernateActionParameters") void testHibernateActions(Parameter parameter) { @@ -183,6 +184,7 @@ private static Stream provideArgumentsHibernateActionParameters() { Arguments.of(named("remove", new Parameter("delete", true, true, EntityManager::remove)))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Test void testHibernatePersist() { EntityManager entityManager = entityManagerFactory.createEntityManager(); @@ -254,6 +256,7 @@ void testHibernatePersist() { equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @ParameterizedTest @MethodSource("provideArgumentsAttachesState") void testAttachesStateToQuery(Function queryBuildMethod) { diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java index 97088676d60a..f68fe97e9ba5 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryTest.java @@ -25,6 +25,7 @@ class QueryTest extends AbstractHibernateTest { + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Test void testHibernateQueryExecuteUpdateWithTransaction() { testing.runWithSpan( @@ -84,6 +85,7 @@ void testHibernateQueryExecuteUpdateWithTransaction() { .get(stringKey("hibernate.session_id")))))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @ParameterizedTest @MethodSource("providesArgumentsSingleCall") void testHibernateQuerySingleCall(Parameter parameter) { @@ -153,6 +155,7 @@ private static Stream providesArgumentsSingleCall() { new Parameter("SELECT Value", sess -> sess.createQuery("from Value").scroll())))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Test void testHibernateQueryIterate() { testing.runWithSpan( diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java index 9f6f5f440d6c..b40068f4827f 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java @@ -34,6 +34,7 @@ @SuppressWarnings("deprecation") // 'lock' is a deprecated method in the Session class class SessionTest extends AbstractHibernateTest { + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @ParameterizedTest @MethodSource("provideArgumentsHibernateAction") void testHibernateAction(Parameter parameter) { @@ -143,6 +144,7 @@ private static Stream provideArgumentsHibernateAction() { null)))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @ParameterizedTest @MethodSource("provideArgumentsHibernateActionStateless") void testHibernateActionStateless(Parameter parameter) { @@ -290,6 +292,7 @@ private static Stream provideArgumentsHibernateActionStateless() { })))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @ParameterizedTest @MethodSource("provideArgumentsHibernateReplicate") void testHibernateReplicate(Parameter parameter) { @@ -437,6 +440,7 @@ void testHibernateFailedReplicate() { .get(stringKey("hibernate.session_id")))))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @ParameterizedTest @MethodSource("provideArgumentsHibernateCommitAction") void testHibernateCommitAction(Parameter parameter) { @@ -626,6 +630,7 @@ private static Stream provideArgumentsHibernateCommitAction() { null)))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @ParameterizedTest @MethodSource("provideArgumentsStateQuery") void testAttachesStateToQueryCreated(Consumer queryBuilder) { @@ -698,6 +703,7 @@ private static Stream provideArgumentsStateQuery() { session -> session.createSQLQuery("SELECT * FROM Value").list()))))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Test void testHibernateOverlappingSessions() { testing.runWithSpan( diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java index 1db265104ca3..17ebc73ba798 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/spring/jpa/SpringJpaTest.java @@ -31,6 +31,7 @@ class SpringJpaTest { new AnnotationConfigApplicationContext(PersistenceConfig.class); CustomerRepository repo = context.getBean(CustomerRepository.class); + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Test void testCrud() { String version = Version.getVersionString(); diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java index 1447be9baffb..d2ab1450ed09 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/CriteriaTest.java @@ -36,6 +36,7 @@ private static Stream provideParameters() { Arguments.of(named("getSingleResultOrNull", interactions.get(2)))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @ParameterizedTest(name = "{index}: {0}") @MethodSource("provideParameters") void testCriteriaQuery(Consumer> interaction) { diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java index 28fb78af3679..5bc237dc24b2 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/EntityManagerTest.java @@ -112,6 +112,7 @@ void testHibernateAction(Parameter parameter) { }); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @ParameterizedTest(name = "{index}: {0}") @MethodSource("provideAttachesStateParameters") void testAttachesStateToQuery(Parameter parameter) { @@ -287,6 +288,7 @@ private static class Parameter { public final Function queryBuildMethod; } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation private static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData parent) { return span.hasKind(SpanKind.CLIENT) .hasParent(parent) @@ -300,6 +302,7 @@ private static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData par equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation private static SpanDataAssert assertClientSpan( SpanDataAssert span, SpanData parent, String spanName) { return span.hasName(spanName) diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java index c22fc5140e02..1a1e36cf9a61 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/ProcedureCallTest.java @@ -69,6 +69,7 @@ static void cleanup() { } } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Test void testProcedureCall() { testing.runWithSpan( diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java index 7edacaf430b3..d95c4fe7805d 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java @@ -219,6 +219,7 @@ void testHibernateCommitAction(Parameter parameter) { span -> assertClientSpan(span, trace.getSpan(2)))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @ParameterizedTest(name = "{index}: {0}") @MethodSource("provideAttachesStateToQueryParameters") void testAttachesStateToQuery(Parameter parameter) { @@ -802,6 +803,7 @@ private static SpanDataAssert assertSpanWithSessionId( equalTo(AttributeKey.stringKey("hibernate.session_id"), sessionId)); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation private static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData parent) { return span.hasKind(SpanKind.CLIENT) .hasParent(parent) @@ -815,6 +817,7 @@ private static SpanDataAssert assertClientSpan(SpanDataAssert span, SpanData par equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "Value")); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation private static SpanDataAssert assertClientSpan( SpanDataAssert span, SpanData parent, String verb) { return span.hasName(verb.concat(" db1.Value")) diff --git a/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy b/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy index d49d2b53f82d..6be2e3e5cdb7 100644 --- a/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy +++ b/instrumentation/hibernate/hibernate-6.0/spring-testing/src/test/groovy/SpringJpaTest.groovy @@ -23,6 +23,7 @@ class SpringJpaTest extends AgentInstrumentationSpecification { @Shared def repo = context.getBean(CustomerRepository) + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation def "test CRUD"() { setup: def isHibernate4 = Version.getVersionString().startsWith("4.") diff --git a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java index eb5dff7ea565..3e36101c7bef 100644 --- a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java +++ b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallTest.java @@ -76,6 +76,7 @@ static void cleanUp() { } } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Test void testProcedureCall() { diff --git a/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy b/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy index f062a3962747..39eec0059569 100644 --- a/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy +++ b/instrumentation/jdbc/javaagent/src/test/groovy/JdbcInstrumentationTest.groovy @@ -167,6 +167,7 @@ class JdbcInstrumentationTest extends AgentInstrumentationSpecification { } } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation def "basic statement with #connection.getClass().getCanonicalName() on #system generates spans"() { setup: Statement statement = connection.createStatement() diff --git a/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala b/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala index dc1ff375acc6..085e4a8aee3a 100644 --- a/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala +++ b/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala @@ -56,6 +56,9 @@ class SlickTest { Duration.Inf ) + @SuppressWarnings( + "deprecation" + ) // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Test def basicStatement(): Unit = { val result = getResults(startQuery(TestQuery)) diff --git a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java index ec0ae8e18a58..e47d7dcddc30 100644 --- a/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java +++ b/instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/DataSourceDbAttributesExtractor.java @@ -21,6 +21,7 @@ enum DataSourceDbAttributesExtractor implements AttributesExtractor extends InstrumentationSpecification { return "testCollection-${collectionIndex.getAndIncrement()}" } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation def mongoSpan(TraceAssert trace, int index, String operation, String collection, String dbName, Object parentSpan, diff --git a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java index d03e72c1ee63..3d85dab01a75 100644 --- a/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java +++ b/instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java @@ -124,6 +124,7 @@ void startContainer(DbSystemProps props) { } } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @ParameterizedTest(name = "{index}: {0}") @MethodSource("provideParameters") void testQueries(Parameter parameter) { diff --git a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java index 7d082359a0b0..826bf0877497 100644 --- a/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java +++ b/instrumentation/spring/spring-data/spring-data-3.0/testing/src/reactiveTest/java/io/opentelemetry/javaagent/instrumentation/spring/data/v3_0/ReactiveSpringDataTest.java @@ -49,6 +49,7 @@ static void cleanUp() { applicationContext.close(); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Test void testFindAll() { long count = diff --git a/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java b/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java index 29452690628e..670999905aa5 100644 --- a/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java +++ b/instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java @@ -66,6 +66,7 @@ void testObjectMethod() { span -> span.hasName("toString test").hasTotalAttributeCount(0))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation static void assertHibernate4Trace(TraceAssert trace, String repoClassName) { trace.hasSpansSatisfyingExactly( span -> @@ -89,6 +90,7 @@ static void assertHibernate4Trace(TraceAssert trace, String repoClassName) { equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer"))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation static void assertHibernateTrace(TraceAssert trace, String repoClassName) { trace.hasSpansSatisfyingExactly( span -> @@ -124,6 +126,7 @@ static void assertHibernateTrace(TraceAssert trace, String repoClassName) { equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer"))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Test void testCrud() { boolean isHibernate4 = Version.getVersionString().startsWith("4."); @@ -278,6 +281,7 @@ void testCrud() { equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Test void testCustomRepositoryMethod() { REPOSITORY repo = repository(); @@ -312,6 +316,7 @@ void testCustomRepositoryMethod() { equalTo(DbIncubatingAttributes.DB_SQL_TABLE, "JpaCustomer")))); } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Test void testFailedRepositoryMethod() { // given diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy index b47cb1887bbb..7e776c9ab177 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy @@ -53,6 +53,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { //Verifies that context is correctly propagated and sql query span has correct parent. //Tests io.opentelemetry.javaagent.instrumentation.vertx.reactive.VertxRxInstrumentation + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation def "should propagate context over vert.x rx-java framework"() { setup: def response = client.get("/listProducts").aggregate().join() @@ -110,6 +111,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { } } + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation def "should propagate context correctly over vert.x rx-java framework with high concurrency"() { setup: int count = 100 diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy index b47cb1887bbb..9490912c8f93 100644 --- a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy +++ b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy @@ -53,6 +53,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { //Verifies that context is correctly propagated and sql query span has correct parent. //Tests io.opentelemetry.javaagent.instrumentation.vertx.reactive.VertxRxInstrumentation + @SuppressWarnings("deprecation") // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation def "should propagate context over vert.x rx-java framework"() { setup: def response = client.get("/listProducts").aggregate().join() From 7984016fbe33faec6e1fb202c73b35b8a083420f Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 9 Apr 2024 10:06:40 +0200 Subject: [PATCH 47/52] stable service attributes --- .../resources/AttributeResourceProvider.java | 4 ++-- .../resources/JarServiceNameDetector.java | 10 ++++------ .../resources/ManifestResourceProvider.java | 6 +++--- .../resources/JarServiceNameDetectorTest.java | 8 ++++---- .../resources/ManifestResourceProviderTest.java | 8 ++++---- .../resources/SpringResourceProvider.java | 8 ++++---- .../resources/SpringResourceProviderTest.java | 8 ++++---- .../spring/resources/TestBootInfClassesResource.java | 4 ++-- .../resources/SpringBootServiceNameDetector.java | 11 ++++------- .../resources/SpringBootServiceVersionDetector.java | 6 ++---- .../resources/SpringBootServiceNameDetectorTest.java | 11 ++++------- .../SpringBootServiceVersionDetectorTest.java | 4 ++-- .../opentelemetry/smoketest/QuarkusSmokeTest.groovy | 4 ++-- 13 files changed, 41 insertions(+), 51 deletions(-) diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java index fa4d075f4b26..594b69cad2cb 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java @@ -12,7 +12,7 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import io.opentelemetry.semconv.ServiceAttributes; import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -101,7 +101,7 @@ private static boolean shouldUpdate( Object value = existing.getAttribute(key); - if (key.equals(ServiceIncubatingAttributes.SERVICE_NAME)) { + if (key.equals(ServiceAttributes.SERVICE_NAME)) { return config.getString("otel.service.name") == null && "unknown_service:java".equals(value); } diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetector.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetector.java index 5b538b196598..7ffaeaa2d170 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetector.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetector.java @@ -13,7 +13,7 @@ import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import io.opentelemetry.semconv.ServiceAttributes; import java.nio.file.Path; import java.util.Map; import java.util.Optional; @@ -53,8 +53,7 @@ public Resource createResource(ConfigProperties config) { String serviceName = getServiceName(jarPath); logger.log( FINE, "Auto-detected service name from the jar file name: {0}", serviceName); - return Resource.create( - Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, serviceName)); + return Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, serviceName)); }) .orElseGet(Resource::empty); } @@ -64,9 +63,8 @@ public boolean shouldApply(ConfigProperties config, Resource existing) { String serviceName = config.getString("otel.service.name"); Map resourceAttributes = config.getMap("otel.resource.attributes"); return serviceName == null - && !resourceAttributes.containsKey(ServiceIncubatingAttributes.SERVICE_NAME.getKey()) - && "unknown_service:java" - .equals(existing.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)); + && !resourceAttributes.containsKey(ServiceAttributes.SERVICE_NAME.getKey()) + && "unknown_service:java".equals(existing.getAttribute(ServiceAttributes.SERVICE_NAME)); } private static String getServiceName(Path jarPath) { diff --git a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ManifestResourceProvider.java b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ManifestResourceProvider.java index b26ec7d6fe54..c5cb94af8de6 100644 --- a/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ManifestResourceProvider.java +++ b/instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ManifestResourceProvider.java @@ -9,7 +9,7 @@ import com.google.auto.service.AutoService; import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import io.opentelemetry.semconv.ServiceAttributes; import java.io.IOException; import java.nio.file.Path; import java.util.Optional; @@ -46,14 +46,14 @@ public Optional readData() { public void registerAttributes(Builder builder) { builder .add( - ServiceIncubatingAttributes.SERVICE_NAME, + ServiceAttributes.SERVICE_NAME, manifest -> { String serviceName = manifest.getMainAttributes().getValue("Implementation-Title"); return Optional.ofNullable(serviceName); }) .add( - ServiceIncubatingAttributes.SERVICE_VERSION, + ServiceAttributes.SERVICE_VERSION, manifest -> { String serviceVersion = manifest.getMainAttributes().getValue("Implementation-Version"); diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetectorTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetectorTest.java index f40f03d83286..bcb0ff2c631d 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetectorTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetectorTest.java @@ -10,7 +10,7 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import io.opentelemetry.semconv.ServiceAttributes; import java.nio.file.Path; import java.nio.file.Paths; import java.util.function.Function; @@ -70,7 +70,7 @@ void createResource_processHandleJar() { assertThat(resource.getAttributes()) .hasSize(1) - .containsEntry(ServiceIncubatingAttributes.SERVICE_NAME, "my-service"); + .containsEntry(ServiceAttributes.SERVICE_NAME, "my-service"); } @Test @@ -82,7 +82,7 @@ void createResource_processHandleJarWithoutExtension() { assertThat(resource.getAttributes()) .hasSize(1) - .containsEntry(ServiceIncubatingAttributes.SERVICE_NAME, "my-service"); + .containsEntry(ServiceAttributes.SERVICE_NAME, "my-service"); } static String[] getArgs(String jarName) { @@ -104,7 +104,7 @@ void createResource_sunCommandLine(String commandLine, Path jarPath) { assertThat(resource.getAttributes()) .hasSize(1) - .containsEntry(ServiceIncubatingAttributes.SERVICE_NAME, "my-service"); + .containsEntry(ServiceAttributes.SERVICE_NAME, "my-service"); } // regression test for diff --git a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java index 56366db95c59..c617f58a6dbc 100644 --- a/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java +++ b/instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java @@ -11,7 +11,7 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import io.opentelemetry.semconv.ServiceAttributes; import java.io.InputStream; import java.util.Collection; import java.util.Collections; @@ -68,7 +68,7 @@ Collection createResource() { null, "0.0.1-SNAPSHOT", openClasspathResource("MANIFEST.MF"), - Resource.create(Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, "old")))) + Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, "old")))) .map( t -> DynamicTest.dynamicTest( @@ -92,9 +92,9 @@ Collection createResource() { provider.shouldApply(config, t.existing); Resource resource = provider.createResource(config); - assertThat(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)) + assertThat(resource.getAttribute(ServiceAttributes.SERVICE_NAME)) .isEqualTo(t.expectedName); - assertThat(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_VERSION)) + assertThat(resource.getAttribute(ServiceAttributes.SERVICE_VERSION)) .isEqualTo(t.expectedVersion); })) .collect(Collectors.toList()); diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProvider.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProvider.java index 2bb9058312b6..11c45fe9e6b9 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProvider.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProvider.java @@ -10,7 +10,7 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import io.opentelemetry.semconv.ServiceAttributes; import java.util.Optional; import org.springframework.boot.info.BuildProperties; @@ -27,16 +27,16 @@ public Resource createResource(ConfigProperties configProperties) { AttributesBuilder attributesBuilder = Attributes.builder(); buildProperties .map(BuildProperties::getName) - .ifPresent(v -> attributesBuilder.put(ServiceIncubatingAttributes.SERVICE_NAME, v)); + .ifPresent(v -> attributesBuilder.put(ServiceAttributes.SERVICE_NAME, v)); String springApplicationName = configProperties.getString("spring.application.name"); if (springApplicationName != null) { - attributesBuilder.put(ServiceIncubatingAttributes.SERVICE_NAME, springApplicationName); + attributesBuilder.put(ServiceAttributes.SERVICE_NAME, springApplicationName); } buildProperties .map(BuildProperties::getVersion) - .ifPresent(v -> attributesBuilder.put(ServiceIncubatingAttributes.SERVICE_VERSION, v)); + .ifPresent(v -> attributesBuilder.put(ServiceAttributes.SERVICE_VERSION, v)); return Resource.create(attributesBuilder.build()); } diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProviderTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProviderTest.java index d988c3b44ec7..f6e6f7de1ed3 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProviderTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/resources/SpringResourceProviderTest.java @@ -14,7 +14,7 @@ import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; import io.opentelemetry.sdk.testing.assertj.AttributesAssert; import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import io.opentelemetry.semconv.ServiceAttributes; import java.util.Collections; import java.util.Properties; import org.junit.jupiter.api.DisplayName; @@ -42,7 +42,7 @@ void shouldDetermineServiceNameBySpringApplicationName() { .run( context -> assertResourceAttributes(context) - .containsEntry(ServiceIncubatingAttributes.SERVICE_NAME, "myapp-backend")); + .containsEntry(ServiceAttributes.SERVICE_NAME, "myapp-backend")); } @Test @@ -57,8 +57,8 @@ void shouldDetermineServiceNameAndVersionBySpringApplicationVersion() { .run( context -> assertResourceAttributes(context) - .containsEntry(ServiceIncubatingAttributes.SERVICE_NAME, "demo") - .containsEntry(ServiceIncubatingAttributes.SERVICE_VERSION, "0.3")); + .containsEntry(ServiceAttributes.SERVICE_NAME, "demo") + .containsEntry(ServiceAttributes.SERVICE_VERSION, "0.3")); } private static AttributesAssert assertResourceAttributes(AssertableApplicationContext context) { diff --git a/instrumentation/spring/spring-boot-resources/javaagent-unit-tests/src/test/java/io/opentelemetry/instrumentation/spring/resources/TestBootInfClassesResource.java b/instrumentation/spring/spring-boot-resources/javaagent-unit-tests/src/test/java/io/opentelemetry/instrumentation/spring/resources/TestBootInfClassesResource.java index bebeec596099..ec268062632c 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent-unit-tests/src/test/java/io/opentelemetry/instrumentation/spring/resources/TestBootInfClassesResource.java +++ b/instrumentation/spring/spring-boot-resources/javaagent-unit-tests/src/test/java/io/opentelemetry/instrumentation/spring/resources/TestBootInfClassesResource.java @@ -9,7 +9,7 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import io.opentelemetry.semconv.ServiceAttributes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -28,7 +28,7 @@ void testServiceName() { SpringBootServiceNameDetector guesser = new SpringBootServiceNameDetector(); Resource result = guesser.createResource(config); - assertThat(result.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)) + assertThat(result.getAttribute(ServiceAttributes.SERVICE_NAME)) .isEqualTo("otel-spring-test-app"); } } diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java index 6b21aab3a091..0bcdb527095a 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java @@ -13,7 +13,7 @@ import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import io.opentelemetry.semconv.ServiceAttributes; import java.io.IOException; import java.io.InputStream; import java.util.Map; @@ -99,9 +99,7 @@ public Resource createResource(ConfigProperties config) { .map( serviceName -> { logger.log(FINE, "Auto-detected Spring Boot service name: {0}", serviceName); - return Resource.builder() - .put(ServiceIncubatingAttributes.SERVICE_NAME, serviceName) - .build(); + return Resource.builder().put(ServiceAttributes.SERVICE_NAME, serviceName).build(); }) .orElseGet(Resource::empty); } @@ -113,9 +111,8 @@ public boolean shouldApply(ConfigProperties config, Resource resource) { String serviceName = config.getString("otel.service.name"); Map resourceAttributes = config.getMap("otel.resource.attributes"); return serviceName == null - && !resourceAttributes.containsKey(ServiceIncubatingAttributes.SERVICE_NAME.getKey()) - && "unknown_service:java" - .equals(resource.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)); + && !resourceAttributes.containsKey(ServiceAttributes.SERVICE_NAME.getKey()) + && "unknown_service:java".equals(resource.getAttribute(ServiceAttributes.SERVICE_NAME)); } @Override diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java index 329066c984c9..865279de3064 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java @@ -11,7 +11,7 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import io.opentelemetry.semconv.ServiceAttributes; import java.io.IOException; import java.io.InputStream; import java.util.Optional; @@ -45,9 +45,7 @@ public Resource createResource(ConfigProperties config) { .map( version -> { logger.log(FINE, "Auto-detected Spring Boot service version: {0}", version); - return Resource.builder() - .put(ServiceIncubatingAttributes.SERVICE_VERSION, version) - .build(); + return Resource.builder().put(ServiceAttributes.SERVICE_VERSION, version).build(); }) .orElseGet(Resource::empty); } diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetectorTest.java b/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetectorTest.java index 9afb0ee3b213..d8abfe890de8 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetectorTest.java +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetectorTest.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import io.opentelemetry.semconv.ServiceAttributes; import java.io.InputStream; import java.io.OutputStream; import java.net.URL; @@ -174,9 +174,7 @@ void shouldNotApplyWhenResourceHasServiceName() { SpringBootServiceNameDetector guesser = new SpringBootServiceNameDetector(system); Resource resource = Resource.getDefault() - .merge( - Resource.create( - Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, "test-service"))); + .merge(Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, "test-service"))); assertThat(guesser.shouldApply(config, resource)).isFalse(); } @@ -191,13 +189,12 @@ void shouldNotApplyIfConfigHasServiceName() { void shouldNotApplyIfConfigHasServiceNameResourceAttribute() { SpringBootServiceNameDetector guesser = new SpringBootServiceNameDetector(system); when(config.getMap("otel.resource.attributes")) - .thenReturn( - singletonMap(ServiceIncubatingAttributes.SERVICE_NAME.getKey(), "test-service")); + .thenReturn(singletonMap(ServiceAttributes.SERVICE_NAME.getKey(), "test-service")); assertThat(guesser.shouldApply(config, Resource.getDefault())).isFalse(); } private static void expectServiceName(Resource result, String expected) { - assertThat(result.getAttribute(ServiceIncubatingAttributes.SERVICE_NAME)).isEqualTo(expected); + assertThat(result.getAttribute(ServiceAttributes.SERVICE_NAME)).isEqualTo(expected); } private static void writeString(Path path, String value) throws Exception { diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java b/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java index f92b1a2f9ada..8482af0f08ee 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java @@ -10,7 +10,7 @@ import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import io.opentelemetry.semconv.ServiceAttributes; import java.io.InputStream; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -33,7 +33,7 @@ void givenBuildVersionIsPresentInBuildInfProperties_thenReturnBuildVersion() { SpringBootServiceVersionDetector guesser = new SpringBootServiceVersionDetector(system); Resource result = guesser.createResource(config); - assertThat(result.getAttribute(ServiceIncubatingAttributes.SERVICE_VERSION)).isEqualTo("0.0.2"); + assertThat(result.getAttribute(ServiceAttributes.SERVICE_VERSION)).isEqualTo("0.0.2"); } @Test diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy index 4dcfa7093ac3..e8d87c20c527 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/QuarkusSmokeTest.groovy @@ -5,7 +5,7 @@ package io.opentelemetry.smoketest -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes +import io.opentelemetry.semconv.ServiceAttributes import spock.lang.IgnoreIf import spock.lang.Unroll @@ -50,7 +50,7 @@ class QuarkusSmokeTest extends SmokeTest { traces.countFilteredResourceAttributes("telemetry.distro.version", currentAgentVersion) == 1 and: "service.name is detected from manifest" - traces.countFilteredResourceAttributes(ServiceIncubatingAttributes.SERVICE_NAME.key, "smoke-test-quarkus-images") == 1 + traces.countFilteredResourceAttributes(ServiceAttributes.SERVICE_NAME.key, "smoke-test-quarkus-images") == 1 cleanup: stopTarget() From 8373832676d893a9e31fb462682de13721a4e37e Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 9 Apr 2024 10:21:18 +0200 Subject: [PATCH 48/52] deprecation of messaging.kafka.destination.partition --- .../apachecamel/decorators/KafkaSpanDecorator.java | 2 ++ .../kafka/internal/KafkaClientBaseTest.java | 4 ++++ .../v2_6/InterceptorsSuppressReceiveSpansTest.java | 2 ++ .../kafkaclients/v2_6/InterceptorsTest.java | 2 ++ .../v2_6/WrapperSuppressReceiveSpansTest.java | 4 ++++ .../instrumentation/kafkaclients/v2_6/WrapperTest.java | 4 ++++ .../kafka/internal/KafkaConsumerAttributesExtractor.java | 2 ++ .../kafka/internal/KafkaProducerAttributesExtractor.java | 2 ++ .../src/test/groovy/KafkaStreamsDefaultTest.groovy | 1 + .../groovy/KafkaStreamsSuppressReceiveSpansTest.groovy | 1 + .../reactor/kafka/v1_0/AbstractReactorKafkaTest.java | 4 ++++ .../instrumentation/kafka/KafkaIntegrationTest.java | 1 + .../spring/kafka/v2_7/SpringKafkaTest.java | 7 +++++++ .../AbstractSpringKafkaNoReceiveTelemetryTest.java | 8 ++++++++ .../vertx/kafka/v3_6/AbstractVertxKafkaTest.java | 4 ++++ 15 files changed, 48 insertions(+) diff --git a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java index 7656008e5007..b506501987aa 100644 --- a/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java +++ b/instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java @@ -52,6 +52,8 @@ public String getDestination(Exchange exchange, Endpoint endpoint) { return topic != null ? topic : super.getDestination(exchange, endpoint); } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation @Override public void pre( AttributesBuilder attributes, diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java index 332342324da1..698602d7c40e 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java @@ -152,6 +152,8 @@ public void awaitUntilConsumerIsReady() throws InterruptedException { consumer.seekToBeginning(Collections.emptyList()); } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation protected static List sendAttributes( String messageKey, String messageValue, boolean testHeaders) { List assertions = @@ -212,6 +214,8 @@ protected static List receiveAttributes(boolean testHeaders) return assertions; } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation protected static List processAttributes( String messageKey, String messageValue, boolean testHeaders) { List assertions = diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsSuppressReceiveSpansTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsSuppressReceiveSpansTest.java index 09634c11976e..ede8f3c0bcb3 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsSuppressReceiveSpansTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsSuppressReceiveSpansTest.java @@ -15,6 +15,8 @@ class InterceptorsSuppressReceiveSpansTest extends AbstractInterceptorsTest { + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation @Override void assertTraces() { testing.waitAndAssertTraces( diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java index c694c7cd13d0..de1d557c667b 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/InterceptorsTest.java @@ -20,6 +20,8 @@ class InterceptorsTest extends AbstractInterceptorsTest { + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation @Override void assertTraces() { AtomicReference producerSpanContext = new AtomicReference<>(); diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperSuppressReceiveSpansTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperSuppressReceiveSpansTest.java index 554da765571d..eb3358ad497e 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperSuppressReceiveSpansTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperSuppressReceiveSpansTest.java @@ -52,6 +52,8 @@ void assertTraces(boolean testHeaders) { .hasParent(trace.getSpan(0)))); } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation protected static List sendAttributes(boolean testHeaders) { List assertions = new ArrayList<>( @@ -77,6 +79,8 @@ protected static List sendAttributes(boolean testHeaders) { return assertions; } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation private static List processAttributes(String greeting, boolean testHeaders) { List assertions = new ArrayList<>( diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperTest.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperTest.java index 8d5a84449359..9fb07bab0866 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperTest.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/WrapperTest.java @@ -74,6 +74,8 @@ void assertTraces(boolean testHeaders) { .hasParent(trace.getSpan(1)))); } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation protected static List sendAttributes(boolean testHeaders) { List assertions = new ArrayList<>( @@ -99,6 +101,8 @@ protected static List sendAttributes(boolean testHeaders) { return assertions; } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation private static List processAttributes(String greeting, boolean testHeaders) { List assertions = new ArrayList<>( diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesExtractor.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesExtractor.java index e01efe827440..7460956b51c8 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesExtractor.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAttributesExtractor.java @@ -16,6 +16,8 @@ final class KafkaConsumerAttributesExtractor implements AttributesExtractor { + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation @Override public void onStart( AttributesBuilder attributes, Context parentContext, KafkaProcessRequest request) { diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesExtractor.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesExtractor.java index abc30140a9ad..30618e6628f9 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesExtractor.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAttributesExtractor.java @@ -35,6 +35,8 @@ private static boolean canSerialize(Class keyClass) { return !(keyClass.isArray() || keyClass == ByteBuffer.class); } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation @Override public void onEnd( AttributesBuilder attributes, diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy index 08402d0818ac..44e1b3fa321e 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy @@ -24,6 +24,7 @@ import static io.opentelemetry.api.trace.SpanKind.PRODUCER class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest { + @SuppressWarnings("deprecation") // TODO MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation def "test kafka produce and consume with streams in-between"() { setup: def config = new Properties() diff --git a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy index 054067aae6dc..de1ec297e455 100644 --- a/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy +++ b/instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy @@ -24,6 +24,7 @@ import static io.opentelemetry.api.trace.SpanKind.PRODUCER class KafkaStreamsSuppressReceiveSpansTest extends KafkaStreamsBaseTest { + @SuppressWarnings("deprecation") // TODO MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation def "test kafka produce and consume with streams in-between"() { setup: def config = new Properties() diff --git a/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java b/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java index ef5b333ed76a..aad42569d24d 100644 --- a/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java +++ b/instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java @@ -174,6 +174,8 @@ protected void testSingleRecordProcess( span -> span.hasName("consumer").hasParent(trace.getSpan(1)))); } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation protected static List sendAttributes(ProducerRecord record) { List assertions = new ArrayList<>( @@ -215,6 +217,8 @@ protected static List receiveAttributes(String topic) { return assertions; } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation protected static List processAttributes( ProducerRecord record) { List assertions = diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/kafka/KafkaIntegrationTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/kafka/KafkaIntegrationTest.java index 39440d1b3826..62b9bf9990e0 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/kafka/KafkaIntegrationTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/kafka/KafkaIntegrationTest.java @@ -84,6 +84,7 @@ void shouldInstrumentProducerAndConsumer() { // In kafka 2 ops.send is deprecated. We are using it to avoid reflection because kafka 3 also has // ops.send, although with different return type. @SuppressWarnings({"unchecked", "deprecation"}) + // TODO MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation private static void runShouldInstrumentProducerAndConsumer( ConfigurableApplicationContext applicationContext) { KafkaTemplate kafkaTemplate = applicationContext.getBean(KafkaTemplate.class); diff --git a/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java b/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java index 2a398cb441b6..3fa9196943a1 100644 --- a/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java +++ b/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java @@ -48,6 +48,8 @@ protected List> additionalSpringConfigs() { return emptyList(); } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation @Test void shouldCreateSpansForSingleRecordProcess() { testing.runWithSpan( @@ -261,6 +263,8 @@ void shouldHandleFailureInKafkaListener() { span -> span.hasName("consumer").hasParent(trace.getSpan(1)))); } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation @Test void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { Map batchMessages = new HashMap<>(); @@ -364,6 +368,9 @@ void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { span -> span.hasName("consumer").hasParent(trace.getSpan(1)))); } + @SuppressWarnings( + "deprecation") // TODO MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION + // deprecation @Test void shouldHandleFailureInKafkaBatchListener() { testing.runWithSpan( diff --git a/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaNoReceiveTelemetryTest.java b/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaNoReceiveTelemetryTest.java index 2655c54135dd..33eab53b3605 100644 --- a/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaNoReceiveTelemetryTest.java +++ b/instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaNoReceiveTelemetryTest.java @@ -27,6 +27,8 @@ public abstract class AbstractSpringKafkaNoReceiveTelemetryTest extends Abstract protected abstract boolean isLibraryInstrumentationTest(); + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation @Test void shouldCreateSpansForSingleRecordProcess() { testing() @@ -102,6 +104,8 @@ void shouldCreateSpansForSingleRecordProcess() { span -> span.hasName("consumer").hasParent(trace.getSpan(2)))); } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation @Test void shouldHandleFailureInKafkaListener() { testing() @@ -190,6 +194,8 @@ void shouldHandleFailureInKafkaListener() { span -> span.hasName("consumer").hasParent(trace.getSpan(6)))); } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation @Test void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { Map batchMessages = new HashMap<>(); @@ -284,6 +290,8 @@ void shouldCreateSpansForBatchReceiveAndProcess() throws InterruptedException { span -> span.hasName("consumer").hasParent(trace.getSpan(0)))); } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation @Test void shouldHandleFailureInKafkaBatchListener() { testing() diff --git a/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java b/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java index cad2b516e017..70a2088f8734 100644 --- a/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java +++ b/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/AbstractVertxKafkaTest.java @@ -194,6 +194,8 @@ protected static void sendRecord( } } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation protected static List sendAttributes( KafkaProducerRecord record) { List assertions = @@ -247,6 +249,8 @@ private static List batchConsumerAttributes(String topic, St return assertions; } + @SuppressWarnings("deprecation") // TODO + // MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation protected static List processAttributes( KafkaProducerRecord record) { List assertions = From 6839613f2d5f3ab35be249cbb9808e63499e6b6b Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 9 Apr 2024 10:27:03 +0200 Subject: [PATCH 49/52] stable exception attributes --- .../OpenTelemetryInstrumentationHelper.java | 6 +++--- .../graphql/AbstractGraphqlTest.java | 10 +++++----- .../hibernate/v3_3/SessionTest.java | 6 +++--- .../jul/JavaUtilLoggingHelper.java | 8 ++++---- .../jul/JavaUtilLoggingTest.java | 10 ++++------ .../appender/v1_1/LoggingEventMapper.java | 8 ++++---- .../appender/v1_1/JbossLogmanagerTest.java | 10 ++++------ .../JspInstrumentationBasicTests.groovy | 14 ++++++------- .../log4j/appender/v1_2/LogEventMapper.java | 8 ++++---- .../log4j/appender/v1_2/Log4j1Test.java | 10 ++++------ .../log4j/appender/v2_17/Log4j2Test.java | 10 ++++------ .../appender/v2_17/Slf4jToLog4jTest.java | 10 ++++------ .../v2_17/internal/LogEventMapper.java | 8 ++++---- .../AbstractOpenTelemetryAppenderTest.java | 12 ++++------- .../logback/appender/v1_0/LogbackTest.java | 10 ++++------ .../v1_0/internal/LoggingEventMapper.java | 8 ++++---- .../AbstractOpenTelemetryAppenderTest.java | 8 ++++---- .../src/test/groovy/TracerTest.groovy | 10 +++++----- .../rabbitmq/RabbitMqTest.java | 10 ++++------ .../v1_0/ReactorNettyClientSslTest.java | 11 ++++------ .../instrumentation/rmi/RmiTest.java | 16 +++++++-------- .../src/test/groovy/SpringRmiTest.groovy | 20 +++++++++---------- .../scheduling/v3_1/SpringSchedulingTest.java | 10 ++++------ .../v5_0/server/SpringWebfluxTest.java | 6 +++--- .../ControllerSpringWebFluxServerTest.java | 6 +++--- .../base/HandlerSpringWebFluxServerTest.java | 6 +++--- .../vertx/v4_0/sql/VertxSqlClientTest.java | 6 +++--- .../test/asserts/SpanAssert.groovy | 14 ++++++------- 28 files changed, 123 insertions(+), 148 deletions(-) diff --git a/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java b/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java index fb24119ee795..ab8538450c2e 100644 --- a/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java +++ b/instrumentation/graphql-java/graphql-java-common/library/src/main/java/io/opentelemetry/instrumentation/graphql/internal/OpenTelemetryInstrumentationHelper.java @@ -35,7 +35,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder; import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; +import io.opentelemetry.semconv.ExceptionAttributes; import java.util.Locale; /** @@ -96,8 +96,8 @@ public InstrumentationContext beginExecution( for (GraphQLError error : result.getErrors()) { AttributesBuilder attributes = Attributes.builder(); attributes.put( - ExceptionIncubatingAttributes.EXCEPTION_TYPE, String.valueOf(error.getErrorType())); - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, error.getMessage()); + ExceptionAttributes.EXCEPTION_TYPE, String.valueOf(error.getErrorType())); + attributes.put(ExceptionAttributes.EXCEPTION_MESSAGE, error.getMessage()); span.addEvent("exception", attributes.build()); } diff --git a/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java b/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java index f9efde37f4e5..f8ba47c038fc 100644 --- a/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java +++ b/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java @@ -24,7 +24,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; +import io.opentelemetry.semconv.ExceptionAttributes; import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; @@ -207,10 +207,10 @@ void parseError() { .hasName("exception") .hasAttributesSatisfyingExactly( equalTo( - ExceptionIncubatingAttributes.EXCEPTION_TYPE, + ExceptionAttributes.EXCEPTION_TYPE, "InvalidSyntax"), satisfies( - ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, + ExceptionAttributes.EXCEPTION_MESSAGE, message -> message.startsWithIgnoringCase( "Invalid Syntax")))))); @@ -249,10 +249,10 @@ void validationError() { .hasName("exception") .hasAttributesSatisfyingExactly( equalTo( - ExceptionIncubatingAttributes.EXCEPTION_TYPE, + ExceptionAttributes.EXCEPTION_TYPE, "ValidationError"), satisfies( - ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, + ExceptionAttributes.EXCEPTION_MESSAGE, message -> message.startsWith("Validation error")))))); } diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java index 7ba1ff08aa0a..9a246eb10754 100644 --- a/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java +++ b/instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionTest.java @@ -7,9 +7,9 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_TYPE; +import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE; import static org.junit.jupiter.api.Named.named; import io.opentelemetry.api.common.AttributeKey; diff --git a/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java b/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java index 533372392391..434ec148421a 100644 --- a/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java +++ b/instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java @@ -13,7 +13,7 @@ import io.opentelemetry.api.logs.Severity; import io.opentelemetry.context.Context; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; +import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; @@ -87,11 +87,11 @@ private static void mapLogRecord(LogRecordBuilder builder, LogRecord logRecord) if (throwable != null) { // TODO (trask) extract method for recording exception into // io.opentelemetry:opentelemetry-api - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); + attributes.put(ExceptionAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); + attributes.put(ExceptionAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); StringWriter writer = new StringWriter(); throwable.printStackTrace(new PrintWriter(writer)); - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, writer.toString()); + attributes.put(ExceptionAttributes.EXCEPTION_STACKTRACE, writer.toString()); } if (captureExperimentalAttributes) { diff --git a/instrumentation/java-util-logging/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingTest.java b/instrumentation/java-util-logging/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingTest.java index 155d0c25e46d..a18bfd8c871b 100644 --- a/instrumentation/java-util-logging/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingTest.java +++ b/instrumentation/java-util-logging/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingTest.java @@ -14,7 +14,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; +import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.util.logging.Level; import java.util.logging.Logger; @@ -117,12 +117,10 @@ private static void test( .hasAttributesSatisfyingExactly( equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), - equalTo( - ExceptionIncubatingAttributes.EXCEPTION_TYPE, - IllegalStateException.class.getName()), - equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, "hello"), + equalTo(ExceptionAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), + equalTo(ExceptionAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( - ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, + ExceptionAttributes.EXCEPTION_STACKTRACE, v -> v.contains(JavaUtilLoggingTest.class.getName()))); } else { assertThat(log) diff --git a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java index 3cc962a0eddf..66c685c968d4 100644 --- a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java +++ b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java @@ -17,7 +17,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; +import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; @@ -83,11 +83,11 @@ public void capture(Logger logger, ExtLogRecord record) { if (throwable != null) { // TODO (trask) extract method for recording exception into // io.opentelemetry:opentelemetry-api - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); + attributes.put(ExceptionAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); + attributes.put(ExceptionAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); StringWriter writer = new StringWriter(); throwable.printStackTrace(new PrintWriter(writer)); - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, writer.toString()); + attributes.put(ExceptionAttributes.EXCEPTION_STACKTRACE, writer.toString()); } captureMdcAttributes(attributes); diff --git a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java index 4b0d58fc9c87..eaa67c0d6ba7 100644 --- a/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java +++ b/instrumentation/jboss-logmanager/jboss-logmanager-appender-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/JbossLogmanagerTest.java @@ -17,7 +17,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; +import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.time.Instant; import java.util.stream.Stream; @@ -143,12 +143,10 @@ private static void test( .hasAttributesSatisfyingExactly( equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), - equalTo( - ExceptionIncubatingAttributes.EXCEPTION_TYPE, - IllegalStateException.class.getName()), - equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, "hello"), + equalTo(ExceptionAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), + equalTo(ExceptionAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( - ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, + ExceptionAttributes.EXCEPTION_STACKTRACE, v -> v.contains(JbossLogmanagerTest.class.getName()))); } else { assertThat(log) diff --git a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy index 5f7d34cbb23d..8990653a46d8 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy @@ -5,7 +5,7 @@ import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes +import io.opentelemetry.semconv.ExceptionAttributes import io.opentelemetry.semconv.ServerAttributes import io.opentelemetry.semconv.ClientAttributes import io.opentelemetry.semconv.UserAgentAttributes @@ -260,13 +260,13 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { event(0) { eventName("exception") attributes { - "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" { String tagExceptionType -> + "$ExceptionAttributes.EXCEPTION_TYPE" { String tagExceptionType -> return tagExceptionType == exceptionClass.getName() || tagExceptionType.contains(exceptionClass.getSimpleName()) } - "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" { String tagErrorMsg -> + "$ExceptionAttributes.EXCEPTION_MESSAGE" { String tagErrorMsg -> return errorMessageOptional || tagErrorMsg instanceof String } - "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionAttributes.EXCEPTION_STACKTRACE" String } } attributes { @@ -300,13 +300,13 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { event(0) { eventName("exception") attributes { - "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" { String tagExceptionType -> + "$ExceptionAttributes.EXCEPTION_TYPE" { String tagExceptionType -> return tagExceptionType == exceptionClass.getName() || tagExceptionType.contains(exceptionClass.getSimpleName()) } - "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" { String tagErrorMsg -> + "$ExceptionAttributes.EXCEPTION_MESSAGE" { String tagErrorMsg -> return errorMessageOptional || tagErrorMsg instanceof String } - "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionAttributes.EXCEPTION_STACKTRACE" String } } attributes { diff --git a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java index 3ea37e564186..da552d0756a0 100644 --- a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java +++ b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java @@ -16,7 +16,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; +import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; @@ -89,11 +89,11 @@ public void capture(Category logger, Priority level, Object message, Throwable t if (throwable != null) { // TODO (trask) extract method for recording exception into // io.opentelemetry:opentelemetry-api - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); + attributes.put(ExceptionAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); + attributes.put(ExceptionAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); StringWriter writer = new StringWriter(); throwable.printStackTrace(new PrintWriter(writer)); - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, writer.toString()); + attributes.put(ExceptionAttributes.EXCEPTION_STACKTRACE, writer.toString()); } captureMdcAttributes(attributes); diff --git a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java index bc20c61e1677..7019e8844418 100644 --- a/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java +++ b/instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java @@ -16,7 +16,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; +import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.lang.reflect.Field; import java.time.Instant; @@ -114,12 +114,10 @@ private static void test( .hasAttributesSatisfyingExactly( equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), - equalTo( - ExceptionIncubatingAttributes.EXCEPTION_TYPE, - IllegalStateException.class.getName()), - equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, "hello"), + equalTo(ExceptionAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), + equalTo(ExceptionAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( - ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, + ExceptionAttributes.EXCEPTION_STACKTRACE, v -> v.contains(Log4j1Test.class.getName()))); } else { assertThat(log) diff --git a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java index 2e8a07993b58..2db99177c409 100644 --- a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java +++ b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java @@ -16,7 +16,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; +import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.time.Instant; import java.util.stream.Stream; @@ -103,12 +103,10 @@ private static void test( .hasAttributesSatisfyingExactly( equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), - equalTo( - ExceptionIncubatingAttributes.EXCEPTION_TYPE, - IllegalStateException.class.getName()), - equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, "hello"), + equalTo(ExceptionAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), + equalTo(ExceptionAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( - ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, + ExceptionAttributes.EXCEPTION_STACKTRACE, v -> v.contains(Log4j2Test.class.getName()))); } else { assertThat(log) diff --git a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java index db924cb481be..6a3ffafa8853 100644 --- a/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java +++ b/instrumentation/log4j/log4j-appender-2.17/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Slf4jToLog4jTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; +import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.util.stream.Stream; import org.junit.jupiter.api.Test; @@ -92,12 +92,10 @@ private static void test( .hasAttributesSatisfyingExactly( equalTo(ThreadIncubatingAttributes.THREAD_NAME, Thread.currentThread().getName()), equalTo(ThreadIncubatingAttributes.THREAD_ID, Thread.currentThread().getId()), - equalTo( - ExceptionIncubatingAttributes.EXCEPTION_TYPE, - IllegalStateException.class.getName()), - equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, "hello"), + equalTo(ExceptionAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), + equalTo(ExceptionAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( - ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, + ExceptionAttributes.EXCEPTION_STACKTRACE, v -> v.contains(Slf4jToLog4jTest.class.getName()))); } else { assertThat(log) diff --git a/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java b/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java index 9b8bc0863936..9ae3e34360ef 100644 --- a/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java +++ b/instrumentation/log4j/log4j-appender-2.17/library/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/internal/LogEventMapper.java @@ -12,7 +12,7 @@ import io.opentelemetry.api.logs.Severity; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.internal.cache.Cache; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; +import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; @@ -188,11 +188,11 @@ public static AttributeKey getMapMessageAttributeKey(String key) { private static void setThrowable(AttributesBuilder attributes, Throwable throwable) { // TODO (trask) extract method for recording exception into // io.opentelemetry:opentelemetry-api - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); + attributes.put(ExceptionAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); + attributes.put(ExceptionAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); StringWriter writer = new StringWriter(); throwable.printStackTrace(new PrintWriter(writer)); - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, writer.toString()); + attributes.put(ExceptionAttributes.EXCEPTION_STACKTRACE, writer.toString()); } private static Severity levelToSeverity(Level level) { diff --git a/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java b/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java index 5aafe497032e..17f07014b0f4 100644 --- a/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java +++ b/instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractOpenTelemetryAppenderTest.java @@ -22,7 +22,7 @@ import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.testing.exporter.InMemoryLogRecordExporter; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; +import io.opentelemetry.semconv.ExceptionAttributes; import java.time.Instant; import java.util.List; import org.apache.logging.log4j.LogManager; @@ -138,13 +138,9 @@ void logWithExtras() { .hasSeverity(Severity.INFO) .hasSeverityText("INFO") .hasAttributesSatisfyingExactly( - equalTo( - ExceptionIncubatingAttributes.EXCEPTION_TYPE, - IllegalStateException.class.getName()), - equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, "Error!"), - satisfies( - ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, - v -> v.contains("logWithExtras"))); + equalTo(ExceptionAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), + equalTo(ExceptionAttributes.EXCEPTION_MESSAGE, "Error!"), + satisfies(ExceptionAttributes.EXCEPTION_STACKTRACE, v -> v.contains("logWithExtras"))); assertThat(logDataList.get(0).getTimestampEpochNanos()) .isGreaterThanOrEqualTo(MILLISECONDS.toNanos(start.toEpochMilli())) diff --git a/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java b/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java index 4a8a1357792a..a1236c9ace55 100644 --- a/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java +++ b/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java @@ -15,8 +15,8 @@ import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.data.LogRecordData; +import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.util.Arrays; import java.util.stream.Stream; @@ -150,12 +150,10 @@ private static void test( equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "performLogging"), satisfies(CodeIncubatingAttributes.CODE_LINENO, AbstractLongAssert::isPositive), equalTo(CodeIncubatingAttributes.CODE_FILEPATH, "LogbackTest.java"), - equalTo( - ExceptionIncubatingAttributes.EXCEPTION_TYPE, - IllegalStateException.class.getName()), - equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, "hello"), + equalTo(ExceptionAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), + equalTo(ExceptionAttributes.EXCEPTION_MESSAGE, "hello"), satisfies( - ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, + ExceptionAttributes.EXCEPTION_STACKTRACE, v -> v.contains(LogbackTest.class.getName()))); } else { assertThat(log) diff --git a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java index c82e74a583af..a37c5fe8170c 100644 --- a/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java +++ b/instrumentation/logback/logback-appender-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapper.java @@ -20,8 +20,8 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.internal.cache.Cache; import io.opentelemetry.javaagent.tooling.muzzle.NoMuzzle; +import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes; import java.io.PrintWriter; import java.io.StringWriter; @@ -191,11 +191,11 @@ public static AttributeKey getMdcAttributeKey(String key) { private static void setThrowable(AttributesBuilder attributes, Throwable throwable) { // TODO (trask) extract method for recording exception into // io.opentelemetry:opentelemetry-api - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); + attributes.put(ExceptionAttributes.EXCEPTION_TYPE, throwable.getClass().getName()); + attributes.put(ExceptionAttributes.EXCEPTION_MESSAGE, throwable.getMessage()); StringWriter writer = new StringWriter(); throwable.printStackTrace(new PrintWriter(writer)); - attributes.put(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, writer.toString()); + attributes.put(ExceptionAttributes.EXCEPTION_STACKTRACE, writer.toString()); } private static Severity levelToSeverity(Level level) { diff --git a/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java b/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java index b9612ab9014c..39244e330122 100644 --- a/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java +++ b/instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/AbstractOpenTelemetryAppenderTest.java @@ -18,8 +18,8 @@ import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.testing.exporter.InMemoryLogRecordExporter; +import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.time.Instant; @@ -126,11 +126,11 @@ void logWithExtras() { assertThat(logData.getSeverityText()).isEqualTo("INFO"); assertThat(logData.getAttributes().size()) .isEqualTo(3 + 4 + 1); // 3 exception attributes, 4 code attributes, 1 marker attribute - assertThat(logData.getAttributes().get(ExceptionIncubatingAttributes.EXCEPTION_TYPE)) + assertThat(logData.getAttributes().get(ExceptionAttributes.EXCEPTION_TYPE)) .isEqualTo(IllegalStateException.class.getName()); - assertThat(logData.getAttributes().get(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE)) + assertThat(logData.getAttributes().get(ExceptionAttributes.EXCEPTION_MESSAGE)) .isEqualTo("Error!"); - assertThat(logData.getAttributes().get(ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE)) + assertThat(logData.getAttributes().get(ExceptionAttributes.EXCEPTION_STACKTRACE)) .contains("logWithExtras"); String file = logData.getAttributes().get(CodeIncubatingAttributes.CODE_FILEPATH); diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/TracerTest.groovy b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/TracerTest.groovy index 21180e497928..be63f3d40255 100644 --- a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/TracerTest.groovy +++ b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/test/groovy/TracerTest.groovy @@ -9,7 +9,7 @@ import io.opentelemetry.api.trace.Span import io.opentelemetry.context.Context import io.opentelemetry.context.Scope import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes +import io.opentelemetry.semconv.ExceptionAttributes import static io.opentelemetry.api.trace.SpanKind.PRODUCER import static io.opentelemetry.api.trace.StatusCode.ERROR @@ -235,8 +235,8 @@ class TracerTest extends AgentInstrumentationSpecification { event(0) { eventName("exception") attributes { - "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" "java.lang.IllegalStateException" - "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionAttributes.EXCEPTION_TYPE" "java.lang.IllegalStateException" + "$ExceptionAttributes.EXCEPTION_STACKTRACE" String } } attributes { @@ -263,8 +263,8 @@ class TracerTest extends AgentInstrumentationSpecification { event(0) { eventName("exception") attributes { - "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" "java.lang.IllegalStateException" - "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionAttributes.EXCEPTION_TYPE" "java.lang.IllegalStateException" + "$ExceptionAttributes.EXCEPTION_STACKTRACE" String "dog" "bark" } } diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java index 16e55d77f8d1..957a641bb5e2 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java +++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java @@ -29,8 +29,8 @@ import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.StatusData; +import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.NetworkAttributes; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes; import java.io.FileNotFoundException; import java.io.IOException; @@ -890,12 +890,10 @@ private static void verifyException(SpanDataAssert span, Throwable exception, St assertThat(events.get(0)) .hasName("exception") .hasAttributesSatisfying( - equalTo( - ExceptionIncubatingAttributes.EXCEPTION_TYPE, - exception.getClass().getName()), - equalTo(ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, errorMsg), + equalTo(ExceptionAttributes.EXCEPTION_TYPE, exception.getClass().getName()), + equalTo(ExceptionAttributes.EXCEPTION_MESSAGE, errorMsg), satisfies( - ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, + ExceptionAttributes.EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))); }); } diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java index 524aa8cda5f0..0d89311e213e 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyClientSslTest.java @@ -21,11 +21,11 @@ import io.opentelemetry.sdk.trace.data.EventData; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.ErrorAttributes; +import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.NetworkAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; import java.util.List; import javax.annotation.Nullable; import javax.net.ssl.SSLException; @@ -228,12 +228,9 @@ private static void isSslHandshakeException(List events) { assertThat(event) .hasAttributesSatisfyingExactly( equalTo( - ExceptionIncubatingAttributes.EXCEPTION_TYPE, + ExceptionAttributes.EXCEPTION_TYPE, SSLHandshakeException.class.getCanonicalName()), - satisfies( - ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, s -> s.isNotEmpty()), - satisfies( - ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, - s -> s.isNotEmpty()))); + satisfies(ExceptionAttributes.EXCEPTION_MESSAGE, s -> s.isNotEmpty()), + satisfies(ExceptionAttributes.EXCEPTION_STACKTRACE, s -> s.isNotEmpty()))); } } diff --git a/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java b/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java index 1bf332325fc5..88ecd3ba0d1d 100644 --- a/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java +++ b/instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; +import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes; import java.rmi.registry.LocateRegistry; import java.rmi.registry.Registry; @@ -150,14 +150,13 @@ void serviceThrownException() throws Exception { .hasName("exception") .hasAttributesSatisfyingExactly( equalTo( - ExceptionIncubatingAttributes.EXCEPTION_TYPE, + ExceptionAttributes.EXCEPTION_TYPE, thrown.getClass().getCanonicalName()), equalTo( - ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, + ExceptionAttributes.EXCEPTION_MESSAGE, thrown.getMessage()), satisfies( - ExceptionIncubatingAttributes - .EXCEPTION_STACKTRACE, + ExceptionAttributes.EXCEPTION_STACKTRACE, AbstractAssert::isNotNull))) .hasAttributesSatisfyingExactly( equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "java_rmi"), @@ -173,14 +172,13 @@ void serviceThrownException() throws Exception { .hasName("exception") .hasAttributesSatisfyingExactly( equalTo( - ExceptionIncubatingAttributes.EXCEPTION_TYPE, + ExceptionAttributes.EXCEPTION_TYPE, thrown.getClass().getCanonicalName()), equalTo( - ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, + ExceptionAttributes.EXCEPTION_MESSAGE, thrown.getMessage()), satisfies( - ExceptionIncubatingAttributes - .EXCEPTION_STACKTRACE, + ExceptionAttributes.EXCEPTION_STACKTRACE, AbstractAssert::isNotNull))) .hasAttributesSatisfyingExactly( equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "java_rmi"), diff --git a/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy b/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy index 1c74da23e0ad..50d5e99cb73a 100644 --- a/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy +++ b/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy @@ -6,7 +6,7 @@ import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes +import io.opentelemetry.semconv.ExceptionAttributes import io.opentelemetry.semconv.incubating.RpcIncubatingAttributes import org.springframework.boot.SpringApplication import org.springframework.context.ConfigurableApplicationContext @@ -131,9 +131,9 @@ class SpringRmiTest extends AgentInstrumentationSpecification { event(0) { eventName("exception") attributes { - "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" error.getClass().getCanonicalName() - "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" error.getMessage() - "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionAttributes.EXCEPTION_TYPE" error.getClass().getCanonicalName() + "$ExceptionAttributes.EXCEPTION_MESSAGE" error.getMessage() + "$ExceptionAttributes.EXCEPTION_STACKTRACE" String } } } @@ -145,9 +145,9 @@ class SpringRmiTest extends AgentInstrumentationSpecification { event(0) { eventName("exception") attributes { - "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" error.getClass().getCanonicalName() - "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" error.getMessage() - "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionAttributes.EXCEPTION_TYPE" error.getClass().getCanonicalName() + "$ExceptionAttributes.EXCEPTION_MESSAGE" error.getMessage() + "$ExceptionAttributes.EXCEPTION_STACKTRACE" String } } attributes { @@ -164,9 +164,9 @@ class SpringRmiTest extends AgentInstrumentationSpecification { event(0) { eventName("exception") attributes { - "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" error.getClass().getCanonicalName() - "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" error.getMessage() - "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionAttributes.EXCEPTION_TYPE" error.getClass().getCanonicalName() + "$ExceptionAttributes.EXCEPTION_MESSAGE" error.getMessage() + "$ExceptionAttributes.EXCEPTION_STACKTRACE" String } } attributes { diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java index 6059d187efed..eea1a23a4498 100644 --- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java +++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java @@ -26,7 +26,7 @@ import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.config.TriggerTaskConfig; import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.service.LambdaTaskConfigurer; import io.opentelemetry.sdk.trace.data.StatusData; -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes; +import io.opentelemetry.semconv.ExceptionAttributes; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -166,13 +166,11 @@ void taskWithErrorTest() throws InterruptedException { .hasName("exception") .hasAttributesSatisfying( equalTo( - ExceptionIncubatingAttributes.EXCEPTION_TYPE, + ExceptionAttributes.EXCEPTION_TYPE, IllegalStateException.class.getName()), - equalTo( - ExceptionIncubatingAttributes.EXCEPTION_MESSAGE, - "failure"), + equalTo(ExceptionAttributes.EXCEPTION_MESSAGE, "failure"), satisfies( - ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE, + ExceptionAttributes.EXCEPTION_STACKTRACE, value -> value.isInstanceOf(String.class)))), span -> span.hasName("error-handler").hasParent(trace.getSpan(0)))); } diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java index 3ee07c9b25da..2748191b7e83 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java @@ -11,6 +11,9 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; import static io.opentelemetry.semconv.ClientAttributes.CLIENT_ADDRESS; import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE; +import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD; import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE; import static io.opentelemetry.semconv.HttpAttributes.HTTP_ROUTE; @@ -18,9 +21,6 @@ import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.UserAgentAttributes.USER_AGENT_ORIGINAL; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import static org.junit.jupiter.api.Named.named; import io.opentelemetry.api.trace.SpanKind; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java index 721e2a2cc4d0..ea5c7be2bd1a 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ControllerSpringWebFluxServerTest.java @@ -9,9 +9,9 @@ import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.NOT_FOUND; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_TYPE; +import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java index 748f8b3e5352..637c5b8124ca 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/HandlerSpringWebFluxServerTest.java @@ -9,9 +9,9 @@ import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.NOT_FOUND; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_TYPE; +import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.api.internal.HttpConstants; diff --git a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java index 467cc030ae85..61ad7dd4974e 100644 --- a/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java +++ b/instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java @@ -7,6 +7,9 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; +import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE; +import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE; +import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE; import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS; import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME; @@ -14,9 +17,6 @@ import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SQL_TABLE; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT; import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_MESSAGE; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE; -import static io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes.EXCEPTION_TYPE; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension; diff --git a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy index bfa2003b0a3c..0b1e3468e8a6 100644 --- a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy +++ b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/asserts/SpanAssert.groovy @@ -12,7 +12,7 @@ import io.opentelemetry.api.trace.SpanId import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.api.trace.StatusCode import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes +import io.opentelemetry.semconv.ExceptionAttributes import java.util.regex.Pattern @@ -149,9 +149,9 @@ class SpanAssert { event(0) { eventName("exception") attributes { - "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" expectedClass.canonicalName - "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String - "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" { it != null } + "$ExceptionAttributes.EXCEPTION_TYPE" expectedClass.canonicalName + "$ExceptionAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionAttributes.EXCEPTION_MESSAGE" { it != null } } } } @@ -164,10 +164,10 @@ class SpanAssert { event(index) { eventName("exception") attributes { - "$ExceptionIncubatingAttributes.EXCEPTION_TYPE" errorClass.canonicalName - "$ExceptionIncubatingAttributes.EXCEPTION_STACKTRACE" String + "$ExceptionAttributes.EXCEPTION_TYPE" errorClass.canonicalName + "$ExceptionAttributes.EXCEPTION_STACKTRACE" String if (expectedMessage != null) { - "$ExceptionIncubatingAttributes.EXCEPTION_MESSAGE" expectedMessage + "$ExceptionAttributes.EXCEPTION_MESSAGE" expectedMessage } } } From 41697cb65e5f78e13a96c5074d8420db2c02c8de Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 9 Apr 2024 12:27:26 +0200 Subject: [PATCH 50/52] revert changes in scala test --- .../javaagent/instrumentation/scalaexecutors/SlickTest.scala | 3 --- 1 file changed, 3 deletions(-) diff --git a/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala b/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala index 085e4a8aee3a..dc1ff375acc6 100644 --- a/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala +++ b/instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala @@ -56,9 +56,6 @@ class SlickTest { Duration.Inf ) - @SuppressWarnings( - "deprecation" - ) // TODO DbIncubatingAttributes.DB_CONNECTION_STRING deprecation @Test def basicStatement(): Unit = { val result = getResults(startQuery(TestQuery)) From 68ff1bce61f5c077c4efd3e1ec6b87c163829b1d Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 9 Apr 2024 14:27:38 +0200 Subject: [PATCH 51/52] fix kafka spring test --- .../instrumentation/spring/kafka/v2_7/SpringKafkaTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java b/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java index 3fa9196943a1..6e272dd14605 100644 --- a/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java +++ b/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java @@ -146,6 +146,7 @@ void shouldCreateSpansForSingleRecordProcess() { span -> span.hasName("consumer").hasParent(trace.getSpan(1)))); } + @SuppressWarnings("deprecation") // TODO MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation @Test void shouldHandleFailureInKafkaListener() { testing.runWithSpan( From 6365bf0dcd7499ad263adb947b4c00bd663fd8f2 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 9 Apr 2024 15:01:29 +0200 Subject: [PATCH 52/52] fix formatting --- .../instrumentation/spring/kafka/v2_7/SpringKafkaTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java b/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java index 6e272dd14605..9c86159526d9 100644 --- a/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java +++ b/instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java @@ -146,7 +146,9 @@ void shouldCreateSpansForSingleRecordProcess() { span -> span.hasName("consumer").hasParent(trace.getSpan(1)))); } - @SuppressWarnings("deprecation") // TODO MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION deprecation + @SuppressWarnings( + "deprecation") // TODO MessagingIncubatingAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION + // deprecation @Test void shouldHandleFailureInKafkaListener() { testing.runWithSpan(