diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsView.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsView.java index 8a2f7cc748..351f55c108 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsView.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsView.java @@ -8,7 +8,6 @@ package io.opentelemetry.instrumentation.api.instrumenter.http; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.instrumentation.api.instrumenter.network.internal.NetworkAttributes; import io.opentelemetry.instrumentation.api.instrumenter.url.internal.UrlAttributes; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; @@ -32,8 +31,8 @@ final class TemporaryMetricsView { Set view = new HashSet<>(); view.add(SemanticAttributes.HTTP_METHOD); view.add(SemanticAttributes.HTTP_STATUS_CODE); // Optional - view.add(NetAttributes.NET_PROTOCOL_NAME); // Optional - view.add(NetAttributes.NET_PROTOCOL_VERSION); // Optional + view.add(SemanticAttributes.NET_PROTOCOL_NAME); // Optional + view.add(SemanticAttributes.NET_PROTOCOL_VERSION); // Optional // stable semconv view.add(HttpAttributes.HTTP_REQUEST_METHOD); view.add(HttpAttributes.HTTP_RESPONSE_STATUS_CODE); diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/NetAttributes.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/NetAttributes.java deleted file mode 100644 index 1a23d126cb..0000000000 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/NetAttributes.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.instrumentation.api.instrumenter.net.internal; - -import static io.opentelemetry.api.common.AttributeKey.stringKey; - -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 NetAttributes { - - // FIXME: remove this class and replace its usages with SemanticAttributes once schema 1.20 is - // released - - public static final AttributeKey NET_PROTOCOL_NAME = stringKey("net.protocol.name"); - - public static final AttributeKey NET_PROTOCOL_VERSION = stringKey("net.protocol.version"); - - private NetAttributes() {} -} diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/internal/InternalNetworkAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/internal/InternalNetworkAttributesExtractor.java index 957f0b75ec..6244dcb6d5 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/internal/InternalNetworkAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/internal/InternalNetworkAttributesExtractor.java @@ -8,8 +8,8 @@ package io.opentelemetry.instrumentation.api.instrumenter.network.internal; import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet; import io.opentelemetry.api.common.AttributesBuilder; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesGetter; +import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import java.util.Locale; import javax.annotation.Nullable; @@ -55,8 +55,8 @@ public final class InternalNetworkAttributesExtractor { if (emitOldHttpAttributes) { // net.transport and net.sock.family are not 1:1 convertible with network.transport and // network.type; they must be handled separately in the old net.* extractors - internalSet(attributes, NetAttributes.NET_PROTOCOL_NAME, protocolName); - internalSet(attributes, NetAttributes.NET_PROTOCOL_VERSION, protocolVersion); + internalSet(attributes, SemanticAttributes.NET_PROTOCOL_NAME, protocolName); + internalSet(attributes, SemanticAttributes.NET_PROTOCOL_VERSION, protocolVersion); } } diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorTest.java index 8092111add..dde24858b1 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorTest.java @@ -18,7 +18,6 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.instrumentation.api.internal.HttpConstants; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import java.util.HashMap; @@ -169,8 +168,8 @@ class HttpClientAttributesExtractorTest { entry( AttributeKey.stringArrayKey("http.response.header.custom_response_header"), asList("654", "321")), - entry(NetAttributes.NET_PROTOCOL_NAME, "http"), - entry(NetAttributes.NET_PROTOCOL_VERSION, "1.1")); + entry(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + entry(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1")); } @ParameterizedTest diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientExperimentalMetricsTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientExperimentalMetricsTest.java index 91acbb0ebb..8c049a6dc5 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientExperimentalMetricsTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientExperimentalMetricsTest.java @@ -15,7 +15,6 @@ import io.opentelemetry.api.trace.TraceFlags; import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; @@ -48,8 +47,8 @@ class HttpClientExperimentalMetricsTest { Attributes.builder() .put("http.status_code", 200) .put("http.response_content_length", 200) - .put(NetAttributes.NET_PROTOCOL_NAME, "http") - .put(NetAttributes.NET_PROTOCOL_VERSION, "2.0") + .put(SemanticAttributes.NET_PROTOCOL_NAME, "http") + .put(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0") .put("net.sock.peer.addr", "1.2.3.4") .put("net.sock.peer.name", "somehost20") .put("net.sock.peer.port", 8080) @@ -90,8 +89,8 @@ class HttpClientExperimentalMetricsTest { .hasAttributesSatisfying( equalTo(SemanticAttributes.HTTP_METHOD, "GET"), equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200), - equalTo(NetAttributes.NET_PROTOCOL_NAME, "http"), - equalTo(NetAttributes.NET_PROTOCOL_VERSION, "2.0"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_PORT, 1234), equalTo( @@ -114,8 +113,8 @@ class HttpClientExperimentalMetricsTest { .hasAttributesSatisfying( equalTo(SemanticAttributes.HTTP_METHOD, "GET"), equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200), - equalTo(NetAttributes.NET_PROTOCOL_NAME, "http"), - equalTo(NetAttributes.NET_PROTOCOL_VERSION, "2.0"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_PORT, 1234), equalTo( diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientMetricsTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientMetricsTest.java index 0d01c08cb2..ada86bde40 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientMetricsTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientMetricsTest.java @@ -15,7 +15,6 @@ import io.opentelemetry.api.trace.TraceFlags; import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.metrics.internal.aggregator.ExplicitBucketHistogramUtils; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; @@ -53,8 +52,8 @@ class HttpClientMetricsTest { Attributes.builder() .put("http.status_code", 200) .put("http.response_content_length", 200) - .put(NetAttributes.NET_PROTOCOL_NAME, "http") - .put(NetAttributes.NET_PROTOCOL_VERSION, "2.0") + .put(SemanticAttributes.NET_PROTOCOL_NAME, "http") + .put(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0") .put("net.sock.peer.addr", "1.2.3.4") .put("net.sock.peer.name", "somehost20") .put("net.sock.peer.port", 8080) @@ -95,8 +94,8 @@ class HttpClientMetricsTest { .hasAttributesSatisfying( equalTo(SemanticAttributes.HTTP_METHOD, "GET"), equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200), - equalTo(NetAttributes.NET_PROTOCOL_NAME, "http"), - equalTo(NetAttributes.NET_PROTOCOL_VERSION, "2.0"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_PORT, 1234), equalTo( diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractorTest.java index 427ccb8c65..33e7c3fb5f 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractorTest.java @@ -18,7 +18,6 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.instrumentation.api.internal.HttpConstants; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import java.util.HashMap; @@ -186,8 +185,8 @@ class HttpServerAttributesExtractorTest { extractor.onEnd(endAttributes, Context.root(), request, response, null); assertThat(endAttributes.build()) .containsOnly( - entry(NetAttributes.NET_PROTOCOL_NAME, "http"), - entry(NetAttributes.NET_PROTOCOL_VERSION, "2.0"), + entry(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + entry(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0"), entry(SemanticAttributes.HTTP_ROUTE, "/repositories/{repoId}"), entry(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH, 10L), entry(SemanticAttributes.HTTP_STATUS_CODE, 202L), diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerMetricsTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerMetricsTest.java index 79546118d1..a968b77722 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerMetricsTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerMetricsTest.java @@ -16,7 +16,6 @@ import io.opentelemetry.api.trace.TraceFlags; import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.OperationListener; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.metrics.internal.aggregator.ExplicitBucketHistogramUtils; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; @@ -45,8 +44,8 @@ class HttpServerMetricsTest { .put("http.target", "/") .put("http.scheme", "https") .put("net.transport", IP_TCP) - .put(NetAttributes.NET_PROTOCOL_NAME, "http") - .put(NetAttributes.NET_PROTOCOL_VERSION, "2.0") + .put(SemanticAttributes.NET_PROTOCOL_NAME, "http") + .put(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0") .put("net.host.name", "localhost") .put("net.host.port", 1234) .put("net.sock.family", "inet") @@ -165,8 +164,8 @@ class HttpServerMetricsTest { .hasAttributesSatisfying( equalTo(SemanticAttributes.HTTP_METHOD, "GET"), equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200), - equalTo(NetAttributes.NET_PROTOCOL_NAME, "http"), - equalTo(NetAttributes.NET_PROTOCOL_VERSION, "2.0"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0"), equalTo(SemanticAttributes.HTTP_SCHEME, "https"), equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"), equalTo(SemanticAttributes.NET_HOST_PORT, 1234)) @@ -189,8 +188,8 @@ class HttpServerMetricsTest { .hasAttributesSatisfying( equalTo(SemanticAttributes.HTTP_METHOD, "GET"), equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200), - equalTo(NetAttributes.NET_PROTOCOL_NAME, "http"), - equalTo(NetAttributes.NET_PROTOCOL_VERSION, "2.0"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0"), equalTo(SemanticAttributes.HTTP_SCHEME, "https"), equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"), equalTo(SemanticAttributes.NET_HOST_PORT, 1234)) @@ -212,8 +211,8 @@ class HttpServerMetricsTest { .hasAttributesSatisfying( equalTo(SemanticAttributes.HTTP_METHOD, "GET"), equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200), - equalTo(NetAttributes.NET_PROTOCOL_NAME, "http"), - equalTo(NetAttributes.NET_PROTOCOL_VERSION, "2.0"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0"), equalTo(SemanticAttributes.HTTP_SCHEME, "https"), equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"), equalTo(SemanticAttributes.NET_HOST_PORT, 1234)) diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsViewTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsViewTest.java index e08ba37786..f22b3f9ce4 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsViewTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsViewTest.java @@ -13,7 +13,6 @@ import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTr import static org.assertj.core.api.Assertions.entry; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.instrumentation.api.instrumenter.network.internal.NetworkAttributes; import io.opentelemetry.instrumentation.api.instrumenter.url.internal.UrlAttributes; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; @@ -37,8 +36,8 @@ class TemporaryMetricsViewTest { Attributes.builder() .put(SemanticAttributes.HTTP_STATUS_CODE, 500) .put(SemanticAttributes.NET_TRANSPORT, IP_TCP) - .put(NetAttributes.NET_PROTOCOL_NAME, "http") - .put(NetAttributes.NET_PROTOCOL_VERSION, "1.1") + .put(SemanticAttributes.NET_PROTOCOL_NAME, "http") + .put(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1") .put(SemanticAttributes.NET_PEER_NAME, "somehost2") .put(SemanticAttributes.NET_PEER_PORT, 443) .put(SemanticAttributes.NET_SOCK_FAMILY, "inet") @@ -51,8 +50,8 @@ class TemporaryMetricsViewTest { .containsOnly( entry(SemanticAttributes.HTTP_METHOD, "GET"), entry(SemanticAttributes.HTTP_STATUS_CODE, 500L), - entry(NetAttributes.NET_PROTOCOL_NAME, "http"), - entry(NetAttributes.NET_PROTOCOL_VERSION, "1.1"), + entry(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + entry(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), entry(SemanticAttributes.NET_PEER_NAME, "somehost2"), entry(SemanticAttributes.NET_PEER_PORT, 443L), entry(SemanticAttributes.NET_SOCK_PEER_ADDR, "1.2.3.4")); @@ -106,8 +105,8 @@ class TemporaryMetricsViewTest { .put(SemanticAttributes.HTTP_TARGET, "/high/cardinality/12345?jsessionId=121454") .put(SemanticAttributes.HTTP_SCHEME, "https") .put(SemanticAttributes.NET_TRANSPORT, IP_TCP) - .put(NetAttributes.NET_PROTOCOL_NAME, "http") - .put(NetAttributes.NET_PROTOCOL_VERSION, "1.1") + .put(SemanticAttributes.NET_PROTOCOL_NAME, "http") + .put(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1") .put(SemanticAttributes.NET_HOST_NAME, "somehost") .put(SemanticAttributes.NET_HOST_PORT, 443) .put(SemanticAttributes.NET_SOCK_FAMILY, "inet") @@ -130,8 +129,8 @@ class TemporaryMetricsViewTest { entry(SemanticAttributes.HTTP_METHOD, "GET"), entry(SemanticAttributes.HTTP_STATUS_CODE, 500L), entry(SemanticAttributes.HTTP_SCHEME, "https"), - entry(NetAttributes.NET_PROTOCOL_NAME, "http"), - entry(NetAttributes.NET_PROTOCOL_VERSION, "1.1"), + entry(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + entry(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), entry(SemanticAttributes.NET_HOST_NAME, "somehost"), entry(SemanticAttributes.NET_HOST_PORT, 443L), entry(SemanticAttributes.HTTP_ROUTE, "/somehost/high/{name}/{id}")); @@ -188,8 +187,8 @@ class TemporaryMetricsViewTest { .put(SemanticAttributes.HTTP_TARGET, "/high/cardinality/12345?jsessionId=121454") .put(SemanticAttributes.HTTP_SCHEME, "https") .put(SemanticAttributes.NET_TRANSPORT, IP_TCP) - .put(NetAttributes.NET_PROTOCOL_NAME, "http") - .put(NetAttributes.NET_PROTOCOL_VERSION, "1.1") + .put(SemanticAttributes.NET_PROTOCOL_NAME, "http") + .put(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1") .put(SemanticAttributes.NET_HOST_NAME, "somehost") .put(SemanticAttributes.NET_HOST_PORT, 443) .put(SemanticAttributes.NET_SOCK_FAMILY, "inet") diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorTest.java index 3278a22270..d05d7bf222 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorTest.java @@ -14,7 +14,6 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import java.util.HashMap; import java.util.Map; @@ -131,8 +130,8 @@ class NetClientAttributesExtractorTest { assertThat(endAttributes.build()) .containsOnly( entry(SemanticAttributes.NET_TRANSPORT, IP_TCP), - entry(NetAttributes.NET_PROTOCOL_NAME, "http"), - entry(NetAttributes.NET_PROTOCOL_VERSION, "1.1"), + entry(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + entry(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), entry(SemanticAttributes.NET_SOCK_FAMILY, "inet6"), entry(SemanticAttributes.NET_SOCK_PEER_ADDR, "1:2:3:4::"), entry(SemanticAttributes.NET_SOCK_PEER_NAME, "proxy.opentelemetry.io"), diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorTest.java index 63239ef701..d6d3dc4ab7 100644 --- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorTest.java +++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorTest.java @@ -14,7 +14,6 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import java.util.HashMap; import java.util.Map; @@ -139,8 +138,8 @@ class NetServerAttributesExtractorTest { assertThat(endAttributes.build()) .containsOnly( - entry(NetAttributes.NET_PROTOCOL_NAME, "http"), - entry(NetAttributes.NET_PROTOCOL_VERSION, "1.1"), + entry(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + entry(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), entry(SemanticAttributes.NET_SOCK_HOST_ADDR, "4:3:2:1::"), entry(SemanticAttributes.NET_SOCK_HOST_PORT, 8080L), entry(SemanticAttributes.NET_SOCK_PEER_ADDR, "1:2:3:4::"), diff --git a/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorBothSemconvTest.java b/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorBothSemconvTest.java index cc768a7b2b..faef5d2072 100644 --- a/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorBothSemconvTest.java +++ b/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorBothSemconvTest.java @@ -17,7 +17,6 @@ import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.instrumentation.api.instrumenter.network.internal.NetworkAttributes; import io.opentelemetry.instrumentation.api.instrumenter.url.internal.UrlAttributes; import io.opentelemetry.instrumentation.api.internal.HttpConstants; @@ -171,8 +170,8 @@ class HttpClientAttributesExtractorBothSemconvTest { entry( AttributeKey.stringArrayKey("http.response.header.custom_response_header"), asList("654", "321")), - entry(NetAttributes.NET_PROTOCOL_NAME, "http"), - entry(NetAttributes.NET_PROTOCOL_VERSION, "1.1"), + entry(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + entry(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), entry(NetworkAttributes.NETWORK_TRANSPORT, "udp"), entry(NetworkAttributes.NETWORK_TYPE, "ipv4"), entry(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), diff --git a/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractorBothSemconvTest.java b/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractorBothSemconvTest.java index d37f39216f..92a2e66732 100644 --- a/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractorBothSemconvTest.java +++ b/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractorBothSemconvTest.java @@ -16,7 +16,6 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.instrumentation.api.instrumenter.network.internal.NetworkAttributes; import io.opentelemetry.instrumentation.api.instrumenter.url.internal.UrlAttributes; import io.opentelemetry.instrumentation.api.internal.HttpConstants; @@ -186,8 +185,8 @@ class HttpServerAttributesExtractorBothSemconvTest { extractor.onEnd(endAttributes, Context.root(), request, response, null); assertThat(endAttributes.build()) .containsOnly( - entry(NetAttributes.NET_PROTOCOL_NAME, "http"), - entry(NetAttributes.NET_PROTOCOL_VERSION, "2.0"), + entry(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + entry(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0"), entry(NetworkAttributes.NETWORK_TRANSPORT, "udp"), entry(NetworkAttributes.NETWORK_TYPE, "ipv4"), entry(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), diff --git a/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorBothSemconvTest.java b/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorBothSemconvTest.java index 2b20c5dc41..1993da0c92 100644 --- a/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorBothSemconvTest.java +++ b/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorBothSemconvTest.java @@ -13,7 +13,6 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.instrumentation.api.instrumenter.network.internal.NetworkAttributes; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import java.util.HashMap; @@ -132,8 +131,8 @@ class NetClientAttributesExtractorBothSemconvTest { assertThat(endAttributes.build()) .containsOnly( entry(SemanticAttributes.NET_TRANSPORT, IP_TCP), - entry(NetAttributes.NET_PROTOCOL_NAME, "http"), - entry(NetAttributes.NET_PROTOCOL_VERSION, "1.1"), + entry(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + entry(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), entry(NetworkAttributes.NETWORK_TRANSPORT, "tcp"), entry(NetworkAttributes.NETWORK_TYPE, "ipv6"), entry(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), diff --git a/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorBothSemconvTest.java b/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorBothSemconvTest.java index 5b6ea38cf5..51887c7cd1 100644 --- a/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorBothSemconvTest.java +++ b/instrumentation-api-semconv/src/testBothHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesExtractorBothSemconvTest.java @@ -13,7 +13,6 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.instrumentation.api.instrumenter.network.internal.NetworkAttributes; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import java.util.HashMap; @@ -152,7 +151,7 @@ class NetServerAttributesExtractorBothSemconvTest { entry(NetworkAttributes.NETWORK_TYPE, "ipv6"), entry(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"), entry(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"), - entry(NetAttributes.NET_PROTOCOL_NAME, "http"), - entry(NetAttributes.NET_PROTOCOL_VERSION, "1.1")); + entry(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + entry(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1")); } } 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 7a2a7941c5..c29c1ac269 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 @@ -5,12 +5,11 @@ package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0; -import static io.opentelemetry.api.common.AttributeKey.stringKey; - import io.opentelemetry.api.common.AttributeKey; 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.trace.attributes.SemanticAttributes; import java.net.URI; import java.time.Duration; import java.util.HashSet; @@ -43,8 +42,8 @@ abstract class AbstractApacheHttpClientTest || "https://192.0.2.1/".equals(uri.toString()) || uri.toString().contains("/read-timeout") || uri.toString().contains("/circular-redirect")) { - attributes.remove(stringKey("net.protocol.name")); - attributes.remove(stringKey("net.protocol.version")); + attributes.remove(SemanticAttributes.NET_PROTOCOL_NAME); + attributes.remove(SemanticAttributes.NET_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 c42f10cf40..5f50428382 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 @@ -5,8 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9; -import static io.opentelemetry.api.common.AttributeKey.stringKey; - import com.ning.http.client.AsyncCompletionHandler; import com.ning.http.client.AsyncHttpClient; import com.ning.http.client.AsyncHttpClientConfig; @@ -20,6 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTes 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.trace.attributes.SemanticAttributes; import java.net.URI; import java.util.HashSet; import java.util.Map; @@ -93,8 +92,8 @@ class AsyncHttpClientTest extends AbstractHttpClientTest { endpoint -> { Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(stringKey("net.protocol.name")); - attributes.remove(stringKey("net.protocol.version")); + attributes.remove(SemanticAttributes.NET_PROTOCOL_NAME); + attributes.remove(SemanticAttributes.NET_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 39e09dde97..490a21d0b8 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 @@ -60,8 +60,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -85,8 +85,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -110,8 +110,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -135,8 +135,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -160,8 +160,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -184,8 +184,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -208,8 +208,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -231,8 +231,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.url" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -260,8 +260,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -284,8 +284,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -308,8 +308,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 204 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -332,8 +332,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 204 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -356,8 +356,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -410,8 +410,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -434,8 +434,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -458,8 +458,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -481,8 +481,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -504,8 +504,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -528,8 +528,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -551,8 +551,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -575,8 +575,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -600,8 +600,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -624,8 +624,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -652,8 +652,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -677,8 +677,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.url" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -701,8 +701,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -725,8 +725,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 204 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -749,8 +749,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 204 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } @@ -773,8 +773,8 @@ class S3TracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long } 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 be0845bed2..b291c09d42 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 @@ -53,8 +53,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long } @@ -77,8 +77,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long } @@ -101,8 +101,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long } @@ -124,8 +124,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long } @@ -147,8 +147,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long } @@ -169,8 +169,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long } @@ -191,8 +191,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "http.url" String "$SemanticAttributes.USER_AGENT_ORIGINAL" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long } @@ -218,8 +218,8 @@ class SnsTracingTest extends AgentInstrumentationSpecification { "http.status_code" 200 "http.url" String "net.peer.name" String - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "net.peer.port" { it == null || Number } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long } 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 ceb6e4258b..7c79d841a5 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 @@ -110,8 +110,8 @@ class Aws0ClientTest extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_METHOD" "$method" "$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_PEER_PORT" server.httpPort() "$SemanticAttributes.NET_PEER_NAME" "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 fe27ec4d6e..4fb7255be4 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 @@ -107,8 +107,8 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification { "$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_PEER_PORT" server.httpPort() "$SemanticAttributes.NET_PEER_NAME" "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/AbstractSqsTracingTest.groovy b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.groovy index 9d1b034924..b79f8431f3 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.groovy +++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.groovy @@ -79,8 +79,8 @@ abstract class AbstractSqsTracingTest extends InstrumentationSpecification { "http.url" "http://localhost:$sqsPort" "net.peer.name" "localhost" "net.peer.port" sqsPort - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long } } @@ -102,8 +102,8 @@ abstract class AbstractSqsTracingTest extends InstrumentationSpecification { "http.url" "http://localhost:$sqsPort" "net.peer.name" "localhost" "net.peer.port" sqsPort - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long } } @@ -124,8 +124,8 @@ abstract class AbstractSqsTracingTest extends InstrumentationSpecification { "$SemanticAttributes.USER_AGENT_ORIGINAL" String "net.peer.name" "localhost" "net.peer.port" sqsPort - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long } } @@ -151,8 +151,8 @@ abstract class AbstractSqsTracingTest extends InstrumentationSpecification { "http.url" "http://localhost:$sqsPort" "net.peer.name" "localhost" "net.peer.port" sqsPort - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long } } 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 7b2ab09046..662e7d9f34 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 @@ -103,8 +103,8 @@ class RestCamelTest extends AbstractHttpServerUsingTest assertThat(v).isNull(), v -> assertThat(v).isInstanceOf(Number.class))), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(stringKey("rpc.system"), "aws-api"), satisfies( stringKey("rpc.method"), @@ -100,8 +100,8 @@ class AwsSpanAssertions { equalTo(stringKey("http.method"), method), equalTo(longKey("http.status_code"), 200), satisfies(stringKey("http.url"), val -> val.isInstanceOf(String.class)), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), satisfies(stringKey("net.peer.name"), val -> val.isInstanceOf(String.class)), satisfies( SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH, @@ -127,8 +127,8 @@ class AwsSpanAssertions { equalTo(stringKey("http.method"), "POST"), equalTo(longKey("http.status_code"), 200), satisfies(stringKey("http.url"), val -> val.isInstanceOf(String.class)), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), satisfies(stringKey("net.peer.name"), val -> val.isInstanceOf(String.class)), satisfies( stringKey("net.peer.port"), diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/ElasticsearchClientTest.java b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/ElasticsearchClientTest.java index 19ce31686b..9b83580f1c 100644 --- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/ElasticsearchClientTest.java +++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/ElasticsearchClientTest.java @@ -104,8 +104,8 @@ class ElasticsearchClientTest { equalTo(SemanticAttributes.NET_PEER_NAME, httpHost.getHostName()), equalTo(SemanticAttributes.NET_PEER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_METHOD, "GET"), - equalTo(AttributeKey.stringKey("net.protocol.name"), "http"), - equalTo(AttributeKey.stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.HTTP_URL, httpHost.toURI() + "/"), equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200L), equalTo(SemanticAttributes.USER_AGENT_ORIGINAL, userAgent()), @@ -153,8 +153,8 @@ class ElasticsearchClientTest { equalTo(SemanticAttributes.NET_PEER_NAME, httpHost.getHostName()), equalTo(SemanticAttributes.NET_PEER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_METHOD, "PUT"), - equalTo(AttributeKey.stringKey("net.protocol.name"), "http"), - equalTo(AttributeKey.stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo( SemanticAttributes.HTTP_URL, httpHost.toURI() + "/test-index/_doc/test-id?timeout=10s"), @@ -211,8 +211,8 @@ class ElasticsearchClientTest { equalTo(SemanticAttributes.NET_PEER_NAME, httpHost.getHostName()), equalTo(SemanticAttributes.NET_PEER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_METHOD, "GET"), - equalTo(AttributeKey.stringKey("net.protocol.name"), "http"), - equalTo(AttributeKey.stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.HTTP_URL, httpHost.toURI() + "/"), equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200L), equalTo(SemanticAttributes.USER_AGENT_ORIGINAL, userAgent()), diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/ElasticsearchRest5Test.java b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/ElasticsearchRest5Test.java index 72d9e51368..ae27396ab6 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/ElasticsearchRest5Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/ElasticsearchRest5Test.java @@ -6,7 +6,6 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import com.fasterxml.jackson.databind.ObjectMapper; -import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; @@ -106,8 +105,8 @@ class ElasticsearchRest5Test { equalTo(SemanticAttributes.NET_PEER_NAME, httpHost.getHostName()), equalTo(SemanticAttributes.NET_PEER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_METHOD, "GET"), - equalTo(AttributeKey.stringKey("net.protocol.name"), "http"), - equalTo(AttributeKey.stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.HTTP_URL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200), equalTo( @@ -187,8 +186,8 @@ class ElasticsearchRest5Test { equalTo(SemanticAttributes.NET_PEER_NAME, httpHost.getHostName()), equalTo(SemanticAttributes.NET_PEER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_METHOD, "GET"), - equalTo(AttributeKey.stringKey("net.protocol.name"), "http"), - equalTo(AttributeKey.stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.HTTP_URL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200), equalTo( diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/ElasticsearchRest6Test.java b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/ElasticsearchRest6Test.java index e1120bedaa..2c9ccc284c 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/ElasticsearchRest6Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/ElasticsearchRest6Test.java @@ -6,7 +6,6 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import com.fasterxml.jackson.databind.ObjectMapper; -import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; @@ -97,8 +96,8 @@ class ElasticsearchRest6Test { equalTo(SemanticAttributes.NET_PEER_NAME, httpHost.getHostName()), equalTo(SemanticAttributes.NET_PEER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_METHOD, "GET"), - equalTo(AttributeKey.stringKey("net.protocol.name"), "http"), - equalTo(AttributeKey.stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.HTTP_URL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200L), equalTo( @@ -177,8 +176,8 @@ class ElasticsearchRest6Test { equalTo(SemanticAttributes.NET_PEER_NAME, httpHost.getHostName()), equalTo(SemanticAttributes.NET_PEER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_METHOD, "GET"), - equalTo(AttributeKey.stringKey("net.protocol.name"), "http"), - equalTo(AttributeKey.stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.HTTP_URL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200), equalTo( diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/ElasticsearchRest7Test.java index 535f32b840..60718ca35e 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/ElasticsearchRest7Test.java @@ -7,7 +7,6 @@ import static io.opentelemetry.instrumentation.testing.GlobalTraceUtil.runWithSp import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; -import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; @@ -97,8 +96,8 @@ class ElasticsearchRest7Test { equalTo(SemanticAttributes.NET_PEER_NAME, httpHost.getHostName()), equalTo(SemanticAttributes.NET_PEER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_METHOD, "GET"), - equalTo(AttributeKey.stringKey("net.protocol.name"), "http"), - equalTo(AttributeKey.stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo( SemanticAttributes.HTTP_URL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200L), @@ -174,8 +173,8 @@ class ElasticsearchRest7Test { equalTo(SemanticAttributes.NET_PEER_NAME, httpHost.getHostName()), equalTo(SemanticAttributes.NET_PEER_PORT, httpHost.getPort()), equalTo(SemanticAttributes.HTTP_METHOD, "GET"), - equalTo(AttributeKey.stringKey("net.protocol.name"), "http"), - equalTo(AttributeKey.stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo( SemanticAttributes.HTTP_URL, httpHost.toURI() + "/_cluster/health"), equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200L), 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 440d23aaad..803ba4b855 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 @@ -5,7 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.googlehttpclient; -import static io.opentelemetry.api.common.AttributeKey.stringKey; 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; @@ -122,8 +121,8 @@ public abstract class AbstractGoogleHttpClientTest extends AbstractHttpClientTes uri -> { Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(stringKey("net.protocol.name")); - attributes.remove(stringKey("net.protocol.version")); + attributes.remove(SemanticAttributes.NET_PROTOCOL_NAME); + attributes.remove(SemanticAttributes.NET_PROTOCOL_VERSION); return attributes; }); } 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 61c76c4324..242e72899f 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 @@ -5,7 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.httpurlconnection; -import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.api.trace.SpanKind.CLIENT; import static io.opentelemetry.api.trace.SpanKind.SERVER; import static io.opentelemetry.javaagent.instrumentation.httpurlconnection.StreamUtils.readLines; @@ -119,8 +118,8 @@ class HttpUrlConnectionTest extends AbstractHttpClientTest { .hasKind(CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_PORT, url.getPort()), equalTo(SemanticAttributes.HTTP_URL, url.toString()), @@ -136,8 +135,8 @@ class HttpUrlConnectionTest extends AbstractHttpClientTest { .hasKind(CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_PORT, url.getPort()), equalTo(SemanticAttributes.HTTP_URL, url.toString()), @@ -174,8 +173,8 @@ class HttpUrlConnectionTest extends AbstractHttpClientTest { .hasKind(CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_PORT, url.getPort()), equalTo(SemanticAttributes.HTTP_URL, url.toString()), @@ -225,8 +224,8 @@ class HttpUrlConnectionTest extends AbstractHttpClientTest { .hasKind(CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_PORT, url.getPort()), equalTo(SemanticAttributes.HTTP_URL, url.toString()), @@ -281,8 +280,8 @@ class HttpUrlConnectionTest extends AbstractHttpClientTest { .hasKind(CLIENT) .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_PORT, url.getPort()), equalTo(SemanticAttributes.HTTP_URL, url.toString()), diff --git a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/UrlConnectionTest.java b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/UrlConnectionTest.java index 7ec7d967be..ac4818e8b2 100644 --- a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/UrlConnectionTest.java +++ b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/UrlConnectionTest.java @@ -5,7 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.httpurlconnection; -import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.api.trace.SpanKind.CLIENT; import static io.opentelemetry.api.trace.SpanKind.INTERNAL; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; @@ -64,8 +63,8 @@ class UrlConnectionTest { .hasStatus(StatusData.error()) .hasException(thrown) .hasAttributesSatisfyingExactly( - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_PORT, PortUtils.UNUSABLE_PORT), equalTo(SemanticAttributes.HTTP_URL, 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 8c286509ef..c4fe8369ca 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 @@ -5,12 +5,11 @@ package io.opentelemetry.instrumentation.httpclient; -import static io.opentelemetry.api.common.AttributeKey.stringKey; - import io.opentelemetry.api.common.AttributeKey; 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.trace.attributes.SemanticAttributes; import java.io.IOException; import java.net.URI; import java.net.http.HttpClient; @@ -92,8 +91,8 @@ public abstract class AbstractJavaHttpClientTest extends AbstractHttpClientTest< if ("http://localhost:61/".equals(uri.toString()) || "https://192.0.2.1/".equals(uri.toString()) || uri.toString().contains("/read-timeout")) { - attributes.remove(stringKey("net.protocol.name")); - attributes.remove(stringKey("net.protocol.version")); + attributes.remove(SemanticAttributes.NET_PROTOCOL_NAME); + attributes.remove(SemanticAttributes.NET_PROTOCOL_VERSION); } return attributes; }); diff --git a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/test/groovy/JaxRsClientV1Test.groovy b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/test/groovy/JaxRsClientV1Test.groovy index fb21b26a7f..ee6bfbf15f 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/test/groovy/JaxRsClientV1Test.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/test/groovy/JaxRsClientV1Test.groovy @@ -11,10 +11,9 @@ 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.trace.attributes.SemanticAttributes import spock.lang.Shared -import static io.opentelemetry.api.common.AttributeKey.stringKey - class JaxRsClientV1Test extends HttpClientTest implements AgentTestTrait { @Shared @@ -54,8 +53,8 @@ class JaxRsClientV1Test extends HttpClientTest implements A @Override Set> httpAttributes(URI uri) { def attributes = super.httpAttributes(uri) - attributes.remove(stringKey("net.protocol.name")) - attributes.remove(stringKey("net.protocol.version")) + attributes.remove(SemanticAttributes.NET_PROTOCOL_NAME) + attributes.remove(SemanticAttributes.NET_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 0c6816b9a4..df7f04ffc3 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 @@ -107,8 +107,8 @@ abstract class JaxRsClientTest extends HttpClientTest implem kind CLIENT status ERROR attributes { - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_PEER_NAME" uri.host "$SemanticAttributes.NET_PEER_PORT" uri.port > 0 ? uri.port : { it == null || it == 443 } "$SemanticAttributes.NET_SOCK_PEER_ADDR" { 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 7c3b89cef6..0614cdfb53 100644 --- a/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-common/testing/src/main/groovy/AbstractJaxRsHttpServerTest.groovy @@ -279,8 +279,8 @@ abstract class AbstractJaxRsHttpServerTest extends HttpServerTest implemen spanId spanID } attributes { - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" fullUrl.host "$SemanticAttributes.NET_HOST_PORT" fullUrl.port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "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 dd5a67b6b3..fc08736f9b 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 @@ -86,8 +86,8 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements kind SpanKind.SERVER hasNoParent() attributes { - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "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 d78ea5cb5c..c9718785f7 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 @@ -97,8 +97,8 @@ abstract class BaseJsfTest extends AgentInstrumentationSpecification implements kind SpanKind.SERVER hasNoParent() attributes { - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "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 3f479c193b..dddec4411e 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationBasicTests.groovy @@ -96,8 +96,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long } "$SemanticAttributes.HTTP_ROUTE" route - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" @@ -154,8 +154,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" @@ -209,8 +209,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" Long "$SemanticAttributes.HTTP_ROUTE" route - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" @@ -272,8 +272,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_STATUS_CODE" 500 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" @@ -340,8 +340,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" @@ -389,8 +389,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" @@ -470,8 +470,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_STATUS_CODE" 500 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" @@ -520,8 +520,8 @@ class JspInstrumentationBasicTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "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 87d23596db..2b2023367e 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy +++ b/instrumentation/jsp-2.3/javaagent/src/test/groovy/JspInstrumentationForwardTests.groovy @@ -93,8 +93,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" @@ -163,8 +163,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" @@ -212,8 +212,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" @@ -309,8 +309,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_STATUS_CODE" 200 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" @@ -392,8 +392,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_STATUS_CODE" 500 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" @@ -454,8 +454,8 @@ class JspInstrumentationForwardTests extends AgentInstrumentationSpecification { "$SemanticAttributes.HTTP_STATUS_CODE" 404 "$SemanticAttributes.USER_AGENT_ORIGINAL" String "$SemanticAttributes.HTTP_ROUTE" route - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" "localhost" "$SemanticAttributes.NET_HOST_PORT" port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" diff --git a/instrumentation/ktor/ktor-2.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorHttpClientTest.kt b/instrumentation/ktor/ktor-2.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorHttpClientTest.kt index d56b6e30dd..39a68f6845 100644 --- a/instrumentation/ktor/ktor-2.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorHttpClientTest.kt +++ b/instrumentation/ktor/ktor-2.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorHttpClientTest.kt @@ -12,12 +12,12 @@ import io.ktor.client.request.* import io.ktor.http.* import io.opentelemetry.context.Context import io.opentelemetry.extension.kotlin.asContextElement -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTest 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.instrumentation.testing.junit.http.HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES +import io.opentelemetry.semconv.trace.attributes.SemanticAttributes import kotlinx.coroutines.* import org.junit.jupiter.api.extension.RegisterExtension import java.net.URI @@ -59,7 +59,7 @@ class KtorHttpClientTest : AbstractHttpClientTest() { // related issue https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/5722 disableTestRedirects() - setHttpAttributes { DEFAULT_HTTP_ATTRIBUTES - setOf(NetAttributes.NET_PROTOCOL_NAME, NetAttributes.NET_PROTOCOL_VERSION) } + setHttpAttributes { DEFAULT_HTTP_ATTRIBUTES - setOf(SemanticAttributes.NET_PROTOCOL_NAME, SemanticAttributes.NET_PROTOCOL_VERSION) } setSingleConnectionFactory { host, port -> KtorHttpClientSingleConnection(host, port) { installTracing() } 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 41807753bf..ade6c8875b 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 @@ -5,8 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.okhttp.v2_2; -import static io.opentelemetry.api.common.AttributeKey.stringKey; - import com.squareup.okhttp.Callback; import com.squareup.okhttp.MediaType; import com.squareup.okhttp.OkHttpClient; @@ -20,6 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTes 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.trace.attributes.SemanticAttributes; import java.io.IOException; import java.net.URI; import java.util.HashSet; @@ -106,8 +105,8 @@ public class OkHttp2Test extends AbstractHttpClientTest { if ("http://localhost:61/".equals(uri.toString()) || "https://192.0.2.1/".equals(uri.toString()) || resolveAddress("/read-timeout").toString().equals(uri.toString())) { - attributes.remove(stringKey("net.protocol.name")); - attributes.remove(stringKey("net.protocol.version")); + attributes.remove(SemanticAttributes.NET_PROTOCOL_NAME); + attributes.remove(SemanticAttributes.NET_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 fc3b3bfd9c..25b17a4486 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 @@ -5,7 +5,6 @@ package io.opentelemetry.instrumentation.okhttp.v3_0; -import static io.opentelemetry.api.common.AttributeKey.stringKey; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; @@ -131,8 +130,8 @@ public abstract class AbstractOkHttp3Test extends AbstractHttpClientTest implements AgentTestTrait { @Subject @Shared @@ -80,8 +79,8 @@ class PlayWsClientTest extends HttpClientTest implements AgentTestTra @Override Set> httpAttributes(URI uri) { def attributes = super.httpAttributes(uri) - attributes.remove(stringKey("net.protocol.name")) - attributes.remove(stringKey("net.protocol.version")) + attributes.remove(SemanticAttributes.NET_PROTOCOL_NAME) + attributes.remove(SemanticAttributes.NET_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 94b4d211cc..0616a4b7dc 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 @@ -21,8 +21,6 @@ import play.shaded.ahc.org.asynchttpclient.DefaultAsyncHttpClientConfig import play.shaded.ahc.org.asynchttpclient.RequestBuilderBase import spock.lang.Shared -import static io.opentelemetry.api.common.AttributeKey.stringKey - abstract class PlayWsClientTestBaseBase extends HttpClientTest implements AgentTestTrait { @Shared ActorSystem system @@ -87,8 +85,8 @@ abstract class PlayWsClientTestBaseBase extends HttpClientTest @Override Set> httpAttributes(URI uri) { def attributes = super.httpAttributes(uri) - attributes.remove(stringKey("net.protocol.name")) - attributes.remove(stringKey("net.protocol.version")) + attributes.remove(SemanticAttributes.NET_PROTOCOL_NAME) + attributes.remove(SemanticAttributes.NET_PROTOCOL_VERSION) if (uri.toString().endsWith("/circular-redirect")) { attributes.remove(SemanticAttributes.NET_PEER_NAME) attributes.remove(SemanticAttributes.NET_PEER_PORT) 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 050b6fe1ad..e5c9fa7e54 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 @@ -96,8 +96,8 @@ abstract class AbstractRatpackRoutesTest extends InstrumentationSpecification { hasNoParent() attributes { "$SemanticAttributes.NET_TRANSPORT" {it == null || it == IP_TCP } - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" { it == "localhost" || it == null } "$SemanticAttributes.NET_HOST_PORT" { it == app.bindPort || it == null } "$SemanticAttributes.NET_SOCK_PEER_ADDR" { 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 9c1ed3fec5..9b9a5e5633 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 @@ -5,8 +5,6 @@ package io.opentelemetry.instrumentation.ratpack.v1_7; -import static io.opentelemetry.api.common.AttributeKey.stringKey; - import com.google.common.collect.ImmutableList; import io.netty.channel.ConnectTimeoutException; import io.opentelemetry.api.common.AttributeKey; @@ -14,6 +12,7 @@ import io.opentelemetry.context.Context; 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.trace.attributes.SemanticAttributes; import java.net.URI; import java.time.Duration; import java.util.HashSet; @@ -157,8 +156,8 @@ abstract class AbstractRatpackHttpClientTest extends AbstractHttpClientTest> getHttpAttributes(URI uri) { Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(stringKey("net.protocol.name")); - attributes.remove(stringKey("net.protocol.version")); + attributes.remove(SemanticAttributes.NET_PROTOCOL_NAME); + attributes.remove(SemanticAttributes.NET_PROTOCOL_VERSION); return attributes; } } 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 bc6550036f..fbcf6e7989 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 @@ -5,7 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.reactornetty.v1_0; -import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.api.trace.SpanKind.CLIENT; import static io.opentelemetry.api.trace.SpanKind.INTERNAL; import static io.opentelemetry.api.trace.SpanKind.SERVER; @@ -133,8 +132,8 @@ abstract class AbstractReactorNettyHttpClientTest Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); if (uri.toString().contains("/read-timeout")) { - attributes.remove(stringKey("net.protocol.name")); - attributes.remove(stringKey("net.protocol.version")); + attributes.remove(SemanticAttributes.NET_PROTOCOL_NAME); + attributes.remove(SemanticAttributes.NET_PROTOCOL_VERSION); attributes.remove(SemanticAttributes.NET_PEER_NAME); attributes.remove(SemanticAttributes.NET_PEER_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 a07b8f33b6..56195f1e11 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 @@ -5,7 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.reactornetty.v1_0; -import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.api.trace.SpanKind.CLIENT; import static io.opentelemetry.api.trace.SpanKind.INTERNAL; import static io.opentelemetry.api.trace.SpanKind.SERVER; @@ -113,8 +112,8 @@ class ReactorNettyBaseUrlOnlyTest { satisfies( SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH, AbstractLongAssert::isNotNegative), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_PORT, server.httpPort()), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "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 c2c8c6eaa2..270a21825f 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 @@ -5,7 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.reactornetty.v1_0; -import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.api.trace.SpanKind.CLIENT; import static io.opentelemetry.api.trace.SpanKind.INTERNAL; import static io.opentelemetry.api.trace.SpanKind.SERVER; @@ -158,8 +157,8 @@ class ReactorNettyClientSslTest { satisfies( SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH, AbstractLongAssert::isNotNegative), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_PORT, server.httpsPort()), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "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 ad7da35936..6179fefe8c 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 @@ -5,7 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.reactornetty.v1_0; -import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.api.trace.SpanKind.CLIENT; import static io.opentelemetry.api.trace.SpanKind.INTERNAL; import static io.opentelemetry.api.trace.SpanKind.SERVER; @@ -84,8 +83,8 @@ class ReactorNettyConnectionSpanTest { satisfies( SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH, AbstractLongAssert::isNotNegative), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), equalTo(SemanticAttributes.NET_PEER_PORT, server.httpPort()), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1")), 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 9e5dcfa82b..59d24a8b6e 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 @@ -5,7 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.sparkjava; -import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -68,8 +67,8 @@ public class SparkJavaBasedTest { SemanticAttributes.USER_AGENT_ORIGINAL, val -> val.isInstanceOf(String.class)), equalTo(SemanticAttributes.HTTP_ROUTE, "/param/:param"), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"), + equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"), equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"), equalTo(SemanticAttributes.NET_HOST_PORT, port), equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1"), 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 cac9ee16af..80159e48d1 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 @@ -5,7 +5,6 @@ package io.opentelemetry.instrumentation.spring.web.v3_1; -import static io.opentelemetry.api.common.AttributeKey.stringKey; import static java.util.Collections.singletonList; import io.opentelemetry.api.common.AttributeKey; @@ -14,6 +13,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTes 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.trace.attributes.SemanticAttributes; import java.net.URI; import java.util.Collections; import java.util.HashSet; @@ -102,8 +102,8 @@ public class SpringWebInstrumentationTest extends AbstractHttpClientTest { Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(stringKey("net.protocol.name")); - attributes.remove(stringKey("net.protocol.version")); + attributes.remove(SemanticAttributes.NET_PROTOCOL_NAME); + attributes.remove(SemanticAttributes.NET_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 68a1799bab..dda2b4c8a0 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 @@ -22,6 +22,8 @@ import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_ import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_TARGET; import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_HOST_NAME; import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_HOST_PORT; +import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_PROTOCOL_NAME; +import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_PROTOCOL_VERSION; import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_SOCK_HOST_ADDR; import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_SOCK_PEER_ADDR; import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_SOCK_PEER_PORT; @@ -113,8 +115,8 @@ public class SpringWebfluxTest { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(NET_TRANSPORT, IP_TCP), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(NET_PROTOCOL_NAME, "http"), + equalTo(NET_PROTOCOL_VERSION, "1.1"), equalTo(NET_SOCK_PEER_ADDR, "127.0.0.1"), satisfies(NET_SOCK_PEER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(NET_SOCK_HOST_ADDR, "127.0.0.1"), @@ -238,8 +240,8 @@ public class SpringWebfluxTest { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(NET_TRANSPORT, IP_TCP), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(NET_PROTOCOL_NAME, "http"), + equalTo(NET_PROTOCOL_VERSION, "1.1"), equalTo(NET_SOCK_PEER_ADDR, "127.0.0.1"), satisfies(NET_SOCK_PEER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(NET_SOCK_HOST_ADDR, "127.0.0.1"), @@ -358,8 +360,8 @@ public class SpringWebfluxTest { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(NET_TRANSPORT, IP_TCP), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(NET_PROTOCOL_NAME, "http"), + equalTo(NET_PROTOCOL_VERSION, "1.1"), equalTo(NET_SOCK_PEER_ADDR, "127.0.0.1"), satisfies(NET_SOCK_PEER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(NET_SOCK_HOST_ADDR, "127.0.0.1"), @@ -443,8 +445,8 @@ public class SpringWebfluxTest { .hasStatus(StatusData.unset()) .hasAttributesSatisfyingExactly( equalTo(NET_TRANSPORT, IP_TCP), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(NET_PROTOCOL_NAME, "http"), + equalTo(NET_PROTOCOL_VERSION, "1.1"), equalTo(NET_SOCK_PEER_ADDR, "127.0.0.1"), satisfies(NET_SOCK_PEER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(NET_SOCK_HOST_ADDR, "127.0.0.1"), @@ -511,8 +513,8 @@ public class SpringWebfluxTest { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(NET_TRANSPORT, IP_TCP), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(NET_PROTOCOL_NAME, "http"), + equalTo(NET_PROTOCOL_VERSION, "1.1"), equalTo(NET_SOCK_PEER_ADDR, "127.0.0.1"), satisfies(NET_SOCK_PEER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(NET_SOCK_HOST_ADDR, "127.0.0.1"), @@ -564,8 +566,8 @@ public class SpringWebfluxTest { .hasStatus(StatusData.error()) .hasAttributesSatisfyingExactly( equalTo(NET_TRANSPORT, IP_TCP), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(NET_PROTOCOL_NAME, "http"), + equalTo(NET_PROTOCOL_VERSION, "1.1"), equalTo(NET_SOCK_PEER_ADDR, "127.0.0.1"), satisfies(NET_SOCK_PEER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(NET_SOCK_HOST_ADDR, "127.0.0.1"), @@ -656,8 +658,8 @@ public class SpringWebfluxTest { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(NET_TRANSPORT, IP_TCP), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(NET_PROTOCOL_NAME, "http"), + equalTo(NET_PROTOCOL_VERSION, "1.1"), equalTo(NET_SOCK_PEER_ADDR, "127.0.0.1"), satisfies(NET_SOCK_PEER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(NET_SOCK_HOST_ADDR, "127.0.0.1"), @@ -697,8 +699,8 @@ public class SpringWebfluxTest { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(NET_TRANSPORT, IP_TCP), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(NET_PROTOCOL_NAME, "http"), + equalTo(NET_PROTOCOL_VERSION, "1.1"), equalTo(NET_SOCK_PEER_ADDR, "127.0.0.1"), satisfies(NET_SOCK_PEER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(NET_SOCK_HOST_ADDR, "127.0.0.1"), @@ -761,8 +763,8 @@ public class SpringWebfluxTest { .hasNoParent() .hasAttributesSatisfyingExactly( equalTo(NET_TRANSPORT, IP_TCP), - equalTo(stringKey("net.protocol.name"), "http"), - equalTo(stringKey("net.protocol.version"), "1.1"), + equalTo(NET_PROTOCOL_NAME, "http"), + equalTo(NET_PROTOCOL_VERSION, "1.1"), equalTo(NET_SOCK_PEER_ADDR, "127.0.0.1"), satisfies(NET_SOCK_PEER_PORT, val -> val.isInstanceOf(Long.class)), equalTo(NET_SOCK_HOST_ADDR, "127.0.0.1"), 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 3912f8e28e..a38ec52040 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 @@ -5,13 +5,13 @@ package io.opentelemetry.instrumentation.spring.webflux.client; -import static io.opentelemetry.api.common.AttributeKey.stringKey; import static java.util.Objects.requireNonNull; import io.opentelemetry.api.common.AttributeKey; 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.trace.attributes.SemanticAttributes; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -74,8 +74,8 @@ public abstract class AbstractSpringWebfluxClientInstrumentationTest uri -> { Set> attributes = new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES); - attributes.remove(stringKey("net.protocol.name")); - attributes.remove(stringKey("net.protocol.version")); + attributes.remove(SemanticAttributes.NET_PROTOCOL_NAME); + attributes.remove(SemanticAttributes.NET_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 7cede2a78c..95f6e51e92 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 @@ -248,8 +248,8 @@ class TwilioClientTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(1) attributes { - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_PEER_NAME.key" "api.twilio.com" "$SemanticAttributes.HTTP_METHOD.key" "POST" "$SemanticAttributes.HTTP_URL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" @@ -315,8 +315,8 @@ class TwilioClientTest extends AgentInstrumentationSpecification { childOf span(1) status ERROR attributes { - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_PEER_NAME.key" "api.twilio.com" "$SemanticAttributes.HTTP_METHOD.key" "POST" "$SemanticAttributes.HTTP_URL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" @@ -328,8 +328,8 @@ class TwilioClientTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(1) attributes { - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_PEER_NAME.key" "api.twilio.com" "$SemanticAttributes.HTTP_METHOD.key" "POST" "$SemanticAttributes.HTTP_URL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" @@ -402,8 +402,8 @@ class TwilioClientTest extends AgentInstrumentationSpecification { childOf span(1) status ERROR attributes { - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_PEER_NAME.key" "api.twilio.com" "$SemanticAttributes.HTTP_METHOD.key" "POST" "$SemanticAttributes.HTTP_URL.key" "https://api.twilio.com/2010-04-01/Accounts/abc/Messages.json" @@ -415,8 +415,8 @@ class TwilioClientTest extends AgentInstrumentationSpecification { kind CLIENT childOf span(1) attributes { - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_PEER_NAME.key" "api.twilio.com" "$SemanticAttributes.HTTP_METHOD.key" "POST" "$SemanticAttributes.HTTP_URL.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 aacc32624c..27fca280ae 100644 --- a/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy +++ b/instrumentation/undertow-1.4/javaagent/src/test/groovy/UndertowServerTest.groovy @@ -152,8 +152,8 @@ class UndertowServerTest extends HttpServerTest implements AgentTestTr "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long "$SemanticAttributes.HTTP_SCHEME" "http" "$SemanticAttributes.HTTP_TARGET" "/sendResponse" - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" uri.host "$SemanticAttributes.NET_HOST_PORT" uri.port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" @@ -206,8 +206,8 @@ class UndertowServerTest extends HttpServerTest implements AgentTestTr "$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long "$SemanticAttributes.HTTP_SCHEME" "http" "$SemanticAttributes.HTTP_TARGET" "/sendResponseWithException" - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_HOST_NAME" uri.host "$SemanticAttributes.NET_HOST_PORT" uri.port "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/groovy/client/VertxHttpClientTest.groovy b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/groovy/client/VertxHttpClientTest.groovy index 2452ccd513..9bc30e6d8e 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/groovy/client/VertxHttpClientTest.groovy +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/groovy/client/VertxHttpClientTest.groovy @@ -21,8 +21,6 @@ import spock.lang.Shared import java.util.concurrent.CompletableFuture import java.util.concurrent.TimeUnit -import static io.opentelemetry.api.common.AttributeKey.stringKey - class VertxHttpClientTest extends HttpClientTest implements AgentTestTrait { @Shared @@ -89,8 +87,8 @@ class VertxHttpClientTest extends HttpClientTest implements A @Override Set> httpAttributes(URI uri) { def attributes = super.httpAttributes(uri) - attributes.remove(stringKey("net.protocol.name")) - attributes.remove(stringKey("net.protocol.version")) + attributes.remove(SemanticAttributes.NET_PROTOCOL_NAME) + attributes.remove(SemanticAttributes.NET_PROTOCOL_VERSION) attributes.remove(SemanticAttributes.NET_PEER_NAME) attributes.remove(SemanticAttributes.NET_PEER_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 584776fea0..4684b5e953 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 @@ -64,8 +64,8 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { hasNoParent() attributes { "$SemanticAttributes.NET_TRANSPORT" { it == null || it == IP_TCP } - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_PORT" Long "$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1" @@ -158,8 +158,8 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { childOf(span(0)) attributes { "$SemanticAttributes.NET_TRANSPORT" { it == null || it == IP_TCP } - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_PORT" Long "$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1" 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 584776fea0..4684b5e953 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 @@ -64,8 +64,8 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { hasNoParent() attributes { "$SemanticAttributes.NET_TRANSPORT" { it == null || it == IP_TCP } - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_PORT" Long "$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1" @@ -158,8 +158,8 @@ class VertxReactivePropagationTest extends AgentInstrumentationSpecification { childOf(span(0)) attributes { "$SemanticAttributes.NET_TRANSPORT" { it == null || it == IP_TCP } - "net.protocol.name" "http" - "net.protocol.version" "1.1" + "$SemanticAttributes.NET_PROTOCOL_NAME" "http" + "$SemanticAttributes.NET_PROTOCOL_VERSION" "1.1" "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1" "$SemanticAttributes.NET_SOCK_PEER_PORT" Long "$SemanticAttributes.NET_SOCK_HOST_ADDR" "127.0.0.1" 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 782b9d81be..60196dbbd8 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 @@ -25,8 +25,6 @@ import spock.lang.Shared import java.util.concurrent.CompletableFuture import java.util.function.Consumer -import static io.opentelemetry.api.common.AttributeKey.stringKey - class VertxRxCircuitBreakerWebClientTest extends HttpClientTest> implements AgentTestTrait { @Shared @@ -109,8 +107,8 @@ class VertxRxCircuitBreakerWebClientTest extends HttpClientTest> @Override Set> httpAttributes(URI uri) { def attributes = super.httpAttributes(uri) - attributes.remove(stringKey("net.protocol.name")) - attributes.remove(stringKey("net.protocol.version")) + attributes.remove(SemanticAttributes.NET_PROTOCOL_NAME) + attributes.remove(SemanticAttributes.NET_PROTOCOL_VERSION) attributes.remove(SemanticAttributes.NET_PEER_NAME) attributes.remove(SemanticAttributes.NET_PEER_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 d65c9850cb..e62709275a 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 @@ -21,8 +21,6 @@ import io.vertx.reactivex.ext.web.client.HttpResponse import io.vertx.reactivex.ext.web.client.WebClient import spock.lang.Shared -import static io.opentelemetry.api.common.AttributeKey.stringKey - class VertxRxWebClientTest extends HttpClientTest> implements AgentTestTrait { @Shared @@ -95,8 +93,8 @@ class VertxRxWebClientTest extends HttpClientTest> implement @Override Set> httpAttributes(URI uri) { def attributes = super.httpAttributes(uri) - attributes.remove(stringKey("net.protocol.name")) - attributes.remove(stringKey("net.protocol.version")) + attributes.remove(SemanticAttributes.NET_PROTOCOL_NAME) + attributes.remove(SemanticAttributes.NET_PROTOCOL_VERSION) attributes.remove(SemanticAttributes.NET_PEER_NAME) attributes.remove(SemanticAttributes.NET_PEER_PORT) return attributes 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 27f1bca7fb..e80bc13861 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 @@ -16,7 +16,6 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.instrumentation.test.utils.PortUtils; import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; @@ -942,12 +941,12 @@ public abstract class AbstractHttpClientTest implements HttpClientTypeA if (attrs.get(SemanticAttributes.NET_TRANSPORT) != null) { assertThat(attrs).containsEntry(SemanticAttributes.NET_TRANSPORT, IP_TCP); } - if (httpClientAttributes.contains(NetAttributes.NET_PROTOCOL_NAME)) { - assertThat(attrs).containsEntry(NetAttributes.NET_PROTOCOL_NAME, "http"); + if (httpClientAttributes.contains(SemanticAttributes.NET_PROTOCOL_NAME)) { + assertThat(attrs).containsEntry(SemanticAttributes.NET_PROTOCOL_NAME, "http"); } - if (httpClientAttributes.contains(NetAttributes.NET_PROTOCOL_VERSION)) { + if (httpClientAttributes.contains(SemanticAttributes.NET_PROTOCOL_VERSION)) { // TODO(anuraaga): Support HTTP/2 - assertThat(attrs).containsEntry(NetAttributes.NET_PROTOCOL_VERSION, "1.1"); + assertThat(attrs).containsEntry(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"); } if (httpClientAttributes.contains(SemanticAttributes.NET_PEER_NAME)) { assertThat(attrs).containsEntry(SemanticAttributes.NET_PEER_NAME, uri.getHost()); 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 c6d3026591..6eafab980a 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,6 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.context.Context; import io.opentelemetry.context.propagation.TextMapPropagator; import io.opentelemetry.context.propagation.TextMapSetter; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.instrumentation.testing.GlobalTraceUtil; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.testing.assertj.TraceAssert; @@ -688,13 +687,13 @@ public abstract class AbstractHttpServerTest extends AbstractHttpServerU assertThat(attrs).containsEntry(SemanticAttributes.HTTP_METHOD, method); assertThat(attrs).containsEntry(SemanticAttributes.HTTP_STATUS_CODE, endpoint.status); - if (attrs.get(NetAttributes.NET_PROTOCOL_NAME) != null) { - assertThat(attrs).containsEntry(NetAttributes.NET_PROTOCOL_NAME, "http"); + if (attrs.get(SemanticAttributes.NET_PROTOCOL_NAME) != null) { + assertThat(attrs).containsEntry(SemanticAttributes.NET_PROTOCOL_NAME, "http"); } - if (attrs.get(NetAttributes.NET_PROTOCOL_VERSION) != null) { + if (attrs.get(SemanticAttributes.NET_PROTOCOL_VERSION) != null) { assertThat(attrs) .hasEntrySatisfying( - NetAttributes.NET_PROTOCOL_VERSION, + SemanticAttributes.NET_PROTOCOL_VERSION, entry -> assertThat(entry).isIn("1.1", "2.0")); } assertThat(attrs).containsEntry(SemanticAttributes.USER_AGENT_ORIGINAL, TEST_USER_AGENT); 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 4878e4fd04..b38c0fcf24 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 @@ -8,7 +8,6 @@ package io.opentelemetry.instrumentation.testing.junit.http; import com.google.auto.value.AutoValue; import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.api.common.AttributeKey; -import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import io.opentelemetry.testing.internal.armeria.common.HttpStatus; import java.net.URI; @@ -26,8 +25,8 @@ public abstract class HttpClientTestOptions { Collections.unmodifiableSet( new HashSet<>( Arrays.asList( - NetAttributes.NET_PROTOCOL_NAME, - NetAttributes.NET_PROTOCOL_VERSION, + SemanticAttributes.NET_PROTOCOL_NAME, + SemanticAttributes.NET_PROTOCOL_VERSION, SemanticAttributes.NET_PEER_NAME, SemanticAttributes.NET_PEER_PORT, SemanticAttributes.HTTP_URL,