diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/instrumenter/InstrumenterCustomizer.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/instrumenter/InstrumenterCustomizer.java index ab47b3092b74..0873f4054969 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/instrumenter/InstrumenterCustomizer.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/instrumenter/InstrumenterCustomizer.java @@ -13,7 +13,6 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor; import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor; import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractor; -import java.util.function.Function; import java.util.function.UnaryOperator; /** @@ -82,21 +81,6 @@ InstrumenterCustomizer addAttributesExtractors( */ InstrumenterCustomizer addContextCustomizer(ContextCustomizer customizer); - /** - * Sets a transformer function that will modify the {@link SpanNameExtractor}. This allows - * customizing how span names are generated for the instrumented operations. - * - * @param spanNameExtractorTransformer function that transforms the original span name extractor - * @return this InstrumenterCustomizer for method chaining - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @SuppressWarnings("FunctionalInterfaceClash") - default InstrumenterCustomizer setSpanNameExtractor( - Function, SpanNameExtractor> spanNameExtractorTransformer) { - return setSpanNameExtractor(spanNameExtractorTransformer::apply); - } - /** * Sets a transformer function that will modify the {@link SpanNameExtractor}. This allows * customizing how span names are generated for the instrumented operations. diff --git a/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java index c33fcf6a71de..bedaa61c1ea3 100644 --- a/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java +++ b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java @@ -22,7 +22,6 @@ import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesExtractor; import java.util.ArrayList; import java.util.List; -import java.util.function.Function; import java.util.function.UnaryOperator; import javax.annotation.Nullable; import org.apache.dubbo.rpc.Result; @@ -64,22 +63,6 @@ public DubboTelemetryBuilder addAttributesExtractor( return this; } - /** - * Sets custom client {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setClientSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - @SuppressWarnings("unchecked") // cast result to SpanNameExtractor - public DubboTelemetryBuilder setClientSpanNameExtractor( - Function, ? extends SpanNameExtractor> - clientSpanNameExtractor) { - return setClientSpanNameExtractor( - (UnaryOperator>) - input -> (SpanNameExtractor) clientSpanNameExtractor.apply(input)); - } - /** Sets custom client {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public DubboTelemetryBuilder setClientSpanNameExtractor( @@ -88,22 +71,6 @@ public DubboTelemetryBuilder setClientSpanNameExtractor( return this; } - /** - * Sets custom server {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setServerSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - @SuppressWarnings("unchecked") // cast result to SpanNameExtractor - public DubboTelemetryBuilder setServerSpanNameExtractor( - Function, ? extends SpanNameExtractor> - serverSpanNameExtractor) { - return setServerSpanNameExtractor( - (UnaryOperator>) - input -> (SpanNameExtractor) serverSpanNameExtractor.apply(input)); - } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public DubboTelemetryBuilder setServerSpanNameExtractor( 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 43b4f5dbaca7..28ddb67670d5 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.function.Function; import java.util.function.UnaryOperator; import org.apache.http.HttpResponse; @@ -90,23 +89,6 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection known return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public ApacheHttpClientTelemetryBuilder setSpanNameExtractor( - Function< - SpanNameExtractor, - SpanNameExtractor> - spanNameExtractorTransformer) { - return setSpanNameExtractor( - (UnaryOperator>) - spanNameExtractorTransformer::apply); - } - /** Sets custom {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public ApacheHttpClientTelemetryBuilder setSpanNameExtractor( 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 84266154d865..48e68b159b15 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.function.Function; import java.util.function.UnaryOperator; import org.apache.hc.core5.http.HttpResponse; @@ -90,23 +89,6 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection known return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public ApacheHttpClientTelemetryBuilder setSpanNameExtractor( - Function< - SpanNameExtractor, - SpanNameExtractor> - spanNameExtractorTransformer) { - return setSpanNameExtractor( - (UnaryOperator>) - spanNameExtractorTransformer::apply); - } - /** Sets custom {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public ApacheHttpClientTelemetryBuilder setSpanNameExtractor( 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 9c36a8d7b5a1..5f7c9f5490df 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.function.Function; import java.util.function.UnaryOperator; public final class ArmeriaClientTelemetryBuilder { @@ -37,23 +36,6 @@ public final class ArmeriaClientTelemetryBuilder { builder = ArmeriaInstrumenterBuilderFactory.getClientBuilder(openTelemetry); } - /** - * Sets the status extractor for client spans. - * - * @deprecated Use {@link #setStatusExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public ArmeriaClientTelemetryBuilder setStatusExtractor( - Function< - SpanStatusExtractor, - SpanStatusExtractor> - statusExtractor) { - return setStatusExtractor( - (UnaryOperator>) - statusExtractor::apply); - } - /** Sets the status extractor for client spans. */ @CanIgnoreReturnValue public ArmeriaClientTelemetryBuilder setStatusExtractor( @@ -116,20 +98,6 @@ public ArmeriaClientTelemetryBuilder setKnownMethods(Collection knownMet return this; } - /** - * Sets custom client {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public ArmeriaClientTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - clientSpanNameExtractor) { - return setSpanNameExtractor( - (UnaryOperator>) clientSpanNameExtractor::apply); - } - /** Sets custom client {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public ArmeriaClientTelemetryBuilder setSpanNameExtractor( 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 84418da78050..dfea8dca34e1 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.function.Function; import java.util.function.UnaryOperator; public final class ArmeriaServerTelemetryBuilder { @@ -35,23 +34,6 @@ public final class ArmeriaServerTelemetryBuilder { builder = ArmeriaInstrumenterBuilderFactory.getServerBuilder(openTelemetry); } - /** - * Sets the status extractor for server spans. - * - * @deprecated Use {@link #setStatusExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public ArmeriaServerTelemetryBuilder setStatusExtractor( - Function< - SpanStatusExtractor, - SpanStatusExtractor> - statusExtractor) { - return setStatusExtractor( - (UnaryOperator>) - statusExtractor::apply); - } - /** Sets the status extractor for server spans. */ @CanIgnoreReturnValue public ArmeriaServerTelemetryBuilder setStatusExtractor( @@ -114,20 +96,6 @@ public ArmeriaServerTelemetryBuilder setKnownMethods(Collection knownMet return this; } - /** - * Sets custom server {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public ArmeriaServerTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - serverSpanNameExtractor) { - return setSpanNameExtractor( - (UnaryOperator>) serverSpanNameExtractor::apply); - } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public ArmeriaServerTelemetryBuilder setSpanNameExtractor( diff --git a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java index fe0575c0f15e..b2b17ef7802b 100644 --- a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java +++ b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.function.Function; import java.util.function.UnaryOperator; import javax.annotation.Nullable; @@ -95,22 +94,6 @@ public GrpcTelemetryBuilder addServerAttributeExtractor( return this; } - /** - * Sets custom client {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setClientSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - @SuppressWarnings("unchecked") // cast result to SpanNameExtractor - public GrpcTelemetryBuilder setClientSpanNameExtractor( - Function, ? extends SpanNameExtractor> - clientSpanNameExtractor) { - return setClientSpanNameExtractor( - (UnaryOperator>) - input -> (SpanNameExtractor) clientSpanNameExtractor.apply(input)); - } - /** Sets custom client {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public GrpcTelemetryBuilder setClientSpanNameExtractor( @@ -119,22 +102,6 @@ public GrpcTelemetryBuilder setClientSpanNameExtractor( return this; } - /** - * Sets custom server {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setServerSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - @SuppressWarnings("unchecked") // cast result to SpanNameExtractor - public GrpcTelemetryBuilder setServerSpanNameExtractor( - Function, ? extends SpanNameExtractor> - serverSpanNameExtractor) { - return setServerSpanNameExtractor( - (UnaryOperator>) - input -> (SpanNameExtractor) serverSpanNameExtractor.apply(input)); - } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public GrpcTelemetryBuilder setServerSpanNameExtractor( 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 d5cc848db438..77ce2c4e3a3c 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 @@ -17,7 +17,6 @@ import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.util.Collection; -import java.util.function.Function; import java.util.function.UnaryOperator; public final class JavaHttpClientTelemetryBuilder { @@ -89,20 +88,6 @@ public JavaHttpClientTelemetryBuilder setKnownMethods(Collection knownMe return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public JavaHttpClientTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - spanNameExtractorTransformer) { - return setSpanNameExtractor( - (UnaryOperator>) spanNameExtractorTransformer::apply); - } - /** Sets custom {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public JavaHttpClientTelemetryBuilder setSpanNameExtractor( 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 e8860805c5f1..4befaf9b9277 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 @@ -16,7 +16,6 @@ import io.opentelemetry.instrumentation.javahttpserver.internal.Experimental; import io.opentelemetry.instrumentation.javahttpserver.internal.JavaHttpServerInstrumenterBuilderUtil; import java.util.Collection; -import java.util.function.Function; import java.util.function.UnaryOperator; public final class JavaHttpServerTelemetryBuilder { @@ -40,22 +39,6 @@ public final class JavaHttpServerTelemetryBuilder { JavaHttpServerExchangeGetter.INSTANCE); } - /** - * Sets the status extractor for server spans. - * - * @deprecated Use {@link #setStatusExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public JavaHttpServerTelemetryBuilder setStatusExtractor( - Function< - SpanStatusExtractor, - SpanStatusExtractor> - statusExtractor) { - return setStatusExtractor( - (UnaryOperator>) statusExtractor::apply); - } - /** Sets the status extractor for server spans. */ @CanIgnoreReturnValue public JavaHttpServerTelemetryBuilder setStatusExtractor( @@ -118,20 +101,6 @@ public JavaHttpServerTelemetryBuilder setKnownMethods(Collection knownMe return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public JavaHttpServerTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - spanNameExtractorTransformer) { - return setSpanNameExtractor( - (UnaryOperator>) spanNameExtractorTransformer::apply); - } - /** Sets custom {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public JavaHttpServerTelemetryBuilder setSpanNameExtractor( 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 55459288e92a..f5706c46b869 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.function.Function; import java.util.function.UnaryOperator; import org.eclipse.jetty.client.HttpClientTransport; import org.eclipse.jetty.client.Request; @@ -103,20 +102,6 @@ public JettyClientTelemetryBuilder setKnownMethods(Collection knownMetho return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public JettyClientTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - spanNameExtractorTransformer) { - return setSpanNameExtractor( - (UnaryOperator>) spanNameExtractorTransformer::apply); - } - /** Sets custom {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public JettyClientTelemetryBuilder setSpanNameExtractor( 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 3b1021a526f9..8ded5c9d5dff 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.function.Function; import java.util.function.UnaryOperator; import org.eclipse.jetty.client.HttpClientTransport; import org.eclipse.jetty.client.api.Request; @@ -103,20 +102,6 @@ public JettyClientTelemetryBuilder setKnownMethods(Collection knownMetho return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public JettyClientTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - spanNameExtractorTransformer) { - return setSpanNameExtractor( - (UnaryOperator>) spanNameExtractorTransformer::apply); - } - /** Sets custom {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public JettyClientTelemetryBuilder setSpanNameExtractor( 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 27b325eada28..d612d33ff18e 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.common.v4_0.internal.client.NettyConnectionInstrumentationFlag; import io.opentelemetry.instrumentation.netty.v4_1.internal.Experimental; import java.util.Collection; -import java.util.function.Function; import java.util.function.UnaryOperator; /** A builder of {@link NettyClientTelemetry}. */ @@ -94,20 +93,6 @@ public NettyClientTelemetryBuilder setKnownMethods(Collection knownMetho return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public NettyClientTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - spanNameExtractorTransformer) { - return setSpanNameExtractor( - (UnaryOperator>) spanNameExtractorTransformer::apply); - } - /** Sets custom {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public NettyClientTelemetryBuilder setSpanNameExtractor( 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 90f26273275a..dc864ea8a8ff 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.function.Function; import java.util.function.UnaryOperator; import okhttp3.Interceptor; import okhttp3.Response; @@ -87,20 +86,6 @@ public OkHttpTelemetryBuilder setKnownMethods(Collection knownMethods) { return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public OkHttpTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - spanNameExtractorTransformer) { - return setSpanNameExtractor( - (UnaryOperator>) spanNameExtractorTransformer::apply); - } - /** Sets custom {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public OkHttpTelemetryBuilder setSpanNameExtractor( diff --git a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcTelemetryBuilder.java b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcTelemetryBuilder.java index d0d6b46367ae..fc39e40a6fa2 100644 --- a/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcTelemetryBuilder.java +++ b/instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcTelemetryBuilder.java @@ -14,7 +14,6 @@ import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.DbExecution; import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.Experimental; import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.R2dbcInstrumenterBuilder; -import java.util.function.Function; import java.util.function.UnaryOperator; /** A builder of {@link R2dbcTelemetry}. */ @@ -52,22 +51,6 @@ public R2dbcTelemetryBuilder setStatementSanitizationEnabled(boolean enabled) { return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - @SuppressWarnings("unchecked") // cast result to SpanNameExtractor - public R2dbcTelemetryBuilder setSpanNameExtractor( - Function, ? extends SpanNameExtractor> - spanNameExtractorTransformer) { - return setSpanNameExtractor( - (UnaryOperator>) - input -> (SpanNameExtractor) spanNameExtractorTransformer.apply(input)); - } - /** Sets custom {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public R2dbcTelemetryBuilder setSpanNameExtractor( 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 ff0366d2b534..c5d536cc9690 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.function.Function; import java.util.function.UnaryOperator; import ratpack.http.client.HttpResponse; import ratpack.http.client.RequestSpec; @@ -85,20 +84,6 @@ public RatpackClientTelemetryBuilder setKnownMethods(Collection knownMet return this; } - /** - * Sets custom client {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public RatpackClientTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - clientSpanNameExtractor) { - return setSpanNameExtractor( - (UnaryOperator>) clientSpanNameExtractor::apply); - } - /** Sets custom client {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public RatpackClientTelemetryBuilder setSpanNameExtractor( 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 21df54da775e..0d933340d960 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.function.Function; import java.util.function.UnaryOperator; import ratpack.http.Request; import ratpack.http.Response; @@ -89,19 +88,6 @@ public RatpackServerTelemetryBuilder setKnownMethods(Collection knownMet return this; } - /** - * Sets custom server {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public RatpackServerTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> serverSpanNameExtractor) { - return setSpanNameExtractor( - (UnaryOperator>) serverSpanNameExtractor::apply); - } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public RatpackServerTelemetryBuilder setSpanNameExtractor( 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 a0bc0a16f1cf..19bc3007c16a 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.function.Function; import java.util.function.UnaryOperator; import org.restlet.data.Request; import org.restlet.data.Response; @@ -85,20 +84,6 @@ public RestletTelemetryBuilder setKnownMethods(Collection knownMethods) return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public RestletTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - spanNameExtractorTransformer) { - return setSpanNameExtractor( - (UnaryOperator>) spanNameExtractorTransformer::apply); - } - /** Sets custom {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public RestletTelemetryBuilder setSpanNameExtractor( 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 131709a1294e..7bbe77273ad7 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.function.Function; import java.util.function.UnaryOperator; import org.restlet.Request; import org.restlet.Response; @@ -85,20 +84,6 @@ public RestletTelemetryBuilder setKnownMethods(Collection knownMethods) return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public RestletTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - spanNameExtractorTransformer) { - return setSpanNameExtractor( - (UnaryOperator>) spanNameExtractorTransformer::apply); - } - /** Sets custom {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public RestletTelemetryBuilder setSpanNameExtractor( 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 16edc0b9a133..d83b1c67c395 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.function.Function; import java.util.function.UnaryOperator; import org.springframework.http.HttpRequest; import org.springframework.http.client.ClientHttpResponse; @@ -76,20 +75,6 @@ public SpringWebTelemetryBuilder setCapturedResponseHeaders(Collection r return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public SpringWebTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - spanNameExtractorTransformer) { - return setSpanNameExtractor( - (UnaryOperator>) spanNameExtractorTransformer::apply); - } - /** Sets custom {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public SpringWebTelemetryBuilder setSpanNameExtractor( 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 163505760e05..76cc840e3b4b 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.function.Function; import java.util.function.UnaryOperator; import org.springframework.web.reactive.function.client.ClientRequest; import org.springframework.web.reactive.function.client.ClientResponse; @@ -94,20 +93,6 @@ public SpringWebfluxClientTelemetryBuilder setKnownMethods(Collection kn return this; } - /** - * Sets custom client {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public SpringWebfluxClientTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - clientSpanNameExtractor) { - return setSpanNameExtractor( - (UnaryOperator>) clientSpanNameExtractor::apply); - } - /** Sets custom client {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public SpringWebfluxClientTelemetryBuilder setSpanNameExtractor( 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 aff8906467db..24d92e735f1c 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.function.Function; import java.util.function.UnaryOperator; import org.springframework.web.server.ServerWebExchange; @@ -95,20 +94,6 @@ public SpringWebfluxServerTelemetryBuilder setKnownMethods(Collection kn return this; } - /** - * Sets custom server {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public SpringWebfluxServerTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - serverSpanNameExtractor) { - return setSpanNameExtractor( - (UnaryOperator>) serverSpanNameExtractor::apply); - } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public SpringWebfluxServerTelemetryBuilder setSpanNameExtractor( 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 7273a76de512..8a74f5f19109 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.function.Function; import java.util.function.UnaryOperator; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -76,20 +75,6 @@ public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders( return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public SpringWebMvcTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - spanNameExtractor) { - return setSpanNameExtractor( - (UnaryOperator>) spanNameExtractor::apply); - } - /** Sets custom {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public SpringWebMvcTelemetryBuilder setSpanNameExtractor( 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 4604dff9e99a..8e9b19c646c4 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.function.Function; import java.util.function.UnaryOperator; /** A builder of {@link SpringWebMvcTelemetry}. */ @@ -75,20 +74,6 @@ public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders( return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public SpringWebMvcTelemetryBuilder setSpanNameExtractor( - Function, SpanNameExtractor> - spanNameExtractor) { - return setSpanNameExtractor( - (UnaryOperator>) spanNameExtractor::apply); - } - /** Sets custom {@link SpanNameExtractor} via transform function. */ @CanIgnoreReturnValue public SpringWebMvcTelemetryBuilder setSpanNameExtractor(