fix tests and codenarc

open-telemetry · Apr 20, 2023 · 18d10ff · 18d10ff
1 parent 04373dd
commit 18d10ff
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/...src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpan.groovy b/...src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpan.groovy
@@ -9,7 +9,6 @@ import io.opentelemetry.instrumentation.test.asserts.TraceAssert
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
 
 import static io.opentelemetry.api.trace.SpanKind.CLIENT
-import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
 
 class AwsSpan {
 

diff --git a/.../vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/.../vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy
@@ -63,6 +63,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification {
           kind SERVER
           hasNoParent()
           attributes {
+            "$SemanticAttributes.NET_TRANSPORT" { it == null || it == IP_TCP }
             "net.protocol.name" "http"
             "net.protocol.version" "1.1"
             "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
@@ -156,6 +157,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification {
             kind SERVER
             childOf(span(0))
             attributes {
+              "$SemanticAttributes.NET_TRANSPORT" { it == null || it == IP_TCP }
               "net.protocol.name" "http"
               "net.protocol.version" "1.1"
               "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"

diff --git a/.../vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy b/.../vertx-rx-java-3.5/javaagent/src/version35Test/groovy/VertxReactivePropagationTest.groovy
@@ -63,6 +63,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification {
           kind SERVER
           hasNoParent()
           attributes {
+            "$SemanticAttributes.NET_TRANSPORT" { it == null || it == IP_TCP }
             "net.protocol.name" "http"
             "net.protocol.version" "1.1"
             "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
@@ -156,6 +157,7 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification {
             kind SERVER
             childOf(span(0))
             attributes {
+              "$SemanticAttributes.NET_TRANSPORT" { it == null || it == IP_TCP }
               "net.protocol.name" "http"
               "net.protocol.version" "1.1"
               "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"