Skip to content

Commit 6e57328

Browse files
author
Mateusz Rzeszutek
authored
Replace NetAttributes with SemanticAttributes (open-telemetry#8992)
1 parent ba996ba commit 6e57328

File tree

66 files changed

+320
-388
lines changed

Some content is hidden

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

66 files changed

+320
-388
lines changed

‎instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsView.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import io.opentelemetry.api.common.AttributeKey;
99
import io.opentelemetry.api.common.Attributes;
1010
import io.opentelemetry.api.common.AttributesBuilder;
11-
import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes;
1211
import io.opentelemetry.instrumentation.api.instrumenter.network.internal.NetworkAttributes;
1312
import io.opentelemetry.instrumentation.api.instrumenter.url.internal.UrlAttributes;
1413
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
@@ -32,8 +31,8 @@ private static Set<AttributeKey> buildDurationAlwaysInclude() {
3231
Set<AttributeKey> view = new HashSet<>();
3332
view.add(SemanticAttributes.HTTP_METHOD);
3433
view.add(SemanticAttributes.HTTP_STATUS_CODE); // Optional
35-
view.add(NetAttributes.NET_PROTOCOL_NAME); // Optional
36-
view.add(NetAttributes.NET_PROTOCOL_VERSION); // Optional
34+
view.add(SemanticAttributes.NET_PROTOCOL_NAME); // Optional
35+
view.add(SemanticAttributes.NET_PROTOCOL_VERSION); // Optional
3736
// stable semconv
3837
view.add(HttpAttributes.HTTP_REQUEST_METHOD);
3938
view.add(HttpAttributes.HTTP_RESPONSE_STATUS_CODE);

‎instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/NetAttributes.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/network/internal/InternalNetworkAttributesExtractor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
99

1010
import io.opentelemetry.api.common.AttributesBuilder;
11-
import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes;
1211
import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesGetter;
12+
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
1313
import java.util.Locale;
1414
import javax.annotation.Nullable;
1515

@@ -55,8 +55,8 @@ public void onEnd(AttributesBuilder attributes, REQUEST request, @Nullable RESPO
5555
if (emitOldHttpAttributes) {
5656
// net.transport and net.sock.family are not 1:1 convertible with network.transport and
5757
// network.type; they must be handled separately in the old net.* extractors
58-
internalSet(attributes, NetAttributes.NET_PROTOCOL_NAME, protocolName);
59-
internalSet(attributes, NetAttributes.NET_PROTOCOL_VERSION, protocolVersion);
58+
internalSet(attributes, SemanticAttributes.NET_PROTOCOL_NAME, protocolName);
59+
internalSet(attributes, SemanticAttributes.NET_PROTOCOL_VERSION, protocolVersion);
6060
}
6161
}
6262

‎instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.opentelemetry.context.Context;
1919
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
2020
import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
21-
import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes;
2221
import io.opentelemetry.instrumentation.api.internal.HttpConstants;
2322
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
2423
import java.util.HashMap;
@@ -169,8 +168,8 @@ void normal() {
169168
entry(
170169
AttributeKey.stringArrayKey("http.response.header.custom_response_header"),
171170
asList("654", "321")),
172-
entry(NetAttributes.NET_PROTOCOL_NAME, "http"),
173-
entry(NetAttributes.NET_PROTOCOL_VERSION, "1.1"));
171+
entry(SemanticAttributes.NET_PROTOCOL_NAME, "http"),
172+
entry(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"));
174173
}
175174

176175
@ParameterizedTest

‎instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientExperimentalMetricsTest.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import io.opentelemetry.api.trace.TraceState;
1616
import io.opentelemetry.context.Context;
1717
import io.opentelemetry.instrumentation.api.instrumenter.OperationListener;
18-
import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes;
1918
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
2019
import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader;
2120
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
@@ -48,8 +47,8 @@ void collectsMetrics() {
4847
Attributes.builder()
4948
.put("http.status_code", 200)
5049
.put("http.response_content_length", 200)
51-
.put(NetAttributes.NET_PROTOCOL_NAME, "http")
52-
.put(NetAttributes.NET_PROTOCOL_VERSION, "2.0")
50+
.put(SemanticAttributes.NET_PROTOCOL_NAME, "http")
51+
.put(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0")
5352
.put("net.sock.peer.addr", "1.2.3.4")
5453
.put("net.sock.peer.name", "somehost20")
5554
.put("net.sock.peer.port", 8080)
@@ -90,8 +89,8 @@ void collectsMetrics() {
9089
.hasAttributesSatisfying(
9190
equalTo(SemanticAttributes.HTTP_METHOD, "GET"),
9291
equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200),
93-
equalTo(NetAttributes.NET_PROTOCOL_NAME, "http"),
94-
equalTo(NetAttributes.NET_PROTOCOL_VERSION, "2.0"),
92+
equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"),
93+
equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0"),
9594
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
9695
equalTo(SemanticAttributes.NET_PEER_PORT, 1234),
9796
equalTo(
@@ -114,8 +113,8 @@ void collectsMetrics() {
114113
.hasAttributesSatisfying(
115114
equalTo(SemanticAttributes.HTTP_METHOD, "GET"),
116115
equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200),
117-
equalTo(NetAttributes.NET_PROTOCOL_NAME, "http"),
118-
equalTo(NetAttributes.NET_PROTOCOL_VERSION, "2.0"),
116+
equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"),
117+
equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0"),
119118
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
120119
equalTo(SemanticAttributes.NET_PEER_PORT, 1234),
121120
equalTo(

‎instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientMetricsTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import io.opentelemetry.api.trace.TraceState;
1616
import io.opentelemetry.context.Context;
1717
import io.opentelemetry.instrumentation.api.instrumenter.OperationListener;
18-
import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes;
1918
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
2019
import io.opentelemetry.sdk.metrics.internal.aggregator.ExplicitBucketHistogramUtils;
2120
import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader;
@@ -53,8 +52,8 @@ void collectsMetrics() {
5352
Attributes.builder()
5453
.put("http.status_code", 200)
5554
.put("http.response_content_length", 200)
56-
.put(NetAttributes.NET_PROTOCOL_NAME, "http")
57-
.put(NetAttributes.NET_PROTOCOL_VERSION, "2.0")
55+
.put(SemanticAttributes.NET_PROTOCOL_NAME, "http")
56+
.put(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0")
5857
.put("net.sock.peer.addr", "1.2.3.4")
5958
.put("net.sock.peer.name", "somehost20")
6059
.put("net.sock.peer.port", 8080)
@@ -95,8 +94,8 @@ void collectsMetrics() {
9594
.hasAttributesSatisfying(
9695
equalTo(SemanticAttributes.HTTP_METHOD, "GET"),
9796
equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200),
98-
equalTo(NetAttributes.NET_PROTOCOL_NAME, "http"),
99-
equalTo(NetAttributes.NET_PROTOCOL_VERSION, "2.0"),
97+
equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"),
98+
equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0"),
10099
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"),
101100
equalTo(SemanticAttributes.NET_PEER_PORT, 1234),
102101
equalTo(

‎instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractorTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.opentelemetry.context.Context;
1919
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
2020
import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter;
21-
import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes;
2221
import io.opentelemetry.instrumentation.api.internal.HttpConstants;
2322
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
2423
import java.util.HashMap;
@@ -186,8 +185,8 @@ void normal() {
186185
extractor.onEnd(endAttributes, Context.root(), request, response, null);
187186
assertThat(endAttributes.build())
188187
.containsOnly(
189-
entry(NetAttributes.NET_PROTOCOL_NAME, "http"),
190-
entry(NetAttributes.NET_PROTOCOL_VERSION, "2.0"),
188+
entry(SemanticAttributes.NET_PROTOCOL_NAME, "http"),
189+
entry(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0"),
191190
entry(SemanticAttributes.HTTP_ROUTE, "/repositories/{repoId}"),
192191
entry(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH, 10L),
193192
entry(SemanticAttributes.HTTP_STATUS_CODE, 202L),

‎instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerMetricsTest.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import io.opentelemetry.api.trace.TraceState;
1717
import io.opentelemetry.context.Context;
1818
import io.opentelemetry.instrumentation.api.instrumenter.OperationListener;
19-
import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes;
2019
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
2120
import io.opentelemetry.sdk.metrics.internal.aggregator.ExplicitBucketHistogramUtils;
2221
import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader;
@@ -45,8 +44,8 @@ void collectsMetrics() {
4544
.put("http.target", "/")
4645
.put("http.scheme", "https")
4746
.put("net.transport", IP_TCP)
48-
.put(NetAttributes.NET_PROTOCOL_NAME, "http")
49-
.put(NetAttributes.NET_PROTOCOL_VERSION, "2.0")
47+
.put(SemanticAttributes.NET_PROTOCOL_NAME, "http")
48+
.put(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0")
5049
.put("net.host.name", "localhost")
5150
.put("net.host.port", 1234)
5251
.put("net.sock.family", "inet")
@@ -165,8 +164,8 @@ void collectsMetrics() {
165164
.hasAttributesSatisfying(
166165
equalTo(SemanticAttributes.HTTP_METHOD, "GET"),
167166
equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200),
168-
equalTo(NetAttributes.NET_PROTOCOL_NAME, "http"),
169-
equalTo(NetAttributes.NET_PROTOCOL_VERSION, "2.0"),
167+
equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"),
168+
equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0"),
170169
equalTo(SemanticAttributes.HTTP_SCHEME, "https"),
171170
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
172171
equalTo(SemanticAttributes.NET_HOST_PORT, 1234))
@@ -189,8 +188,8 @@ void collectsMetrics() {
189188
.hasAttributesSatisfying(
190189
equalTo(SemanticAttributes.HTTP_METHOD, "GET"),
191190
equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200),
192-
equalTo(NetAttributes.NET_PROTOCOL_NAME, "http"),
193-
equalTo(NetAttributes.NET_PROTOCOL_VERSION, "2.0"),
191+
equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"),
192+
equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0"),
194193
equalTo(SemanticAttributes.HTTP_SCHEME, "https"),
195194
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
196195
equalTo(SemanticAttributes.NET_HOST_PORT, 1234))
@@ -212,8 +211,8 @@ void collectsMetrics() {
212211
.hasAttributesSatisfying(
213212
equalTo(SemanticAttributes.HTTP_METHOD, "GET"),
214213
equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200),
215-
equalTo(NetAttributes.NET_PROTOCOL_NAME, "http"),
216-
equalTo(NetAttributes.NET_PROTOCOL_VERSION, "2.0"),
214+
equalTo(SemanticAttributes.NET_PROTOCOL_NAME, "http"),
215+
equalTo(SemanticAttributes.NET_PROTOCOL_VERSION, "2.0"),
217216
equalTo(SemanticAttributes.HTTP_SCHEME, "https"),
218217
equalTo(SemanticAttributes.NET_HOST_NAME, "localhost"),
219218
equalTo(SemanticAttributes.NET_HOST_PORT, 1234))

‎instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/http/TemporaryMetricsViewTest.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import static org.assertj.core.api.Assertions.entry;
1414

1515
import io.opentelemetry.api.common.Attributes;
16-
import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes;
1716
import io.opentelemetry.instrumentation.api.instrumenter.network.internal.NetworkAttributes;
1817
import io.opentelemetry.instrumentation.api.instrumenter.url.internal.UrlAttributes;
1918
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
@@ -37,8 +36,8 @@ void shouldApplyClientDurationAndSizeView() {
3736
Attributes.builder()
3837
.put(SemanticAttributes.HTTP_STATUS_CODE, 500)
3938
.put(SemanticAttributes.NET_TRANSPORT, IP_TCP)
40-
.put(NetAttributes.NET_PROTOCOL_NAME, "http")
41-
.put(NetAttributes.NET_PROTOCOL_VERSION, "1.1")
39+
.put(SemanticAttributes.NET_PROTOCOL_NAME, "http")
40+
.put(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1")
4241
.put(SemanticAttributes.NET_PEER_NAME, "somehost2")
4342
.put(SemanticAttributes.NET_PEER_PORT, 443)
4443
.put(SemanticAttributes.NET_SOCK_FAMILY, "inet")
@@ -51,8 +50,8 @@ void shouldApplyClientDurationAndSizeView() {
5150
.containsOnly(
5251
entry(SemanticAttributes.HTTP_METHOD, "GET"),
5352
entry(SemanticAttributes.HTTP_STATUS_CODE, 500L),
54-
entry(NetAttributes.NET_PROTOCOL_NAME, "http"),
55-
entry(NetAttributes.NET_PROTOCOL_VERSION, "1.1"),
53+
entry(SemanticAttributes.NET_PROTOCOL_NAME, "http"),
54+
entry(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"),
5655
entry(SemanticAttributes.NET_PEER_NAME, "somehost2"),
5756
entry(SemanticAttributes.NET_PEER_PORT, 443L),
5857
entry(SemanticAttributes.NET_SOCK_PEER_ADDR, "1.2.3.4"));
@@ -106,8 +105,8 @@ void shouldApplyServerDurationAndSizeView() {
106105
.put(SemanticAttributes.HTTP_TARGET, "/high/cardinality/12345?jsessionId=121454")
107106
.put(SemanticAttributes.HTTP_SCHEME, "https")
108107
.put(SemanticAttributes.NET_TRANSPORT, IP_TCP)
109-
.put(NetAttributes.NET_PROTOCOL_NAME, "http")
110-
.put(NetAttributes.NET_PROTOCOL_VERSION, "1.1")
108+
.put(SemanticAttributes.NET_PROTOCOL_NAME, "http")
109+
.put(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1")
111110
.put(SemanticAttributes.NET_HOST_NAME, "somehost")
112111
.put(SemanticAttributes.NET_HOST_PORT, 443)
113112
.put(SemanticAttributes.NET_SOCK_FAMILY, "inet")
@@ -130,8 +129,8 @@ void shouldApplyServerDurationAndSizeView() {
130129
entry(SemanticAttributes.HTTP_METHOD, "GET"),
131130
entry(SemanticAttributes.HTTP_STATUS_CODE, 500L),
132131
entry(SemanticAttributes.HTTP_SCHEME, "https"),
133-
entry(NetAttributes.NET_PROTOCOL_NAME, "http"),
134-
entry(NetAttributes.NET_PROTOCOL_VERSION, "1.1"),
132+
entry(SemanticAttributes.NET_PROTOCOL_NAME, "http"),
133+
entry(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"),
135134
entry(SemanticAttributes.NET_HOST_NAME, "somehost"),
136135
entry(SemanticAttributes.NET_HOST_PORT, 443L),
137136
entry(SemanticAttributes.HTTP_ROUTE, "/somehost/high/{name}/{id}"));
@@ -188,8 +187,8 @@ void shouldApplyActiveRequestsView() {
188187
.put(SemanticAttributes.HTTP_TARGET, "/high/cardinality/12345?jsessionId=121454")
189188
.put(SemanticAttributes.HTTP_SCHEME, "https")
190189
.put(SemanticAttributes.NET_TRANSPORT, IP_TCP)
191-
.put(NetAttributes.NET_PROTOCOL_NAME, "http")
192-
.put(NetAttributes.NET_PROTOCOL_VERSION, "1.1")
190+
.put(SemanticAttributes.NET_PROTOCOL_NAME, "http")
191+
.put(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1")
193192
.put(SemanticAttributes.NET_HOST_NAME, "somehost")
194193
.put(SemanticAttributes.NET_HOST_PORT, 443)
195194
.put(SemanticAttributes.NET_SOCK_FAMILY, "inet")

‎instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesExtractorTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import io.opentelemetry.api.common.AttributesBuilder;
1515
import io.opentelemetry.context.Context;
1616
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
17-
import io.opentelemetry.instrumentation.api.instrumenter.net.internal.NetAttributes;
1817
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
1918
import java.util.HashMap;
2019
import java.util.Map;
@@ -131,8 +130,8 @@ void normal() {
131130
assertThat(endAttributes.build())
132131
.containsOnly(
133132
entry(SemanticAttributes.NET_TRANSPORT, IP_TCP),
134-
entry(NetAttributes.NET_PROTOCOL_NAME, "http"),
135-
entry(NetAttributes.NET_PROTOCOL_VERSION, "1.1"),
133+
entry(SemanticAttributes.NET_PROTOCOL_NAME, "http"),
134+
entry(SemanticAttributes.NET_PROTOCOL_VERSION, "1.1"),
136135
entry(SemanticAttributes.NET_SOCK_FAMILY, "inet6"),
137136
entry(SemanticAttributes.NET_SOCK_PEER_ADDR, "1:2:3:4::"),
138137
entry(SemanticAttributes.NET_SOCK_PEER_NAME, "proxy.opentelemetry.io"),

0 commit comments

Comments
 (0)