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 1ee27eb05bbc..1857d25cde65 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 @@ -89,18 +89,6 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection known return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public ApacheHttpClientTelemetryBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractorTransformer) { - return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 fa5a89c2bf73..674bcdac3eff 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 @@ -89,18 +89,6 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection known return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public ApacheHttpClientTelemetryBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractorTransformer) { - return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 de9ef6e72c29..08574d3d6d30 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 @@ -36,18 +36,6 @@ public final class ArmeriaClientTelemetryBuilder { builder = ArmeriaInstrumenterBuilderFactory.getClientBuilder(openTelemetry); } - /** - * Sets the status extractor for client spans. - * - * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public ArmeriaClientTelemetryBuilder setStatusExtractor( - UnaryOperator> statusExtractor) { - return setSpanStatusExtractorCustomizer(statusExtractor); - } - /** * Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a * customized one. @@ -114,18 +102,6 @@ public ArmeriaClientTelemetryBuilder setKnownMethods(Collection knownMet return this; } - /** - * Sets custom client {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public ArmeriaClientTelemetryBuilder setSpanNameExtractor( - UnaryOperator> clientSpanNameExtractor) { - return setSpanNameExtractorCustomizer(clientSpanNameExtractor); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 eac0374c3fd9..0ac0ff08398f 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 @@ -34,18 +34,6 @@ public final class ArmeriaServerTelemetryBuilder { builder = ArmeriaInstrumenterBuilderFactory.getServerBuilder(openTelemetry); } - /** - * Sets the status extractor for server spans. - * - * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public ArmeriaServerTelemetryBuilder setStatusExtractor( - UnaryOperator> statusExtractor) { - return setSpanStatusExtractorCustomizer(statusExtractor); - } - /** * Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a * customized one. @@ -112,18 +100,6 @@ public ArmeriaServerTelemetryBuilder setKnownMethods(Collection knownMet return this; } - /** - * Sets custom server {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public ArmeriaServerTelemetryBuilder setSpanNameExtractor( - UnaryOperator> serverSpanNameExtractor) { - return setSpanNameExtractorCustomizer(serverSpanNameExtractor); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 8fb91705d384..5152d4e933c1 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 @@ -40,18 +40,6 @@ public final class HelidonTelemetryBuilder { HelidonRequestGetter.INSTANCE); } - /** - * Sets the status extractor for server spans. - * - * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public HelidonTelemetryBuilder setStatusExtractor( - UnaryOperator> statusExtractor) { - return setSpanStatusExtractorCustomizer(statusExtractor); - } - /** * Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a * customized one. @@ -116,18 +104,6 @@ public HelidonTelemetryBuilder setKnownMethods(Collection knownMethods) return this; } - /** - * Sets custom server {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public HelidonTelemetryBuilder setSpanNameExtractor( - UnaryOperator> serverSpanNameExtractor) { - return setSpanNameExtractorCustomizer(serverSpanNameExtractor); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 66bd30806947..ce0056dad786 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 @@ -88,18 +88,6 @@ public JavaHttpClientTelemetryBuilder setKnownMethods(Collection knownMe return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public JavaHttpClientTelemetryBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractorTransformer) { - return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 790eb07ca8b9..806ca387e849 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 @@ -39,18 +39,6 @@ public final class JavaHttpServerTelemetryBuilder { JavaHttpServerExchangeGetter.INSTANCE); } - /** - * Sets the status extractor for server spans. - * - * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public JavaHttpServerTelemetryBuilder setStatusExtractor( - UnaryOperator> statusExtractor) { - return setSpanStatusExtractorCustomizer(statusExtractor); - } - /** * Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a * customized one. @@ -117,18 +105,6 @@ public JavaHttpServerTelemetryBuilder setKnownMethods(Collection knownMe return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public JavaHttpServerTelemetryBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractorTransformer) { - return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 90b21cecc4dc..454285a2da95 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 @@ -102,18 +102,6 @@ public JettyClientTelemetryBuilder setKnownMethods(Collection knownMetho return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public JettyClientTelemetryBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractorTransformer) { - return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 f35cbaed03f6..7b4486ea7760 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 @@ -102,18 +102,6 @@ public JettyClientTelemetryBuilder setKnownMethods(Collection knownMetho return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public JettyClientTelemetryBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractorTransformer) { - return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. diff --git a/instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/AbstractKtorClientTelemetryBuilder.kt b/instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/AbstractKtorClientTelemetryBuilder.kt index 9f5eab1e603a..28b5d862e284 100644 --- a/instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/AbstractKtorClientTelemetryBuilder.kt +++ b/instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/AbstractKtorClientTelemetryBuilder.kt @@ -79,11 +79,6 @@ abstract class AbstractKtorClientTelemetryBuilder( }) } - @Deprecated("Use spanNameExtractor(UnaryOperator) instead", ReplaceWith("spanNameExtractor(spanNameExtractorTransformer::apply)")) - fun spanNameExtractor(spanNameExtractorTransformer: Function, SpanNameExtractor>) { - spanNameExtractor(spanNameExtractorTransformer::apply) - } - fun spanNameExtractor(spanNameExtractor: UnaryOperator>) { builder.setSpanNameExtractorCustomizer(spanNameExtractor) } diff --git a/instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/AbstractKtorServerTelemetryBuilder.kt b/instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/AbstractKtorServerTelemetryBuilder.kt index 58f89f73ff0a..a5979ae90830 100644 --- a/instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/AbstractKtorServerTelemetryBuilder.kt +++ b/instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/AbstractKtorServerTelemetryBuilder.kt @@ -89,11 +89,6 @@ abstract class AbstractKtorServerTelemetryBuilder(private val instrumentationNam ) } - @Deprecated("Use spanNameExtractor(UnaryOperator) instead", ReplaceWith("spanNameExtractor(spanNameExtractorTransformer::apply)")) - fun spanNameExtractor(spanNameExtractorTransformer: Function, SpanNameExtractor>) { - spanNameExtractor(spanNameExtractorTransformer::apply) - } - fun spanNameExtractor(spanNameExtractor: UnaryOperator>) { builder.setSpanNameExtractorCustomizer(spanNameExtractor) } 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 c76afb627003..be9dfab28b4a 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 @@ -93,18 +93,6 @@ public NettyClientTelemetryBuilder setKnownMethods(Collection knownMetho return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public NettyClientTelemetryBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractorTransformer) { - return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 ce208b68466c..22b0f6cf0c41 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 @@ -86,18 +86,6 @@ public OkHttpTelemetryBuilder setKnownMethods(Collection knownMethods) { return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public OkHttpTelemetryBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractorTransformer) { - return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 56f1121c288c..e46ebfff832e 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 @@ -84,18 +84,6 @@ public RatpackClientTelemetryBuilder setKnownMethods(Collection knownMet return this; } - /** - * Sets custom client {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public RatpackClientTelemetryBuilder setSpanNameExtractor( - UnaryOperator> clientSpanNameExtractor) { - return setSpanNameExtractorCustomizer(clientSpanNameExtractor); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 9ba88d706af9..2cbca0112cb8 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 @@ -88,18 +88,6 @@ public RatpackServerTelemetryBuilder setKnownMethods(Collection knownMet return this; } - /** - * Sets custom server {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public RatpackServerTelemetryBuilder setSpanNameExtractor( - UnaryOperator> serverSpanNameExtractor) { - return setSpanNameExtractorCustomizer(serverSpanNameExtractor); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 bbc42bbb39c8..519f22bcf062 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 @@ -84,18 +84,6 @@ public RestletTelemetryBuilder setKnownMethods(Collection knownMethods) return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public RestletTelemetryBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractorTransformer) { - return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 017382cd232d..572bf02b04f2 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 @@ -84,18 +84,6 @@ public RestletTelemetryBuilder setKnownMethods(Collection knownMethods) return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public RestletTelemetryBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractorTransformer) { - return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 fde5c4b5ea66..839aa5090926 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 @@ -57,18 +57,6 @@ public final class ServletTelemetryBuilder { builder = servletBuilder.getBuilder(); } - /** - * Sets the status extractor for server spans. - * - * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public ServletTelemetryBuilder setStatusExtractor( - UnaryOperator> statusExtractor) { - return setSpanStatusExtractorCustomizer(statusExtractor); - } - /** * Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a * customized one. @@ -153,18 +141,6 @@ public ServletTelemetryBuilder setKnownMethods(Collection knownMethods) return this; } - /** - * Sets custom server {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public ServletTelemetryBuilder setSpanNameExtractor( - UnaryOperator> serverSpanNameExtractor) { - return setSpanNameExtractorCustomizer(serverSpanNameExtractor); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 48c759c6c77c..aa683df8ebb7 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 @@ -75,18 +75,6 @@ public SpringWebTelemetryBuilder setCapturedResponseHeaders(Collection r return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public SpringWebTelemetryBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractor) { - return setSpanNameExtractorCustomizer(spanNameExtractor); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 05606b2e1992..da59baa55b2a 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 @@ -93,18 +93,6 @@ public SpringWebfluxClientTelemetryBuilder setKnownMethods(Collection kn return this; } - /** - * Sets custom client {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public SpringWebfluxClientTelemetryBuilder setSpanNameExtractor( - UnaryOperator> clientSpanNameExtractor) { - return setSpanNameExtractorCustomizer(clientSpanNameExtractor); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 ab75a91e7a23..33bd899f0fb5 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 @@ -94,18 +94,6 @@ public SpringWebfluxServerTelemetryBuilder setKnownMethods(Collection kn return this; } - /** - * Sets custom server {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public SpringWebfluxServerTelemetryBuilder setSpanNameExtractor( - UnaryOperator> serverSpanNameExtractor) { - return setSpanNameExtractorCustomizer(serverSpanNameExtractor); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 a317b4d258dc..a4562c25155e 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 @@ -75,18 +75,6 @@ public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders( return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public SpringWebMvcTelemetryBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractor) { - return setSpanNameExtractorCustomizer(spanNameExtractor); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 b8f879499160..8fb1bc537228 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 @@ -74,18 +74,6 @@ public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders( return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public SpringWebMvcTelemetryBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractor) { - return setSpanNameExtractorCustomizer(spanNameExtractor); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one.