Skip to content

Commit 5a152cd

Browse files
author
Mateusz Rzeszutek
authored
Deprecate uncompressed content length HTTP attributes (#6383)
1 parent 54b8b6a commit 5a152cd

File tree

48 files changed

+12
-618
lines changed

Some content is hidden

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

48 files changed

+12
-618
lines changed

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

-8
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ public void onEnd(
6262
attributes,
6363
SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH,
6464
getter.requestContentLength(request, response));
65-
internalSet(
66-
attributes,
67-
SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED,
68-
getter.requestContentLengthUncompressed(request, response));
6965

7066
if (response != null) {
7167
Integer statusCode = getter.statusCode(request, response);
@@ -76,10 +72,6 @@ public void onEnd(
7672
attributes,
7773
SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH,
7874
getter.responseContentLength(request, response));
79-
internalSet(
80-
attributes,
81-
SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED,
82-
getter.responseContentLengthUncompressed(request, response));
8375

8476
for (String name : capturedResponseHeaders) {
8577
List<String> values = getter.responseHeader(request, response, name);

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

+12-2
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,14 @@ public interface HttpCommonAttributesGetter<REQUEST, RESPONSE> {
4343
*
4444
* <p>This is called from {@link Instrumenter#end(Context, Object, Object, Throwable)}, whether
4545
* {@code response} is {@code null} or not.
46+
*
47+
* @deprecated This method is deprecated and will be removed in the next release.
4648
*/
49+
@Deprecated
4750
@Nullable
48-
Long requestContentLengthUncompressed(REQUEST request, @Nullable RESPONSE response);
51+
default Long requestContentLengthUncompressed(REQUEST request, @Nullable RESPONSE response) {
52+
throw new UnsupportedOperationException("This method is deprecated and will be removed");
53+
}
4954

5055
/**
5156
* Extracts the {@code http.status_code} span attribute.
@@ -70,9 +75,14 @@ public interface HttpCommonAttributesGetter<REQUEST, RESPONSE> {
7075
*
7176
* <p>This is called from {@link Instrumenter#end(Context, Object, Object, Throwable)}, only when
7277
* {@code response} is non-{@code null}.
78+
*
79+
* @deprecated This method is deprecated and will be removed in the next release.
7380
*/
81+
@Deprecated
7482
@Nullable
75-
Long responseContentLengthUncompressed(REQUEST request, RESPONSE response);
83+
default Long responseContentLengthUncompressed(REQUEST request, RESPONSE response) {
84+
throw new UnsupportedOperationException("This method is deprecated and will be removed");
85+
}
7686

7787
/**
7888
* Extracts all values of header named {@code name} from the response, or an empty list if there

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

-18
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,6 @@ public Long requestContentLength(Map<String, String> request, Map<String, String
4848
return value == null ? null : Long.parseLong(value);
4949
}
5050

51-
@Override
52-
public Long requestContentLengthUncompressed(
53-
Map<String, String> request, Map<String, String> response) {
54-
String value = request.get("requestContentLengthUncompressed");
55-
return value == null ? null : Long.parseLong(value);
56-
}
57-
5851
@Override
5952
public Integer statusCode(Map<String, String> request, Map<String, String> response) {
6053
return Integer.parseInt(response.get("statusCode"));
@@ -71,13 +64,6 @@ public Long responseContentLength(Map<String, String> request, Map<String, Strin
7164
return value == null ? null : Long.parseLong(value);
7265
}
7366

74-
@Override
75-
public Long responseContentLengthUncompressed(
76-
Map<String, String> request, Map<String, String> response) {
77-
String value = response.get("responseContentLengthUncompressed");
78-
return value == null ? null : Long.parseLong(value);
79-
}
80-
8167
@Override
8268
public List<String> responseHeader(
8369
Map<String, String> request, Map<String, String> response, String name) {
@@ -92,15 +78,13 @@ void normal() {
9278
request.put("method", "POST");
9379
request.put("url", "http://github.com");
9480
request.put("requestContentLength", "10");
95-
request.put("requestContentLengthUncompressed", "11");
9681
request.put("flavor", "http/2");
9782
request.put("header.user-agent", "okhttp 3.x");
9883
request.put("header.custom-request-header", "123,456");
9984

10085
Map<String, String> response = new HashMap<>();
10186
response.put("statusCode", "202");
10287
response.put("responseContentLength", "20");
103-
response.put("responseContentLengthUncompressed", "21");
10488
response.put("header.custom-response-header", "654,321");
10589

10690
HttpClientAttributesExtractor<Map<String, String>, Map<String, String>> extractor =
@@ -130,11 +114,9 @@ void normal() {
130114
AttributeKey.stringArrayKey("http.request.header.custom_request_header"),
131115
asList("123", "456")),
132116
entry(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH, 10L),
133-
entry(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED, 11L),
134117
entry(SemanticAttributes.HTTP_FLAVOR, "http/2"),
135118
entry(SemanticAttributes.HTTP_STATUS_CODE, 202L),
136119
entry(SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH, 20L),
137-
entry(SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED, 21L),
138120
entry(
139121
AttributeKey.stringArrayKey("http.response.header.custom_response_header"),
140122
asList("654", "321")));

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

-18
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,6 @@ public Long requestContentLength(Map<String, String> request, Map<String, String
6464
return value == null ? null : Long.parseLong(value);
6565
}
6666

67-
@Override
68-
public Long requestContentLengthUncompressed(
69-
Map<String, String> request, Map<String, String> response) {
70-
String value = request.get("requestContentLengthUncompressed");
71-
return value == null ? null : Long.parseLong(value);
72-
}
73-
7467
@Override
7568
public Integer statusCode(Map<String, String> request, Map<String, String> response) {
7669
String value = response.get("statusCode");
@@ -88,13 +81,6 @@ public Long responseContentLength(Map<String, String> request, Map<String, Strin
8881
return value == null ? null : Long.parseLong(value);
8982
}
9083

91-
@Override
92-
public Long responseContentLengthUncompressed(
93-
Map<String, String> request, Map<String, String> response) {
94-
String value = response.get("responseContentLengthUncompressed");
95-
return value == null ? null : Long.parseLong(value);
96-
}
97-
9884
@Override
9985
public List<String> responseHeader(
10086
Map<String, String> request, Map<String, String> response, String name) {
@@ -111,7 +97,6 @@ void normal() {
11197
request.put("target", "/repositories/1");
11298
request.put("scheme", "http");
11399
request.put("requestContentLength", "10");
114-
request.put("requestContentLengthUncompressed", "11");
115100
request.put("flavor", "http/2");
116101
request.put("route", "/repositories/{id}");
117102
request.put("serverName", "server");
@@ -123,7 +108,6 @@ void normal() {
123108
Map<String, String> response = new HashMap<>();
124109
response.put("statusCode", "202");
125110
response.put("responseContentLength", "20");
126-
response.put("responseContentLengthUncompressed", "21");
127111
response.put("header.custom-response-header", "654,321");
128112

129113
Function<Context, String> routeFromContext = ctx -> "/repositories/{repoId}";
@@ -168,11 +152,9 @@ void normal() {
168152
asList("123", "456")),
169153
entry(SemanticAttributes.HTTP_SERVER_NAME, "server"),
170154
entry(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH, 10L),
171-
entry(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED, 11L),
172155
entry(SemanticAttributes.HTTP_FLAVOR, "http/2"),
173156
entry(SemanticAttributes.HTTP_STATUS_CODE, 202L),
174157
entry(SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH, 20L),
175-
entry(SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED, 21L),
176158
entry(
177159
AttributeKey.stringArrayKey("http.response.header.custom_response_header"),
178160
asList("654", "321")));

‎instrumentation-api/src/jmh/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBenchmark.java

-12
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,6 @@ public Long requestContentLength(Void unused, @Nullable Void unused2) {
8585
return 100L;
8686
}
8787

88-
@Override
89-
@Nullable
90-
public Long requestContentLengthUncompressed(Void unused, @Nullable Void unused2) {
91-
return null;
92-
}
93-
9488
@Override
9589
public String flavor(Void unused, @Nullable Void unused2) {
9690
return SemanticAttributes.HttpFlavorValues.HTTP_2_0;
@@ -106,12 +100,6 @@ public Long responseContentLength(Void unused, Void unused2) {
106100
return 100L;
107101
}
108102

109-
@Override
110-
@Nullable
111-
public Long responseContentLengthUncompressed(Void unused, Void unused2) {
112-
return null;
113-
}
114-
115103
@Override
116104
public List<String> responseHeader(Void unused, Void unused2, String name) {
117105
return Collections.emptyList();

‎instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesGetter.java

-14
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@ public Long requestContentLength(HttpRequest httpRequest, @Nullable HttpResponse
4141
return null;
4242
}
4343

44-
@Override
45-
@Nullable
46-
public Long requestContentLengthUncompressed(
47-
HttpRequest httpRequest, @Nullable HttpResponse httpResponse) {
48-
return null;
49-
}
50-
5144
@Override
5245
public Integer statusCode(HttpRequest httpRequest, HttpResponse httpResponse) {
5346
return httpResponse.status().intValue();
@@ -59,13 +52,6 @@ public Long responseContentLength(HttpRequest httpRequest, HttpResponse httpResp
5952
return null;
6053
}
6154

62-
@Override
63-
@Nullable
64-
public Long responseContentLengthUncompressed(
65-
HttpRequest httpRequest, HttpResponse httpResponse) {
66-
return null;
67-
}
68-
6955
@Override
7056
public List<String> responseHeader(
7157
HttpRequest httpRequest, HttpResponse httpResponse, String name) {

‎instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesGetter.java

-13
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@ public Long requestContentLength(HttpRequest request, @Nullable HttpResponse htt
3232
return null;
3333
}
3434

35-
@Override
36-
@Nullable
37-
public Long requestContentLengthUncompressed(
38-
HttpRequest request, @Nullable HttpResponse httpResponse) {
39-
return null;
40-
}
41-
4235
@Override
4336
public Integer statusCode(HttpRequest request, HttpResponse httpResponse) {
4437
return httpResponse.status().intValue();
@@ -50,12 +43,6 @@ public Long responseContentLength(HttpRequest request, HttpResponse httpResponse
5043
return null;
5144
}
5245

53-
@Override
54-
@Nullable
55-
public Long responseContentLengthUncompressed(HttpRequest request, HttpResponse httpResponse) {
56-
return null;
57-
}
58-
5946
@Override
6047
public List<String> responseHeader(HttpRequest request, HttpResponse httpResponse, String name) {
6148
return AkkaHttpUtil.responseHeader(httpResponse, name);

‎instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientHttpAttributesGetter.java

-14
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ public Long requestContentLength(
3838
return null;
3939
}
4040

41-
@Override
42-
@Nullable
43-
public Long requestContentLengthUncompressed(
44-
ApacheHttpClientRequest request, @Nullable HttpResponse response) {
45-
return null;
46-
}
47-
4841
@Override
4942
@Nullable
5043
public Integer statusCode(ApacheHttpClientRequest request, HttpResponse response) {
@@ -64,13 +57,6 @@ public Long responseContentLength(ApacheHttpClientRequest request, HttpResponse
6457
return null;
6558
}
6659

67-
@Override
68-
@Nullable
69-
public Long responseContentLengthUncompressed(
70-
ApacheHttpClientRequest request, HttpResponse response) {
71-
return null;
72-
}
73-
7460
@Override
7561
public List<String> responseHeader(
7662
ApacheHttpClientRequest request, HttpResponse response, String name) {

‎instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientHttpAttributesGetter.java

-12
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ public Long requestContentLength(HttpMethod request, @Nullable HttpMethod respon
4343
return null;
4444
}
4545

46-
@Override
47-
@Nullable
48-
public Long requestContentLengthUncompressed(HttpMethod request, @Nullable HttpMethod response) {
49-
return null;
50-
}
51-
5246
@Override
5347
@Nullable
5448
public Integer statusCode(HttpMethod request, HttpMethod response) {
@@ -73,12 +67,6 @@ public Long responseContentLength(HttpMethod request, HttpMethod response) {
7367
return null;
7468
}
7569

76-
@Override
77-
@Nullable
78-
public Long responseContentLengthUncompressed(HttpMethod request, HttpMethod response) {
79-
return null;
80-
}
81-
8270
@Override
8371
public List<String> responseHeader(HttpMethod request, HttpMethod response, String name) {
8472
Header header = response.getResponseHeader(name);

‎instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientHttpAttributesGetter.java

-14
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@ public Long requestContentLength(
3737
return null;
3838
}
3939

40-
@Override
41-
@Nullable
42-
public Long requestContentLengthUncompressed(
43-
ApacheHttpClientRequest request, @Nullable HttpResponse response) {
44-
return null;
45-
}
46-
4740
@Override
4841
public Integer statusCode(ApacheHttpClientRequest request, HttpResponse response) {
4942
return response.getStatusLine().getStatusCode();
@@ -61,13 +54,6 @@ public Long responseContentLength(ApacheHttpClientRequest request, HttpResponse
6154
return null;
6255
}
6356

64-
@Override
65-
@Nullable
66-
public Long responseContentLengthUncompressed(
67-
ApacheHttpClientRequest request, HttpResponse response) {
68-
return null;
69-
}
70-
7157
@Override
7258
public List<String> responseHeader(
7359
ApacheHttpClientRequest request, HttpResponse response, String name) {

‎instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientHttpAttributesGetter.java

-14
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@ public Long requestContentLength(
3939
return null;
4040
}
4141

42-
@Override
43-
@Nullable
44-
public Long requestContentLengthUncompressed(
45-
ApacheHttpClientRequest request, @Nullable HttpResponse response) {
46-
return null;
47-
}
48-
4942
@Override
5043
public Integer statusCode(ApacheHttpClientRequest request, HttpResponse response) {
5144
return response.getStatusLine().getStatusCode();
@@ -63,13 +56,6 @@ public Long responseContentLength(ApacheHttpClientRequest request, HttpResponse
6356
return null;
6457
}
6558

66-
@Override
67-
@Nullable
68-
public Long responseContentLengthUncompressed(
69-
ApacheHttpClientRequest request, HttpResponse response) {
70-
return null;
71-
}
72-
7359
@Override
7460
public List<String> responseHeader(
7561
ApacheHttpClientRequest request, HttpResponse response, String name) {

‎instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientHttpAttributesGetter.java

-13
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,6 @@ public Long requestContentLength(HttpRequest request, @Nullable HttpResponse res
7474
return null;
7575
}
7676

77-
@Override
78-
@Nullable
79-
public Long requestContentLengthUncompressed(
80-
HttpRequest request, @Nullable HttpResponse response) {
81-
return null;
82-
}
83-
8477
@Override
8578
public Integer statusCode(HttpRequest request, HttpResponse response) {
8679
return response.getCode();
@@ -118,12 +111,6 @@ public Long responseContentLength(HttpRequest request, HttpResponse response) {
118111
return null;
119112
}
120113

121-
@Override
122-
@Nullable
123-
public Long responseContentLengthUncompressed(HttpRequest request, HttpResponse response) {
124-
return null;
125-
}
126-
127114
@Override
128115
public List<String> responseHeader(HttpRequest request, HttpResponse response, String name) {
129116
return getHeader(response, name);

0 commit comments

Comments
 (0)