diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt index eea3e7c5d68f..61b6dc17cbd1 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt @@ -4,8 +4,18 @@ Comparing source compatibility of opentelemetry-instrumentation-api-2.12.0-SNAPS GENERIC TEMPLATES: === REQUEST:java.lang.Object, === RESPONSE:java.lang.Object +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder setCapturedRequestHeaders(java.util.Collection) +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder setCapturedResponseHeaders(java.util.Collection) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder setKnownMethods(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 +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder setCapturedRequestHeaders(java.util.Collection) +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder setCapturedResponseHeaders(java.util.Collection) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder setKnownMethods(java.util.Collection) +*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteBuilder (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + GENERIC TEMPLATES: === REQUEST:java.lang.Object + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteBuilder setKnownMethods(java.util.Collection) +*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + GENERIC TEMPLATES: === REQUEST:java.lang.Object + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder setKnownMethods(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 894d8af16382..a7929ae56eba 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 @@ -31,7 +31,6 @@ import java.util.Collection; import java.util.List; import java.util.Objects; -import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; @@ -155,11 +154,11 @@ public DefaultHttpClientInstrumenterBuilder setCapturedRespon * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue public DefaultHttpClientInstrumenterBuilder setKnownMethods( - Set knownMethods) { + Collection knownMethods) { httpAttributesExtractorBuilder.setKnownMethods(knownMethods); httpSpanNameExtractorBuilder.setKnownMethods(knownMethods); return this; 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 c61e846dc59e..6b12403f779e 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 @@ -30,7 +30,6 @@ import java.util.Collection; import java.util.List; import java.util.Objects; -import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; @@ -153,11 +152,11 @@ public DefaultHttpServerInstrumenterBuilder setCapturedRespon * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue public DefaultHttpServerInstrumenterBuilder setKnownMethods( - Set knownMethods) { + Collection knownMethods) { httpAttributesExtractorBuilder.setKnownMethods(knownMethods); httpSpanNameExtractorBuilder.setKnownMethods(knownMethods); httpServerRouteBuilder.setKnownMethods(knownMethods); 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 39e4e5bcc65b..f5752dc794a7 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 @@ -137,11 +137,34 @@ public HttpClientAttributesExtractorBuilder setCapturedRespon */ @CanIgnoreReturnValue public HttpClientAttributesExtractorBuilder setKnownMethods( - Set knownMethods) { + Collection knownMethods) { this.knownMethods = new HashSet<>(knownMethods); return this; } + /** + * Configures the extractor to recognize an alternative set of HTTP request methods. + * + *

By default, this extractor defines "known" methods as the ones listed in RFC9110 and the PATCH + * method defined in RFC5789. If an + * unknown method is encountered, the extractor will use the value {@value HttpConstants#_OTHER} + * instead of it and put the original value in an extra {@code http.request.method_original} + * attribute. + * + *

Note: calling this method overrides the default known method sets completely; it does + * not supplement it. + * + * @param knownMethods A set of recognized HTTP request methods. + */ + // don't deprecate this since users will get deprecation warning without a clean way to suppress + // it if they're using Set + @CanIgnoreReturnValue + public HttpClientAttributesExtractorBuilder setKnownMethods( + Set knownMethods) { + return setKnownMethods((Collection) knownMethods); + } + // visible for tests @CanIgnoreReturnValue HttpClientAttributesExtractorBuilder setResendCountIncrementer( 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 e811d975d0c7..afae6a55cf82 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 @@ -144,11 +144,34 @@ public HttpServerAttributesExtractorBuilder setCapturedRespon */ @CanIgnoreReturnValue public HttpServerAttributesExtractorBuilder setKnownMethods( - Set knownMethods) { + Collection knownMethods) { this.knownMethods = new HashSet<>(knownMethods); return this; } + /** + * Configures the extractor to recognize an alternative set of HTTP request methods. + * + *

By default, this extractor defines "known" methods as the ones listed in RFC9110 and the PATCH + * method defined in RFC5789. If an + * unknown method is encountered, the extractor will use the value {@value HttpConstants#_OTHER} + * instead of it and put the original value in an extra {@code http.request.method_original} + * attribute. + * + *

Note: calling this method overrides the default known method sets completely; it does + * not supplement it. + * + * @param knownMethods A set of recognized HTTP request methods. + */ + // don't deprecate this since users will get deprecation warning without a clean way to suppress + // it if they're using Set + @CanIgnoreReturnValue + public HttpServerAttributesExtractorBuilder setKnownMethods( + Set knownMethods) { + return setKnownMethods((Collection) knownMethods); + } + // visible for tests @CanIgnoreReturnValue HttpServerAttributesExtractorBuilder setHttpRouteGetter( diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerRouteBuilder.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerRouteBuilder.java index e1a6e3dc21a7..19c7eb7367cd 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerRouteBuilder.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerRouteBuilder.java @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder; import io.opentelemetry.instrumentation.api.internal.HttpConstants; import io.opentelemetry.instrumentation.api.internal.HttpRouteState; +import java.util.Collection; import java.util.HashSet; import java.util.Set; @@ -44,11 +45,32 @@ public final class HttpServerRouteBuilder { * @param knownMethods A set of recognized HTTP request methods. */ @CanIgnoreReturnValue - public HttpServerRouteBuilder setKnownMethods(Set knownMethods) { + public HttpServerRouteBuilder setKnownMethods(Collection knownMethods) { this.knownMethods = new HashSet<>(knownMethods); return this; } + /** + * Configures the customizer to recognize an alternative set of HTTP request methods. + * + *

By default, this customizer defines "known" methods as the ones listed in RFC9110 and the PATCH + * method defined in RFC5789. If an + * unknown method is encountered, the customizer will use the value {@value HttpConstants#_OTHER} + * instead. + * + *

Note: calling this method overrides the default known method sets completely; it does + * not supplement it. + * + * @param knownMethods A set of recognized HTTP request methods. + */ + // don't deprecate this since users will get deprecation warning without a clean way to suppress + // it if they're using Set + @CanIgnoreReturnValue + public HttpServerRouteBuilder setKnownMethods(Set knownMethods) { + return setKnownMethods((Collection) knownMethods); + } + /** * Returns a {@link ContextCustomizer} that initializes an {@link HttpServerRoute} in the {@link * Context} returned from {@link Instrumenter#start(Context, Object)}. The returned customizer is diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpSpanNameExtractorBuilder.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpSpanNameExtractorBuilder.java index f2e16ba10a79..4ca0f90385fd 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpSpanNameExtractorBuilder.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpSpanNameExtractorBuilder.java @@ -12,6 +12,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor; import io.opentelemetry.instrumentation.api.internal.HttpConstants; +import java.util.Collection; import java.util.HashSet; import java.util.Set; import javax.annotation.Nullable; @@ -50,11 +51,33 @@ public HttpSpanNameExtractorBuilder( * @param knownMethods A set of recognized HTTP request methods. */ @CanIgnoreReturnValue - public HttpSpanNameExtractorBuilder setKnownMethods(Set knownMethods) { + public HttpSpanNameExtractorBuilder setKnownMethods(Collection knownMethods) { this.knownMethods = new HashSet<>(knownMethods); return this; } + /** + * Configures the extractor to recognize an alternative set of HTTP request methods. + * + *

By default, this extractor defines "known" methods as the ones listed in RFC9110 and the PATCH + * method defined in RFC5789. If an + * unknown method is encountered, the extractor will use the value {@value HttpConstants#_OTHER} + * instead of it and put the original value in an extra {@code http.request.method_original} + * attribute. + * + *

Note: calling this method overrides the default known method sets completely; it does + * not supplement it. + * + * @param knownMethods A set of recognized HTTP request methods. + */ + // don't deprecate this since users will get deprecation warning without a clean way to suppress + // it if they're using Set + @CanIgnoreReturnValue + public HttpSpanNameExtractorBuilder setKnownMethods(Set knownMethods) { + return setKnownMethods((Collection) knownMethods); + } + /** * Returns a new {@link HttpSpanNameExtractor} with the settings of this {@link * HttpSpanNameExtractorBuilder}. 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 e39104f64c78..03c68850845c 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 @@ -13,7 +13,6 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor; import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder; import java.util.Collection; -import java.util.Set; import java.util.function.Function; import org.apache.http.HttpResponse; @@ -98,10 +97,10 @@ public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public ApacheHttpClientTelemetryBuilder setKnownMethods(Set knownMethods) { + public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } 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 ca896c27bdb9..e66486beec04 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 @@ -13,7 +13,6 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor; import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder; import java.util.Collection; -import java.util.Set; import java.util.function.Function; import org.apache.hc.core5.http.HttpResponse; @@ -83,10 +82,10 @@ public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public ApacheHttpClientTelemetryBuilder setKnownMethods(Set knownMethods) { + public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } 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 4903ae358bad..eaec86093bea 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 @@ -18,7 +18,6 @@ import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderUtil; import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental; import java.util.Collection; -import java.util.Set; import java.util.function.Function; public final class ArmeriaClientTelemetryBuilder { @@ -94,10 +93,10 @@ public ArmeriaClientTelemetryBuilder setCapturedResponseHeaders( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public ArmeriaClientTelemetryBuilder setKnownMethods(Set knownMethods) { + public ArmeriaClientTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } 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 b2455a9dce4c..133f11815967 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 @@ -18,7 +18,6 @@ import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderUtil; import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental; import java.util.Collection; -import java.util.Set; import java.util.function.Function; public final class ArmeriaServerTelemetryBuilder { @@ -92,10 +91,10 @@ public ArmeriaServerTelemetryBuilder setCapturedResponseHeaders( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public ArmeriaServerTelemetryBuilder setKnownMethods(Set knownMethods) { + public ArmeriaServerTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } diff --git a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java index 6f06abac7996..f79adf085e66 100644 --- a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java +++ b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java @@ -222,10 +222,10 @@ public ArmeriaTelemetryBuilder setCapturedServerResponseHeaders(List res * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) - * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set) - * @deprecated Use {@link ArmeriaClientTelemetryBuilder#setKnownMethods(Set)} and {@link - * ArmeriaServerTelemetryBuilder#setKnownMethods(Set)} instead. + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) + * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection) + * @deprecated Use {@link ArmeriaClientTelemetryBuilder#setKnownMethods(Collection)} and {@link + * ArmeriaServerTelemetryBuilder#setKnownMethods(Collection)} instead. */ @Deprecated @CanIgnoreReturnValue diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7TelemetryBuilder.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7TelemetryBuilder.java index 8145d8e4fc91..6d557dd31976 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7TelemetryBuilder.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7TelemetryBuilder.java @@ -15,6 +15,7 @@ import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestInstrumenterFactory; import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestRequest; import java.util.ArrayList; +import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -60,10 +61,10 @@ public ElasticsearchRest7TelemetryBuilder addAttributesExtractor( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public ElasticsearchRest7TelemetryBuilder setKnownMethods(Set knownMethods) { + public ElasticsearchRest7TelemetryBuilder setKnownMethods(Collection knownMethods) { this.knownMethods = new HashSet<>(knownMethods); return this; } diff --git a/instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/httpclient/JavaHttpClientTelemetryBuilder.java b/instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/httpclient/JavaHttpClientTelemetryBuilder.java index 00daa7e70a32..56096edb7b3d 100644 --- a/instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/httpclient/JavaHttpClientTelemetryBuilder.java +++ b/instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/httpclient/JavaHttpClientTelemetryBuilder.java @@ -17,7 +17,6 @@ import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.util.Collection; -import java.util.Set; import java.util.function.Function; public final class JavaHttpClientTelemetryBuilder { @@ -95,10 +94,10 @@ public JavaHttpClientTelemetryBuilder setCapturedResponseHeaders( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public JavaHttpClientTelemetryBuilder setKnownMethods(Set knownMethods) { + public JavaHttpClientTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } 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 223dfb2aedc5..6a7ab1cc20f4 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 @@ -14,7 +14,6 @@ import io.opentelemetry.instrumentation.jetty.httpclient.v12_0.internal.Experimental; import io.opentelemetry.instrumentation.jetty.httpclient.v12_0.internal.JettyHttpClientInstrumenterBuilderFactory; import java.util.Collection; -import java.util.Set; import java.util.function.Function; import org.eclipse.jetty.client.HttpClientTransport; import org.eclipse.jetty.client.Request; @@ -109,10 +108,10 @@ public JettyClientTelemetryBuilder setCapturedResponseHeaders( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public JettyClientTelemetryBuilder setKnownMethods(Set knownMethods) { + public JettyClientTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } 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 58295bf12e24..3f242b7fbb3c 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 @@ -14,7 +14,6 @@ import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal.Experimental; import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal.JettyHttpClientInstrumenterBuilderFactory; import java.util.Collection; -import java.util.Set; import java.util.function.Function; import org.eclipse.jetty.client.HttpClientTransport; import org.eclipse.jetty.client.api.Request; @@ -109,10 +108,10 @@ public JettyClientTelemetryBuilder setCapturedResponseHeaders( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public JettyClientTelemetryBuilder setKnownMethods(Set knownMethods) { + public JettyClientTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } 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 d4635e557962..588bf415499d 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,7 +73,7 @@ class KtorServerTelemetry private constructor( builder.setCapturedResponseHeaders(responseHeaders) } - fun setKnownMethods(knownMethods: Set) { + fun setKnownMethods(knownMethods: Collection) { builder.setKnownMethods(knownMethods) } 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 be742f93e779..cae8789df16b 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 @@ -18,7 +18,6 @@ import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyConnectionInstrumentationFlag; import io.opentelemetry.instrumentation.netty.v4_1.internal.Experimental; import java.util.Collection; -import java.util.Set; import java.util.function.Function; /** A builder of {@link NettyClientTelemetry}. */ @@ -98,10 +97,10 @@ public NettyClientTelemetryBuilder addAttributesExtractor( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public NettyClientTelemetryBuilder setKnownMethods(Set knownMethods) { + public NettyClientTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } 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 bec0b22ecbef..92233db0fac6 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 @@ -17,7 +17,6 @@ import io.opentelemetry.instrumentation.netty.v4_1.internal.ProtocolEventHandler; import io.opentelemetry.instrumentation.netty.v4_1.internal.server.NettyServerInstrumenterBuilderUtil; import java.util.Collection; -import java.util.Set; /** A builder of {@link NettyServerTelemetry}. */ public final class NettyServerTelemetryBuilder { @@ -92,10 +91,10 @@ public NettyServerTelemetryBuilder setCapturedResponseHeaders( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public NettyServerTelemetryBuilder setKnownMethods(Set knownMethods) { + public NettyServerTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } 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 d8fa780d5d50..8e830da41473 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 @@ -14,7 +14,6 @@ import io.opentelemetry.instrumentation.okhttp.v3_0.internal.Experimental; import io.opentelemetry.instrumentation.okhttp.v3_0.internal.OkHttpClientInstrumenterBuilderFactory; import java.util.Collection; -import java.util.Set; import java.util.function.Function; import okhttp3.Interceptor; import okhttp3.Response; @@ -93,10 +92,10 @@ public OkHttpTelemetryBuilder setCapturedResponseHeaders(Collection resp * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public OkHttpTelemetryBuilder setKnownMethods(Set knownMethods) { + public OkHttpTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } 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 3f82c7a480d8..b1e0ddf1db5c 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 @@ -14,7 +14,6 @@ import io.opentelemetry.instrumentation.ratpack.v1_7.internal.Experimental; import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackClientInstrumenterBuilderFactory; import java.util.Collection; -import java.util.Set; import java.util.function.Function; import ratpack.http.client.HttpResponse; import ratpack.http.client.RequestSpec; @@ -77,10 +76,10 @@ public RatpackClientTelemetryBuilder setCapturedResponseHeaders( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public RatpackClientTelemetryBuilder setKnownMethods(Set knownMethods) { + public RatpackClientTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } 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 1464970409c5..07da8e9959b3 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 @@ -14,7 +14,6 @@ import io.opentelemetry.instrumentation.ratpack.v1_7.internal.Experimental; import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackServerInstrumenterBuilderFactory; import java.util.Collection; -import java.util.Set; import java.util.function.Function; import ratpack.http.Request; import ratpack.http.Response; @@ -81,10 +80,10 @@ public RatpackServerTelemetryBuilder setCapturedResponseHeaders( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public RatpackServerTelemetryBuilder setKnownMethods(Set knownMethods) { + public RatpackServerTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackTelemetryBuilder.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackTelemetryBuilder.java index 39e60c56c3bf..8239fbeeed33 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackTelemetryBuilder.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackTelemetryBuilder.java @@ -140,10 +140,10 @@ public RatpackTelemetryBuilder setCapturedClientResponseHeaders(List res * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) - * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set) - * @deprecated Use {@link RatpackServerTelemetryBuilder#setKnownMethods(Set)} and {@link - * RatpackClientTelemetryBuilder#setKnownMethods(Set)} instead. + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) + * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection) + * @deprecated Use {@link RatpackServerTelemetryBuilder#setKnownMethods(Collection)} and {@link + * RatpackClientTelemetryBuilder#setKnownMethods(Collection)} instead. */ @Deprecated @CanIgnoreReturnValue 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 bd7b4ee3494b..b45c063a9a5e 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 @@ -14,7 +14,6 @@ import io.opentelemetry.instrumentation.restlet.v1_1.internal.Experimental; import io.opentelemetry.instrumentation.restlet.v1_1.internal.RestletTelemetryBuilderFactory; import java.util.Collection; -import java.util.Set; import java.util.function.Function; import org.restlet.data.Request; import org.restlet.data.Response; @@ -77,10 +76,10 @@ public RestletTelemetryBuilder setCapturedResponseHeaders(Collection res * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public RestletTelemetryBuilder setKnownMethods(Set knownMethods) { + public RestletTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } 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 d13c5b28921b..ed7f134a0b76 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 @@ -14,7 +14,6 @@ import io.opentelemetry.instrumentation.restlet.v2_0.internal.Experimental; import io.opentelemetry.instrumentation.restlet.v2_0.internal.RestletTelemetryBuilderFactory; import java.util.Collection; -import java.util.Set; import java.util.function.Function; import org.restlet.Request; import org.restlet.Response; @@ -77,10 +76,10 @@ public RestletTelemetryBuilder setCapturedResponseHeaders(Collection res * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public RestletTelemetryBuilder setKnownMethods(Set knownMethods) { + public RestletTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } 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 6ddbd89b7a33..1b34f2bad280 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 @@ -14,7 +14,6 @@ import io.opentelemetry.instrumentation.spring.web.v3_1.internal.Experimental; import io.opentelemetry.instrumentation.spring.web.v3_1.internal.WebTelemetryUtil; import java.util.Collection; -import java.util.Set; import java.util.function.Function; import org.springframework.http.HttpRequest; import org.springframework.http.client.ClientHttpResponse; @@ -112,10 +111,10 @@ public SpringWebTelemetryBuilder setSpanNameExtractor( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public SpringWebTelemetryBuilder setKnownMethods(Set knownMethods) { + public SpringWebTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } 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 71cbef236fa9..7535fbe62466 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 @@ -15,7 +15,6 @@ import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.SpringWebfluxBuilderUtil; import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.WebClientHttpAttributesGetter; import java.util.Collection; -import java.util.Set; import java.util.function.Function; import org.springframework.web.reactive.function.client.ClientRequest; import org.springframework.web.reactive.function.client.ClientResponse; @@ -86,10 +85,10 @@ public SpringWebfluxClientTelemetryBuilder setCapturedResponseHeaders( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public SpringWebfluxClientTelemetryBuilder setKnownMethods(Set knownMethods) { + public SpringWebfluxClientTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } 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 32a32fadee37..4142b7a3a9e9 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 @@ -14,7 +14,6 @@ import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.Experimental; import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.SpringWebfluxBuilderUtil; import java.util.Collection; -import java.util.Set; import java.util.function.Function; import org.springframework.web.server.ServerWebExchange; @@ -87,10 +86,10 @@ public SpringWebfluxServerTelemetryBuilder setCapturedResponseHeaders( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public SpringWebfluxServerTelemetryBuilder setKnownMethods(Set knownMethods) { + public SpringWebfluxServerTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxTelemetryBuilder.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxTelemetryBuilder.java index 4bb2c305b9fc..3fa01131678c 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxTelemetryBuilder.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxTelemetryBuilder.java @@ -154,10 +154,10 @@ public SpringWebfluxTelemetryBuilder setCapturedServerResponseHeaders( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Set) - * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set) - * @deprecated Use {@link SpringWebfluxClientTelemetryBuilder#setKnownMethods(Set)} and {@link - * SpringWebfluxServerTelemetryBuilder#setKnownMethods(Set)} instead. + * @see HttpClientAttributesExtractorBuilder#setKnownMethods(Collection) + * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection) + * @deprecated Use {@link SpringWebfluxClientTelemetryBuilder#setKnownMethods(Collection)} and + * {@link SpringWebfluxServerTelemetryBuilder#setKnownMethods(Collection)} instead. */ @Deprecated @CanIgnoreReturnValue 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 df47ef5b6120..9980ac7be7fc 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 @@ -14,7 +14,6 @@ import io.opentelemetry.instrumentation.spring.webmvc.v5_3.internal.Experimental; import io.opentelemetry.instrumentation.spring.webmvc.v5_3.internal.SpringMvcBuilderUtil; import java.util.Collection; -import java.util.Set; import java.util.function.Function; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -98,10 +97,10 @@ public SpringWebMvcTelemetryBuilder setSpanNameExtractor( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public SpringWebMvcTelemetryBuilder setKnownMethods(Set knownMethods) { + public SpringWebMvcTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; } 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 276af5a26b3f..f7d6a030d6c6 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 @@ -16,7 +16,6 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import java.util.Collection; -import java.util.Set; import java.util.function.Function; /** A builder of {@link SpringWebMvcTelemetry}. */ @@ -97,10 +96,10 @@ public SpringWebMvcTelemetryBuilder setSpanNameExtractor( * not supplement it. * * @param knownMethods A set of recognized HTTP request methods. - * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Set) + * @see HttpServerAttributesExtractorBuilder#setKnownMethods(Collection) */ @CanIgnoreReturnValue - public SpringWebMvcTelemetryBuilder setKnownMethods(Set knownMethods) { + public SpringWebMvcTelemetryBuilder setKnownMethods(Collection knownMethods) { builder.setKnownMethods(knownMethods); return this; }