From 5a152cd289c1ed1e70ac2741cbe540153bcc8b5c Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Fri, 29 Jul 2022 06:17:38 +0200 Subject: [PATCH] Deprecate uncompressed content length HTTP attributes (#6383) --- .../http/HttpCommonAttributesExtractor.java | 8 -------- .../http/HttpCommonAttributesGetter.java | 14 ++++++++++++-- .../HttpClientAttributesExtractorTest.java | 18 ------------------ .../HttpServerAttributesExtractorTest.java | 18 ------------------ .../instrumenter/InstrumenterBenchmark.java | 12 ------------ .../client/AkkaHttpClientAttributesGetter.java | 14 -------------- .../server/AkkaHttpServerAttributesGetter.java | 13 ------------- ...cheHttpAsyncClientHttpAttributesGetter.java | 14 -------------- .../ApacheHttpClientHttpAttributesGetter.java | 12 ------------ .../ApacheHttpClientHttpAttributesGetter.java | 14 -------------- .../ApacheHttpClientHttpAttributesGetter.java | 14 -------------- .../ApacheHttpClientHttpAttributesGetter.java | 13 ------------- .../ArmeriaHttpClientAttributesGetter.java | 13 ------------- .../ArmeriaHttpServerAttributesGetter.java | 13 ------------- .../AsyncHttpClientHttpAttributesGetter.java | 12 ------------ .../AsyncHttpClientHttpAttributesGetter.java | 13 ------------- .../v1_11/AwsSdkHttpAttributesGetter.java | 12 ------------ .../v2_2/AwsSdkHttpAttributesGetter.java | 14 -------------- .../GoogleHttpClientHttpAttributesGetter.java | 14 -------------- .../grizzly/GrizzlyHttpAttributesGetter.java | 14 -------------- .../HttpUrlHttpAttributesGetter.java | 13 ------------- .../httpclient/JdkHttpAttributesGetter.java | 14 -------------- .../v1_1/JaxRsClientHttpAttributesGetter.java | 14 -------------- .../JettyClientHttpAttributesGetter.java | 12 ------------ .../v1_0/KtorHttpServerAttributesGetter.kt | 8 -------- .../v2_0/KtorHttpServerAttributesGetter.kt | 8 -------- .../KubernetesHttpAttributesGetter.java | 13 ------------- .../LibertyDispatcherHttpAttributesGetter.java | 14 -------------- .../NettyHttpClientAttributesGetter.java | 14 -------------- .../NettyHttpServerAttributesGetter.java | 14 -------------- .../NettyHttpClientAttributesGetter.java | 14 -------------- .../NettyHttpServerAttributesGetter.java | 14 -------------- .../v2_2/OkHttp2HttpAttributesGetter.java | 12 ------------ .../okhttp/v3_0/OkHttpAttributesGetter.java | 12 ------------ .../MockHttpServerAttributesGetter.java | 12 ------------ .../PlayWsClientHttpAttributesGetter.java | 12 ------------ .../ratpack/RatpackHttpAttributesGetter.java | 12 ------------ .../RatpackHttpClientAttributesGetter.java | 14 -------------- ...ReactorNettyHttpClientAttributesGetter.java | 14 -------------- .../v1_0/RestletHttpAttributesGetter.java | 12 ------------ .../internal/RestletHttpAttributesGetter.java | 12 ------------ .../servlet/ServletHttpAttributesGetter.java | 16 ---------------- .../web/SpringWebHttpAttributesGetter.java | 14 -------------- .../SpringWebfluxHttpAttributesGetter.java | 13 ------------- .../SpringWebMvcHttpAttributesGetter.java | 14 -------------- .../common/TomcatHttpAttributesGetter.java | 12 ------------ .../undertow/UndertowHttpAttributesGetter.java | 14 -------------- .../AbstractVertxHttpAttributesGetter.java | 14 -------------- 48 files changed, 12 insertions(+), 618 deletions(-) diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesExtractor.java index 1d3bb659c25b..01b78dcd626e 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesExtractor.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesExtractor.java @@ -62,10 +62,6 @@ public void onEnd( attributes, SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH, getter.requestContentLength(request, response)); - internalSet( - attributes, - SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED, - getter.requestContentLengthUncompressed(request, response)); if (response != null) { Integer statusCode = getter.statusCode(request, response); @@ -76,10 +72,6 @@ public void onEnd( attributes, SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH, getter.responseContentLength(request, response)); - internalSet( - attributes, - SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED, - getter.responseContentLengthUncompressed(request, response)); for (String name : capturedResponseHeaders) { List values = getter.responseHeader(request, response, name); diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesGetter.java index 8cf034114934..8758915eac90 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesGetter.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesGetter.java @@ -43,9 +43,14 @@ public interface HttpCommonAttributesGetter { * *

This is called from {@link Instrumenter#end(Context, Object, Object, Throwable)}, whether * {@code response} is {@code null} or not. + * + * @deprecated This method is deprecated and will be removed in the next release. */ + @Deprecated @Nullable - Long requestContentLengthUncompressed(REQUEST request, @Nullable RESPONSE response); + default Long requestContentLengthUncompressed(REQUEST request, @Nullable RESPONSE response) { + throw new UnsupportedOperationException("This method is deprecated and will be removed"); + } /** * Extracts the {@code http.status_code} span attribute. @@ -70,9 +75,14 @@ public interface HttpCommonAttributesGetter { * *

This is called from {@link Instrumenter#end(Context, Object, Object, Throwable)}, only when * {@code response} is non-{@code null}. + * + * @deprecated This method is deprecated and will be removed in the next release. */ + @Deprecated @Nullable - Long responseContentLengthUncompressed(REQUEST request, RESPONSE response); + default Long responseContentLengthUncompressed(REQUEST request, RESPONSE response) { + throw new UnsupportedOperationException("This method is deprecated and will be removed"); + } /** * Extracts all values of header named {@code name} from the response, or an empty list if there 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 0e1a0b8456dc..7c884504b69a 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 @@ -48,13 +48,6 @@ public Long requestContentLength(Map request, Map request, Map response) { - String value = request.get("requestContentLengthUncompressed"); - return value == null ? null : Long.parseLong(value); - } - @Override public Integer statusCode(Map request, Map response) { return Integer.parseInt(response.get("statusCode")); @@ -71,13 +64,6 @@ public Long responseContentLength(Map request, Map request, Map response) { - String value = response.get("responseContentLengthUncompressed"); - return value == null ? null : Long.parseLong(value); - } - @Override public List responseHeader( Map request, Map response, String name) { @@ -92,7 +78,6 @@ void normal() { request.put("method", "POST"); request.put("url", "http://github.com"); request.put("requestContentLength", "10"); - request.put("requestContentLengthUncompressed", "11"); request.put("flavor", "http/2"); request.put("header.user-agent", "okhttp 3.x"); request.put("header.custom-request-header", "123,456"); @@ -100,7 +85,6 @@ void normal() { Map response = new HashMap<>(); response.put("statusCode", "202"); response.put("responseContentLength", "20"); - response.put("responseContentLengthUncompressed", "21"); response.put("header.custom-response-header", "654,321"); HttpClientAttributesExtractor, Map> extractor = @@ -130,11 +114,9 @@ void normal() { AttributeKey.stringArrayKey("http.request.header.custom_request_header"), asList("123", "456")), entry(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH, 10L), - entry(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED, 11L), entry(SemanticAttributes.HTTP_FLAVOR, "http/2"), entry(SemanticAttributes.HTTP_STATUS_CODE, 202L), entry(SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH, 20L), - entry(SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED, 21L), entry( AttributeKey.stringArrayKey("http.response.header.custom_response_header"), asList("654", "321"))); 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 d815679d4382..739b63e26bf3 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 @@ -64,13 +64,6 @@ public Long requestContentLength(Map request, Map request, Map response) { - String value = request.get("requestContentLengthUncompressed"); - return value == null ? null : Long.parseLong(value); - } - @Override public Integer statusCode(Map request, Map response) { String value = response.get("statusCode"); @@ -88,13 +81,6 @@ public Long responseContentLength(Map request, Map request, Map response) { - String value = response.get("responseContentLengthUncompressed"); - return value == null ? null : Long.parseLong(value); - } - @Override public List responseHeader( Map request, Map response, String name) { @@ -111,7 +97,6 @@ void normal() { request.put("target", "/repositories/1"); request.put("scheme", "http"); request.put("requestContentLength", "10"); - request.put("requestContentLengthUncompressed", "11"); request.put("flavor", "http/2"); request.put("route", "/repositories/{id}"); request.put("serverName", "server"); @@ -123,7 +108,6 @@ void normal() { Map response = new HashMap<>(); response.put("statusCode", "202"); response.put("responseContentLength", "20"); - response.put("responseContentLengthUncompressed", "21"); response.put("header.custom-response-header", "654,321"); Function routeFromContext = ctx -> "/repositories/{repoId}"; @@ -168,11 +152,9 @@ void normal() { asList("123", "456")), entry(SemanticAttributes.HTTP_SERVER_NAME, "server"), entry(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH, 10L), - entry(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED, 11L), entry(SemanticAttributes.HTTP_FLAVOR, "http/2"), entry(SemanticAttributes.HTTP_STATUS_CODE, 202L), entry(SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH, 20L), - entry(SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED, 21L), entry( AttributeKey.stringArrayKey("http.response.header.custom_response_header"), asList("654", "321"))); diff --git a/instrumentation-api/src/jmh/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBenchmark.java b/instrumentation-api/src/jmh/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBenchmark.java index 5e2a4726dd4e..a0e049204276 100644 --- a/instrumentation-api/src/jmh/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBenchmark.java +++ b/instrumentation-api/src/jmh/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBenchmark.java @@ -85,12 +85,6 @@ public Long requestContentLength(Void unused, @Nullable Void unused2) { return 100L; } - @Override - @Nullable - public Long requestContentLengthUncompressed(Void unused, @Nullable Void unused2) { - return null; - } - @Override public String flavor(Void unused, @Nullable Void unused2) { return SemanticAttributes.HttpFlavorValues.HTTP_2_0; @@ -106,12 +100,6 @@ public Long responseContentLength(Void unused, Void unused2) { return 100L; } - @Override - @Nullable - public Long responseContentLengthUncompressed(Void unused, Void unused2) { - return null; - } - @Override public List responseHeader(Void unused, Void unused2, String name) { return Collections.emptyList(); diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesGetter.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesGetter.java index a0a981932b2d..43a331d7255e 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesGetter.java +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesGetter.java @@ -41,13 +41,6 @@ public Long requestContentLength(HttpRequest httpRequest, @Nullable HttpResponse return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - HttpRequest httpRequest, @Nullable HttpResponse httpResponse) { - return null; - } - @Override public Integer statusCode(HttpRequest httpRequest, HttpResponse httpResponse) { return httpResponse.status().intValue(); @@ -59,13 +52,6 @@ public Long responseContentLength(HttpRequest httpRequest, HttpResponse httpResp return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - HttpRequest httpRequest, HttpResponse httpResponse) { - return null; - } - @Override public List responseHeader( HttpRequest httpRequest, HttpResponse httpResponse, String name) { diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesGetter.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesGetter.java index 5c24bd6b4f74..c12361e2df37 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesGetter.java +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesGetter.java @@ -32,13 +32,6 @@ public Long requestContentLength(HttpRequest request, @Nullable HttpResponse htt return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - HttpRequest request, @Nullable HttpResponse httpResponse) { - return null; - } - @Override public Integer statusCode(HttpRequest request, HttpResponse httpResponse) { return httpResponse.status().intValue(); @@ -50,12 +43,6 @@ public Long responseContentLength(HttpRequest request, HttpResponse httpResponse return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed(HttpRequest request, HttpResponse httpResponse) { - return null; - } - @Override public List responseHeader(HttpRequest request, HttpResponse httpResponse, String name) { return AkkaHttpUtil.responseHeader(httpResponse, name); diff --git a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientHttpAttributesGetter.java b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientHttpAttributesGetter.java index 9544a5869899..af01333fcdaf 100644 --- a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientHttpAttributesGetter.java +++ b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientHttpAttributesGetter.java @@ -38,13 +38,6 @@ public Long requestContentLength( return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - ApacheHttpClientRequest request, @Nullable HttpResponse response) { - return null; - } - @Override @Nullable public Integer statusCode(ApacheHttpClientRequest request, HttpResponse response) { @@ -64,13 +57,6 @@ public Long responseContentLength(ApacheHttpClientRequest request, HttpResponse return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - ApacheHttpClientRequest request, HttpResponse response) { - return null; - } - @Override public List responseHeader( ApacheHttpClientRequest request, HttpResponse response, String name) { diff --git a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientHttpAttributesGetter.java b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientHttpAttributesGetter.java index 8824fda97c97..ef96d024d276 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientHttpAttributesGetter.java +++ b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientHttpAttributesGetter.java @@ -43,12 +43,6 @@ public Long requestContentLength(HttpMethod request, @Nullable HttpMethod respon return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed(HttpMethod request, @Nullable HttpMethod response) { - return null; - } - @Override @Nullable public Integer statusCode(HttpMethod request, HttpMethod response) { @@ -73,12 +67,6 @@ public Long responseContentLength(HttpMethod request, HttpMethod response) { return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed(HttpMethod request, HttpMethod response) { - return null; - } - @Override public List responseHeader(HttpMethod request, HttpMethod response, String name) { Header header = response.getResponseHeader(name); diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientHttpAttributesGetter.java b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientHttpAttributesGetter.java index 94f9534ba5d1..4cf21edddc31 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientHttpAttributesGetter.java +++ b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientHttpAttributesGetter.java @@ -37,13 +37,6 @@ public Long requestContentLength( return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - ApacheHttpClientRequest request, @Nullable HttpResponse response) { - return null; - } - @Override public Integer statusCode(ApacheHttpClientRequest request, HttpResponse response) { return response.getStatusLine().getStatusCode(); @@ -61,13 +54,6 @@ public Long responseContentLength(ApacheHttpClientRequest request, HttpResponse return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - ApacheHttpClientRequest request, HttpResponse response) { - return null; - } - @Override public List responseHeader( ApacheHttpClientRequest request, HttpResponse response, String name) { diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientHttpAttributesGetter.java b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientHttpAttributesGetter.java index 677739cd8fa9..cba402debb54 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientHttpAttributesGetter.java +++ b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientHttpAttributesGetter.java @@ -39,13 +39,6 @@ public Long requestContentLength( return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - ApacheHttpClientRequest request, @Nullable HttpResponse response) { - return null; - } - @Override public Integer statusCode(ApacheHttpClientRequest request, HttpResponse response) { return response.getStatusLine().getStatusCode(); @@ -63,13 +56,6 @@ public Long responseContentLength(ApacheHttpClientRequest request, HttpResponse return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - ApacheHttpClientRequest request, HttpResponse response) { - return null; - } - @Override public List responseHeader( ApacheHttpClientRequest request, HttpResponse response, String name) { diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientHttpAttributesGetter.java b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientHttpAttributesGetter.java index d85b396ff5a5..184a5ec4e105 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientHttpAttributesGetter.java +++ b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientHttpAttributesGetter.java @@ -74,13 +74,6 @@ public Long requestContentLength(HttpRequest request, @Nullable HttpResponse res return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - HttpRequest request, @Nullable HttpResponse response) { - return null; - } - @Override public Integer statusCode(HttpRequest request, HttpResponse response) { return response.getCode(); @@ -118,12 +111,6 @@ public Long responseContentLength(HttpRequest request, HttpResponse response) { return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed(HttpRequest request, HttpResponse response) { - return null; - } - @Override public List responseHeader(HttpRequest request, HttpResponse response, String name) { return getHeader(response, name); diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientAttributesGetter.java b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientAttributesGetter.java index dc93929faa7d..0e8e3d155f83 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientAttributesGetter.java +++ b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientAttributesGetter.java @@ -43,13 +43,6 @@ public Long requestContentLength(RequestContext ctx, @Nullable RequestLog reques return requestLog.requestLength(); } - @Override - @Nullable - public Long requestContentLengthUncompressed( - RequestContext ctx, @Nullable RequestLog requestLog) { - return null; - } - @Override @Nullable public Integer statusCode(RequestContext ctx, RequestLog requestLog) { @@ -75,12 +68,6 @@ public Long responseContentLength(RequestContext ctx, RequestLog requestLog) { return requestLog.responseLength(); } - @Override - @Nullable - public Long responseContentLengthUncompressed(RequestContext ctx, RequestLog requestLog) { - return null; - } - @Override public List responseHeader(RequestContext ctx, RequestLog requestLog, String name) { return requestLog.responseHeaders().getAll(name); diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerAttributesGetter.java b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerAttributesGetter.java index cfae5c0b0a64..4b515106df0f 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerAttributesGetter.java +++ b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerAttributesGetter.java @@ -50,13 +50,6 @@ public Long requestContentLength(RequestContext ctx, @Nullable RequestLog reques return requestLog.requestLength(); } - @Override - @Nullable - public Long requestContentLengthUncompressed( - RequestContext ctx, @Nullable RequestLog requestLog) { - return null; - } - @Override @Nullable public Integer statusCode(RequestContext ctx, RequestLog requestLog) { @@ -82,12 +75,6 @@ public Long responseContentLength(RequestContext ctx, RequestLog requestLog) { return requestLog.responseLength(); } - @Override - @Nullable - public Long responseContentLengthUncompressed(RequestContext ctx, RequestLog requestLog) { - return null; - } - @Override public List responseHeader(RequestContext ctx, RequestLog requestLog, String name) { return requestLog.responseHeaders().getAll(name); diff --git a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientHttpAttributesGetter.java b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientHttpAttributesGetter.java index 376b0e0fe621..920f3fd890fa 100644 --- a/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientHttpAttributesGetter.java +++ b/instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientHttpAttributesGetter.java @@ -37,12 +37,6 @@ public Long requestContentLength(Request request, @Nullable Response response) { return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed(Request request, @Nullable Response response) { - return null; - } - @Override public Integer statusCode(Request request, Response response) { return response.getStatusCode(); @@ -59,12 +53,6 @@ public Long responseContentLength(Request request, Response response) { return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed(Request request, Response response) { - return null; - } - @Override public List responseHeader(Request request, Response response, String name) { return response.getHeaders().getOrDefault(name, Collections.emptyList()); diff --git a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientHttpAttributesGetter.java b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientHttpAttributesGetter.java index 4212387286e1..6ea090be4036 100644 --- a/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientHttpAttributesGetter.java +++ b/instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientHttpAttributesGetter.java @@ -47,13 +47,6 @@ public Long requestContentLength(RequestContext requestContext, @Nullable Respon return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - RequestContext requestContext, @Nullable Response response) { - return null; - } - @Override public Integer statusCode(RequestContext requestContext, Response response) { return response.getStatusCode(); @@ -78,12 +71,6 @@ public Long responseContentLength(RequestContext requestContext, Response respon return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed(RequestContext requestContext, Response response) { - return null; - } - @Override public List responseHeader( RequestContext requestContext, Response response, String name) { diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkHttpAttributesGetter.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkHttpAttributesGetter.java index e628f4391fb0..d65031bbd2ba 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkHttpAttributesGetter.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkHttpAttributesGetter.java @@ -45,12 +45,6 @@ public Long requestContentLength(Request request, @Nullable Response respo return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed(Request request, @Nullable Response response) { - return null; - } - @Override public Integer statusCode(Request request, Response response) { return response.getHttpResponse().getStatusCode(); @@ -62,12 +56,6 @@ public Long responseContentLength(Request request, Response response) { return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed(Request request, Response response) { - return null; - } - @Override public List responseHeader(Request request, Response response, String name) { String value = response.getHttpResponse().getHeaders().get(name); diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpAttributesGetter.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpAttributesGetter.java index acb7e95d2434..c1df829e7757 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpAttributesGetter.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpAttributesGetter.java @@ -53,13 +53,6 @@ public Long requestContentLength( return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - ExecutionAttributes request, @Nullable SdkHttpResponse response) { - return null; - } - @Override public Integer statusCode(ExecutionAttributes request, SdkHttpResponse response) { return response.statusCode(); @@ -72,13 +65,6 @@ public Long responseContentLength( return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - ExecutionAttributes request, @Nullable SdkHttpResponse response) { - return null; - } - @Override public List responseHeader( ExecutionAttributes request, SdkHttpResponse response, String name) { diff --git a/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientHttpAttributesGetter.java b/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientHttpAttributesGetter.java index aa71bd68f16a..f1877b6c8deb 100644 --- a/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientHttpAttributesGetter.java +++ b/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientHttpAttributesGetter.java @@ -37,13 +37,6 @@ public Long requestContentLength(HttpRequest httpRequest, @Nullable HttpResponse return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - HttpRequest httpRequest, @Nullable HttpResponse httpResponse) { - return null; - } - @Override public String flavor(HttpRequest httpRequest, @Nullable HttpResponse httpResponse) { return SemanticAttributes.HttpFlavorValues.HTTP_1_1; @@ -60,13 +53,6 @@ public Long responseContentLength(HttpRequest httpRequest, HttpResponse httpResp return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - HttpRequest httpRequest, HttpResponse httpResponse) { - return null; - } - @Override public List responseHeader( HttpRequest httpRequest, HttpResponse httpResponse, String name) { diff --git a/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpAttributesGetter.java b/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpAttributesGetter.java index c23d7a82bab9..d2e018efd370 100644 --- a/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpAttributesGetter.java +++ b/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpAttributesGetter.java @@ -35,13 +35,6 @@ public Long requestContentLength( return null; } - @Nullable - @Override - public Long requestContentLengthUncompressed( - HttpRequestPacket request, @Nullable HttpResponsePacket response) { - return null; - } - @Override public Integer statusCode(HttpRequestPacket request, HttpResponsePacket response) { return response.getStatus(); @@ -53,13 +46,6 @@ public Long responseContentLength(HttpRequestPacket request, HttpResponsePacket return null; } - @Nullable - @Override - public Long responseContentLengthUncompressed( - HttpRequestPacket request, HttpResponsePacket response) { - return null; - } - @Override public List responseHeader( HttpRequestPacket request, HttpResponsePacket response, String name) { diff --git a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlHttpAttributesGetter.java b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlHttpAttributesGetter.java index c7a43899e470..56a5a7979a26 100644 --- a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlHttpAttributesGetter.java +++ b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlHttpAttributesGetter.java @@ -39,13 +39,6 @@ public Long requestContentLength(HttpURLConnection connection, @Nullable Integer return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - HttpURLConnection connection, @Nullable Integer response) { - return null; - } - @Override public String flavor(HttpURLConnection connection, @Nullable Integer statusCode) { return SemanticAttributes.HttpFlavorValues.HTTP_1_1; @@ -62,12 +55,6 @@ public Long responseContentLength(HttpURLConnection connection, Integer statusCo return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed(HttpURLConnection connection, Integer statusCode) { - return null; - } - @Override public List responseHeader( HttpURLConnection connection, Integer statusCode, String name) { diff --git a/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpAttributesGetter.java b/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpAttributesGetter.java index fbc3b44ce5e7..056755d4ed8c 100644 --- a/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpAttributesGetter.java +++ b/instrumentation/java-http-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpAttributesGetter.java @@ -37,13 +37,6 @@ public Long requestContentLength( return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - HttpRequest httpRequest, @Nullable HttpResponse httpResponse) { - return null; - } - @Override public Integer statusCode(HttpRequest httpRequest, HttpResponse httpResponse) { return httpResponse.statusCode(); @@ -63,13 +56,6 @@ public Long responseContentLength(HttpRequest httpRequest, HttpResponse httpR return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - HttpRequest httpRequest, HttpResponse httpResponse) { - return null; - } - @Override public List responseHeader( HttpRequest httpRequest, HttpResponse httpResponse, String name) { diff --git a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientHttpAttributesGetter.java b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientHttpAttributesGetter.java index 4777432c92ac..d0482dd07897 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientHttpAttributesGetter.java +++ b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientHttpAttributesGetter.java @@ -49,13 +49,6 @@ public Long requestContentLength( return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - ClientRequest httpRequest, @Nullable ClientResponse httpResponse) { - return null; - } - @Override public String flavor(ClientRequest httpRequest, @Nullable ClientResponse httpResponse) { return SemanticAttributes.HttpFlavorValues.HTTP_1_1; @@ -73,13 +66,6 @@ public Long responseContentLength(ClientRequest httpRequest, ClientResponse http return length != -1 ? (long) length : null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - ClientRequest httpRequest, ClientResponse httpResponse) { - return null; - } - @Override public List responseHeader( ClientRequest httpRequest, ClientResponse httpResponse, String name) { diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyClientHttpAttributesGetter.java b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyClientHttpAttributesGetter.java index fc76c58376bf..488ce58968b6 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyClientHttpAttributesGetter.java +++ b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/internal/JettyClientHttpAttributesGetter.java @@ -50,12 +50,6 @@ public Long requestContentLength(Request request, @Nullable Response response) { return getLongFromJettyHttpField(requestContentLengthField); } - @Override - @Nullable - public Long requestContentLengthUncompressed(Request request, @Nullable Response response) { - return null; - } - @Override public String flavor(Request request, @Nullable Response response) { @@ -97,12 +91,6 @@ public Long responseContentLength(Request request, Response response) { return respContentLength; } - @Override - @Nullable - public Long responseContentLengthUncompressed(Request request, Response response) { - return null; - } - @Override public List responseHeader(Request request, Response response, String name) { return response.getHeaders().getValuesList(name); diff --git a/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerAttributesGetter.kt b/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerAttributesGetter.kt index 43c992429871..3f8031542846 100644 --- a/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerAttributesGetter.kt +++ b/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerAttributesGetter.kt @@ -27,10 +27,6 @@ internal enum class KtorHttpServerAttributesGetter : return null } - override fun requestContentLengthUncompressed(request: ApplicationRequest, response: ApplicationResponse?): Long? { - return null - } - override fun statusCode(request: ApplicationRequest, response: ApplicationResponse): Int? { return response.status()?.value } @@ -39,10 +35,6 @@ internal enum class KtorHttpServerAttributesGetter : return null } - override fun responseContentLengthUncompressed(request: ApplicationRequest, response: ApplicationResponse): Long? { - return null - } - override fun responseHeader(request: ApplicationRequest, response: ApplicationResponse, name: String): List { return response.headers.allValues().getAll(name) ?: emptyList() } diff --git a/instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/KtorHttpServerAttributesGetter.kt b/instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/KtorHttpServerAttributesGetter.kt index ee5ac98322fa..8161a808e5f4 100644 --- a/instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/KtorHttpServerAttributesGetter.kt +++ b/instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/KtorHttpServerAttributesGetter.kt @@ -27,10 +27,6 @@ internal enum class KtorHttpServerAttributesGetter : return null } - override fun requestContentLengthUncompressed(request: ApplicationRequest, response: ApplicationResponse?): Long? { - return null - } - override fun statusCode(request: ApplicationRequest, response: ApplicationResponse): Int? { return response.status()?.value } @@ -39,10 +35,6 @@ internal enum class KtorHttpServerAttributesGetter : return null } - override fun responseContentLengthUncompressed(request: ApplicationRequest, response: ApplicationResponse): Long? { - return null - } - override fun responseHeader(request: ApplicationRequest, response: ApplicationResponse, name: String): List { return response.headers.allValues().getAll(name) ?: emptyList() } diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesHttpAttributesGetter.java b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesHttpAttributesGetter.java index aa39706afdd7..ef64a32c5d6f 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesHttpAttributesGetter.java +++ b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesHttpAttributesGetter.java @@ -38,13 +38,6 @@ public Long requestContentLength(Request request, @Nullable ApiResponse apiRe return null; } - @Nullable - @Override - public Long requestContentLengthUncompressed( - Request request, @Nullable ApiResponse apiResponse) { - return null; - } - @Override public String flavor(Request request, @Nullable ApiResponse apiResponse) { return SemanticAttributes.HttpFlavorValues.HTTP_1_1; @@ -61,12 +54,6 @@ public Long responseContentLength(Request request, ApiResponse apiResponse) { return null; } - @Nullable - @Override - public Long responseContentLengthUncompressed(Request request, ApiResponse apiResponse) { - return null; - } - @Override public List responseHeader(Request request, ApiResponse apiResponse, String name) { return apiResponse.getHeaders().getOrDefault(name, emptyList()); diff --git a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherHttpAttributesGetter.java b/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherHttpAttributesGetter.java index 7ce35be351b4..990daad3a2d2 100644 --- a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherHttpAttributesGetter.java +++ b/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherHttpAttributesGetter.java @@ -30,13 +30,6 @@ public Long requestContentLength( return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - LibertyRequest libertyRequest, @Nullable LibertyResponse libertyResponse) { - return null; - } - @Override @Nullable public String flavor(LibertyRequest libertyRequest) { @@ -63,13 +56,6 @@ public Long responseContentLength( return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - LibertyRequest libertyRequest, LibertyResponse libertyResponse) { - return null; - } - @Override public List responseHeader( LibertyRequest libertyRequest, LibertyResponse libertyResponse, String name) { diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesGetter.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesGetter.java index b83f2e77db11..b3aa9279139a 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesGetter.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientAttributesGetter.java @@ -65,13 +65,6 @@ public Long requestContentLength( return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { - return null; - } - @Override public Integer statusCode(HttpRequestAndChannel requestAndChannel, HttpResponse response) { return response.getStatus().getCode(); @@ -84,13 +77,6 @@ public Long responseContentLength( return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - HttpRequestAndChannel requestAndChannel, HttpResponse response) { - return null; - } - @Override public List responseHeader( HttpRequestAndChannel requestAndChannel, HttpResponse response, String name) { diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerAttributesGetter.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerAttributesGetter.java index b43a192025cc..13a687d4a4b4 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerAttributesGetter.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerAttributesGetter.java @@ -33,13 +33,6 @@ public Long requestContentLength( return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { - return null; - } - @Override public Integer statusCode(HttpRequestAndChannel requestAndChannel, HttpResponse response) { return response.getStatus().getCode(); @@ -52,13 +45,6 @@ public Long responseContentLength( return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - HttpRequestAndChannel requestAndChannel, HttpResponse response) { - return null; - } - @Override public List responseHeader( HttpRequestAndChannel requestAndChannel, HttpResponse response, String name) { diff --git a/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4/common/client/NettyHttpClientAttributesGetter.java b/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4/common/client/NettyHttpClientAttributesGetter.java index 57c10e72042b..9c8f243b9e63 100644 --- a/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4/common/client/NettyHttpClientAttributesGetter.java +++ b/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4/common/client/NettyHttpClientAttributesGetter.java @@ -65,13 +65,6 @@ public Long requestContentLength( return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { - return null; - } - @Override public Integer statusCode(HttpRequestAndChannel requestAndChannel, HttpResponse response) { return response.getStatus().code(); @@ -84,13 +77,6 @@ public Long responseContentLength( return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - HttpRequestAndChannel requestAndChannel, HttpResponse response) { - return null; - } - @Override public List responseHeader( HttpRequestAndChannel requestAndChannel, HttpResponse response, String name) { diff --git a/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4/common/server/NettyHttpServerAttributesGetter.java b/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4/common/server/NettyHttpServerAttributesGetter.java index 0c1dd32b6511..19092769fad7 100644 --- a/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4/common/server/NettyHttpServerAttributesGetter.java +++ b/instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4/common/server/NettyHttpServerAttributesGetter.java @@ -33,13 +33,6 @@ public Long requestContentLength( return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - HttpRequestAndChannel requestAndChannel, @Nullable HttpResponse response) { - return null; - } - @Override public Integer statusCode(HttpRequestAndChannel requestAndChannel, HttpResponse response) { return response.getStatus().code(); @@ -52,13 +45,6 @@ public Long responseContentLength( return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - HttpRequestAndChannel requestAndChannel, HttpResponse response) { - return null; - } - @Override public List responseHeader( HttpRequestAndChannel requestAndChannel, HttpResponse response, String name) { diff --git a/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2HttpAttributesGetter.java b/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2HttpAttributesGetter.java index 9822bb2db0a7..7c494077633d 100644 --- a/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2HttpAttributesGetter.java +++ b/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2HttpAttributesGetter.java @@ -35,12 +35,6 @@ public Long requestContentLength(Request request, @Nullable Response response) { return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed(Request request, @Nullable Response response) { - return null; - } - @Override public Integer statusCode(Request request, Response response) { return response.code(); @@ -70,12 +64,6 @@ public Long responseContentLength(Request request, Response response) { return response.body().contentLength(); } - @Override - @Nullable - public Long responseContentLengthUncompressed(Request request, Response response) { - return null; - } - @Override public List responseHeader(Request request, Response response, String name) { return response.headers(name); diff --git a/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpAttributesGetter.java b/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpAttributesGetter.java index 23ced7f7c07a..5f402aa763ac 100644 --- a/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpAttributesGetter.java +++ b/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpAttributesGetter.java @@ -36,12 +36,6 @@ public Long requestContentLength(Request request, @Nullable Response response) { return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed(Request request, @Nullable Response response) { - return null; - } - @Override @SuppressWarnings("UnnecessaryDefaultInEnumSwitch") @Nullable @@ -75,12 +69,6 @@ public Long responseContentLength(Request request, Response response) { return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed(Request request, Response response) { - return null; - } - @Override public List responseHeader(Request request, Response response, String name) { return response.headers(name); diff --git a/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/MockHttpServerAttributesGetter.java b/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/MockHttpServerAttributesGetter.java index 6e8165e64f0c..3a91d0a52237 100644 --- a/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/MockHttpServerAttributesGetter.java +++ b/instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/MockHttpServerAttributesGetter.java @@ -33,12 +33,6 @@ public Long requestContentLength(String s, @Nullable Void unused) { return null; } - @Nullable - @Override - public Long requestContentLengthUncompressed(String s, @Nullable Void unused) { - return null; - } - @Nullable @Override public Integer statusCode(String s, Void unused) { @@ -51,12 +45,6 @@ public Long responseContentLength(String s, Void unused) { return null; } - @Nullable - @Override - public Long responseContentLengthUncompressed(String s, Void unused) { - return null; - } - @Override public List responseHeader(String s, Void unused, String name) { return emptyList(); diff --git a/instrumentation/play/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientHttpAttributesGetter.java b/instrumentation/play/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientHttpAttributesGetter.java index 64c4bfac3f81..c103f08b99ad 100644 --- a/instrumentation/play/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientHttpAttributesGetter.java +++ b/instrumentation/play/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientHttpAttributesGetter.java @@ -36,12 +36,6 @@ public Long requestContentLength(Request request, @Nullable Response response) { return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed(Request request, @Nullable Response response) { - return null; - } - @Override public Integer statusCode(Request request, Response response) { return response.getStatusCode(); @@ -58,12 +52,6 @@ public Long responseContentLength(Request request, Response response) { return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed(Request request, Response response) { - return null; - } - @Override public List responseHeader(Request request, Response response, String name) { return response.getHeaders().getAll(name); diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpAttributesGetter.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpAttributesGetter.java index 232f1e02dce6..766bc020e54e 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpAttributesGetter.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpAttributesGetter.java @@ -60,12 +60,6 @@ public Long requestContentLength(Request request, @Nullable Response response) { return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed(Request request, @Nullable Response response) { - return null; - } - @Override @Nullable public String flavor(Request request) { @@ -99,12 +93,6 @@ public Long responseContentLength(Request request, Response response) { return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed(Request request, Response response) { - return null; - } - @Override public List responseHeader(Request request, Response response, String name) { return response.getHeaders().getAll(name); diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpClientAttributesGetter.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpClientAttributesGetter.java index 57694d5b6c8b..d92e7be2e9ad 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpClientAttributesGetter.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackHttpClientAttributesGetter.java @@ -44,13 +44,6 @@ public Long requestContentLength(RequestSpec requestSpec, @Nullable HttpResponse return null; } - @Nullable - @Override - public Long requestContentLengthUncompressed( - RequestSpec requestSpec, @Nullable HttpResponse httpResponse) { - return null; - } - @Override public Integer statusCode(RequestSpec requestSpec, HttpResponse httpResponse) { return httpResponse.getStatusCode(); @@ -62,13 +55,6 @@ public Long responseContentLength(RequestSpec requestSpec, HttpResponse httpResp return null; } - @Nullable - @Override - public Long responseContentLengthUncompressed( - RequestSpec requestSpec, HttpResponse httpResponse) { - return null; - } - @Override public List responseHeader( RequestSpec requestSpec, HttpResponse httpResponse, String name) { diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesGetter.java b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesGetter.java index 829f1f17e3ae..6db0c8ec8323 100644 --- a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesGetter.java +++ b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyHttpClientAttributesGetter.java @@ -81,13 +81,6 @@ public Long requestContentLength( return null; } - @Nullable - @Override - public Long requestContentLengthUncompressed( - HttpClientConfig request, @Nullable HttpClientResponse response) { - return null; - } - @Override public Integer statusCode(HttpClientConfig request, HttpClientResponse response) { return response.status().code(); @@ -99,13 +92,6 @@ public Long responseContentLength(HttpClientConfig request, HttpClientResponse r return null; } - @Nullable - @Override - public Long responseContentLengthUncompressed( - HttpClientConfig request, HttpClientResponse response) { - return null; - } - @Override public List responseHeader( HttpClientConfig request, HttpClientResponse response, String name) { diff --git a/instrumentation/restlet/restlet-1.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_0/RestletHttpAttributesGetter.java b/instrumentation/restlet/restlet-1.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_0/RestletHttpAttributesGetter.java index 0cd5a6aef514..a84cf3920424 100644 --- a/instrumentation/restlet/restlet-1.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_0/RestletHttpAttributesGetter.java +++ b/instrumentation/restlet/restlet-1.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_0/RestletHttpAttributesGetter.java @@ -63,12 +63,6 @@ public Long requestContentLength(Request request, @Nullable Response response) { return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed(Request request, @Nullable Response response) { - return null; - } - @Override @Nullable public String flavor(Request request) { @@ -103,12 +97,6 @@ public Long responseContentLength(Request request, Response response) { return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed(Request request, Response response) { - return null; - } - @Override public List responseHeader(Request request, Response response, String name) { Form headers = getHeaders(response); diff --git a/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletHttpAttributesGetter.java b/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletHttpAttributesGetter.java index 2ce344a48eb7..d2105f2bbc3a 100644 --- a/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletHttpAttributesGetter.java +++ b/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletHttpAttributesGetter.java @@ -65,12 +65,6 @@ public Long requestContentLength(Request request, @Nullable Response response) { return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed(Request request, @Nullable Response response) { - return null; - } - @Override @Nullable public String flavor(Request request) { @@ -104,12 +98,6 @@ public Long responseContentLength(Request request, Response response) { return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed(Request request, Response response) { - return null; - } - @Override public List responseHeader(Request request, Response response, String name) { Series headers = getHeaders(response); diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletHttpAttributesGetter.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletHttpAttributesGetter.java index 3cb2925d593f..ffb793c95911 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletHttpAttributesGetter.java +++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletHttpAttributesGetter.java @@ -60,14 +60,6 @@ public Long requestContentLength( return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - ServletRequestContext requestContext, - @Nullable ServletResponseContext responseContext) { - return null; - } - @Override @Nullable public String flavor(ServletRequestContext requestContext) { @@ -115,14 +107,6 @@ public Long responseContentLength( return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - ServletRequestContext requestContext, - ServletResponseContext responseContext) { - return null; - } - @Override public List responseHeader( ServletRequestContext requestContext, diff --git a/instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/SpringWebHttpAttributesGetter.java b/instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/SpringWebHttpAttributesGetter.java index b18574fd50dd..b20cfb55c26d 100644 --- a/instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/SpringWebHttpAttributesGetter.java +++ b/instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/SpringWebHttpAttributesGetter.java @@ -42,13 +42,6 @@ public Long requestContentLength( return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - HttpRequest httpRequest, @Nullable ClientHttpResponse clientHttpResponse) { - return null; - } - @Override @Nullable public String flavor(HttpRequest httpRequest, @Nullable ClientHttpResponse clientHttpResponse) { @@ -71,13 +64,6 @@ public Long responseContentLength( return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - HttpRequest httpRequest, ClientHttpResponse clientHttpResponse) { - return null; - } - @Override public List responseHeader( HttpRequest httpRequest, ClientHttpResponse clientHttpResponse, String name) { diff --git a/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpAttributesGetter.java b/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpAttributesGetter.java index 6f673424b102..07eaf9349b80 100644 --- a/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpAttributesGetter.java +++ b/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpAttributesGetter.java @@ -61,13 +61,6 @@ public Long requestContentLength(ClientRequest request, @Nullable ClientResponse return null; } - @Nullable - @Override - public Long requestContentLengthUncompressed( - ClientRequest request, @Nullable ClientResponse response) { - return null; - } - @Override public Integer statusCode(ClientRequest request, ClientResponse response) { if (RAW_STATUS_CODE != null) { @@ -89,12 +82,6 @@ public Long responseContentLength(ClientRequest request, ClientResponse response return null; } - @Nullable - @Override - public Long responseContentLengthUncompressed(ClientRequest request, ClientResponse response) { - return null; - } - @Override public List responseHeader(ClientRequest request, ClientResponse response, String name) { return response.headers().header(name); diff --git a/instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcHttpAttributesGetter.java b/instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcHttpAttributesGetter.java index b13d852d9f81..f666b844efee 100644 --- a/instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcHttpAttributesGetter.java +++ b/instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcHttpAttributesGetter.java @@ -38,13 +38,6 @@ public Long requestContentLength( return null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - HttpServletRequest request, @Nullable HttpServletResponse response) { - return null; - } - @Override @Nullable public String flavor(HttpServletRequest request) { @@ -64,13 +57,6 @@ public Long responseContentLength(HttpServletRequest request, HttpServletRespons return null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - HttpServletRequest request, HttpServletResponse response) { - return null; - } - @Override public List responseHeader( HttpServletRequest request, HttpServletResponse response, String name) { diff --git a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHttpAttributesGetter.java b/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHttpAttributesGetter.java index 486e7ff97e11..5acfbaa3e7ad 100644 --- a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHttpAttributesGetter.java +++ b/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHttpAttributesGetter.java @@ -50,12 +50,6 @@ public Long requestContentLength(Request request, @Nullable Response response) { return contentLength != -1 ? contentLength : null; } - @Override - @Nullable - public Long requestContentLengthUncompressed(Request request, @Nullable Response response) { - return null; - } - @Override @Nullable public String flavor(Request request) { @@ -82,12 +76,6 @@ public Long responseContentLength(Request request, Response response) { return contentLength != -1 ? contentLength : null; } - @Override - @Nullable - public Long responseContentLengthUncompressed(Request request, Response response) { - return null; - } - @Override public List responseHeader(Request request, Response response, String name) { return Collections.list(response.getMimeHeaders().values(name)); diff --git a/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpAttributesGetter.java b/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpAttributesGetter.java index bcb4096484f8..16e1cb60da64 100644 --- a/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpAttributesGetter.java +++ b/instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpAttributesGetter.java @@ -34,13 +34,6 @@ public Long requestContentLength( return requestContentLength != -1 ? requestContentLength : null; } - @Override - @Nullable - public Long requestContentLengthUncompressed( - HttpServerExchange exchange, @Nullable HttpServerExchange unused) { - return null; - } - @Override public String flavor(HttpServerExchange exchange) { String flavor = exchange.getProtocol().toString(); @@ -63,13 +56,6 @@ public Long responseContentLength(HttpServerExchange exchange, HttpServerExchang return responseContentLength != -1 ? responseContentLength : null; } - @Override - @Nullable - public Long responseContentLengthUncompressed( - HttpServerExchange exchange, HttpServerExchange unused) { - return null; - } - @Override public List responseHeader( HttpServerExchange exchange, HttpServerExchange unused, String name) { diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/AbstractVertxHttpAttributesGetter.java b/instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/AbstractVertxHttpAttributesGetter.java index 69f1a22ee40c..44fe6b6f2271 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/AbstractVertxHttpAttributesGetter.java +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/client/AbstractVertxHttpAttributesGetter.java @@ -32,13 +32,6 @@ public Long requestContentLength( return null; } - @Nullable - @Override - public Long requestContentLengthUncompressed( - HttpClientRequest request, @Nullable HttpClientResponse response) { - return null; - } - @Override public Integer statusCode(HttpClientRequest request, HttpClientResponse response) { return response.statusCode(); @@ -50,13 +43,6 @@ public Long responseContentLength(HttpClientRequest request, HttpClientResponse return null; } - @Nullable - @Override - public Long responseContentLengthUncompressed( - HttpClientRequest request, HttpClientResponse response) { - return null; - } - @Override public List responseHeader( HttpClientRequest request, HttpClientResponse response, String name) {