Skip to content

Commit 91a5cce

Browse files
author
Mateusz Rzeszutek
authored
Remove server.{address,port} from HTTP server metrics (#8771)
1 parent bb4211d commit 91a5cce

File tree

3 files changed

+10
-29
lines changed

3 files changed

+10
-29
lines changed

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ private static Set<AttributeKey> buildDurationAlwaysInclude() {
3939
view.add(HttpAttributes.HTTP_RESPONSE_STATUS_CODE);
4040
view.add(NetworkAttributes.NETWORK_PROTOCOL_NAME);
4141
view.add(NetworkAttributes.NETWORK_PROTOCOL_VERSION);
42-
view.add(NetworkAttributes.SERVER_ADDRESS);
43-
view.add(NetworkAttributes.SERVER_PORT);
4442
return view;
4543
}
4644

@@ -54,6 +52,8 @@ private static Set<AttributeKey> buildDurationClientView() {
5452
view.add(SemanticAttributes.NET_SOCK_PEER_ADDR);
5553
// stable semconv
5654
view.add(NetworkAttributes.SERVER_SOCKET_ADDRESS);
55+
view.add(NetworkAttributes.SERVER_ADDRESS);
56+
view.add(NetworkAttributes.SERVER_PORT);
5757
return view;
5858
}
5959

@@ -83,8 +83,6 @@ private static Set<AttributeKey> buildActiveRequestsView() {
8383
view.add(SemanticAttributes.NET_HOST_PORT);
8484
// stable semconv
8585
view.add(HttpAttributes.HTTP_REQUEST_METHOD);
86-
view.add(NetworkAttributes.SERVER_ADDRESS);
87-
view.add(NetworkAttributes.SERVER_PORT);
8886
view.add(UrlAttributes.URL_SCHEME);
8987
return view;
9088
}

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

+2-6
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,7 @@ void shouldApplyServerDurationAndSizeView_stableSemconv() {
174174
entry(SemanticAttributes.HTTP_ROUTE, "/somehost/high/{name}/{id}"),
175175
entry(UrlAttributes.URL_SCHEME, "https"),
176176
entry(NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"),
177-
entry(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"),
178-
entry(NetworkAttributes.SERVER_ADDRESS, "somehost"),
179-
entry(NetworkAttributes.SERVER_PORT, 443L));
177+
entry(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"));
180178
}
181179

182180
@Test
@@ -234,8 +232,6 @@ void shouldApplyActiveRequestsView_stableSemconv() {
234232
assertThat(applyActiveRequestsView(attributes))
235233
.containsOnly(
236234
entry(HttpAttributes.HTTP_REQUEST_METHOD, "GET"),
237-
entry(UrlAttributes.URL_SCHEME, "https"),
238-
entry(NetworkAttributes.SERVER_ADDRESS, "somehost"),
239-
entry(NetworkAttributes.SERVER_PORT, 443L));
235+
entry(UrlAttributes.URL_SCHEME, "https"));
240236
}
241237
}

‎instrumentation-api-semconv/src/testStableHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerMetricsStableSemconvTest.java

+6-19
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ void collectsMetrics() {
9393
.hasValue(1)
9494
.hasAttributesSatisfying(
9595
equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"),
96-
equalTo(UrlAttributes.URL_SCHEME, "https"),
97-
equalTo(NetworkAttributes.SERVER_ADDRESS, "localhost"),
98-
equalTo(NetworkAttributes.SERVER_PORT, 1234L))
96+
equalTo(UrlAttributes.URL_SCHEME, "https"))
9997
.hasExemplarsSatisfying(
10098
exemplar ->
10199
exemplar
@@ -118,9 +116,7 @@ void collectsMetrics() {
118116
.hasValue(2)
119117
.hasAttributesSatisfying(
120118
equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"),
121-
equalTo(UrlAttributes.URL_SCHEME, "https"),
122-
equalTo(NetworkAttributes.SERVER_ADDRESS, "localhost"),
123-
equalTo(NetworkAttributes.SERVER_PORT, 1234L))
119+
equalTo(UrlAttributes.URL_SCHEME, "https"))
124120
.hasExemplarsSatisfying(
125121
exemplar ->
126122
exemplar
@@ -142,9 +138,7 @@ void collectsMetrics() {
142138
.hasValue(1)
143139
.hasAttributesSatisfying(
144140
equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "GET"),
145-
equalTo(UrlAttributes.URL_SCHEME, "https"),
146-
equalTo(NetworkAttributes.SERVER_ADDRESS, "localhost"),
147-
equalTo(NetworkAttributes.SERVER_PORT, 1234L))
141+
equalTo(UrlAttributes.URL_SCHEME, "https"))
148142
.hasExemplarsSatisfying(
149143
exemplar ->
150144
exemplar
@@ -167,9 +161,7 @@ void collectsMetrics() {
167161
NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"),
168162
equalTo(
169163
NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0"),
170-
equalTo(UrlAttributes.URL_SCHEME, "https"),
171-
equalTo(NetworkAttributes.SERVER_ADDRESS, "localhost"),
172-
equalTo(NetworkAttributes.SERVER_PORT, 1234L))
164+
equalTo(UrlAttributes.URL_SCHEME, "https"))
173165
.hasExemplarsSatisfying(
174166
exemplar ->
175167
exemplar
@@ -193,9 +185,7 @@ void collectsMetrics() {
193185
NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"),
194186
equalTo(
195187
NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0"),
196-
equalTo(UrlAttributes.URL_SCHEME, "https"),
197-
equalTo(NetworkAttributes.SERVER_ADDRESS, "localhost"),
198-
equalTo(NetworkAttributes.SERVER_PORT, 1234L))
188+
equalTo(UrlAttributes.URL_SCHEME, "https"))
199189
.hasExemplarsSatisfying(
200190
exemplar ->
201191
exemplar
@@ -218,9 +208,7 @@ void collectsMetrics() {
218208
NetworkAttributes.NETWORK_PROTOCOL_NAME, "http"),
219209
equalTo(
220210
NetworkAttributes.NETWORK_PROTOCOL_VERSION, "2.0"),
221-
equalTo(UrlAttributes.URL_SCHEME, "https"),
222-
equalTo(NetworkAttributes.SERVER_ADDRESS, "localhost"),
223-
equalTo(NetworkAttributes.SERVER_PORT, 1234L))
211+
equalTo(UrlAttributes.URL_SCHEME, "https"))
224212
.hasExemplarsSatisfying(
225213
exemplar ->
226214
exemplar
@@ -328,7 +316,6 @@ void collectsHttpRouteFromEndAttributes() {
328316
.hasSum(0.100 /* seconds */)
329317
.hasAttributesSatisfying(
330318
equalTo(UrlAttributes.URL_SCHEME, "https"),
331-
equalTo(NetworkAttributes.SERVER_ADDRESS, "host"),
332319
equalTo(
333320
SemanticAttributes.HTTP_ROUTE, "/test/{id}")))));
334321
}

0 commit comments

Comments
 (0)