diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt index bce48fec0909..e8d24f314b5a 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt @@ -1,2 +1,27 @@ Comparing source compatibility of opentelemetry-instrumentation-api-2.27.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.26.1.jar -No changes. \ No newline at end of file +*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + GENERIC TEMPLATES: === REQUEST:java.lang.Object, === RESPONSE:java.lang.Object + === UNCHANGED METHOD: PUBLIC io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder setCapturedRequestHeaders(java.util.Collection) + +++ NEW ANNOTATION: java.lang.Deprecated + === UNCHANGED METHOD: PUBLIC io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder setCapturedRequestHeaders(java.util.List) + +++ NEW ANNOTATION: java.lang.Deprecated + === UNCHANGED METHOD: PUBLIC io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder setCapturedResponseHeaders(java.util.Collection) + +++ NEW ANNOTATION: java.lang.Deprecated + === UNCHANGED METHOD: PUBLIC io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder setCapturedResponseHeaders(java.util.List) + +++ NEW ANNOTATION: java.lang.Deprecated + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder setCaptureRequestHeaders(java.util.Collection) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder setCaptureResponseHeaders(java.util.Collection) +*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + GENERIC TEMPLATES: === REQUEST:java.lang.Object, === RESPONSE:java.lang.Object + === UNCHANGED METHOD: PUBLIC io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder setCapturedRequestHeaders(java.util.Collection) + +++ NEW ANNOTATION: java.lang.Deprecated + === UNCHANGED METHOD: PUBLIC io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder setCapturedRequestHeaders(java.util.List) + +++ NEW ANNOTATION: java.lang.Deprecated + === UNCHANGED METHOD: PUBLIC io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder setCapturedResponseHeaders(java.util.Collection) + +++ NEW ANNOTATION: java.lang.Deprecated + === UNCHANGED METHOD: PUBLIC io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder setCapturedResponseHeaders(java.util.List) + +++ NEW ANNOTATION: java.lang.Deprecated + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder setCaptureRequestHeaders(java.util.Collection) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder setCaptureResponseHeaders(java.util.Collection) diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java index f817fe5d4a56..1f8a4bff7e8e 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java @@ -121,24 +121,44 @@ public DefaultHttpClientInstrumenterBuilder setSpanStatusExtr * @param requestHeaders A list of HTTP header names. */ @CanIgnoreReturnValue - public DefaultHttpClientInstrumenterBuilder setCapturedRequestHeaders( + public DefaultHttpClientInstrumenterBuilder setCaptureRequestHeaders( Collection requestHeaders) { - httpAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders); + httpAttributesExtractorBuilder.setCaptureRequestHeaders(requestHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public DefaultHttpClientInstrumenterBuilder setCapturedRequestHeaders( + Collection requestHeaders) { + return setCaptureRequestHeaders(requestHeaders); + } + /** * Configures the HTTP response headers that will be captured as span attributes. * * @param responseHeaders A list of HTTP header names. */ @CanIgnoreReturnValue - public DefaultHttpClientInstrumenterBuilder setCapturedResponseHeaders( + public DefaultHttpClientInstrumenterBuilder setCaptureResponseHeaders( Collection responseHeaders) { - httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders); + httpAttributesExtractorBuilder.setCaptureResponseHeaders(responseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public DefaultHttpClientInstrumenterBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + /** * Configures the instrumentation to recognize an alternative set of HTTP request methods. * @@ -251,8 +271,8 @@ InstrumenterBuilder instrumenterBuilder( @CanIgnoreReturnValue public DefaultHttpClientInstrumenterBuilder configure(CommonConfig config) { set(config::getKnownHttpRequestMethods, this::setKnownMethods); - set(config::getClientRequestHeaders, this::setCapturedRequestHeaders); - set(config::getClientResponseHeaders, this::setCapturedResponseHeaders); + set(config::getClientRequestHeaders, this::setCaptureRequestHeaders); + set(config::getClientResponseHeaders, this::setCaptureResponseHeaders); set( config::shouldEmitExperimentalHttpClientTelemetry, this::setEmitExperimentalHttpClientTelemetry); diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java index 084e331fa6a6..0a4191b3f95a 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java @@ -122,24 +122,44 @@ public DefaultHttpServerInstrumenterBuilder setSpanStatusExtr * @param requestHeaders A list of HTTP header names. */ @CanIgnoreReturnValue - public DefaultHttpServerInstrumenterBuilder setCapturedRequestHeaders( + public DefaultHttpServerInstrumenterBuilder setCaptureRequestHeaders( Collection requestHeaders) { - httpAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders); + httpAttributesExtractorBuilder.setCaptureRequestHeaders(requestHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public DefaultHttpServerInstrumenterBuilder setCapturedRequestHeaders( + Collection requestHeaders) { + return setCaptureRequestHeaders(requestHeaders); + } + /** * Configures the HTTP response headers that will be captured as span attributes. * * @param responseHeaders A list of HTTP header names. */ @CanIgnoreReturnValue - public DefaultHttpServerInstrumenterBuilder setCapturedResponseHeaders( + public DefaultHttpServerInstrumenterBuilder setCaptureResponseHeaders( Collection responseHeaders) { - httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders); + httpAttributesExtractorBuilder.setCaptureResponseHeaders(responseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public DefaultHttpServerInstrumenterBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + /** * Configures the instrumentation to recognize an alternative set of HTTP request methods. * @@ -243,8 +263,8 @@ public InstrumenterBuilder instrumenterBuilder() { @CanIgnoreReturnValue public DefaultHttpServerInstrumenterBuilder configure(CommonConfig config) { set(config::getKnownHttpRequestMethods, this::setKnownMethods); - set(config::getServerRequestHeaders, this::setCapturedRequestHeaders); - set(config::getServerResponseHeaders, this::setCapturedResponseHeaders); + set(config::getServerRequestHeaders, this::setCaptureRequestHeaders); + set(config::getServerResponseHeaders, this::setCaptureResponseHeaders); set( config::shouldEmitExperimentalHttpServerTelemetry, this::setEmitExperimentalHttpServerTelemetry); diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorBuilder.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorBuilder.java index 7ffa7e168e6a..61d36d3d6093 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorBuilder.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorBuilder.java @@ -65,28 +65,30 @@ public final class HttpClientAttributesExtractorBuilder { * @param requestHeaders A list of HTTP header names. */ @CanIgnoreReturnValue - public HttpClientAttributesExtractorBuilder setCapturedRequestHeaders( + public HttpClientAttributesExtractorBuilder setCaptureRequestHeaders( Collection requestHeaders) { this.capturedRequestHeaders = new ArrayList<>(requestHeaders); return this; } /** - * Configures the HTTP request headers that will be captured as span attributes as described in HTTP - * semantic conventions. - * - *

The HTTP request header values will be captured under the {@code http.request.header.} - * attribute key. The {@code } part in the attribute key is the lowercase header name. - * - * @param requestHeaders A list of HTTP header names. + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. */ - // don't deprecate this since users will get deprecation warning without a clean way to suppress - // it if they're using List + @Deprecated + @CanIgnoreReturnValue + public HttpClientAttributesExtractorBuilder setCapturedRequestHeaders( + Collection requestHeaders) { + return setCaptureRequestHeaders(requestHeaders); + } + + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated @CanIgnoreReturnValue public HttpClientAttributesExtractorBuilder setCapturedRequestHeaders( List requestHeaders) { - return setCapturedRequestHeaders((Collection) requestHeaders); + return setCaptureRequestHeaders((Collection) requestHeaders); } /** @@ -102,30 +104,30 @@ public HttpClientAttributesExtractorBuilder setCapturedReques * @param responseHeaders A list of HTTP header names. */ @CanIgnoreReturnValue - public HttpClientAttributesExtractorBuilder setCapturedResponseHeaders( + public HttpClientAttributesExtractorBuilder setCaptureResponseHeaders( Collection responseHeaders) { this.capturedResponseHeaders = new ArrayList<>(responseHeaders); return this; } /** - * Configures the HTTP response headers that will be captured as span attributes as described in - * HTTP - * semantic conventions. - * - *

The HTTP response header values will be captured under the {@code - * http.response.header.} attribute key. The {@code } part in the attribute key is the - * lowercase header name. - * - * @param responseHeaders A list of HTTP header names. + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. */ - // don't deprecate this since users will get deprecation warning without a clean way to suppress - // it if they're using List + @Deprecated + @CanIgnoreReturnValue + public HttpClientAttributesExtractorBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated @CanIgnoreReturnValue public HttpClientAttributesExtractorBuilder setCapturedResponseHeaders( List responseHeaders) { - return setCapturedResponseHeaders((Collection) responseHeaders); + return setCaptureResponseHeaders((Collection) responseHeaders); } /** diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorBuilder.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorBuilder.java index c3d1ec29e63d..00ad53d836e9 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorBuilder.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorBuilder.java @@ -70,29 +70,30 @@ public final class HttpServerAttributesExtractorBuilder { * @param requestHeaders A list of HTTP header names. */ @CanIgnoreReturnValue - public HttpServerAttributesExtractorBuilder setCapturedRequestHeaders( + public HttpServerAttributesExtractorBuilder setCaptureRequestHeaders( Collection requestHeaders) { this.capturedRequestHeaders = new ArrayList<>(requestHeaders); return this; } /** - * Configures the HTTP response headers that will be captured as span attributes as described in - * HTTP - * semantic conventions. - * - *

The HTTP request header values will be captured under the {@code http.request.header.} - * attribute key. The {@code } part in the attribute key is the lowercase header name. - * - * @param requestHeaders A list of HTTP header names. + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. */ - // don't deprecate this since users will get deprecation warning without a clean way to suppress - // it if they're using List + @Deprecated + @CanIgnoreReturnValue + public HttpServerAttributesExtractorBuilder setCapturedRequestHeaders( + Collection requestHeaders) { + return setCaptureRequestHeaders(requestHeaders); + } + + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated @CanIgnoreReturnValue public HttpServerAttributesExtractorBuilder setCapturedRequestHeaders( List requestHeaders) { - return setCapturedRequestHeaders((Collection) requestHeaders); + return setCaptureRequestHeaders((Collection) requestHeaders); } /** @@ -108,30 +109,30 @@ public HttpServerAttributesExtractorBuilder setCapturedReques * @param responseHeaders A list of HTTP header names. */ @CanIgnoreReturnValue - public HttpServerAttributesExtractorBuilder setCapturedResponseHeaders( + public HttpServerAttributesExtractorBuilder setCaptureResponseHeaders( Collection responseHeaders) { this.capturedResponseHeaders = new ArrayList<>(responseHeaders); return this; } /** - * Configures the HTTP response headers that will be captured as span attributes as described in - * HTTP - * semantic conventions. - * - *

The HTTP response header values will be captured under the {@code - * http.response.header.} attribute key. The {@code } part in the attribute key is the - * lowercase header name. - * - * @param responseHeaders A list of HTTP header names. + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. */ - // don't deprecate this since users will get deprecation warning without a clean way to suppress - // it if they're using List + @Deprecated + @CanIgnoreReturnValue + public HttpServerAttributesExtractorBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated @CanIgnoreReturnValue public HttpServerAttributesExtractorBuilder setCapturedResponseHeaders( List responseHeaders) { - return setCapturedResponseHeaders((Collection) responseHeaders); + return setCaptureResponseHeaders((Collection) responseHeaders); } /** diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java index 31b563c82508..f9084103171b 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java @@ -170,8 +170,8 @@ void normal() { AttributesExtractor, Map> extractor = HttpClientAttributesExtractor.builder(new TestHttpClientAttributesGetter()) - .setCapturedRequestHeaders(singletonList("Custom-Request-Header")) - .setCapturedResponseHeaders(singletonList("Custom-Response-Header")) + .setCaptureRequestHeaders(singletonList("Custom-Request-Header")) + .setCaptureResponseHeaders(singletonList("Custom-Response-Header")) .setResendCountIncrementer(resendCountFromContext) .build(); diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java index 43277f55caf1..0a691f317386 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorTest.java @@ -199,8 +199,8 @@ void normal() { AttributesExtractor, Map> extractor = HttpServerAttributesExtractor.builder(new TestHttpServerAttributesGetter()) - .setCapturedRequestHeaders(singletonList("Custom-Request-Header")) - .setCapturedResponseHeaders(singletonList("Custom-Response-Header")) + .setCaptureRequestHeaders(singletonList("Custom-Request-Header")) + .setCaptureResponseHeaders(singletonList("Custom-Response-Header")) .setHttpRouteGetter(routeFromContext) .build(); diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java index e82d266cc4df..1a32422e87f2 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java +++ b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java @@ -52,24 +52,44 @@ public ApacheHttpClientTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders( + public ApacheHttpClientTelemetryBuilder setCaptureRequestHeaders( Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + builder.setCaptureRequestHeaders(requestHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders( + Collection requestHeaders) { + return setCaptureRequestHeaders(requestHeaders); + } + /** * Configures HTTP response headers to capture as span attributes. * * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders( + public ApacheHttpClientTelemetryBuilder setCaptureResponseHeaders( Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + builder.setCaptureResponseHeaders(responseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + /** * Configures recognized HTTP request methods. * diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/test/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTest.java b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/test/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTest.java index 4b6a06543661..06d79770b928 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/test/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTest.java +++ b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/test/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTest.java @@ -29,8 +29,8 @@ protected InstrumentationExtension testing() { protected CloseableHttpClient createClient(boolean readTimeout) { HttpClientBuilder builder = ApacheHttpClientTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) .build() .createHttpClientBuilder(); RequestConfig.Builder requestConfigBuilder = diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTelemetryBuilder.java b/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTelemetryBuilder.java index 5c42e5375056..394b5f9f35db 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTelemetryBuilder.java +++ b/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTelemetryBuilder.java @@ -52,24 +52,44 @@ public ApacheHttpClientTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders( + public ApacheHttpClientTelemetryBuilder setCaptureRequestHeaders( Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + builder.setCaptureRequestHeaders(requestHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders( + Collection requestHeaders) { + return setCaptureRequestHeaders(requestHeaders); + } + /** * Configures HTTP response headers to capture as span attributes. * * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders( + public ApacheHttpClientTelemetryBuilder setCaptureResponseHeaders( Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + builder.setCaptureResponseHeaders(responseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + /** * Configures recognized HTTP request methods. * diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/test/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTest.java b/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/test/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTest.java index 7e1468afd7ae..25b5e7f89371 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/test/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTest.java +++ b/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/test/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTest.java @@ -33,8 +33,8 @@ protected InstrumentationExtension testing() { protected CloseableHttpClient createClient(boolean readTimeout) { HttpClientBuilder builder = ApacheHttpClientTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) .build() .createHttpClientBuilder(); builder.setDefaultRequestConfig(RequestConfig.custom().setMaxRedirects(2).build()); diff --git a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java index 81b060113f33..5b5b147560a3 100644 --- a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java +++ b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java @@ -60,10 +60,19 @@ public ArmeriaClientTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue + public ArmeriaClientTelemetryBuilder setCaptureRequestHeaders(Collection requestHeaders) { + builder.setCaptureRequestHeaders(requestHeaders); + return this; + } + + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue public ArmeriaClientTelemetryBuilder setCapturedRequestHeaders( Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); - return this; + return setCaptureRequestHeaders(requestHeaders); } /** @@ -72,12 +81,22 @@ public ArmeriaClientTelemetryBuilder setCapturedRequestHeaders( * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public ArmeriaClientTelemetryBuilder setCapturedResponseHeaders( + public ArmeriaClientTelemetryBuilder setCaptureResponseHeaders( Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + builder.setCaptureResponseHeaders(responseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public ArmeriaClientTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + /** * Configures recognized HTTP request methods. * diff --git a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaServerTelemetryBuilder.java b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaServerTelemetryBuilder.java index 7054b26ed111..39608b9456b8 100644 --- a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaServerTelemetryBuilder.java +++ b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaServerTelemetryBuilder.java @@ -61,10 +61,19 @@ public ArmeriaServerTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue + public ArmeriaServerTelemetryBuilder setCaptureRequestHeaders(Collection requestHeaders) { + builder.setCaptureRequestHeaders(requestHeaders); + return this; + } + + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue public ArmeriaServerTelemetryBuilder setCapturedRequestHeaders( Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); - return this; + return setCaptureRequestHeaders(requestHeaders); } /** @@ -73,12 +82,22 @@ public ArmeriaServerTelemetryBuilder setCapturedRequestHeaders( * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public ArmeriaServerTelemetryBuilder setCapturedResponseHeaders( + public ArmeriaServerTelemetryBuilder setCaptureResponseHeaders( Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + builder.setCaptureResponseHeaders(responseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public ArmeriaServerTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + /** * Configures recognized HTTP request methods. * diff --git a/instrumentation/armeria/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java b/instrumentation/armeria/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java index 83173d8d8795..9d71bd0f778a 100644 --- a/instrumentation/armeria/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java +++ b/instrumentation/armeria/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java @@ -23,8 +23,8 @@ class ArmeriaHttpClientTest extends AbstractArmeriaHttpClientTest { protected WebClientBuilder configureClient(WebClientBuilder clientBuilder) { return clientBuilder.decorator( ArmeriaClientTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) .build() .createDecorator()); } diff --git a/instrumentation/armeria/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java b/instrumentation/armeria/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java index 8a865dde837f..23a6372e4740 100644 --- a/instrumentation/armeria/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java +++ b/instrumentation/armeria/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java @@ -23,8 +23,8 @@ class ArmeriaHttpServerTest extends AbstractArmeriaHttpServerTest { protected ServerBuilder configureServer(ServerBuilder sb) { return sb.decorator( ArmeriaServerTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) .build() .createDecorator()); } diff --git a/instrumentation/helidon-4.3/library/src/main/java/io/opentelemetry/instrumentation/helidon/v4_3/HelidonTelemetryBuilder.java b/instrumentation/helidon-4.3/library/src/main/java/io/opentelemetry/instrumentation/helidon/v4_3/HelidonTelemetryBuilder.java index 98e3456ca61b..a35fe4bedc11 100644 --- a/instrumentation/helidon-4.3/library/src/main/java/io/opentelemetry/instrumentation/helidon/v4_3/HelidonTelemetryBuilder.java +++ b/instrumentation/helidon-4.3/library/src/main/java/io/opentelemetry/instrumentation/helidon/v4_3/HelidonTelemetryBuilder.java @@ -67,8 +67,8 @@ public HelidonTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public HelidonTelemetryBuilder setCapturedRequestHeaders(Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + public HelidonTelemetryBuilder setCaptureRequestHeaders(Collection requestHeaders) { + builder.setCaptureRequestHeaders(requestHeaders); return this; } @@ -78,8 +78,8 @@ public HelidonTelemetryBuilder setCapturedRequestHeaders(Collection requ * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public HelidonTelemetryBuilder setCapturedResponseHeaders(Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + public HelidonTelemetryBuilder setCaptureResponseHeaders(Collection responseHeaders) { + builder.setCaptureResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/helidon-4.3/library/src/test/java/io/opentelemetry/instrumentation/helidon/v4_3/HelidonServerTest.java b/instrumentation/helidon-4.3/library/src/test/java/io/opentelemetry/instrumentation/helidon/v4_3/HelidonServerTest.java index fcd9c052331b..032bfa171747 100644 --- a/instrumentation/helidon-4.3/library/src/test/java/io/opentelemetry/instrumentation/helidon/v4_3/HelidonServerTest.java +++ b/instrumentation/helidon-4.3/library/src/test/java/io/opentelemetry/instrumentation/helidon/v4_3/HelidonServerTest.java @@ -22,8 +22,8 @@ class HelidonServerTest extends AbstractHelidonTest { protected void configureRoutes(HttpRouting.Builder routing) { var feature = HelidonTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) .build(); routing.addFilter(feature.createFilter()); } diff --git a/instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/javahttpclient/JavaHttpClientTelemetryBuilder.java b/instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/javahttpclient/JavaHttpClientTelemetryBuilder.java index b82e085b79d7..becc9f68d2e4 100644 --- a/instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/javahttpclient/JavaHttpClientTelemetryBuilder.java +++ b/instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/javahttpclient/JavaHttpClientTelemetryBuilder.java @@ -52,24 +52,44 @@ public JavaHttpClientTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public JavaHttpClientTelemetryBuilder setCapturedRequestHeaders( + public JavaHttpClientTelemetryBuilder setCaptureRequestHeaders( Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + builder.setCaptureRequestHeaders(requestHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public JavaHttpClientTelemetryBuilder setCapturedRequestHeaders( + Collection requestHeaders) { + return setCaptureRequestHeaders(requestHeaders); + } + /** * Configures HTTP response headers to capture as span attributes. * * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public JavaHttpClientTelemetryBuilder setCapturedResponseHeaders( + public JavaHttpClientTelemetryBuilder setCaptureResponseHeaders( Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + builder.setCaptureResponseHeaders(responseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public JavaHttpClientTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + /** * Configures recognized HTTP request methods. * diff --git a/instrumentation/java-http-client/library/src/test/java/io/opentelemetry/instrumentation/javahttpclient/JavaHttpClientTest.java b/instrumentation/java-http-client/library/src/test/java/io/opentelemetry/instrumentation/javahttpclient/JavaHttpClientTest.java index 3d1ba773c598..e09b79b852d3 100644 --- a/instrumentation/java-http-client/library/src/test/java/io/opentelemetry/instrumentation/javahttpclient/JavaHttpClientTest.java +++ b/instrumentation/java-http-client/library/src/test/java/io/opentelemetry/instrumentation/javahttpclient/JavaHttpClientTest.java @@ -24,8 +24,8 @@ abstract static class AbstractTest extends AbstractJavaHttpClientTest { @Override protected HttpClient configureHttpClient(HttpClient httpClient) { return JavaHttpClientTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) .build() .wrap(httpClient); } diff --git a/instrumentation/java-http-server/library/src/main/java/io/opentelemetry/instrumentation/javahttpserver/JavaHttpServerTelemetryBuilder.java b/instrumentation/java-http-server/library/src/main/java/io/opentelemetry/instrumentation/javahttpserver/JavaHttpServerTelemetryBuilder.java index 69d627b8e255..31ee8250e351 100644 --- a/instrumentation/java-http-server/library/src/main/java/io/opentelemetry/instrumentation/javahttpserver/JavaHttpServerTelemetryBuilder.java +++ b/instrumentation/java-http-server/library/src/main/java/io/opentelemetry/instrumentation/javahttpserver/JavaHttpServerTelemetryBuilder.java @@ -66,24 +66,44 @@ public JavaHttpServerTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public JavaHttpServerTelemetryBuilder setCapturedRequestHeaders( + public JavaHttpServerTelemetryBuilder setCaptureRequestHeaders( Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + builder.setCaptureRequestHeaders(requestHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public JavaHttpServerTelemetryBuilder setCapturedRequestHeaders( + Collection requestHeaders) { + return setCaptureRequestHeaders(requestHeaders); + } + /** * Configures HTTP response headers to capture as span attributes. * * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public JavaHttpServerTelemetryBuilder setCapturedResponseHeaders( + public JavaHttpServerTelemetryBuilder setCaptureResponseHeaders( Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + builder.setCaptureResponseHeaders(responseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public JavaHttpServerTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + /** * Configures recognized HTTP request methods. * diff --git a/instrumentation/java-http-server/library/src/test/java/io/opentelemetry/instrumentation/javahttpserver/JavaHttpServerTest.java b/instrumentation/java-http-server/library/src/test/java/io/opentelemetry/instrumentation/javahttpserver/JavaHttpServerTest.java index 873f47d35755..8c9fd2ff3430 100644 --- a/instrumentation/java-http-server/library/src/test/java/io/opentelemetry/instrumentation/javahttpserver/JavaHttpServerTest.java +++ b/instrumentation/java-http-server/library/src/test/java/io/opentelemetry/instrumentation/javahttpserver/JavaHttpServerTest.java @@ -24,8 +24,8 @@ class JavaHttpServerTest extends AbstractJavaHttpServerTest { protected void configureContexts(List contexts) { Filter filter = JavaHttpServerTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) .build() .createFilter(); contexts.forEach(ctx -> ctx.getFilters().add(filter)); diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyClientTelemetryBuilder.java b/instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyClientTelemetryBuilder.java index 7f52748f459c..b41835ad0ace 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyClientTelemetryBuilder.java +++ b/instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyClientTelemetryBuilder.java @@ -49,21 +49,39 @@ public JettyClientTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public JettyClientTelemetryBuilder setCapturedRequestHeaders(Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + public JettyClientTelemetryBuilder setCaptureRequestHeaders(Collection requestHeaders) { + builder.setCaptureRequestHeaders(requestHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public JettyClientTelemetryBuilder setCapturedRequestHeaders(Collection requestHeaders) { + return setCaptureRequestHeaders(requestHeaders); + } + /** * Configures HTTP response headers to capture as span attributes. * * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue + public JettyClientTelemetryBuilder setCaptureResponseHeaders(Collection responseHeaders) { + builder.setCaptureResponseHeaders(responseHeaders); + return this; + } + + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue public JettyClientTelemetryBuilder setCapturedResponseHeaders( Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); - return this; + return setCaptureResponseHeaders(responseHeaders); } /** diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/test/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyHttpClient12LibraryTest.java b/instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/test/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyHttpClient12LibraryTest.java index 551094bd79bd..e1b35ddfe47a 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/test/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyHttpClient12LibraryTest.java +++ b/instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/test/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyHttpClient12LibraryTest.java @@ -22,8 +22,8 @@ class JettyHttpClient12LibraryTest extends AbstractJettyClient12Test { @Override protected HttpClient createStandardClient() { return JettyClientTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) .build() .createHttpClient(); } diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java index fae7f0b30218..324405c35636 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java +++ b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java @@ -50,21 +50,39 @@ public JettyClientTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public JettyClientTelemetryBuilder setCapturedRequestHeaders(Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + public JettyClientTelemetryBuilder setCaptureRequestHeaders(Collection requestHeaders) { + builder.setCaptureRequestHeaders(requestHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public JettyClientTelemetryBuilder setCapturedRequestHeaders(Collection requestHeaders) { + return setCaptureRequestHeaders(requestHeaders); + } + /** * Configures HTTP response headers to capture as span attributes. * * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue + public JettyClientTelemetryBuilder setCaptureResponseHeaders(Collection responseHeaders) { + builder.setCaptureResponseHeaders(responseHeaders); + return this; + } + + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue public JettyClientTelemetryBuilder setCapturedResponseHeaders( Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); - return this; + return setCaptureResponseHeaders(responseHeaders); } /** diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/test/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyHttpClient9LibraryTest.java b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/test/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyHttpClient9LibraryTest.java index 984fc6221a61..743bea0b2029 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/test/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyHttpClient9LibraryTest.java +++ b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/test/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyHttpClient9LibraryTest.java @@ -22,8 +22,8 @@ class JettyHttpClient9LibraryTest extends AbstractJettyClient9Test { @Override protected HttpClient createStandardClient() { return JettyClientTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) .build() .createHttpClient(); } diff --git a/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorServerTelemetry.kt b/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorServerTelemetry.kt index f6bcba8b447b..54c599076986 100644 --- a/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorServerTelemetry.kt +++ b/instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorServerTelemetry.kt @@ -73,12 +73,22 @@ class KtorServerTelemetry private constructor( builder.addAttributesExtractor(extractor) } + fun setCaptureRequestHeaders(requestHeaders: List) { + builder.setCaptureRequestHeaders(requestHeaders) + } + + @Deprecated("Use setCaptureRequestHeaders instead.") fun setCapturedRequestHeaders(requestHeaders: List) { - builder.setCapturedRequestHeaders(requestHeaders) + setCaptureRequestHeaders(requestHeaders) + } + + fun setCaptureResponseHeaders(responseHeaders: List) { + builder.setCaptureResponseHeaders(responseHeaders) } + @Deprecated("Use setCaptureResponseHeaders instead.") fun setCapturedResponseHeaders(responseHeaders: List) { - builder.setCapturedResponseHeaders(responseHeaders) + setCaptureResponseHeaders(responseHeaders) } fun setKnownMethods(knownMethods: Collection) { diff --git a/instrumentation/ktor/ktor-1.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorTestUtil.kt b/instrumentation/ktor/ktor-1.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorTestUtil.kt index 85fd9d6b78fa..43cbe92dbb27 100644 --- a/instrumentation/ktor/ktor-1.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorTestUtil.kt +++ b/instrumentation/ktor/ktor-1.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorTestUtil.kt @@ -14,8 +14,8 @@ class KtorTestUtil { fun installOpenTelemetry(application: Application, openTelemetry: OpenTelemetry) { application.install(KtorServerTelemetry) { setOpenTelemetry(openTelemetry) - setCapturedRequestHeaders(listOf(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - setCapturedResponseHeaders(listOf(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) + setCaptureRequestHeaders(listOf(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + setCaptureResponseHeaders(listOf(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) } } } diff --git a/instrumentation/ktor/ktor-common-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/common/v2_0/AbstractKtorClientTelemetryBuilder.kt b/instrumentation/ktor/ktor-common-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/common/v2_0/AbstractKtorClientTelemetryBuilder.kt index 0c20d8c2f5fc..9fb9665d8ad5 100644 --- a/instrumentation/ktor/ktor-common-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/common/v2_0/AbstractKtorClientTelemetryBuilder.kt +++ b/instrumentation/ktor/ktor-common-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/common/v2_0/AbstractKtorClientTelemetryBuilder.kt @@ -46,13 +46,13 @@ abstract class AbstractKtorClientTelemetryBuilder( fun capturedRequestHeaders(vararg headers: String) = capturedRequestHeaders(headers.asIterable()) fun capturedRequestHeaders(headers: Iterable) { - builder.setCapturedRequestHeaders(headers.toList()) + builder.setCaptureRequestHeaders(headers.toList()) } fun capturedResponseHeaders(vararg headers: String) = capturedResponseHeaders(headers.asIterable()) fun capturedResponseHeaders(headers: Iterable) { - builder.setCapturedResponseHeaders(headers.toList()) + builder.setCaptureResponseHeaders(headers.toList()) } fun knownMethods(vararg methods: String) = knownMethods(methods.asIterable()) diff --git a/instrumentation/ktor/ktor-common-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/common/v2_0/AbstractKtorServerTelemetryBuilder.kt b/instrumentation/ktor/ktor-common-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/common/v2_0/AbstractKtorServerTelemetryBuilder.kt index d4fdf01afb00..a8821ced9f59 100644 --- a/instrumentation/ktor/ktor-common-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/common/v2_0/AbstractKtorServerTelemetryBuilder.kt +++ b/instrumentation/ktor/ktor-common-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/common/v2_0/AbstractKtorServerTelemetryBuilder.kt @@ -126,13 +126,13 @@ abstract class AbstractKtorServerTelemetryBuilder(private val instrumentationNam fun capturedRequestHeaders(vararg headers: String) = capturedRequestHeaders(headers.asIterable()) fun capturedRequestHeaders(headers: Iterable) { - builder.setCapturedRequestHeaders(headers.toList()) + builder.setCaptureRequestHeaders(headers.toList()) } fun capturedResponseHeaders(vararg headers: String) = capturedResponseHeaders(headers.asIterable()) fun capturedResponseHeaders(headers: Iterable) { - builder.setCapturedResponseHeaders(headers.toList()) + builder.setCaptureResponseHeaders(headers.toList()) } fun knownMethods(vararg methods: String) = knownMethods(methods.asIterable()) diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java index 336c984c0a7c..bfdac2eaa498 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java @@ -46,24 +46,44 @@ public final class NettyClientTelemetryBuilder { * @param capturedRequestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public NettyClientTelemetryBuilder setCapturedRequestHeaders( + public NettyClientTelemetryBuilder setCaptureRequestHeaders( Collection capturedRequestHeaders) { - builder.setCapturedRequestHeaders(capturedRequestHeaders); + builder.setCaptureRequestHeaders(capturedRequestHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public NettyClientTelemetryBuilder setCapturedRequestHeaders( + Collection capturedRequestHeaders) { + return setCaptureRequestHeaders(capturedRequestHeaders); + } + /** * Configures HTTP response headers to capture as span attributes. * * @param capturedResponseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public NettyClientTelemetryBuilder setCapturedResponseHeaders( + public NettyClientTelemetryBuilder setCaptureResponseHeaders( Collection capturedResponseHeaders) { - builder.setCapturedResponseHeaders(capturedResponseHeaders); + builder.setCaptureResponseHeaders(capturedResponseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public NettyClientTelemetryBuilder setCapturedResponseHeaders( + Collection capturedResponseHeaders) { + return setCaptureResponseHeaders(capturedResponseHeaders); + } + /** * Adds an {@link AttributesExtractor} to extract attributes from requests and responses. Executed * after all default extractors. diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetryBuilder.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetryBuilder.java index c7e1ddfdf774..a17718347d05 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetryBuilder.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetryBuilder.java @@ -53,24 +53,44 @@ public final class NettyServerTelemetryBuilder { * @param capturedRequestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public NettyServerTelemetryBuilder setCapturedRequestHeaders( + public NettyServerTelemetryBuilder setCaptureRequestHeaders( Collection capturedRequestHeaders) { - builder.setCapturedRequestHeaders(capturedRequestHeaders); + builder.setCaptureRequestHeaders(capturedRequestHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public NettyServerTelemetryBuilder setCapturedRequestHeaders( + Collection capturedRequestHeaders) { + return setCaptureRequestHeaders(capturedRequestHeaders); + } + /** * Configures HTTP response headers to capture as span attributes. * * @param capturedResponseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public NettyServerTelemetryBuilder setCapturedResponseHeaders( + public NettyServerTelemetryBuilder setCaptureResponseHeaders( Collection capturedResponseHeaders) { - builder.setCapturedResponseHeaders(capturedResponseHeaders); + builder.setCaptureResponseHeaders(capturedResponseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public NettyServerTelemetryBuilder setCapturedResponseHeaders( + Collection capturedResponseHeaders) { + return setCaptureResponseHeaders(capturedResponseHeaders); + } + /** * Configures recognized HTTP request methods. * diff --git a/instrumentation/netty/netty-4.1/library/src/test/java/io/opentelemetry/instrumentation/netty/v4_1/Netty41ClientTest.java b/instrumentation/netty/netty-4.1/library/src/test/java/io/opentelemetry/instrumentation/netty/v4_1/Netty41ClientTest.java index 1d10cd412441..a35e83f2d565 100644 --- a/instrumentation/netty/netty-4.1/library/src/test/java/io/opentelemetry/instrumentation/netty/v4_1/Netty41ClientTest.java +++ b/instrumentation/netty/netty-4.1/library/src/test/java/io/opentelemetry/instrumentation/netty/v4_1/Netty41ClientTest.java @@ -26,9 +26,9 @@ class Netty41ClientTest extends AbstractNetty41ClientTest { channelPipeline -> channelPipeline.addLast( NettyClientTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders( + .setCaptureRequestHeaders( singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders( + .setCaptureResponseHeaders( singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) .build() .createCombinedHandler())); diff --git a/instrumentation/netty/netty-4.1/library/src/test/java/io/opentelemetry/instrumentation/netty/v4_1/Netty41ServerTest.java b/instrumentation/netty/netty-4.1/library/src/test/java/io/opentelemetry/instrumentation/netty/v4_1/Netty41ServerTest.java index a06e5a8e5b6d..044427802ed6 100644 --- a/instrumentation/netty/netty-4.1/library/src/test/java/io/opentelemetry/instrumentation/netty/v4_1/Netty41ServerTest.java +++ b/instrumentation/netty/netty-4.1/library/src/test/java/io/opentelemetry/instrumentation/netty/v4_1/Netty41ServerTest.java @@ -25,8 +25,8 @@ protected void configurePipeline(ChannelPipeline channelPipeline) { HttpServerCodec.class.getSimpleName() + "#0", NettyServerTelemetry.class.getName(), NettyServerTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) .build() .createCombinedHandler()); } diff --git a/instrumentation/okhttp/okhttp-3.0/library/src/http2Test/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttp3Http2Test.java b/instrumentation/okhttp/okhttp-3.0/library/src/http2Test/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttp3Http2Test.java index 11c120bcaa93..0110776f2d11 100644 --- a/instrumentation/okhttp/okhttp-3.0/library/src/http2Test/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttp3Http2Test.java +++ b/instrumentation/okhttp/okhttp-3.0/library/src/http2Test/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttp3Http2Test.java @@ -25,8 +25,8 @@ class OkHttp3Http2Test extends AbstractOkHttp3Test { public Call.Factory createCallFactory(OkHttpClient.Builder clientBuilder) { clientBuilder.protocols(singletonList(Protocol.H2_PRIOR_KNOWLEDGE)); return OkHttpTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) .build() .createCallFactory(clientBuilder.build()); } diff --git a/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpTelemetryBuilder.java b/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpTelemetryBuilder.java index d28000fd3150..5199483f638e 100644 --- a/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpTelemetryBuilder.java +++ b/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpTelemetryBuilder.java @@ -51,8 +51,8 @@ public OkHttpTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public OkHttpTelemetryBuilder setCapturedRequestHeaders(Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + public OkHttpTelemetryBuilder setCaptureRequestHeaders(Collection requestHeaders) { + builder.setCaptureRequestHeaders(requestHeaders); return this; } @@ -62,8 +62,8 @@ public OkHttpTelemetryBuilder setCapturedRequestHeaders(Collection reque * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public OkHttpTelemetryBuilder setCapturedResponseHeaders(Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + public OkHttpTelemetryBuilder setCaptureResponseHeaders(Collection responseHeaders) { + builder.setCaptureResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/okhttp/okhttp-3.0/library/src/test/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttp3Test.java b/instrumentation/okhttp/okhttp-3.0/library/src/test/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttp3Test.java index 2ad314143a0b..4138e4eb0f20 100644 --- a/instrumentation/okhttp/okhttp-3.0/library/src/test/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttp3Test.java +++ b/instrumentation/okhttp/okhttp-3.0/library/src/test/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttp3Test.java @@ -24,8 +24,8 @@ class OkHttp3Test extends AbstractOkHttp3Test { public Call.Factory createCallFactory(OkHttpClient.Builder clientBuilder) { clientBuilder.protocols(singletonList(Protocol.HTTP_1_1)); return OkHttpTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) .build() .createCallFactory(clientBuilder.build()); } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackClientTelemetryBuilder.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackClientTelemetryBuilder.java index 43957c1d8dd6..583dac491b11 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackClientTelemetryBuilder.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackClientTelemetryBuilder.java @@ -47,10 +47,19 @@ public RatpackClientTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue + public RatpackClientTelemetryBuilder setCaptureRequestHeaders(Collection requestHeaders) { + builder.setCaptureRequestHeaders(requestHeaders); + return this; + } + + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue public RatpackClientTelemetryBuilder setCapturedRequestHeaders( Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); - return this; + return setCaptureRequestHeaders(requestHeaders); } /** @@ -59,12 +68,22 @@ public RatpackClientTelemetryBuilder setCapturedRequestHeaders( * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public RatpackClientTelemetryBuilder setCapturedResponseHeaders( + public RatpackClientTelemetryBuilder setCaptureResponseHeaders( Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + builder.setCaptureResponseHeaders(responseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public RatpackClientTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + /** * Configures recognized HTTP request methods. * diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackServerTelemetryBuilder.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackServerTelemetryBuilder.java index cb5e6966e865..efd0041a12cd 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackServerTelemetryBuilder.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackServerTelemetryBuilder.java @@ -51,10 +51,19 @@ public RatpackServerTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue + public RatpackServerTelemetryBuilder setCaptureRequestHeaders(Collection requestHeaders) { + builder.setCaptureRequestHeaders(requestHeaders); + return this; + } + + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue public RatpackServerTelemetryBuilder setCapturedRequestHeaders( Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); - return this; + return setCaptureRequestHeaders(requestHeaders); } /** @@ -63,12 +72,22 @@ public RatpackServerTelemetryBuilder setCapturedRequestHeaders( * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public RatpackServerTelemetryBuilder setCapturedResponseHeaders( + public RatpackServerTelemetryBuilder setCaptureResponseHeaders( Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + builder.setCaptureResponseHeaders(responseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public RatpackServerTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + /** * Configures recognized HTTP request methods. * diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackHttpClientTest.java b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackHttpClientTest.java index 7fd21c125c1a..af570d70c7a6 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackHttpClientTest.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackHttpClientTest.java @@ -23,8 +23,8 @@ class RatpackHttpClientTest extends AbstractRatpackHttpClientTest { @Override protected HttpClient buildHttpClient() throws Exception { return RatpackClientTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) .build() .instrument(HttpClient.of(Action.noop())); } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackAsyncHttpServerTest.java b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackAsyncHttpServerTest.java index 629234ebc0ea..89e74f72c992 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackAsyncHttpServerTest.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackAsyncHttpServerTest.java @@ -25,8 +25,8 @@ class RatpackAsyncHttpServerTest extends AbstractRatpackAsyncHttpServerTest { protected void configure(RatpackServerSpec serverSpec) throws Exception { RatpackServerTelemetry telemetry = RatpackServerTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) .build(); serverSpec.registryOf(telemetry::configureRegistry); } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackForkedHttpServerTest.java b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackForkedHttpServerTest.java index fbd9815891cf..d64b473795c7 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackForkedHttpServerTest.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackForkedHttpServerTest.java @@ -25,8 +25,8 @@ class RatpackForkedHttpServerTest extends AbstractRatpackForkedHttpServerTest { protected void configure(RatpackServerSpec serverSpec) throws Exception { RatpackServerTelemetry telemetry = RatpackServerTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) .build(); serverSpec.registryOf(telemetry::configureRegistry); } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackHttpServerTest.java b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackHttpServerTest.java index 1c2636d61bed..6666a034107e 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackHttpServerTest.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackHttpServerTest.java @@ -25,8 +25,8 @@ class RatpackHttpServerTest extends AbstractRatpackHttpServerTest { protected void configure(RatpackServerSpec serverSpec) throws Exception { RatpackServerTelemetry telemetry = RatpackServerTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) .build(); serverSpec.registryOf(telemetry::configureRegistry); } diff --git a/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetryBuilder.java b/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetryBuilder.java index 60a2326c2ebe..079f08681660 100644 --- a/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetryBuilder.java +++ b/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetryBuilder.java @@ -49,8 +49,8 @@ public RestletTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public RestletTelemetryBuilder setCapturedRequestHeaders(Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + public RestletTelemetryBuilder setCaptureRequestHeaders(Collection requestHeaders) { + builder.setCaptureRequestHeaders(requestHeaders); return this; } @@ -60,8 +60,8 @@ public RestletTelemetryBuilder setCapturedRequestHeaders(Collection requ * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public RestletTelemetryBuilder setCapturedResponseHeaders(Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + public RestletTelemetryBuilder setCaptureResponseHeaders(Collection responseHeaders) { + builder.setCaptureResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/restlet/restlet-1.1/library/src/test/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletServerTest.java b/instrumentation/restlet/restlet-1.1/library/src/test/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletServerTest.java index 67327f4958c4..b7ced271864d 100644 --- a/instrumentation/restlet/restlet-1.1/library/src/test/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletServerTest.java +++ b/instrumentation/restlet/restlet-1.1/library/src/test/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletServerTest.java @@ -24,8 +24,8 @@ class RestletServerTest extends AbstractRestletServerTest { protected Restlet wrapRestlet(Restlet restlet, String path) { RestletTelemetry telemetry = RestletTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) .build(); Filter tracingFilter = telemetry.createFilter(path); diff --git a/instrumentation/restlet/restlet-1.1/library/src/test/java/io/opentelemetry/instrumentation/restlet/v1_1/spring/AbstractSpringServerLibraryTest.java b/instrumentation/restlet/restlet-1.1/library/src/test/java/io/opentelemetry/instrumentation/restlet/v1_1/spring/AbstractSpringServerLibraryTest.java index 37a73f86dca3..9c37952d02ed 100644 --- a/instrumentation/restlet/restlet-1.1/library/src/test/java/io/opentelemetry/instrumentation/restlet/v1_1/spring/AbstractSpringServerLibraryTest.java +++ b/instrumentation/restlet/restlet-1.1/library/src/test/java/io/opentelemetry/instrumentation/restlet/v1_1/spring/AbstractSpringServerLibraryTest.java @@ -30,8 +30,8 @@ abstract class AbstractSpringServerLibraryTest extends AbstractSpringServerTest protected Restlet wrapRestlet(Restlet restlet, String path) { RestletTelemetry telemetry = RestletTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) .build(); Filter tracingFilter = telemetry.createFilter(path); diff --git a/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletTelemetryBuilder.java b/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletTelemetryBuilder.java index b0a058b2b75a..f31ad366952a 100644 --- a/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletTelemetryBuilder.java +++ b/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletTelemetryBuilder.java @@ -49,8 +49,8 @@ public RestletTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public RestletTelemetryBuilder setCapturedRequestHeaders(Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + public RestletTelemetryBuilder setCaptureRequestHeaders(Collection requestHeaders) { + builder.setCaptureRequestHeaders(requestHeaders); return this; } @@ -60,8 +60,8 @@ public RestletTelemetryBuilder setCapturedRequestHeaders(Collection requ * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public RestletTelemetryBuilder setCapturedResponseHeaders(Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + public RestletTelemetryBuilder setCaptureResponseHeaders(Collection responseHeaders) { + builder.setCaptureResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/restlet/restlet-2.0/library/src/test/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletServerTest.java b/instrumentation/restlet/restlet-2.0/library/src/test/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletServerTest.java index 991e27ee4d50..e5f6177a4f8c 100644 --- a/instrumentation/restlet/restlet-2.0/library/src/test/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletServerTest.java +++ b/instrumentation/restlet/restlet-2.0/library/src/test/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletServerTest.java @@ -25,8 +25,8 @@ class RestletServerTest extends AbstractRestletServerTest { protected Restlet wrapRestlet(Restlet restlet, String path) { RestletTelemetry telemetry = RestletTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) .build(); Filter tracingFilter = telemetry.createFilter(path); diff --git a/instrumentation/restlet/restlet-2.0/library/src/test/java/io/opentelemetry/instrumentation/restlet/v2_0/spring/AbstractSpringServerLibraryTest.java b/instrumentation/restlet/restlet-2.0/library/src/test/java/io/opentelemetry/instrumentation/restlet/v2_0/spring/AbstractSpringServerLibraryTest.java index b2494254ecad..abf5d171280b 100644 --- a/instrumentation/restlet/restlet-2.0/library/src/test/java/io/opentelemetry/instrumentation/restlet/v2_0/spring/AbstractSpringServerLibraryTest.java +++ b/instrumentation/restlet/restlet-2.0/library/src/test/java/io/opentelemetry/instrumentation/restlet/v2_0/spring/AbstractSpringServerLibraryTest.java @@ -43,8 +43,8 @@ abstract class AbstractSpringServerLibraryTest extends AbstractSpringServerTest protected Restlet wrapRestlet(Restlet restlet, String path) { RestletTelemetry telemetry = RestletTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) .build(); Filter tracingFilter = telemetry.createFilter(path); diff --git a/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetryBuilder.java b/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetryBuilder.java index cb5a264d5cb6..ef07d8244829 100644 --- a/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetryBuilder.java +++ b/instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTelemetryBuilder.java @@ -94,8 +94,8 @@ public ServletTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public ServletTelemetryBuilder setCapturedRequestHeaders(Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + public ServletTelemetryBuilder setCaptureRequestHeaders(Collection requestHeaders) { + builder.setCaptureRequestHeaders(requestHeaders); return this; } @@ -105,8 +105,8 @@ public ServletTelemetryBuilder setCapturedRequestHeaders(Collection requ * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public ServletTelemetryBuilder setCapturedResponseHeaders(Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + public ServletTelemetryBuilder setCaptureResponseHeaders(Collection responseHeaders) { + builder.setCaptureResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTestUtil.java b/instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTestUtil.java index efebf4324ff6..feabb9e16d09 100644 --- a/instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTestUtil.java +++ b/instrumentation/servlet/servlet-3.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v3_0/ServletTestUtil.java @@ -20,8 +20,8 @@ public class ServletTestUtil { public static Filter newFilter(OpenTelemetry openTelemetry) { ServletTelemetryBuilder builder = ServletTelemetry.builder(openTelemetry) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)); + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)); Experimental.setCaptureRequestParameters(builder, singletonList("test-parameter")); Experimental.setTraceIdRequestAttributeEnabled(builder, true); return builder.build().createFilter(); diff --git a/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/ServletTelemetryBuilder.java b/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/ServletTelemetryBuilder.java index 4cd12aa4adb4..04ea71d0a013 100644 --- a/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/ServletTelemetryBuilder.java +++ b/instrumentation/servlet/servlet-5.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v5_0/ServletTelemetryBuilder.java @@ -94,8 +94,8 @@ public ServletTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public ServletTelemetryBuilder setCapturedRequestHeaders(Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + public ServletTelemetryBuilder setCaptureRequestHeaders(Collection requestHeaders) { + builder.setCaptureRequestHeaders(requestHeaders); return this; } @@ -105,8 +105,8 @@ public ServletTelemetryBuilder setCapturedRequestHeaders(Collection requ * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public ServletTelemetryBuilder setCapturedResponseHeaders(Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + public ServletTelemetryBuilder setCaptureResponseHeaders(Collection responseHeaders) { + builder.setCaptureResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/servlet/servlet-5.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v5_0/tomcat/ServletTestUtil.java b/instrumentation/servlet/servlet-5.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v5_0/tomcat/ServletTestUtil.java index 75d0c3a8d769..f76a9e2da6fe 100644 --- a/instrumentation/servlet/servlet-5.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v5_0/tomcat/ServletTestUtil.java +++ b/instrumentation/servlet/servlet-5.0/library/src/test/java/io/opentelemetry/instrumentation/servlet/v5_0/tomcat/ServletTestUtil.java @@ -22,8 +22,8 @@ class ServletTestUtil { public static Filter newFilter(OpenTelemetry openTelemetry) { ServletTelemetryBuilder builder = ServletTelemetry.builder(openTelemetry) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)); + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)); Experimental.setCaptureRequestParameters(builder, singletonList("test-parameter")); Experimental.setTraceIdRequestAttributeEnabled(builder, true); return builder.build().createFilter(); diff --git a/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebTelemetryBuilder.java b/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebTelemetryBuilder.java index de07c274da36..34093d096856 100644 --- a/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebTelemetryBuilder.java +++ b/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebTelemetryBuilder.java @@ -59,8 +59,8 @@ public SpringWebTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public SpringWebTelemetryBuilder setCapturedRequestHeaders(Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + public SpringWebTelemetryBuilder setCaptureRequestHeaders(Collection requestHeaders) { + builder.setCaptureRequestHeaders(requestHeaders); return this; } @@ -70,8 +70,8 @@ public SpringWebTelemetryBuilder setCapturedRequestHeaders(Collection re * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public SpringWebTelemetryBuilder setCapturedResponseHeaders(Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + public SpringWebTelemetryBuilder setCaptureResponseHeaders(Collection responseHeaders) { + builder.setCaptureResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/spring/spring-web/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebInstrumentationTest.java b/instrumentation/spring/spring-web/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebInstrumentationTest.java index 796ec6dd7cf3..de837925c956 100644 --- a/instrumentation/spring/spring-web/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebInstrumentationTest.java +++ b/instrumentation/spring/spring-web/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebInstrumentationTest.java @@ -44,9 +44,8 @@ static void setUp() { .getInterceptors() .add( SpringWebTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders( - singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders( + .setCaptureRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders( singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) .build() .createInterceptor()); diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientTelemetryBuilder.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientTelemetryBuilder.java index ef2e7e13b309..31e0e9140a15 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientTelemetryBuilder.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientTelemetryBuilder.java @@ -56,24 +56,44 @@ public SpringWebfluxClientTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public SpringWebfluxClientTelemetryBuilder setCapturedRequestHeaders( + public SpringWebfluxClientTelemetryBuilder setCaptureRequestHeaders( Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + builder.setCaptureRequestHeaders(requestHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public SpringWebfluxClientTelemetryBuilder setCapturedRequestHeaders( + Collection requestHeaders) { + return setCaptureRequestHeaders(requestHeaders); + } + /** * Configures HTTP response headers to capture as span attributes. * * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public SpringWebfluxClientTelemetryBuilder setCapturedResponseHeaders( + public SpringWebfluxClientTelemetryBuilder setCaptureResponseHeaders( Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + builder.setCaptureResponseHeaders(responseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public SpringWebfluxClientTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + /** * Configures recognized HTTP request methods. * diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxServerTelemetryBuilder.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxServerTelemetryBuilder.java index 8848988cc73e..950873684291 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxServerTelemetryBuilder.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxServerTelemetryBuilder.java @@ -55,24 +55,44 @@ public SpringWebfluxServerTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public SpringWebfluxServerTelemetryBuilder setCapturedRequestHeaders( + public SpringWebfluxServerTelemetryBuilder setCaptureRequestHeaders( Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + builder.setCaptureRequestHeaders(requestHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public SpringWebfluxServerTelemetryBuilder setCapturedRequestHeaders( + Collection requestHeaders) { + return setCaptureRequestHeaders(requestHeaders); + } + /** * Configures HTTP response headers to capture as span attributes. * * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public SpringWebfluxServerTelemetryBuilder setCapturedResponseHeaders( + public SpringWebfluxServerTelemetryBuilder setCaptureResponseHeaders( Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + builder.setCaptureResponseHeaders(responseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public SpringWebfluxServerTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + /** * Configures recognized HTTP request methods. * diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientInstrumentationTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientInstrumentationTest.java index 42dc663de701..0d546562b35f 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientInstrumentationTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientInstrumentationTest.java @@ -24,8 +24,8 @@ class SpringWebfluxClientInstrumentationTest protected WebClient.Builder instrument(WebClient.Builder builder) { SpringWebfluxClientTelemetry instrumentation = SpringWebfluxClientTelemetry.builder(testing.getOpenTelemetry()) - .setCapturedRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpClientTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpClientTest.TEST_RESPONSE_HEADER)) .build(); return builder.filters(instrumentation::addFilterAndRegisterReactorHook); } diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/TestWebfluxSpringBootApp.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/TestWebfluxSpringBootApp.java index 2d1312bc1be8..4fadadc639a7 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/TestWebfluxSpringBootApp.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/TestWebfluxSpringBootApp.java @@ -54,8 +54,8 @@ static ConfigurableApplicationContext start(int port, String contextPath) { @Bean WebFilter telemetryFilter() { return SpringWebfluxServerTelemetry.builder(GlobalOpenTelemetry.get()) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) .build() .createWebFilterAndRegisterReactorHook(); } diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java index 5e89515b1973..7aec0ade9315 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java @@ -58,23 +58,42 @@ public SpringWebMvcTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public SpringWebMvcTelemetryBuilder setCapturedRequestHeaders(Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + public SpringWebMvcTelemetryBuilder setCaptureRequestHeaders(Collection requestHeaders) { + builder.setCaptureRequestHeaders(requestHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public SpringWebMvcTelemetryBuilder setCapturedRequestHeaders(Collection requestHeaders) { + return setCaptureRequestHeaders(requestHeaders); + } + /** * Configures HTTP response headers to capture as span attributes. * * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders( + public SpringWebMvcTelemetryBuilder setCaptureResponseHeaders( Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + builder.setCaptureResponseHeaders(responseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + /** Customizes the {@link SpanNameExtractor} by transforming the default instance. */ @CanIgnoreReturnValue public SpringWebMvcTelemetryBuilder setSpanNameExtractorCustomizer( diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/TestWebSpringBootApp.java b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/TestWebSpringBootApp.java index cf5d15abc869..c1f74b4d1fc9 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/TestWebSpringBootApp.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/TestWebSpringBootApp.java @@ -56,8 +56,8 @@ static ConfigurableApplicationContext start(int port, String contextPath) { @Bean Filter telemetryFilter() { return SpringWebMvcTelemetry.builder(GlobalOpenTelemetry.get()) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) .build() .createServletFilter(); } diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java index 0d87d8eff66f..37c07773c7ee 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java @@ -57,23 +57,42 @@ public SpringWebMvcTelemetryBuilder addAttributesExtractor( * @param requestHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public SpringWebMvcTelemetryBuilder setCapturedRequestHeaders(Collection requestHeaders) { - builder.setCapturedRequestHeaders(requestHeaders); + public SpringWebMvcTelemetryBuilder setCaptureRequestHeaders(Collection requestHeaders) { + builder.setCaptureRequestHeaders(requestHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureRequestHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public SpringWebMvcTelemetryBuilder setCapturedRequestHeaders(Collection requestHeaders) { + return setCaptureRequestHeaders(requestHeaders); + } + /** * Configures HTTP response headers to capture as span attributes. * * @param responseHeaders HTTP header names to capture. */ @CanIgnoreReturnValue - public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders( + public SpringWebMvcTelemetryBuilder setCaptureResponseHeaders( Collection responseHeaders) { - builder.setCapturedResponseHeaders(responseHeaders); + builder.setCaptureResponseHeaders(responseHeaders); return this; } + /** + * @deprecated Use {@link #setCaptureResponseHeaders(Collection)} instead. + */ + @Deprecated + @CanIgnoreReturnValue + public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { + return setCaptureResponseHeaders(responseHeaders); + } + /** Customizes the {@link SpanNameExtractor} by transforming the default instance. */ @CanIgnoreReturnValue public SpringWebMvcTelemetryBuilder setSpanNameExtractorCustomizer( diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/TestWebSpringBootApp.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/TestWebSpringBootApp.java index e7470be6a78b..27eb9a152852 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/TestWebSpringBootApp.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/TestWebSpringBootApp.java @@ -56,8 +56,8 @@ static ConfigurableApplicationContext start(int port, String contextPath) { @Bean Filter telemetryFilter() { return SpringWebMvcTelemetry.builder(GlobalOpenTelemetry.get()) - .setCapturedRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) - .setCapturedResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) + .setCaptureRequestHeaders(singletonList(AbstractHttpServerTest.TEST_REQUEST_HEADER)) + .setCaptureResponseHeaders(singletonList(AbstractHttpServerTest.TEST_RESPONSE_HEADER)) .build() .createServletFilter(); }