From a885b6e4e9c179ce094977c17d0d093a023de507 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 3 Dec 2025 13:09:33 -0800 Subject: [PATCH 01/12] Follow SDK naming convention for customizers --- .../DemoInstrumenterCustomizerProvider.java | 2 +- .../DemoInstrumenterCustomizerProvider.java | 2 +- .../DefaultHttpClientInstrumenterBuilder.java | 24 +++++++++++++- .../DefaultHttpServerInstrumenterBuilder.java | 24 +++++++++++++- .../instrumenter/InstrumenterCustomizer.java | 32 +++++++++++++++++-- .../internal/InstrumenterCustomizerImpl.java | 8 ++--- .../api/instrumenter/InstrumenterBuilder.java | 4 +-- .../InternalInstrumenterCustomizer.java | 23 +++++++++++-- .../InstrumentationCustomizerTest.java | 4 +-- .../v2_7/DubboTelemetryBuilder.java | 28 ++++++++++++++-- .../ApacheHttpClientTelemetryBuilder.java | 16 ++++++++-- .../ApacheHttpClientTelemetryBuilder.java | 16 ++++++++-- .../v1_3/ArmeriaClientTelemetryBuilder.java | 32 ++++++++++++++++--- .../v1_3/ArmeriaServerTelemetryBuilder.java | 32 ++++++++++++++++--- .../grpc/v1_6/GrpcTelemetryBuilder.java | 28 ++++++++++++++-- .../helidon/v4_3/HelidonTelemetryBuilder.java | 32 ++++++++++++++++--- .../JavaHttpClientTelemetryBuilder.java | 16 ++++++++-- .../JavaHttpServerTelemetryBuilder.java | 32 ++++++++++++++++--- .../v12_0/JettyClientTelemetryBuilder.java | 16 ++++++++-- .../v9_2/JettyClientTelemetryBuilder.java | 16 ++++++++-- .../AbstractKtorClientTelemetryBuilder.kt | 2 +- .../AbstractKtorServerTelemetryBuilder.kt | 4 +-- .../KubernetesClientSingletons.java | 2 +- .../v4_1/NettyClientTelemetryBuilder.java | 16 ++++++++-- .../okhttp/v3_0/OkHttpTelemetryBuilder.java | 16 ++++++++-- .../r2dbc/v1_0/R2dbcTelemetryBuilder.java | 14 +++++++- .../v1_7/RatpackClientTelemetryBuilder.java | 16 ++++++++-- .../v1_7/RatpackServerTelemetryBuilder.java | 16 ++++++++-- .../restlet/v1_1/RestletTelemetryBuilder.java | 16 ++++++++-- .../restlet/v2_0/RestletTelemetryBuilder.java | 16 ++++++++-- .../servlet/v3_0/ServletTelemetryBuilder.java | 32 ++++++++++++++++--- .../internal/ServletInstrumenterBuilder.java | 2 +- .../web/v3_1/SpringWebTelemetryBuilder.java | 16 ++++++++-- .../SpringWebfluxClientTelemetryBuilder.java | 16 ++++++++-- .../SpringWebfluxServerTelemetryBuilder.java | 16 ++++++++-- .../v5_3/SpringWebMvcTelemetryBuilder.java | 16 ++++++++-- .../v6_0/SpringWebMvcTelemetryBuilder.java | 16 ++++++++-- 37 files changed, 541 insertions(+), 78 deletions(-) diff --git a/examples/distro/custom/src/main/java/com/example/javaagent/DemoInstrumenterCustomizerProvider.java b/examples/distro/custom/src/main/java/com/example/javaagent/DemoInstrumenterCustomizerProvider.java index e57e8d5e146a..aa7f333cc90a 100644 --- a/examples/distro/custom/src/main/java/com/example/javaagent/DemoInstrumenterCustomizerProvider.java +++ b/examples/distro/custom/src/main/java/com/example/javaagent/DemoInstrumenterCustomizerProvider.java @@ -66,7 +66,7 @@ private void customizeHttpServer(InstrumenterCustomizer customizer) { customizer.addAttributesExtractor(new DemoAttributesExtractor()); customizer.addOperationMetrics(new DemoMetrics()); customizer.addContextCustomizer(new DemoContextCustomizer()); - customizer.setSpanNameExtractor( + customizer.setSpanNameExtractorCustomizer( unused -> (SpanNameExtractor) object -> "CustomHTTP/" + object.toString()); } diff --git a/examples/extension/src/main/java/com/example/javaagent/DemoInstrumenterCustomizerProvider.java b/examples/extension/src/main/java/com/example/javaagent/DemoInstrumenterCustomizerProvider.java index f9e1e96727b3..3aa57f28e5ef 100644 --- a/examples/extension/src/main/java/com/example/javaagent/DemoInstrumenterCustomizerProvider.java +++ b/examples/extension/src/main/java/com/example/javaagent/DemoInstrumenterCustomizerProvider.java @@ -69,7 +69,7 @@ private void customizeHttpServer(InstrumenterCustomizer customizer) { customizer.addAttributesExtractor(new DemoAttributesExtractor()); customizer.addOperationMetrics(new DemoMetrics()); customizer.addContextCustomizer(new DemoContextCustomizer()); - customizer.setSpanNameExtractor( + customizer.setSpanNameExtractorCustomizer( unused -> (SpanNameExtractor) object -> "CustomHTTP/" + object.toString()); } 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 89dc9d923e12..ab11e536d718 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 @@ -111,9 +111,19 @@ public DefaultHttpClientInstrumenterBuilder addAttributesExtr return this; } + /** + * @deprecated Use {@link #setStatusExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public DefaultHttpClientInstrumenterBuilder setStatusExtractor( UnaryOperator> statusExtractor) { + return setStatusExtractorCustomizer(statusExtractor); + } + + @CanIgnoreReturnValue + public DefaultHttpClientInstrumenterBuilder setStatusExtractorCustomizer( + UnaryOperator> statusExtractor) { this.statusExtractorTransformer = statusExtractor; return this; } @@ -188,10 +198,22 @@ public DefaultHttpClientInstrumenterBuilder setRedactQueryPar return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public DefaultHttpClientInstrumenterBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractor) { + return setSpanNameExtractorCustomizer(spanNameExtractor); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public DefaultHttpClientInstrumenterBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractor) { this.spanNameExtractorTransformer = spanNameExtractor; 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 7ddd7171d03b..34d14d07c306 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 @@ -106,9 +106,19 @@ public DefaultHttpServerInstrumenterBuilder addAttributesExtr return this; } + /** + * @deprecated Use {@link #setStatusExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public DefaultHttpServerInstrumenterBuilder setStatusExtractor( UnaryOperator> statusExtractor) { + return setStatusExtractorCustomizer(statusExtractor); + } + + @CanIgnoreReturnValue + public DefaultHttpServerInstrumenterBuilder setStatusExtractorCustomizer( + UnaryOperator> statusExtractor) { this.statusExtractorTransformer = statusExtractor; return this; } @@ -172,10 +182,22 @@ public DefaultHttpServerInstrumenterBuilder setKnownMethods( return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public DefaultHttpServerInstrumenterBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractor) { + return setSpanNameExtractorCustomizer(spanNameExtractor); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public DefaultHttpServerInstrumenterBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractor) { this.spanNameExtractorTransformer = spanNameExtractor; return this; } 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 0873f4054969..c69fcaa19a64 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 @@ -87,10 +87,38 @@ InstrumenterCustomizer addAttributesExtractors( * * @param spanNameExtractor function that transforms the original span name extractor * @return this InstrumenterCustomizer for method chaining + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. */ - InstrumenterCustomizer setSpanNameExtractor( + @Deprecated + default InstrumenterCustomizer setSpanNameExtractor( + UnaryOperator> spanNameExtractor) { + return setSpanNameExtractorCustomizer(spanNameExtractor); + } + + /** + * Sets a transformer function that will modify the {@link SpanNameExtractor}. This allows + * customizing how span names are generated for the instrumented operations. + * + * @param spanNameExtractor function that transforms the original span name extractor + * @return this InstrumenterCustomizer for method chaining + */ + InstrumenterCustomizer setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractor); + /** + * Sets a transformer function that will modify the {@link SpanStatusExtractor}. This allows + * customizing how span statuses are generated for the instrumented operations. + * + * @param spanStatusExtractor function that transforms the original span status extractor + * @return this InstrumenterCustomizer for method chaining + * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated + default InstrumenterCustomizer setSpanStatusExtractor( + UnaryOperator> spanStatusExtractor) { + return setSpanStatusExtractorCustomizer(spanStatusExtractor); + } + /** * Sets a transformer function that will modify the {@link SpanStatusExtractor}. This allows * customizing how span statuses are generated for the instrumented operations. @@ -98,7 +126,7 @@ InstrumenterCustomizer setSpanNameExtractor( * @param spanStatusExtractor function that transforms the original span status extractor * @return this InstrumenterCustomizer for method chaining */ - InstrumenterCustomizer setSpanStatusExtractor( + InstrumenterCustomizer setSpanStatusExtractorCustomizer( UnaryOperator> spanStatusExtractor); /** Types of instrumentation. */ diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/instrumenter/internal/InstrumenterCustomizerImpl.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/instrumenter/internal/InstrumenterCustomizerImpl.java index a45862652156..692165be1a3e 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/instrumenter/internal/InstrumenterCustomizerImpl.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/instrumenter/internal/InstrumenterCustomizerImpl.java @@ -83,16 +83,16 @@ public InstrumenterCustomizer addContextCustomizer(ContextCustomizer customiz @Override @SuppressWarnings("FunctionalInterfaceClash") // interface has deprecated overload - public InstrumenterCustomizer setSpanNameExtractor( + public InstrumenterCustomizer setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractor) { - customizer.setSpanNameExtractor(spanNameExtractor); + customizer.setSpanNameExtractorCustomizer(spanNameExtractor); return this; } @Override - public InstrumenterCustomizer setSpanStatusExtractor( + public InstrumenterCustomizer setSpanStatusExtractorCustomizer( UnaryOperator> spanStatusExtractor) { - customizer.setSpanStatusExtractor(spanStatusExtractor); + customizer.setSpanStatusExtractorCustomizer(spanStatusExtractor); return this; } } diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java index eb80bd8dd1d7..a72ffe1ee486 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java @@ -437,14 +437,14 @@ public void addContextCustomizer(ContextCustomizer customizer) { } @Override - public void setSpanNameExtractor( + public void setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorTransformer) { builder.spanNameExtractor = spanNameExtractorTransformer.apply(builder.spanNameExtractor); } @Override - public void setSpanStatusExtractor( + public void setSpanStatusExtractorCustomizer( UnaryOperator> spanStatusExtractorTransformer) { builder.spanStatusExtractor = diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InternalInstrumenterCustomizer.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InternalInstrumenterCustomizer.java index 6f88bd8c225e..f457238eedd8 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InternalInstrumenterCustomizer.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InternalInstrumenterCustomizer.java @@ -31,10 +31,29 @@ void addAttributesExtractors( void addContextCustomizer(ContextCustomizer customizer); - void setSpanNameExtractor( + /** + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated + default void setSpanNameExtractor( + UnaryOperator> spanNameExtractorTransformer) { + setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + } + + void setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorTransformer); - void setSpanStatusExtractor( + /** + * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated + default void setSpanStatusExtractor( + UnaryOperator> + spanStatusExtractorTransformer) { + setSpanStatusExtractorCustomizer(spanStatusExtractorTransformer); + } + + void setSpanStatusExtractorCustomizer( UnaryOperator> spanStatusExtractorTransformer); } diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/InstrumentationCustomizerTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/InstrumentationCustomizerTest.java index 725f71726c1c..bb5ffc4a3b9f 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/InstrumentationCustomizerTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/InstrumentationCustomizerTest.java @@ -327,7 +327,7 @@ void testSetSpanNameExtractor() { setCustomizer( customizer -> { customizerCalled.set(true); - customizer.setSpanNameExtractor( + customizer.setSpanNameExtractorCustomizer( unused -> (SpanNameExtractor) object -> "new name"); }); @@ -366,7 +366,7 @@ void testSetSpanStatusExtractor() { setCustomizer( customizer -> { customizerCalled.set(true); - customizer.setSpanStatusExtractor( + customizer.setSpanStatusExtractorCustomizer( unused -> (spanStatusBuilder, request, response, error) -> spanStatusBuilder.setStatus(StatusCode.OK)); 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 bedaa61c1ea3..761ad00cbc0c 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 @@ -63,18 +63,42 @@ public DubboTelemetryBuilder addAttributesExtractor( return this; } - /** Sets custom client {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom client {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setClientSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public DubboTelemetryBuilder setClientSpanNameExtractor( UnaryOperator> clientSpanNameExtractor) { + return setClientSpanNameExtractorCustomizer(clientSpanNameExtractor); + } + + /** Sets custom client {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public DubboTelemetryBuilder setClientSpanNameExtractorCustomizer( + UnaryOperator> clientSpanNameExtractor) { this.clientSpanNameExtractorTransformer = clientSpanNameExtractor; return this; } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom server {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setServerSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public DubboTelemetryBuilder setServerSpanNameExtractor( UnaryOperator> serverSpanNameExtractor) { + return setServerSpanNameExtractorCustomizer(serverSpanNameExtractor); + } + + /** Sets custom server {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public DubboTelemetryBuilder setServerSpanNameExtractorCustomizer( + UnaryOperator> serverSpanNameExtractor) { this.serverSpanNameExtractorTransformer = serverSpanNameExtractor; return this; } 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 28ddb67670d5..476f1ed8e6ea 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,11 +89,23 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection known return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public ApacheHttpClientTelemetryBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractor(spanNameExtractorTransformer); + return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public ApacheHttpClientTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractorTransformer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); 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 48e68b159b15..07f36e304747 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,11 +89,23 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection known return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public ApacheHttpClientTelemetryBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractor(spanNameExtractorTransformer); + return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public ApacheHttpClientTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractorTransformer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); 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 5f7c9f5490df..ad5e8201206c 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,11 +36,23 @@ public final class ArmeriaClientTelemetryBuilder { builder = ArmeriaInstrumenterBuilderFactory.getClientBuilder(openTelemetry); } - /** Sets the status extractor for client spans. */ + /** + * Sets the status extractor for client spans. + * + * @deprecated Use {@link #setStatusExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public ArmeriaClientTelemetryBuilder setStatusExtractor( UnaryOperator> statusExtractor) { - builder.setStatusExtractor(statusExtractor); + return setStatusExtractorCustomizer(statusExtractor); + } + + /** Sets the status extractor for client spans. */ + @CanIgnoreReturnValue + public ArmeriaClientTelemetryBuilder setStatusExtractorCustomizer( + UnaryOperator> statusExtractor) { + builder.setStatusExtractorCustomizer(statusExtractor); return this; } @@ -98,11 +110,23 @@ public ArmeriaClientTelemetryBuilder setKnownMethods(Collection knownMet return this; } - /** Sets custom client {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom client {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public ArmeriaClientTelemetryBuilder setSpanNameExtractor( UnaryOperator> clientSpanNameExtractor) { - builder.setSpanNameExtractor(clientSpanNameExtractor); + return setSpanNameExtractorCustomizer(clientSpanNameExtractor); + } + + /** Sets custom client {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public ArmeriaClientTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> clientSpanNameExtractor) { + builder.setSpanNameExtractorCustomizer(clientSpanNameExtractor); 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 dfea8dca34e1..d956f56eeff4 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,11 +34,23 @@ public final class ArmeriaServerTelemetryBuilder { builder = ArmeriaInstrumenterBuilderFactory.getServerBuilder(openTelemetry); } - /** Sets the status extractor for server spans. */ + /** + * Sets the status extractor for server spans. + * + * @deprecated Use {@link #setStatusExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public ArmeriaServerTelemetryBuilder setStatusExtractor( UnaryOperator> statusExtractor) { - builder.setStatusExtractor(statusExtractor); + return setStatusExtractorCustomizer(statusExtractor); + } + + /** Sets the status extractor for server spans. */ + @CanIgnoreReturnValue + public ArmeriaServerTelemetryBuilder setStatusExtractorCustomizer( + UnaryOperator> statusExtractor) { + builder.setStatusExtractorCustomizer(statusExtractor); return this; } @@ -96,11 +108,23 @@ public ArmeriaServerTelemetryBuilder setKnownMethods(Collection knownMet return this; } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom server {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public ArmeriaServerTelemetryBuilder setSpanNameExtractor( UnaryOperator> serverSpanNameExtractor) { - builder.setSpanNameExtractor(serverSpanNameExtractor); + return setSpanNameExtractorCustomizer(serverSpanNameExtractor); + } + + /** Sets custom server {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public ArmeriaServerTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> serverSpanNameExtractor) { + builder.setSpanNameExtractorCustomizer(serverSpanNameExtractor); return this; } 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 b2b17ef7802b..71f23f1b9f09 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 @@ -94,18 +94,42 @@ public GrpcTelemetryBuilder addServerAttributeExtractor( return this; } - /** Sets custom client {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom client {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setClientSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public GrpcTelemetryBuilder setClientSpanNameExtractor( UnaryOperator> clientSpanNameExtractor) { + return setClientSpanNameExtractorCustomizer(clientSpanNameExtractor); + } + + /** Sets custom client {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public GrpcTelemetryBuilder setClientSpanNameExtractorCustomizer( + UnaryOperator> clientSpanNameExtractor) { this.clientSpanNameExtractorTransformer = clientSpanNameExtractor; return this; } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom server {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setServerSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public GrpcTelemetryBuilder setServerSpanNameExtractor( UnaryOperator> serverSpanNameExtractor) { + return setServerSpanNameExtractorCustomizer(serverSpanNameExtractor); + } + + /** Sets custom server {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public GrpcTelemetryBuilder setServerSpanNameExtractorCustomizer( + UnaryOperator> serverSpanNameExtractor) { this.serverSpanNameExtractorTransformer = serverSpanNameExtractor; return this; } 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 abb032841919..9d422fd56045 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,11 +40,23 @@ public final class HelidonTelemetryBuilder { HelidonRequestGetter.INSTANCE); } - /** Sets the status extractor for server spans. */ + /** + * Sets the status extractor for server spans. + * + * @deprecated Use {@link #setStatusExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public HelidonTelemetryBuilder setStatusExtractor( UnaryOperator> statusExtractor) { - builder.setStatusExtractor(statusExtractor); + return setStatusExtractorCustomizer(statusExtractor); + } + + /** Sets the status extractor for server spans. */ + @CanIgnoreReturnValue + public HelidonTelemetryBuilder setStatusExtractorCustomizer( + UnaryOperator> statusExtractor) { + builder.setStatusExtractorCustomizer(statusExtractor); return this; } @@ -100,11 +112,23 @@ public HelidonTelemetryBuilder setKnownMethods(Collection knownMethods) return this; } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom server {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public HelidonTelemetryBuilder setSpanNameExtractor( UnaryOperator> serverSpanNameExtractor) { - builder.setSpanNameExtractor(serverSpanNameExtractor); + return setSpanNameExtractorCustomizer(serverSpanNameExtractor); + } + + /** Sets custom server {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public HelidonTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> serverSpanNameExtractor) { + builder.setSpanNameExtractorCustomizer(serverSpanNameExtractor); return this; } 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 77ce2c4e3a3c..007ac90e212b 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,11 +88,23 @@ public JavaHttpClientTelemetryBuilder setKnownMethods(Collection knownMe return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public JavaHttpClientTelemetryBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractor(spanNameExtractorTransformer); + return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public JavaHttpClientTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractorTransformer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); return this; } 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 4befaf9b9277..f2cc85095e11 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,11 +39,23 @@ public final class JavaHttpServerTelemetryBuilder { JavaHttpServerExchangeGetter.INSTANCE); } - /** Sets the status extractor for server spans. */ + /** + * Sets the status extractor for server spans. + * + * @deprecated Use {@link #setStatusExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public JavaHttpServerTelemetryBuilder setStatusExtractor( UnaryOperator> statusExtractor) { - builder.setStatusExtractor(statusExtractor); + return setStatusExtractorCustomizer(statusExtractor); + } + + /** Sets the status extractor for server spans. */ + @CanIgnoreReturnValue + public JavaHttpServerTelemetryBuilder setStatusExtractorCustomizer( + UnaryOperator> statusExtractor) { + builder.setStatusExtractorCustomizer(statusExtractor); return this; } @@ -101,11 +113,23 @@ public JavaHttpServerTelemetryBuilder setKnownMethods(Collection knownMe return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public JavaHttpServerTelemetryBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractor(spanNameExtractorTransformer); + return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public JavaHttpServerTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractorTransformer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); 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 f5706c46b869..6468d3e31bc8 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,11 +102,23 @@ public JettyClientTelemetryBuilder setKnownMethods(Collection knownMetho return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public JettyClientTelemetryBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractor(spanNameExtractorTransformer); + return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public JettyClientTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractorTransformer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); 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 8ded5c9d5dff..ff2e94e42d8a 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,11 +102,23 @@ public JettyClientTelemetryBuilder setKnownMethods(Collection knownMetho return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public JettyClientTelemetryBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractor(spanNameExtractorTransformer); + return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public JettyClientTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractorTransformer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); return this; } 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 718c7250a72f..9f5eab1e603a 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 @@ -85,7 +85,7 @@ abstract class AbstractKtorClientTelemetryBuilder( } fun spanNameExtractor(spanNameExtractor: UnaryOperator>) { - builder.setSpanNameExtractor(spanNameExtractor) + builder.setSpanNameExtractorCustomizer(spanNameExtractor) } class ExtractorBuilder { 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 0323cae40ac9..853987999d59 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 @@ -44,7 +44,7 @@ abstract class AbstractKtorServerTelemetryBuilder(private val instrumentationNam } fun spanStatusExtractor(extract: SpanStatusData.(SpanStatusExtractor) -> Unit) { - builder.setStatusExtractor { prevExtractor -> + builder.setStatusExtractorCustomizer { prevExtractor -> SpanStatusExtractor { spanStatusBuilder: SpanStatusBuilder, request: ApplicationRequest, @@ -95,7 +95,7 @@ abstract class AbstractKtorServerTelemetryBuilder(private val instrumentationNam } fun spanNameExtractor(spanNameExtractor: UnaryOperator>) { - builder.setSpanNameExtractor(spanNameExtractor) + builder.setSpanNameExtractorCustomizer(spanNameExtractor) } class ExtractorBuilder { diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientSingletons.java b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientSingletons.java index b6ce1ac000ff..befb235f456d 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientSingletons.java +++ b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientSingletons.java @@ -37,7 +37,7 @@ public class KubernetesClientSingletons { new KubernetesExperimentalAttributesExtractor()); } }) - .setSpanNameExtractor( + .setSpanNameExtractorCustomizer( requestSpanNameExtractor -> request -> KubernetesRequestDigest.parse(request).toString()) .build(); 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 d612d33ff18e..a522bf39d929 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,11 +93,23 @@ public NettyClientTelemetryBuilder setKnownMethods(Collection knownMetho return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public NettyClientTelemetryBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractor(spanNameExtractorTransformer); + return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public NettyClientTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractorTransformer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); 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 dc864ea8a8ff..a82ebd98dcd0 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,11 +86,23 @@ public OkHttpTelemetryBuilder setKnownMethods(Collection knownMethods) { return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public OkHttpTelemetryBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractor(spanNameExtractorTransformer); + return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public OkHttpTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractorTransformer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); return this; } 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 fc39e40a6fa2..f80d570b03aa 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 @@ -51,10 +51,22 @@ public R2dbcTelemetryBuilder setStatementSanitizationEnabled(boolean enabled) { return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public R2dbcTelemetryBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractor) { + return setSpanNameExtractorCustomizer(spanNameExtractor); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public R2dbcTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractor) { this.spanNameExtractorTransformer = spanNameExtractor; 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 c5d536cc9690..00dafa63d3dd 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,11 +84,23 @@ public RatpackClientTelemetryBuilder setKnownMethods(Collection knownMet return this; } - /** Sets custom client {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom client {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public RatpackClientTelemetryBuilder setSpanNameExtractor( UnaryOperator> clientSpanNameExtractor) { - builder.setSpanNameExtractor(clientSpanNameExtractor); + return setSpanNameExtractorCustomizer(clientSpanNameExtractor); + } + + /** Sets custom client {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public RatpackClientTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> clientSpanNameExtractor) { + builder.setSpanNameExtractorCustomizer(clientSpanNameExtractor); 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 0d933340d960..b42f18e21deb 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,11 +88,23 @@ public RatpackServerTelemetryBuilder setKnownMethods(Collection knownMet return this; } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom server {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public RatpackServerTelemetryBuilder setSpanNameExtractor( UnaryOperator> serverSpanNameExtractor) { - builder.setSpanNameExtractor(serverSpanNameExtractor); + return setSpanNameExtractorCustomizer(serverSpanNameExtractor); + } + + /** Sets custom server {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public RatpackServerTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> serverSpanNameExtractor) { + builder.setSpanNameExtractorCustomizer(serverSpanNameExtractor); return this; } 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 19bc3007c16a..d3c07da4283c 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,11 +84,23 @@ public RestletTelemetryBuilder setKnownMethods(Collection knownMethods) return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public RestletTelemetryBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractor(spanNameExtractorTransformer); + return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public RestletTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractorTransformer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); 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 7bbe77273ad7..9b079c1c9091 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,11 +84,23 @@ public RestletTelemetryBuilder setKnownMethods(Collection knownMethods) return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public RestletTelemetryBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractor(spanNameExtractorTransformer); + return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public RestletTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractorTransformer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); return this; } 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 b2c36eaf085f..5dbf8daa9a2d 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,11 +57,23 @@ public final class ServletTelemetryBuilder { builder = servletBuilder.getBuilder(); } - /** Sets the status extractor for server spans. */ + /** + * Sets the status extractor for server spans. + * + * @deprecated Use {@link #setStatusExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public ServletTelemetryBuilder setStatusExtractor( UnaryOperator> statusExtractor) { - builder.setStatusExtractor( + return setStatusExtractorCustomizer(statusExtractor); + } + + /** Sets the status extractor for server spans. */ + @CanIgnoreReturnValue + public ServletTelemetryBuilder setStatusExtractorCustomizer( + UnaryOperator> statusExtractor) { + builder.setStatusExtractorCustomizer( convertSpanStatusExtractor( statusExtractor, ServletRequestContext::new, @@ -137,11 +149,23 @@ public ServletTelemetryBuilder setKnownMethods(Collection knownMethods) return this; } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom server {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public ServletTelemetryBuilder setSpanNameExtractor( UnaryOperator> serverSpanNameExtractor) { - builder.setSpanNameExtractor( + return setSpanNameExtractorCustomizer(serverSpanNameExtractor); + } + + /** Sets custom server {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public ServletTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> serverSpanNameExtractor) { + builder.setSpanNameExtractorCustomizer( convertSpanNameExtractor( serverSpanNameExtractor, ServletRequestContext::new, ServletRequestContext::request)); return this; diff --git a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletInstrumenterBuilder.java b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletInstrumenterBuilder.java index 6c5c815ec7a5..e09cb5d87232 100644 --- a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletInstrumenterBuilder.java +++ b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletInstrumenterBuilder.java @@ -104,7 +104,7 @@ public ServletInstrumenterBuilder captureRequestParameters( public Instrumenter, ServletResponseContext> build( SpanNameExtractor> spanNameExtractor) { - builder.setSpanNameExtractor(e -> spanNameExtractor); + builder.setSpanNameExtractorCustomizer(e -> spanNameExtractor); builder.setBuilderCustomizer( builder -> { 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 d83b1c67c395..a94553a446cc 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,11 +75,23 @@ public SpringWebTelemetryBuilder setCapturedResponseHeaders(Collection r return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public SpringWebTelemetryBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractor) { - builder.setSpanNameExtractor(spanNameExtractor); + return setSpanNameExtractorCustomizer(spanNameExtractor); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public SpringWebTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractor) { + builder.setSpanNameExtractorCustomizer(spanNameExtractor); 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 76cc840e3b4b..5128683043c6 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,11 +93,23 @@ public SpringWebfluxClientTelemetryBuilder setKnownMethods(Collection kn return this; } - /** Sets custom client {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom client {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public SpringWebfluxClientTelemetryBuilder setSpanNameExtractor( UnaryOperator> clientSpanNameExtractor) { - builder.setSpanNameExtractor(clientSpanNameExtractor); + return setSpanNameExtractorCustomizer(clientSpanNameExtractor); + } + + /** Sets custom client {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public SpringWebfluxClientTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> clientSpanNameExtractor) { + builder.setSpanNameExtractorCustomizer(clientSpanNameExtractor); 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 24d92e735f1c..f36e39d5273e 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,11 +94,23 @@ public SpringWebfluxServerTelemetryBuilder setKnownMethods(Collection kn return this; } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom server {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public SpringWebfluxServerTelemetryBuilder setSpanNameExtractor( UnaryOperator> serverSpanNameExtractor) { - builder.setSpanNameExtractor(serverSpanNameExtractor); + return setSpanNameExtractorCustomizer(serverSpanNameExtractor); + } + + /** Sets custom server {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public SpringWebfluxServerTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> serverSpanNameExtractor) { + builder.setSpanNameExtractorCustomizer(serverSpanNameExtractor); return this; } 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 8a74f5f19109..6ac9b402e0fd 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,11 +75,23 @@ public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders( return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public SpringWebMvcTelemetryBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractor) { - builder.setSpanNameExtractor(spanNameExtractor); + return setSpanNameExtractorCustomizer(spanNameExtractor); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public SpringWebMvcTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractor) { + builder.setSpanNameExtractorCustomizer(spanNameExtractor); 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 8e9b19c646c4..2fac3a559099 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,11 +74,23 @@ public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders( return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. + */ + @Deprecated @CanIgnoreReturnValue public SpringWebMvcTelemetryBuilder setSpanNameExtractor( UnaryOperator> spanNameExtractor) { - builder.setSpanNameExtractor(spanNameExtractor); + return setSpanNameExtractorCustomizer(spanNameExtractor); + } + + /** Sets custom {@link SpanNameExtractor} via transform function. */ + @CanIgnoreReturnValue + public SpringWebMvcTelemetryBuilder setSpanNameExtractorCustomizer( + UnaryOperator> spanNameExtractor) { + builder.setSpanNameExtractorCustomizer(spanNameExtractor); return this; } From adaeffb837530bf51b703c2a5c2336c2a866a094 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 3 Dec 2025 17:25:46 -0800 Subject: [PATCH 02/12] cleanup --- .../DefaultHttpClientInstrumenterBuilder.java | 5 ++++- .../DefaultHttpServerInstrumenterBuilder.java | 5 ++++- .../apachedubbo/v2_7/DubboTelemetryBuilder.java | 10 ++++++++-- .../v4_3/ApacheHttpClientTelemetryBuilder.java | 5 ++++- .../v5_2/ApacheHttpClientTelemetryBuilder.java | 5 ++++- .../v1_3/ArmeriaClientTelemetryBuilder.java | 14 ++++++++++---- .../v1_3/ArmeriaServerTelemetryBuilder.java | 14 ++++++++++---- .../grpc/v1_6/GrpcTelemetryBuilder.java | 10 ++++++++-- .../helidon/v4_3/HelidonTelemetryBuilder.java | 14 ++++++++++---- .../JavaHttpClientTelemetryBuilder.java | 5 ++++- .../JavaHttpServerTelemetryBuilder.java | 10 ++++++++-- .../v12_0/JettyClientTelemetryBuilder.java | 5 ++++- .../v9_2/JettyClientTelemetryBuilder.java | 5 ++++- .../netty/v4_1/NettyClientTelemetryBuilder.java | 5 ++++- .../okhttp/v3_0/OkHttpTelemetryBuilder.java | 5 ++++- .../r2dbc/v1_0/R2dbcTelemetryBuilder.java | 5 ++++- .../v1_7/RatpackClientTelemetryBuilder.java | 9 ++++++--- .../v1_7/RatpackServerTelemetryBuilder.java | 9 ++++++--- .../restlet/v1_1/RestletTelemetryBuilder.java | 5 ++++- .../restlet/v2_0/RestletTelemetryBuilder.java | 5 ++++- .../servlet/v3_0/ServletTelemetryBuilder.java | 14 ++++++++++---- .../spring/web/v3_1/SpringWebTelemetryBuilder.java | 5 ++++- .../v5_3/SpringWebfluxClientTelemetryBuilder.java | 9 ++++++--- .../v5_3/SpringWebfluxServerTelemetryBuilder.java | 9 ++++++--- .../webmvc/v5_3/SpringWebMvcTelemetryBuilder.java | 5 ++++- .../webmvc/v6_0/SpringWebMvcTelemetryBuilder.java | 5 ++++- 26 files changed, 148 insertions(+), 49 deletions(-) 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 ab11e536d718..48bc8534d2e3 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 @@ -210,7 +210,10 @@ public DefaultHttpClientInstrumenterBuilder setSpanNameExtrac return setSpanNameExtractorCustomizer(spanNameExtractor); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public DefaultHttpClientInstrumenterBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractor) { 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 34d14d07c306..b99839d5fdbd 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 @@ -194,7 +194,10 @@ public DefaultHttpServerInstrumenterBuilder setSpanNameExtrac return setSpanNameExtractorCustomizer(spanNameExtractor); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public DefaultHttpServerInstrumenterBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractor) { 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 761ad00cbc0c..1fec5fa0e386 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 @@ -75,7 +75,10 @@ public DubboTelemetryBuilder setClientSpanNameExtractor( return setClientSpanNameExtractorCustomizer(clientSpanNameExtractor); } - /** Sets custom client {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default client {@link SpanNameExtractor} and returns a + * customized one. + */ @CanIgnoreReturnValue public DubboTelemetryBuilder setClientSpanNameExtractorCustomizer( UnaryOperator> clientSpanNameExtractor) { @@ -95,7 +98,10 @@ public DubboTelemetryBuilder setServerSpanNameExtractor( return setServerSpanNameExtractorCustomizer(serverSpanNameExtractor); } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default server {@link SpanNameExtractor} and returns a + * customized one. + */ @CanIgnoreReturnValue public DubboTelemetryBuilder setServerSpanNameExtractorCustomizer( UnaryOperator> serverSpanNameExtractor) { 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 476f1ed8e6ea..de3617935208 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 @@ -101,7 +101,10 @@ public ApacheHttpClientTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public ApacheHttpClientTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorTransformer) { 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 07f36e304747..e10058522442 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 @@ -101,7 +101,10 @@ public ApacheHttpClientTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public ApacheHttpClientTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorTransformer) { 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 ad5e8201206c..f3a7bd6aff08 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 @@ -48,7 +48,10 @@ public ArmeriaClientTelemetryBuilder setStatusExtractor( return setStatusExtractorCustomizer(statusExtractor); } - /** Sets the status extractor for client spans. */ + /** + * Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a + * customized one. + */ @CanIgnoreReturnValue public ArmeriaClientTelemetryBuilder setStatusExtractorCustomizer( UnaryOperator> statusExtractor) { @@ -122,11 +125,14 @@ public ArmeriaClientTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(clientSpanNameExtractor); } - /** Sets custom client {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public ArmeriaClientTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> clientSpanNameExtractor) { - builder.setSpanNameExtractorCustomizer(clientSpanNameExtractor); + UnaryOperator> spanNameExtractor) { + builder.setSpanNameExtractorCustomizer(spanNameExtractor); 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 d956f56eeff4..bc7b1f019699 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 @@ -46,7 +46,10 @@ public ArmeriaServerTelemetryBuilder setStatusExtractor( return setStatusExtractorCustomizer(statusExtractor); } - /** Sets the status extractor for server spans. */ + /** + * Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a + * customized one. + */ @CanIgnoreReturnValue public ArmeriaServerTelemetryBuilder setStatusExtractorCustomizer( UnaryOperator> statusExtractor) { @@ -120,11 +123,14 @@ public ArmeriaServerTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(serverSpanNameExtractor); } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public ArmeriaServerTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> serverSpanNameExtractor) { - builder.setSpanNameExtractorCustomizer(serverSpanNameExtractor); + UnaryOperator> spanNameExtractor) { + builder.setSpanNameExtractorCustomizer(spanNameExtractor); return this; } 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 71f23f1b9f09..ae3092b4d7ca 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 @@ -106,7 +106,10 @@ public GrpcTelemetryBuilder setClientSpanNameExtractor( return setClientSpanNameExtractorCustomizer(clientSpanNameExtractor); } - /** Sets custom client {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default client {@link SpanNameExtractor} and returns a + * customized one. + */ @CanIgnoreReturnValue public GrpcTelemetryBuilder setClientSpanNameExtractorCustomizer( UnaryOperator> clientSpanNameExtractor) { @@ -126,7 +129,10 @@ public GrpcTelemetryBuilder setServerSpanNameExtractor( return setServerSpanNameExtractorCustomizer(serverSpanNameExtractor); } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default server {@link SpanNameExtractor} and returns a + * customized one. + */ @CanIgnoreReturnValue public GrpcTelemetryBuilder setServerSpanNameExtractorCustomizer( UnaryOperator> serverSpanNameExtractor) { 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 9d422fd56045..361bd912825f 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 @@ -52,7 +52,10 @@ public HelidonTelemetryBuilder setStatusExtractor( return setStatusExtractorCustomizer(statusExtractor); } - /** Sets the status extractor for server spans. */ + /** + * Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a + * customized one. + */ @CanIgnoreReturnValue public HelidonTelemetryBuilder setStatusExtractorCustomizer( UnaryOperator> statusExtractor) { @@ -124,11 +127,14 @@ public HelidonTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(serverSpanNameExtractor); } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public HelidonTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> serverSpanNameExtractor) { - builder.setSpanNameExtractorCustomizer(serverSpanNameExtractor); + UnaryOperator> spanNameExtractor) { + builder.setSpanNameExtractorCustomizer(spanNameExtractor); return this; } 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 007ac90e212b..5b9611f595ac 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 @@ -100,7 +100,10 @@ public JavaHttpClientTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public JavaHttpClientTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorTransformer) { 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 f2cc85095e11..453b8e111b04 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 @@ -51,7 +51,10 @@ public JavaHttpServerTelemetryBuilder setStatusExtractor( return setStatusExtractorCustomizer(statusExtractor); } - /** Sets the status extractor for server spans. */ + /** + * Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a + * customized one. + */ @CanIgnoreReturnValue public JavaHttpServerTelemetryBuilder setStatusExtractorCustomizer( UnaryOperator> statusExtractor) { @@ -125,7 +128,10 @@ public JavaHttpServerTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public JavaHttpServerTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorTransformer) { 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 6468d3e31bc8..3cdc6bf3fa15 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 @@ -114,7 +114,10 @@ public JettyClientTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public JettyClientTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorTransformer) { 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 ff2e94e42d8a..fc2d632d0121 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 @@ -114,7 +114,10 @@ public JettyClientTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public JettyClientTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorTransformer) { 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 a522bf39d929..8ee98b4b7e1d 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 @@ -105,7 +105,10 @@ public NettyClientTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public NettyClientTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorTransformer) { 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 a82ebd98dcd0..f45957e96dc9 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 @@ -98,7 +98,10 @@ public OkHttpTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public OkHttpTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorTransformer) { 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 f80d570b03aa..0c6f5e698fe7 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 @@ -63,7 +63,10 @@ public R2dbcTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(spanNameExtractor); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public R2dbcTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractor) { 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 00dafa63d3dd..54b21b3c3ea4 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 @@ -96,11 +96,14 @@ public RatpackClientTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(clientSpanNameExtractor); } - /** Sets custom client {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public RatpackClientTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> clientSpanNameExtractor) { - builder.setSpanNameExtractorCustomizer(clientSpanNameExtractor); + UnaryOperator> spanNameExtractor) { + builder.setSpanNameExtractorCustomizer(spanNameExtractor); 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 b42f18e21deb..381dca9507cf 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 @@ -100,11 +100,14 @@ public RatpackServerTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(serverSpanNameExtractor); } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public RatpackServerTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> serverSpanNameExtractor) { - builder.setSpanNameExtractorCustomizer(serverSpanNameExtractor); + UnaryOperator> spanNameExtractor) { + builder.setSpanNameExtractorCustomizer(spanNameExtractor); return this; } 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 d3c07da4283c..943c6ad424e8 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 @@ -96,7 +96,10 @@ public RestletTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public RestletTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorTransformer) { 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 9b079c1c9091..978a8003595c 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 @@ -96,7 +96,10 @@ public RestletTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(spanNameExtractorTransformer); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public RestletTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorTransformer) { 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 5dbf8daa9a2d..95b4c7b77078 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 @@ -69,7 +69,10 @@ public ServletTelemetryBuilder setStatusExtractor( return setStatusExtractorCustomizer(statusExtractor); } - /** Sets the status extractor for server spans. */ + /** + * Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a + * customized one. + */ @CanIgnoreReturnValue public ServletTelemetryBuilder setStatusExtractorCustomizer( UnaryOperator> statusExtractor) { @@ -161,13 +164,16 @@ public ServletTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(serverSpanNameExtractor); } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public ServletTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> serverSpanNameExtractor) { + UnaryOperator> spanNameExtractor) { builder.setSpanNameExtractorCustomizer( convertSpanNameExtractor( - serverSpanNameExtractor, ServletRequestContext::new, ServletRequestContext::request)); + spanNameExtractor, ServletRequestContext::new, ServletRequestContext::request)); 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 a94553a446cc..320f17fc0dfe 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 @@ -87,7 +87,10 @@ public SpringWebTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(spanNameExtractor); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public SpringWebTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractor) { 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 5128683043c6..b89e2b52ff63 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 @@ -105,11 +105,14 @@ public SpringWebfluxClientTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(clientSpanNameExtractor); } - /** Sets custom client {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public SpringWebfluxClientTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> clientSpanNameExtractor) { - builder.setSpanNameExtractorCustomizer(clientSpanNameExtractor); + UnaryOperator> spanNameExtractor) { + builder.setSpanNameExtractorCustomizer(spanNameExtractor); 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 f36e39d5273e..f3c70e6a825d 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 @@ -106,11 +106,14 @@ public SpringWebfluxServerTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(serverSpanNameExtractor); } - /** Sets custom server {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public SpringWebfluxServerTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> serverSpanNameExtractor) { - builder.setSpanNameExtractorCustomizer(serverSpanNameExtractor); + UnaryOperator> spanNameExtractor) { + builder.setSpanNameExtractorCustomizer(spanNameExtractor); return this; } 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 6ac9b402e0fd..8f51ee95065d 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 @@ -87,7 +87,10 @@ public SpringWebMvcTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(spanNameExtractor); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public SpringWebMvcTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractor) { 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 2fac3a559099..39274706319e 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 @@ -86,7 +86,10 @@ public SpringWebMvcTelemetryBuilder setSpanNameExtractor( return setSpanNameExtractorCustomizer(spanNameExtractor); } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ @CanIgnoreReturnValue public SpringWebMvcTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractor) { From 62e09dbc2b394370c7547eb7dad1d33e6561acd7 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 3 Dec 2025 17:57:27 -0800 Subject: [PATCH 03/12] names --- .../internal/DefaultHttpClientInstrumenterBuilder.java | 8 ++++---- .../internal/DefaultHttpServerInstrumenterBuilder.java | 8 ++++---- .../apachedubbo/v2_7/DubboTelemetryBuilder.java | 8 ++++---- .../v4_3/ApacheHttpClientTelemetryBuilder.java | 4 ++-- .../v5_2/ApacheHttpClientTelemetryBuilder.java | 4 ++-- .../armeria/v1_3/ArmeriaClientTelemetryBuilder.java | 8 ++++---- .../armeria/v1_3/ArmeriaServerTelemetryBuilder.java | 8 ++++---- .../instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java | 8 ++++---- .../helidon/v4_3/HelidonTelemetryBuilder.java | 8 ++++---- .../javahttpclient/JavaHttpClientTelemetryBuilder.java | 4 ++-- .../javahttpserver/JavaHttpServerTelemetryBuilder.java | 8 ++++---- .../httpclient/v12_0/JettyClientTelemetryBuilder.java | 4 ++-- .../httpclient/v9_2/JettyClientTelemetryBuilder.java | 4 ++-- .../netty/v4_1/NettyClientTelemetryBuilder.java | 4 ++-- .../okhttp/v3_0/OkHttpTelemetryBuilder.java | 4 ++-- .../instrumentation/r2dbc/v1_0/R2dbcTelemetryBuilder.java | 4 ++-- .../ratpack/v1_7/RatpackClientTelemetryBuilder.java | 4 ++-- .../ratpack/v1_7/RatpackServerTelemetryBuilder.java | 4 ++-- .../restlet/v1_1/RestletTelemetryBuilder.java | 4 ++-- .../restlet/v2_0/RestletTelemetryBuilder.java | 4 ++-- .../servlet/v3_0/ServletTelemetryBuilder.java | 8 ++++---- .../spring/web/v3_1/SpringWebTelemetryBuilder.java | 4 ++-- .../webflux/v5_3/SpringWebfluxClientTelemetryBuilder.java | 4 ++-- .../webflux/v5_3/SpringWebfluxServerTelemetryBuilder.java | 4 ++-- .../spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java | 4 ++-- .../spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java | 4 ++-- 26 files changed, 70 insertions(+), 70 deletions(-) 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 48bc8534d2e3..5db94ddade96 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 @@ -123,8 +123,8 @@ public DefaultHttpClientInstrumenterBuilder setStatusExtracto @CanIgnoreReturnValue public DefaultHttpClientInstrumenterBuilder setStatusExtractorCustomizer( - UnaryOperator> statusExtractor) { - this.statusExtractorTransformer = statusExtractor; + UnaryOperator> statusExtractorCustomizer) { + this.statusExtractorTransformer = statusExtractorCustomizer; return this; } @@ -216,8 +216,8 @@ public DefaultHttpClientInstrumenterBuilder setSpanNameExtrac */ @CanIgnoreReturnValue public DefaultHttpClientInstrumenterBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor) { - this.spanNameExtractorTransformer = spanNameExtractor; + UnaryOperator> spanNameExtractorCustomizer) { + this.spanNameExtractorTransformer = spanNameExtractorCustomizer; 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 b99839d5fdbd..a9553649ad3b 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 @@ -118,8 +118,8 @@ public DefaultHttpServerInstrumenterBuilder setStatusExtracto @CanIgnoreReturnValue public DefaultHttpServerInstrumenterBuilder setStatusExtractorCustomizer( - UnaryOperator> statusExtractor) { - this.statusExtractorTransformer = statusExtractor; + UnaryOperator> statusExtractorCustomizer) { + this.statusExtractorTransformer = statusExtractorCustomizer; return this; } @@ -200,8 +200,8 @@ public DefaultHttpServerInstrumenterBuilder setSpanNameExtrac */ @CanIgnoreReturnValue public DefaultHttpServerInstrumenterBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor) { - this.spanNameExtractorTransformer = spanNameExtractor; + UnaryOperator> spanNameExtractorCustomizer) { + this.spanNameExtractorTransformer = spanNameExtractorCustomizer; return this; } 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 1fec5fa0e386..e818eaeb5481 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 @@ -81,8 +81,8 @@ public DubboTelemetryBuilder setClientSpanNameExtractor( */ @CanIgnoreReturnValue public DubboTelemetryBuilder setClientSpanNameExtractorCustomizer( - UnaryOperator> clientSpanNameExtractor) { - this.clientSpanNameExtractorTransformer = clientSpanNameExtractor; + UnaryOperator> clientSpanNameExtractorCustomizer) { + this.clientSpanNameExtractorTransformer = clientSpanNameExtractorCustomizer; return this; } @@ -104,8 +104,8 @@ public DubboTelemetryBuilder setServerSpanNameExtractor( */ @CanIgnoreReturnValue public DubboTelemetryBuilder setServerSpanNameExtractorCustomizer( - UnaryOperator> serverSpanNameExtractor) { - this.serverSpanNameExtractorTransformer = serverSpanNameExtractor; + UnaryOperator> serverSpanNameExtractorCustomizer) { + this.serverSpanNameExtractorTransformer = serverSpanNameExtractorCustomizer; return this; } 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 de3617935208..1ee27eb05bbc 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 @@ -107,8 +107,8 @@ public ApacheHttpClientTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public ApacheHttpClientTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); 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 e10058522442..fa5a89c2bf73 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 @@ -107,8 +107,8 @@ public ApacheHttpClientTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public ApacheHttpClientTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); 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 f3a7bd6aff08..2966a68d5341 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 @@ -54,8 +54,8 @@ public ArmeriaClientTelemetryBuilder setStatusExtractor( */ @CanIgnoreReturnValue public ArmeriaClientTelemetryBuilder setStatusExtractorCustomizer( - UnaryOperator> statusExtractor) { - builder.setStatusExtractorCustomizer(statusExtractor); + UnaryOperator> statusExtractorCustomizer) { + builder.setStatusExtractorCustomizer(statusExtractorCustomizer); return this; } @@ -131,8 +131,8 @@ public ArmeriaClientTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public ArmeriaClientTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor) { - builder.setSpanNameExtractorCustomizer(spanNameExtractor); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); 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 bc7b1f019699..590f60ba0545 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 @@ -52,8 +52,8 @@ public ArmeriaServerTelemetryBuilder setStatusExtractor( */ @CanIgnoreReturnValue public ArmeriaServerTelemetryBuilder setStatusExtractorCustomizer( - UnaryOperator> statusExtractor) { - builder.setStatusExtractorCustomizer(statusExtractor); + UnaryOperator> statusExtractorCustomizer) { + builder.setStatusExtractorCustomizer(statusExtractorCustomizer); return this; } @@ -129,8 +129,8 @@ public ArmeriaServerTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public ArmeriaServerTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor) { - builder.setSpanNameExtractorCustomizer(spanNameExtractor); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); return this; } 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 ae3092b4d7ca..ae20af70efc2 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 @@ -112,8 +112,8 @@ public GrpcTelemetryBuilder setClientSpanNameExtractor( */ @CanIgnoreReturnValue public GrpcTelemetryBuilder setClientSpanNameExtractorCustomizer( - UnaryOperator> clientSpanNameExtractor) { - this.clientSpanNameExtractorTransformer = clientSpanNameExtractor; + UnaryOperator> clientSpanNameExtractorCustomizer) { + this.clientSpanNameExtractorTransformer = clientSpanNameExtractorCustomizer; return this; } @@ -135,8 +135,8 @@ public GrpcTelemetryBuilder setServerSpanNameExtractor( */ @CanIgnoreReturnValue public GrpcTelemetryBuilder setServerSpanNameExtractorCustomizer( - UnaryOperator> serverSpanNameExtractor) { - this.serverSpanNameExtractorTransformer = serverSpanNameExtractor; + UnaryOperator> serverSpanNameExtractorCustomizer) { + this.serverSpanNameExtractorTransformer = serverSpanNameExtractorCustomizer; return this; } 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 361bd912825f..e5a0cc98f3fd 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 @@ -58,8 +58,8 @@ public HelidonTelemetryBuilder setStatusExtractor( */ @CanIgnoreReturnValue public HelidonTelemetryBuilder setStatusExtractorCustomizer( - UnaryOperator> statusExtractor) { - builder.setStatusExtractorCustomizer(statusExtractor); + UnaryOperator> statusExtractorCustomizer) { + builder.setStatusExtractorCustomizer(statusExtractorCustomizer); return this; } @@ -133,8 +133,8 @@ public HelidonTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public HelidonTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor) { - builder.setSpanNameExtractorCustomizer(spanNameExtractor); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); return this; } 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 5b9611f595ac..66bd30806947 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 @@ -106,8 +106,8 @@ public JavaHttpClientTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public JavaHttpClientTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); return this; } 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 453b8e111b04..809ed44ac9b6 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 @@ -57,8 +57,8 @@ public JavaHttpServerTelemetryBuilder setStatusExtractor( */ @CanIgnoreReturnValue public JavaHttpServerTelemetryBuilder setStatusExtractorCustomizer( - UnaryOperator> statusExtractor) { - builder.setStatusExtractorCustomizer(statusExtractor); + UnaryOperator> statusExtractorCustomizer) { + builder.setStatusExtractorCustomizer(statusExtractorCustomizer); return this; } @@ -134,8 +134,8 @@ public JavaHttpServerTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public JavaHttpServerTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); 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 3cdc6bf3fa15..90b21cecc4dc 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 @@ -120,8 +120,8 @@ public JettyClientTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public JettyClientTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); 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 fc2d632d0121..f35cbaed03f6 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 @@ -120,8 +120,8 @@ public JettyClientTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public JettyClientTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); return this; } 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 8ee98b4b7e1d..c76afb627003 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 @@ -111,8 +111,8 @@ public NettyClientTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public NettyClientTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); 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 f45957e96dc9..ce208b68466c 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 @@ -104,8 +104,8 @@ public OkHttpTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public OkHttpTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); return this; } 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 0c6f5e698fe7..aba7fd49e2bc 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 @@ -69,8 +69,8 @@ public R2dbcTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public R2dbcTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor) { - this.spanNameExtractorTransformer = spanNameExtractor; + UnaryOperator> spanNameExtractorCustomizer) { + this.spanNameExtractorTransformer = spanNameExtractorCustomizer; 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 54b21b3c3ea4..56f1121c288c 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 @@ -102,8 +102,8 @@ public RatpackClientTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public RatpackClientTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor) { - builder.setSpanNameExtractorCustomizer(spanNameExtractor); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); 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 381dca9507cf..9ba88d706af9 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 @@ -106,8 +106,8 @@ public RatpackServerTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public RatpackServerTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor) { - builder.setSpanNameExtractorCustomizer(spanNameExtractor); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); return this; } 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 943c6ad424e8..bbc42bbb39c8 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 @@ -102,8 +102,8 @@ public RestletTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public RestletTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); 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 978a8003595c..017382cd232d 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 @@ -102,8 +102,8 @@ public RestletTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public RestletTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractorTransformer) { - builder.setSpanNameExtractorCustomizer(spanNameExtractorTransformer); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); return this; } 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 95b4c7b77078..5cb4282194d6 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 @@ -75,10 +75,10 @@ public ServletTelemetryBuilder setStatusExtractor( */ @CanIgnoreReturnValue public ServletTelemetryBuilder setStatusExtractorCustomizer( - UnaryOperator> statusExtractor) { + UnaryOperator> statusExtractorCustomizer) { builder.setStatusExtractorCustomizer( convertSpanStatusExtractor( - statusExtractor, + statusExtractorCustomizer, ServletRequestContext::new, ServletResponseContext::new, ServletRequestContext::request, @@ -170,10 +170,10 @@ public ServletTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public ServletTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor) { + UnaryOperator> spanNameExtractorCustomizer) { builder.setSpanNameExtractorCustomizer( convertSpanNameExtractor( - spanNameExtractor, ServletRequestContext::new, ServletRequestContext::request)); + spanNameExtractorCustomizer, ServletRequestContext::new, ServletRequestContext::request)); 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 320f17fc0dfe..48c759c6c77c 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 @@ -93,8 +93,8 @@ public SpringWebTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public SpringWebTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor) { - builder.setSpanNameExtractorCustomizer(spanNameExtractor); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); 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 b89e2b52ff63..05606b2e1992 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 @@ -111,8 +111,8 @@ public SpringWebfluxClientTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public SpringWebfluxClientTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor) { - builder.setSpanNameExtractorCustomizer(spanNameExtractor); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); 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 f3c70e6a825d..ab75a91e7a23 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 @@ -112,8 +112,8 @@ public SpringWebfluxServerTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public SpringWebfluxServerTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor) { - builder.setSpanNameExtractorCustomizer(spanNameExtractor); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); return this; } 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 8f51ee95065d..a317b4d258dc 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 @@ -93,8 +93,8 @@ public SpringWebMvcTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public SpringWebMvcTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor) { - builder.setSpanNameExtractorCustomizer(spanNameExtractor); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); 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 39274706319e..b8f879499160 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 @@ -92,8 +92,8 @@ public SpringWebMvcTelemetryBuilder setSpanNameExtractor( */ @CanIgnoreReturnValue public SpringWebMvcTelemetryBuilder setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor) { - builder.setSpanNameExtractorCustomizer(spanNameExtractor); + UnaryOperator> spanNameExtractorCustomizer) { + builder.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); return this; } From 18a63a533d296d460363715a1db044d372e24281 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 3 Dec 2025 18:13:12 -0800 Subject: [PATCH 04/12] names --- .../DefaultHttpClientInstrumenterBuilder.java | 12 ++++++------ .../DefaultHttpServerInstrumenterBuilder.java | 12 ++++++------ .../apachedubbo/v2_7/DubboTelemetryBuilder.java | 12 ++++++------ .../armeria/v1_3/ArmeriaClientTelemetryBuilder.java | 3 ++- .../armeria/v1_3/ArmeriaServerTelemetryBuilder.java | 3 ++- .../grpc/v1_6/GrpcTelemetryBuilder.java | 12 ++++++------ .../r2dbc/v1_0/R2dbcTelemetryBuilder.java | 6 +++--- .../servlet/v3_0/ServletTelemetryBuilder.java | 7 +++++-- 8 files changed, 36 insertions(+), 31 deletions(-) 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 5db94ddade96..8f7cebf01911 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 @@ -54,7 +54,7 @@ public final class DefaultHttpClientInstrumenterBuilder { private final List> additionalExtractors = new ArrayList<>(); - private UnaryOperator> statusExtractorTransformer = + private UnaryOperator> statusExtractorCustomizer = UnaryOperator.identity(); private final HttpClientAttributesExtractorBuilder httpAttributesExtractorBuilder; @@ -62,7 +62,7 @@ public final class DefaultHttpClientInstrumenterBuilder { private final HttpSpanNameExtractorBuilder httpSpanNameExtractorBuilder; @Nullable private final TextMapSetter headerSetter; - private UnaryOperator> spanNameExtractorTransformer = + private UnaryOperator> spanNameExtractorCustomizer = UnaryOperator.identity(); private boolean emitExperimentalHttpClientTelemetry = false; private Consumer> builderCustomizer = b -> {}; @@ -124,7 +124,7 @@ public DefaultHttpClientInstrumenterBuilder setStatusExtracto @CanIgnoreReturnValue public DefaultHttpClientInstrumenterBuilder setStatusExtractorCustomizer( UnaryOperator> statusExtractorCustomizer) { - this.statusExtractorTransformer = statusExtractorCustomizer; + this.statusExtractorCustomizer = statusExtractorCustomizer; return this; } @@ -217,7 +217,7 @@ public DefaultHttpClientInstrumenterBuilder setSpanNameExtrac @CanIgnoreReturnValue public DefaultHttpClientInstrumenterBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorCustomizer) { - this.spanNameExtractorTransformer = spanNameExtractorCustomizer; + this.spanNameExtractorCustomizer = spanNameExtractorCustomizer; return this; } @@ -252,13 +252,13 @@ public Instrumenter build() { Context.current(), request, attributesGetter)); } SpanNameExtractor spanNameExtractor = - spanNameExtractorTransformer.apply(httpSpanNameExtractorBuilder.build()); + spanNameExtractorCustomizer.apply(httpSpanNameExtractorBuilder.build()); InstrumenterBuilder builder = Instrumenter.builder( openTelemetry, instrumentationName, spanNameExtractor) .setSpanStatusExtractor( - statusExtractorTransformer.apply(HttpSpanStatusExtractor.create(attributesGetter))) + statusExtractorCustomizer.apply(HttpSpanStatusExtractor.create(attributesGetter))) .addAttributesExtractor(httpAttributesExtractorBuilder.build()) .addAttributesExtractors(additionalExtractors) .addOperationMetrics(HttpClientMetrics.get()) 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 a9553649ad3b..e133b2b61c48 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 @@ -47,14 +47,14 @@ public final class DefaultHttpServerInstrumenterBuilder { private final List> additionalExtractors = new ArrayList<>(); - private UnaryOperator> statusExtractorTransformer = + private UnaryOperator> statusExtractorCustomizer = UnaryOperator.identity(); private final HttpServerAttributesExtractorBuilder httpAttributesExtractorBuilder; private final HttpSpanNameExtractorBuilder httpSpanNameExtractorBuilder; @Nullable private final TextMapGetter headerGetter; - private UnaryOperator> spanNameExtractorTransformer = + private UnaryOperator> spanNameExtractorCustomizer = UnaryOperator.identity(); private final HttpServerRouteBuilder httpServerRouteBuilder; private final HttpServerAttributesGetter attributesGetter; @@ -119,7 +119,7 @@ public DefaultHttpServerInstrumenterBuilder setStatusExtracto @CanIgnoreReturnValue public DefaultHttpServerInstrumenterBuilder setStatusExtractorCustomizer( UnaryOperator> statusExtractorCustomizer) { - this.statusExtractorTransformer = statusExtractorCustomizer; + this.statusExtractorCustomizer = statusExtractorCustomizer; return this; } @@ -201,7 +201,7 @@ public DefaultHttpServerInstrumenterBuilder setSpanNameExtrac @CanIgnoreReturnValue public DefaultHttpServerInstrumenterBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorCustomizer) { - this.spanNameExtractorTransformer = spanNameExtractorCustomizer; + this.spanNameExtractorCustomizer = spanNameExtractorCustomizer; return this; } @@ -223,13 +223,13 @@ public Instrumenter build() { public InstrumenterBuilder instrumenterBuilder() { SpanNameExtractor spanNameExtractor = - spanNameExtractorTransformer.apply(httpSpanNameExtractorBuilder.build()); + spanNameExtractorCustomizer.apply(httpSpanNameExtractorBuilder.build()); InstrumenterBuilder builder = Instrumenter.builder( openTelemetry, instrumentationName, spanNameExtractor) .setSpanStatusExtractor( - statusExtractorTransformer.apply(HttpSpanStatusExtractor.create(attributesGetter))) + statusExtractorCustomizer.apply(HttpSpanStatusExtractor.create(attributesGetter))) .addAttributesExtractor(httpAttributesExtractorBuilder.build()) .addAttributesExtractors(additionalExtractors) .addContextCustomizer(httpServerRouteBuilder.build()) 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 e818eaeb5481..ec5fdf923f32 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 @@ -38,9 +38,9 @@ public final class DubboTelemetryBuilder { @Nullable private String peerService; private final List> attributesExtractors = new ArrayList<>(); - private UnaryOperator> clientSpanNameExtractorTransformer = + private UnaryOperator> clientSpanNameExtractorCustomizer = UnaryOperator.identity(); - private UnaryOperator> serverSpanNameExtractorTransformer = + private UnaryOperator> serverSpanNameExtractorCustomizer = UnaryOperator.identity(); DubboTelemetryBuilder(OpenTelemetry openTelemetry) { @@ -82,7 +82,7 @@ public DubboTelemetryBuilder setClientSpanNameExtractor( @CanIgnoreReturnValue public DubboTelemetryBuilder setClientSpanNameExtractorCustomizer( UnaryOperator> clientSpanNameExtractorCustomizer) { - this.clientSpanNameExtractorTransformer = clientSpanNameExtractorCustomizer; + this.clientSpanNameExtractorCustomizer = clientSpanNameExtractorCustomizer; return this; } @@ -105,7 +105,7 @@ public DubboTelemetryBuilder setServerSpanNameExtractor( @CanIgnoreReturnValue public DubboTelemetryBuilder setServerSpanNameExtractorCustomizer( UnaryOperator> serverSpanNameExtractorCustomizer) { - this.serverSpanNameExtractorTransformer = serverSpanNameExtractorCustomizer; + this.serverSpanNameExtractorCustomizer = serverSpanNameExtractorCustomizer; return this; } @@ -117,9 +117,9 @@ public DubboTelemetry build() { SpanNameExtractor spanNameExtractor = RpcSpanNameExtractor.create(rpcAttributesGetter); SpanNameExtractor clientSpanNameExtractor = - clientSpanNameExtractorTransformer.apply(spanNameExtractor); + clientSpanNameExtractorCustomizer.apply(spanNameExtractor); SpanNameExtractor serverSpanNameExtractor = - serverSpanNameExtractorTransformer.apply(spanNameExtractor); + serverSpanNameExtractorCustomizer.apply(spanNameExtractor); DubboClientNetworkAttributesGetter netClientAttributesGetter = new DubboClientNetworkAttributesGetter(); DubboNetworkServerAttributesGetter netServerAttributesGetter = 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 2966a68d5341..d1abb2df063d 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 @@ -54,7 +54,8 @@ public ArmeriaClientTelemetryBuilder setStatusExtractor( */ @CanIgnoreReturnValue public ArmeriaClientTelemetryBuilder setStatusExtractorCustomizer( - UnaryOperator> statusExtractorCustomizer) { + UnaryOperator> + statusExtractorCustomizer) { builder.setStatusExtractorCustomizer(statusExtractorCustomizer); 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 590f60ba0545..3df46f866afa 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 @@ -52,7 +52,8 @@ public ArmeriaServerTelemetryBuilder setStatusExtractor( */ @CanIgnoreReturnValue public ArmeriaServerTelemetryBuilder setStatusExtractorCustomizer( - UnaryOperator> statusExtractorCustomizer) { + UnaryOperator> + statusExtractorCustomizer) { builder.setStatusExtractorCustomizer(statusExtractorCustomizer); return this; } 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 ae20af70efc2..f89f2a7f8b60 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 @@ -39,9 +39,9 @@ public final class GrpcTelemetryBuilder { private final OpenTelemetry openTelemetry; @Nullable private String peerService; - private UnaryOperator> clientSpanNameExtractorTransformer = + private UnaryOperator> clientSpanNameExtractorCustomizer = UnaryOperator.identity(); - private UnaryOperator> serverSpanNameExtractorTransformer = + private UnaryOperator> serverSpanNameExtractorCustomizer = UnaryOperator.identity(); private final List> additionalExtractors = new ArrayList<>(); @@ -113,7 +113,7 @@ public GrpcTelemetryBuilder setClientSpanNameExtractor( @CanIgnoreReturnValue public GrpcTelemetryBuilder setClientSpanNameExtractorCustomizer( UnaryOperator> clientSpanNameExtractorCustomizer) { - this.clientSpanNameExtractorTransformer = clientSpanNameExtractorCustomizer; + this.clientSpanNameExtractorCustomizer = clientSpanNameExtractorCustomizer; return this; } @@ -136,7 +136,7 @@ public GrpcTelemetryBuilder setServerSpanNameExtractor( @CanIgnoreReturnValue public GrpcTelemetryBuilder setServerSpanNameExtractorCustomizer( UnaryOperator> serverSpanNameExtractorCustomizer) { - this.serverSpanNameExtractorTransformer = serverSpanNameExtractorCustomizer; + this.serverSpanNameExtractorCustomizer = serverSpanNameExtractorCustomizer; return this; } @@ -189,9 +189,9 @@ public GrpcTelemetryBuilder setCapturedServerRequestMetadata( public GrpcTelemetry build() { SpanNameExtractor originalSpanNameExtractor = new GrpcSpanNameExtractor(); SpanNameExtractor clientSpanNameExtractor = - clientSpanNameExtractorTransformer.apply(originalSpanNameExtractor); + clientSpanNameExtractorCustomizer.apply(originalSpanNameExtractor); SpanNameExtractor serverSpanNameExtractor = - serverSpanNameExtractorTransformer.apply(originalSpanNameExtractor); + serverSpanNameExtractorCustomizer.apply(originalSpanNameExtractor); InstrumenterBuilder clientInstrumenterBuilder = Instrumenter.builder(openTelemetry, INSTRUMENTATION_NAME, clientSpanNameExtractor); 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 aba7fd49e2bc..a7567ac76345 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 @@ -21,7 +21,7 @@ public final class R2dbcTelemetryBuilder { private final R2dbcInstrumenterBuilder instrumenterBuilder; private boolean statementSanitizationEnabled = true; - private UnaryOperator> spanNameExtractorTransformer = + private UnaryOperator> spanNameExtractorCustomizer = UnaryOperator.identity(); private final SqlCommenterBuilder sqlCommenterBuilder = SqlCommenter.builder(); @@ -70,7 +70,7 @@ public R2dbcTelemetryBuilder setSpanNameExtractor( @CanIgnoreReturnValue public R2dbcTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorCustomizer) { - this.spanNameExtractorTransformer = spanNameExtractorCustomizer; + this.spanNameExtractorCustomizer = spanNameExtractorCustomizer; return this; } @@ -79,7 +79,7 @@ public R2dbcTelemetryBuilder setSpanNameExtractorCustomizer( */ public R2dbcTelemetry build() { return new R2dbcTelemetry( - instrumenterBuilder.build(spanNameExtractorTransformer, statementSanitizationEnabled), + instrumenterBuilder.build(spanNameExtractorCustomizer, statementSanitizationEnabled), sqlCommenterBuilder.build()); } } 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 5cb4282194d6..8e78a63719aa 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 @@ -75,7 +75,8 @@ public ServletTelemetryBuilder setStatusExtractor( */ @CanIgnoreReturnValue public ServletTelemetryBuilder setStatusExtractorCustomizer( - UnaryOperator> statusExtractorCustomizer) { + UnaryOperator> + statusExtractorCustomizer) { builder.setStatusExtractorCustomizer( convertSpanStatusExtractor( statusExtractorCustomizer, @@ -173,7 +174,9 @@ public ServletTelemetryBuilder setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorCustomizer) { builder.setSpanNameExtractorCustomizer( convertSpanNameExtractor( - spanNameExtractorCustomizer, ServletRequestContext::new, ServletRequestContext::request)); + spanNameExtractorCustomizer, + ServletRequestContext::new, + ServletRequestContext::request)); return this; } From a9f6f624eac5b7ac90c63cc167a7e9193a9fa1ca Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 3 Dec 2025 18:38:57 -0800 Subject: [PATCH 05/12] more --- .../DefaultHttpClientInstrumenterBuilder.java | 15 ++++++++------- .../DefaultHttpServerInstrumenterBuilder.java | 15 ++++++++------- .../v1_3/ArmeriaClientTelemetryBuilder.java | 10 +++++----- .../v1_3/ArmeriaServerTelemetryBuilder.java | 10 +++++----- .../helidon/v4_3/HelidonTelemetryBuilder.java | 11 ++++++----- .../JavaHttpServerTelemetryBuilder.java | 11 ++++++----- .../common/AbstractKtorServerTelemetryBuilder.kt | 2 +- .../servlet/v3_0/ServletTelemetryBuilder.java | 12 ++++++------ 8 files changed, 45 insertions(+), 41 deletions(-) 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 8f7cebf01911..31291a006d71 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 @@ -54,7 +54,7 @@ public final class DefaultHttpClientInstrumenterBuilder { private final List> additionalExtractors = new ArrayList<>(); - private UnaryOperator> statusExtractorCustomizer = + private UnaryOperator> spanStatusExtractorCustomizer = UnaryOperator.identity(); private final HttpClientAttributesExtractorBuilder httpAttributesExtractorBuilder; @@ -112,19 +112,19 @@ public DefaultHttpClientInstrumenterBuilder addAttributesExtr } /** - * @deprecated Use {@link #setStatusExtractorCustomizer(UnaryOperator)} instead. + * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. */ @Deprecated @CanIgnoreReturnValue public DefaultHttpClientInstrumenterBuilder setStatusExtractor( UnaryOperator> statusExtractor) { - return setStatusExtractorCustomizer(statusExtractor); + return setSpanStatusExtractorCustomizer(statusExtractor); } @CanIgnoreReturnValue - public DefaultHttpClientInstrumenterBuilder setStatusExtractorCustomizer( - UnaryOperator> statusExtractorCustomizer) { - this.statusExtractorCustomizer = statusExtractorCustomizer; + public DefaultHttpClientInstrumenterBuilder setSpanStatusExtractorCustomizer( + UnaryOperator> spanStatusExtractorCustomizer) { + this.spanStatusExtractorCustomizer = spanStatusExtractorCustomizer; return this; } @@ -258,7 +258,8 @@ public Instrumenter build() { Instrumenter.builder( openTelemetry, instrumentationName, spanNameExtractor) .setSpanStatusExtractor( - statusExtractorCustomizer.apply(HttpSpanStatusExtractor.create(attributesGetter))) + spanStatusExtractorCustomizer.apply( + HttpSpanStatusExtractor.create(attributesGetter))) .addAttributesExtractor(httpAttributesExtractorBuilder.build()) .addAttributesExtractors(additionalExtractors) .addOperationMetrics(HttpClientMetrics.get()) 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 e133b2b61c48..96e1faa16809 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 @@ -47,7 +47,7 @@ public final class DefaultHttpServerInstrumenterBuilder { private final List> additionalExtractors = new ArrayList<>(); - private UnaryOperator> statusExtractorCustomizer = + private UnaryOperator> spanStatusExtractorCustomizer = UnaryOperator.identity(); private final HttpServerAttributesExtractorBuilder httpAttributesExtractorBuilder; @@ -107,19 +107,19 @@ public DefaultHttpServerInstrumenterBuilder addAttributesExtr } /** - * @deprecated Use {@link #setStatusExtractorCustomizer(UnaryOperator)} instead. + * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. */ @Deprecated @CanIgnoreReturnValue public DefaultHttpServerInstrumenterBuilder setStatusExtractor( UnaryOperator> statusExtractor) { - return setStatusExtractorCustomizer(statusExtractor); + return setSpanStatusExtractorCustomizer(statusExtractor); } @CanIgnoreReturnValue - public DefaultHttpServerInstrumenterBuilder setStatusExtractorCustomizer( - UnaryOperator> statusExtractorCustomizer) { - this.statusExtractorCustomizer = statusExtractorCustomizer; + public DefaultHttpServerInstrumenterBuilder setSpanStatusExtractorCustomizer( + UnaryOperator> spanStatusExtractorCustomizer) { + this.spanStatusExtractorCustomizer = spanStatusExtractorCustomizer; return this; } @@ -229,7 +229,8 @@ public InstrumenterBuilder instrumenterBuilder() { Instrumenter.builder( openTelemetry, instrumentationName, spanNameExtractor) .setSpanStatusExtractor( - statusExtractorCustomizer.apply(HttpSpanStatusExtractor.create(attributesGetter))) + spanStatusExtractorCustomizer.apply( + HttpSpanStatusExtractor.create(attributesGetter))) .addAttributesExtractor(httpAttributesExtractorBuilder.build()) .addAttributesExtractors(additionalExtractors) .addContextCustomizer(httpServerRouteBuilder.build()) diff --git a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java index d1abb2df063d..de9ef6e72c29 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 @@ -39,13 +39,13 @@ public final class ArmeriaClientTelemetryBuilder { /** * Sets the status extractor for client spans. * - * @deprecated Use {@link #setStatusExtractorCustomizer(UnaryOperator)} instead. + * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. */ @Deprecated @CanIgnoreReturnValue public ArmeriaClientTelemetryBuilder setStatusExtractor( UnaryOperator> statusExtractor) { - return setStatusExtractorCustomizer(statusExtractor); + return setSpanStatusExtractorCustomizer(statusExtractor); } /** @@ -53,10 +53,10 @@ public ArmeriaClientTelemetryBuilder setStatusExtractor( * customized one. */ @CanIgnoreReturnValue - public ArmeriaClientTelemetryBuilder setStatusExtractorCustomizer( + public ArmeriaClientTelemetryBuilder setSpanStatusExtractorCustomizer( UnaryOperator> - statusExtractorCustomizer) { - builder.setStatusExtractorCustomizer(statusExtractorCustomizer); + spanStatusExtractorCustomizer) { + builder.setSpanStatusExtractorCustomizer(spanStatusExtractorCustomizer); 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 3df46f866afa..eac0374c3fd9 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 @@ -37,13 +37,13 @@ public final class ArmeriaServerTelemetryBuilder { /** * Sets the status extractor for server spans. * - * @deprecated Use {@link #setStatusExtractorCustomizer(UnaryOperator)} instead. + * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. */ @Deprecated @CanIgnoreReturnValue public ArmeriaServerTelemetryBuilder setStatusExtractor( UnaryOperator> statusExtractor) { - return setStatusExtractorCustomizer(statusExtractor); + return setSpanStatusExtractorCustomizer(statusExtractor); } /** @@ -51,10 +51,10 @@ public ArmeriaServerTelemetryBuilder setStatusExtractor( * customized one. */ @CanIgnoreReturnValue - public ArmeriaServerTelemetryBuilder setStatusExtractorCustomizer( + public ArmeriaServerTelemetryBuilder setSpanStatusExtractorCustomizer( UnaryOperator> - statusExtractorCustomizer) { - builder.setStatusExtractorCustomizer(statusExtractorCustomizer); + spanStatusExtractorCustomizer) { + builder.setSpanStatusExtractorCustomizer(spanStatusExtractorCustomizer); return this; } 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 e5a0cc98f3fd..8fb91705d384 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 @@ -43,13 +43,13 @@ public final class HelidonTelemetryBuilder { /** * Sets the status extractor for server spans. * - * @deprecated Use {@link #setStatusExtractorCustomizer(UnaryOperator)} instead. + * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. */ @Deprecated @CanIgnoreReturnValue public HelidonTelemetryBuilder setStatusExtractor( UnaryOperator> statusExtractor) { - return setStatusExtractorCustomizer(statusExtractor); + return setSpanStatusExtractorCustomizer(statusExtractor); } /** @@ -57,9 +57,10 @@ public HelidonTelemetryBuilder setStatusExtractor( * customized one. */ @CanIgnoreReturnValue - public HelidonTelemetryBuilder setStatusExtractorCustomizer( - UnaryOperator> statusExtractorCustomizer) { - builder.setStatusExtractorCustomizer(statusExtractorCustomizer); + public HelidonTelemetryBuilder setSpanStatusExtractorCustomizer( + UnaryOperator> + spanStatusExtractorCustomizer) { + builder.setSpanStatusExtractorCustomizer(spanStatusExtractorCustomizer); return this; } 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 809ed44ac9b6..790eb07ca8b9 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 @@ -42,13 +42,13 @@ public final class JavaHttpServerTelemetryBuilder { /** * Sets the status extractor for server spans. * - * @deprecated Use {@link #setStatusExtractorCustomizer(UnaryOperator)} instead. + * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. */ @Deprecated @CanIgnoreReturnValue public JavaHttpServerTelemetryBuilder setStatusExtractor( UnaryOperator> statusExtractor) { - return setStatusExtractorCustomizer(statusExtractor); + return setSpanStatusExtractorCustomizer(statusExtractor); } /** @@ -56,9 +56,10 @@ public JavaHttpServerTelemetryBuilder setStatusExtractor( * customized one. */ @CanIgnoreReturnValue - public JavaHttpServerTelemetryBuilder setStatusExtractorCustomizer( - UnaryOperator> statusExtractorCustomizer) { - builder.setStatusExtractorCustomizer(statusExtractorCustomizer); + public JavaHttpServerTelemetryBuilder setSpanStatusExtractorCustomizer( + UnaryOperator> + spanStatusExtractorCustomizer) { + builder.setSpanStatusExtractorCustomizer(spanStatusExtractorCustomizer); return this; } 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 853987999d59..58f89f73ff0a 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 @@ -44,7 +44,7 @@ abstract class AbstractKtorServerTelemetryBuilder(private val instrumentationNam } fun spanStatusExtractor(extract: SpanStatusData.(SpanStatusExtractor) -> Unit) { - builder.setStatusExtractorCustomizer { prevExtractor -> + builder.setSpanStatusExtractorCustomizer { prevExtractor -> SpanStatusExtractor { spanStatusBuilder: SpanStatusBuilder, request: ApplicationRequest, 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 8e78a63719aa..fde5c4b5ea66 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 @@ -60,13 +60,13 @@ public final class ServletTelemetryBuilder { /** * Sets the status extractor for server spans. * - * @deprecated Use {@link #setStatusExtractorCustomizer(UnaryOperator)} instead. + * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. */ @Deprecated @CanIgnoreReturnValue public ServletTelemetryBuilder setStatusExtractor( UnaryOperator> statusExtractor) { - return setStatusExtractorCustomizer(statusExtractor); + return setSpanStatusExtractorCustomizer(statusExtractor); } /** @@ -74,12 +74,12 @@ public ServletTelemetryBuilder setStatusExtractor( * customized one. */ @CanIgnoreReturnValue - public ServletTelemetryBuilder setStatusExtractorCustomizer( + public ServletTelemetryBuilder setSpanStatusExtractorCustomizer( UnaryOperator> - statusExtractorCustomizer) { - builder.setStatusExtractorCustomizer( + spanStatusExtractorCustomizer) { + builder.setSpanStatusExtractorCustomizer( convertSpanStatusExtractor( - statusExtractorCustomizer, + spanStatusExtractorCustomizer, ServletRequestContext::new, ServletResponseContext::new, ServletRequestContext::request, From ddf3edc906dc894f93d48fd8f387101c69f22bcc Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 3 Dec 2025 20:08:14 -0800 Subject: [PATCH 06/12] more --- .../incubator/instrumenter/InstrumenterCustomizer.java | 8 ++++---- .../api/internal/InternalInstrumenterCustomizer.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) 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 c69fcaa19a64..be5605b751d9 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 @@ -99,11 +99,11 @@ default InstrumenterCustomizer setSpanNameExtractor( * Sets a transformer function that will modify the {@link SpanNameExtractor}. This allows * customizing how span names are generated for the instrumented operations. * - * @param spanNameExtractor function that transforms the original span name extractor + * @param spanNameExtractorCustomizer function that transforms the original span name extractor * @return this InstrumenterCustomizer for method chaining */ InstrumenterCustomizer setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor); + UnaryOperator> spanNameExtractorCustomizer); /** * Sets a transformer function that will modify the {@link SpanStatusExtractor}. This allows @@ -123,11 +123,11 @@ default InstrumenterCustomizer setSpanStatusExtractor( * Sets a transformer function that will modify the {@link SpanStatusExtractor}. This allows * customizing how span statuses are generated for the instrumented operations. * - * @param spanStatusExtractor function that transforms the original span status extractor + * @param spanStatusExtractorCustomizer function that transforms the original span status extractor * @return this InstrumenterCustomizer for method chaining */ InstrumenterCustomizer setSpanStatusExtractorCustomizer( - UnaryOperator> spanStatusExtractor); + UnaryOperator> spanStatusExtractorCustomizer); /** Types of instrumentation. */ enum InstrumentationType { diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InternalInstrumenterCustomizer.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InternalInstrumenterCustomizer.java index f457238eedd8..7beb91804575 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InternalInstrumenterCustomizer.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InternalInstrumenterCustomizer.java @@ -41,7 +41,7 @@ default void setSpanNameExtractor( } void setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractorTransformer); + UnaryOperator> spanNameExtractorCustomizer); /** * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. @@ -55,5 +55,5 @@ default void setSpanStatusExtractor( void setSpanStatusExtractorCustomizer( UnaryOperator> - spanStatusExtractorTransformer); + spanStatusExtractorCustomizer); } From 820dbd59939d8ea63151b50d8067f5cc37d178a1 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 3 Dec 2025 20:11:04 -0800 Subject: [PATCH 07/12] more --- .../instrumenter/internal/InstrumenterCustomizerImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/instrumenter/internal/InstrumenterCustomizerImpl.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/instrumenter/internal/InstrumenterCustomizerImpl.java index 692165be1a3e..fc73d1db7efb 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/instrumenter/internal/InstrumenterCustomizerImpl.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/instrumenter/internal/InstrumenterCustomizerImpl.java @@ -84,15 +84,15 @@ public InstrumenterCustomizer addContextCustomizer(ContextCustomizer customiz @Override @SuppressWarnings("FunctionalInterfaceClash") // interface has deprecated overload public InstrumenterCustomizer setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractor) { - customizer.setSpanNameExtractorCustomizer(spanNameExtractor); + UnaryOperator> spanNameExtractorCustomizer) { + customizer.setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); return this; } @Override public InstrumenterCustomizer setSpanStatusExtractorCustomizer( - UnaryOperator> spanStatusExtractor) { - customizer.setSpanStatusExtractorCustomizer(spanStatusExtractor); + UnaryOperator> spanStatusExtractorCustomizer) { + customizer.setSpanStatusExtractorCustomizer(spanStatusExtractorCustomizer); return this; } } From ac4e16b6f5b51beb36124af5c189c3ff4ed4e9e3 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 3 Dec 2025 20:11:56 -0800 Subject: [PATCH 08/12] more --- .../api/instrumenter/InstrumenterBuilder.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java index a72ffe1ee486..422d357349a3 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java @@ -438,17 +438,17 @@ public void addContextCustomizer(ContextCustomizer customizer) { @Override public void setSpanNameExtractorCustomizer( - UnaryOperator> spanNameExtractorTransformer) { + UnaryOperator> spanNameExtractorCustomizer) { builder.spanNameExtractor = - spanNameExtractorTransformer.apply(builder.spanNameExtractor); + spanNameExtractorCustomizer.apply(builder.spanNameExtractor); } @Override public void setSpanStatusExtractorCustomizer( UnaryOperator> - spanStatusExtractorTransformer) { + spanStatusExtractorCustomizer) { builder.spanStatusExtractor = - spanStatusExtractorTransformer.apply(builder.spanStatusExtractor); + spanStatusExtractorCustomizer.apply(builder.spanStatusExtractor); } }); } From 9c80de56e63bc72d10fc790cfd857a3187123909 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 3 Dec 2025 20:22:22 -0800 Subject: [PATCH 09/12] spotless --- .../api/incubator/instrumenter/InstrumenterCustomizer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 be5605b751d9..aa195370aedc 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 @@ -123,7 +123,8 @@ default InstrumenterCustomizer setSpanStatusExtractor( * Sets a transformer function that will modify the {@link SpanStatusExtractor}. This allows * customizing how span statuses are generated for the instrumented operations. * - * @param spanStatusExtractorCustomizer function that transforms the original span status extractor + * @param spanStatusExtractorCustomizer function that transforms the original span status + * extractor * @return this InstrumenterCustomizer for method chaining */ InstrumenterCustomizer setSpanStatusExtractorCustomizer( From 8b0c917067546fedfb2ebf05ab57a2475b288400 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 4 Dec 2025 09:58:58 -0800 Subject: [PATCH 10/12] No deprecation cycle for internal classes --- .../DefaultHttpClientInstrumenterBuilder.java | 22 ------------------- .../DefaultHttpServerInstrumenterBuilder.java | 22 ------------------- .../InternalInstrumenterCustomizer.java | 19 ---------------- 3 files changed, 63 deletions(-) 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 31291a006d71..d73e350503f4 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 @@ -111,16 +111,6 @@ public DefaultHttpClientInstrumenterBuilder addAttributesExtr return this; } - /** - * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public DefaultHttpClientInstrumenterBuilder setStatusExtractor( - UnaryOperator> statusExtractor) { - return setSpanStatusExtractorCustomizer(statusExtractor); - } - @CanIgnoreReturnValue public DefaultHttpClientInstrumenterBuilder setSpanStatusExtractorCustomizer( UnaryOperator> spanStatusExtractorCustomizer) { @@ -198,18 +188,6 @@ public DefaultHttpClientInstrumenterBuilder setRedactQueryPar return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public DefaultHttpClientInstrumenterBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractor) { - return setSpanNameExtractorCustomizer(spanNameExtractor); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. 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 96e1faa16809..ffb48a61a9c5 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 @@ -106,16 +106,6 @@ public DefaultHttpServerInstrumenterBuilder addAttributesExtr return this; } - /** - * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public DefaultHttpServerInstrumenterBuilder setStatusExtractor( - UnaryOperator> statusExtractor) { - return setSpanStatusExtractorCustomizer(statusExtractor); - } - @CanIgnoreReturnValue public DefaultHttpServerInstrumenterBuilder setSpanStatusExtractorCustomizer( UnaryOperator> spanStatusExtractorCustomizer) { @@ -182,18 +172,6 @@ public DefaultHttpServerInstrumenterBuilder setKnownMethods( return this; } - /** - * Sets custom {@link SpanNameExtractor} via transform function. - * - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - @CanIgnoreReturnValue - public DefaultHttpServerInstrumenterBuilder setSpanNameExtractor( - UnaryOperator> spanNameExtractor) { - return setSpanNameExtractorCustomizer(spanNameExtractor); - } - /** * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized * one. diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InternalInstrumenterCustomizer.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InternalInstrumenterCustomizer.java index 7beb91804575..7db66d0221d9 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InternalInstrumenterCustomizer.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/InternalInstrumenterCustomizer.java @@ -31,28 +31,9 @@ void addAttributesExtractors( void addContextCustomizer(ContextCustomizer customizer); - /** - * @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - default void setSpanNameExtractor( - UnaryOperator> spanNameExtractorTransformer) { - setSpanNameExtractorCustomizer(spanNameExtractorTransformer); - } - void setSpanNameExtractorCustomizer( UnaryOperator> spanNameExtractorCustomizer); - /** - * @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead. - */ - @Deprecated - default void setSpanStatusExtractor( - UnaryOperator> - spanStatusExtractorTransformer) { - setSpanStatusExtractorCustomizer(spanStatusExtractorTransformer); - } - void setSpanStatusExtractorCustomizer( UnaryOperator> spanStatusExtractorCustomizer); From 10501513f3a96b56320e89dc5353d6464b787dec Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 4 Dec 2025 10:02:20 -0800 Subject: [PATCH 11/12] two more --- .../ElasticsearchRest7TelemetryBuilder.java | 28 +++++++++++++++---- .../quartz/v2_0/QuartzTelemetryBuilder.java | 28 +++++++++++++++---- 2 files changed, 46 insertions(+), 10 deletions(-) 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 268a06eedcf6..142c15a4efa4 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 @@ -33,7 +33,7 @@ public final class ElasticsearchRest7TelemetryBuilder { private Function< SpanNameExtractor, ? extends SpanNameExtractor> - spanNameExtractorTransformer = Function.identity(); + spanNameExtractorCustomizer = Function.identity(); ElasticsearchRest7TelemetryBuilder(OpenTelemetry openTelemetry) { this.openTelemetry = openTelemetry; @@ -69,14 +69,32 @@ public ElasticsearchRest7TelemetryBuilder setKnownMethods(Collection kno return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(Function)} instead. + */ + @Deprecated @CanIgnoreReturnValue public ElasticsearchRest7TelemetryBuilder setSpanNameExtractor( Function< SpanNameExtractor, ? extends SpanNameExtractor> - spanNameExtractorTransformer) { - this.spanNameExtractorTransformer = spanNameExtractorTransformer; + spanNameExtractorCustomizer) { + return setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); + } + + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ + @CanIgnoreReturnValue + public ElasticsearchRest7TelemetryBuilder setSpanNameExtractorCustomizer( + Function< + SpanNameExtractor, + ? extends SpanNameExtractor> + spanNameExtractorCustomizer) { + this.spanNameExtractorCustomizer = spanNameExtractorCustomizer; return this; } @@ -90,7 +108,7 @@ public ElasticsearchRest7Telemetry build() { openTelemetry, INSTRUMENTATION_NAME, attributesExtractors, - spanNameExtractorTransformer, + spanNameExtractorCustomizer, knownMethods, false); diff --git a/instrumentation/quartz-2.0/library/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/QuartzTelemetryBuilder.java b/instrumentation/quartz-2.0/library/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/QuartzTelemetryBuilder.java index 26e52916bf7c..fde589576412 100644 --- a/instrumentation/quartz-2.0/library/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/QuartzTelemetryBuilder.java +++ b/instrumentation/quartz-2.0/library/src/main/java/io/opentelemetry/instrumentation/quartz/v2_0/QuartzTelemetryBuilder.java @@ -29,7 +29,7 @@ public final class QuartzTelemetryBuilder { private Function< SpanNameExtractor, ? extends SpanNameExtractor> - spanNameExtractorTransformer = Function.identity(); + spanNameExtractorCustomizer = Function.identity(); QuartzTelemetryBuilder(OpenTelemetry openTelemetry) { this.openTelemetry = openTelemetry; @@ -58,14 +58,32 @@ public QuartzTelemetryBuilder setCaptureExperimentalSpanAttributes( return this; } - /** Sets custom {@link SpanNameExtractor} via transform function. */ + /** + * Sets custom {@link SpanNameExtractor} via transform function. + * + * @deprecated Use {@link #setSpanNameExtractorCustomizer(Function)} instead. + */ + @Deprecated @CanIgnoreReturnValue public QuartzTelemetryBuilder setSpanNameExtractor( Function< SpanNameExtractor, ? extends SpanNameExtractor> - spanNameExtractorTransformer) { - this.spanNameExtractorTransformer = spanNameExtractorTransformer; + spanNameExtractorCustomizer) { + return setSpanNameExtractorCustomizer(spanNameExtractorCustomizer); + } + + /** + * Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized + * one. + */ + @CanIgnoreReturnValue + public QuartzTelemetryBuilder setSpanNameExtractorCustomizer( + Function< + SpanNameExtractor, + ? extends SpanNameExtractor> + spanNameExtractorCustomizer) { + this.spanNameExtractorCustomizer = spanNameExtractorCustomizer; return this; } @@ -74,7 +92,7 @@ public QuartzTelemetryBuilder setSpanNameExtractor( */ public QuartzTelemetry build() { SpanNameExtractor spanNameExtractor = - spanNameExtractorTransformer.apply(new QuartzSpanNameExtractor()); + spanNameExtractorCustomizer.apply(new QuartzSpanNameExtractor()); InstrumenterBuilder instrumenter = Instrumenter.builder(openTelemetry, INSTRUMENTATION_NAME, spanNameExtractor); From 04cd34ac85ccc6818a41f7f574ae0fb4ede12f1d Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 4 Dec 2025 10:37:48 -0800 Subject: [PATCH 12/12] fix --- .../instrumentation/ktor/v1_0/KtorServerTelemetry.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3566da713fa6..60b77ba2cdc4 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 @@ -47,7 +47,7 @@ class KtorServerTelemetry private constructor( fun setStatusExtractor( extractor: (SpanStatusExtractor) -> SpanStatusExtractor ) { - builder.setStatusExtractor { prevExtractor -> + builder.setSpanStatusExtractorCustomizer { prevExtractor -> SpanStatusExtractor { spanStatusBuilder: SpanStatusBuilder, request: ApplicationRequest,