Skip to content

Remove deprecated methods in favor of Unary #15324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trask merged 1 commit into from
Nov 20, 2025
Merged

Remove deprecated methods in favor of Unary #15324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions ...a/io/opentelemetry/instrumentation/api/incubator/instrumenter/InstrumenterCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor;
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractor;
import java.util.function.Function;
import java.util.function.UnaryOperator;

/**
Expand Down Expand Up @@ -82,21 +81,6 @@ InstrumenterCustomizer addAttributesExtractors(
*/
InstrumenterCustomizer addContextCustomizer(ContextCustomizer<?> customizer);

/**
* Sets a transformer function that will modify the {@link SpanNameExtractor}. This allows
* customizing how span names are generated for the instrumented operations.
*
* @param spanNameExtractorTransformer function that transforms the original span name extractor
* @return this InstrumenterCustomizer for method chaining
* @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead.
*/
@Deprecated
@SuppressWarnings("FunctionalInterfaceClash")
default InstrumenterCustomizer setSpanNameExtractor(
Function<SpanNameExtractor<?>, SpanNameExtractor<?>> spanNameExtractorTransformer) {
return setSpanNameExtractor(spanNameExtractorTransformer::apply);
}

/**
* Sets a transformer function that will modify the {@link SpanNameExtractor}. This allows
* customizing how span names are generated for the instrumented operations.
Expand Down
33 changes: 0 additions & 33 deletions ...rc/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTelemetryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import io.opentelemetry.instrumentation.api.semconv.network.ServerAttributesExtractor;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Function;
import java.util.function.UnaryOperator;
import javax.annotation.Nullable;
import org.apache.dubbo.rpc.Result;
Expand Down Expand Up @@ -64,22 +63,6 @@ public DubboTelemetryBuilder addAttributesExtractor(
return this;
}

/**
* Sets custom client {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setClientSpanNameExtractor(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
@SuppressWarnings("unchecked") // cast result to SpanNameExtractor<DubboRequest>
public DubboTelemetryBuilder setClientSpanNameExtractor(
Function<SpanNameExtractor<DubboRequest>, ? extends SpanNameExtractor<? super DubboRequest>>
clientSpanNameExtractor) {
return setClientSpanNameExtractor(
(UnaryOperator<SpanNameExtractor<DubboRequest>>)
input -> (SpanNameExtractor<DubboRequest>) clientSpanNameExtractor.apply(input));
}

/** Sets custom client {@link SpanNameExtractor} via transform function. */
@CanIgnoreReturnValue
public DubboTelemetryBuilder setClientSpanNameExtractor(
Expand All @@ -88,22 +71,6 @@ public DubboTelemetryBuilder setClientSpanNameExtractor(
return this;
}

/**
* Sets custom server {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setServerSpanNameExtractor(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
@SuppressWarnings("unchecked") // cast result to SpanNameExtractor<DubboRequest>
public DubboTelemetryBuilder setServerSpanNameExtractor(
Function<SpanNameExtractor<DubboRequest>, ? extends SpanNameExtractor<? super DubboRequest>>
serverSpanNameExtractor) {
return setServerSpanNameExtractor(
(UnaryOperator<SpanNameExtractor<DubboRequest>>)
input -> (SpanNameExtractor<DubboRequest>) serverSpanNameExtractor.apply(input));
}

/** Sets custom server {@link SpanNameExtractor} via transform function. */
@CanIgnoreReturnValue
public DubboTelemetryBuilder setServerSpanNameExtractor(
Expand Down
18 changes: 0 additions & 18 deletions ...opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
import java.util.Collection;
import java.util.function.Function;
import java.util.function.UnaryOperator;
import org.apache.http.HttpResponse;

Expand Down Expand Up @@ -90,23 +89,6 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection<String> known
return this;
}

/**
* Sets custom {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
Function<
SpanNameExtractor<ApacheHttpClientRequest>,
SpanNameExtractor<ApacheHttpClientRequest>>
spanNameExtractorTransformer) {
return setSpanNameExtractor(
(UnaryOperator<SpanNameExtractor<ApacheHttpClientRequest>>)
spanNameExtractorTransformer::apply);
}

/** Sets custom {@link SpanNameExtractor} via transform function. */
@CanIgnoreReturnValue
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
Expand Down
18 changes: 0 additions & 18 deletions ...opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTelemetryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
import java.util.Collection;
import java.util.function.Function;
import java.util.function.UnaryOperator;
import org.apache.hc.core5.http.HttpResponse;

Expand Down Expand Up @@ -90,23 +89,6 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection<String> known
return this;
}

/**
* Sets custom {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
Function<
SpanNameExtractor<ApacheHttpClientRequest>,
SpanNameExtractor<ApacheHttpClientRequest>>
spanNameExtractorTransformer) {
return setSpanNameExtractor(
(UnaryOperator<SpanNameExtractor<ApacheHttpClientRequest>>)
spanNameExtractorTransformer::apply);
}

/** Sets custom {@link SpanNameExtractor} via transform function. */
@CanIgnoreReturnValue
public ApacheHttpClientTelemetryBuilder setSpanNameExtractor(
Expand Down
32 changes: 0 additions & 32 deletions ...ain/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderUtil;
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
import java.util.Collection;
import java.util.function.Function;
import java.util.function.UnaryOperator;

public final class ArmeriaClientTelemetryBuilder {
Expand All @@ -37,23 +36,6 @@ public final class ArmeriaClientTelemetryBuilder {
builder = ArmeriaInstrumenterBuilderFactory.getClientBuilder(openTelemetry);
}

/**
* Sets the status extractor for client spans.
*
* @deprecated Use {@link #setStatusExtractor(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public ArmeriaClientTelemetryBuilder setStatusExtractor(
Function<
SpanStatusExtractor<ClientRequestContext, RequestLog>,
SpanStatusExtractor<ClientRequestContext, RequestLog>>
statusExtractor) {
return setStatusExtractor(
(UnaryOperator<SpanStatusExtractor<ClientRequestContext, RequestLog>>)
statusExtractor::apply);
}

/** Sets the status extractor for client spans. */
@CanIgnoreReturnValue
public ArmeriaClientTelemetryBuilder setStatusExtractor(
Expand Down Expand Up @@ -116,20 +98,6 @@ public ArmeriaClientTelemetryBuilder setKnownMethods(Collection<String> knownMet
return this;
}

/**
* Sets custom client {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public ArmeriaClientTelemetryBuilder setSpanNameExtractor(
Function<SpanNameExtractor<ClientRequestContext>, SpanNameExtractor<ClientRequestContext>>
clientSpanNameExtractor) {
return setSpanNameExtractor(
(UnaryOperator<SpanNameExtractor<ClientRequestContext>>) clientSpanNameExtractor::apply);
}

/** Sets custom client {@link SpanNameExtractor} via transform function. */
@CanIgnoreReturnValue
public ArmeriaClientTelemetryBuilder setSpanNameExtractor(
Expand Down
32 changes: 0 additions & 32 deletions ...ain/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaServerTelemetryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderUtil;
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
import java.util.Collection;
import java.util.function.Function;
import java.util.function.UnaryOperator;

public final class ArmeriaServerTelemetryBuilder {
Expand All @@ -35,23 +34,6 @@ public final class ArmeriaServerTelemetryBuilder {
builder = ArmeriaInstrumenterBuilderFactory.getServerBuilder(openTelemetry);
}

/**
* Sets the status extractor for server spans.
*
* @deprecated Use {@link #setStatusExtractor(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public ArmeriaServerTelemetryBuilder setStatusExtractor(
Function<
SpanStatusExtractor<ServiceRequestContext, RequestLog>,
SpanStatusExtractor<ServiceRequestContext, RequestLog>>
statusExtractor) {
return setStatusExtractor(
(UnaryOperator<SpanStatusExtractor<ServiceRequestContext, RequestLog>>)
statusExtractor::apply);
}

/** Sets the status extractor for server spans. */
@CanIgnoreReturnValue
public ArmeriaServerTelemetryBuilder setStatusExtractor(
Expand Down Expand Up @@ -114,20 +96,6 @@ public ArmeriaServerTelemetryBuilder setKnownMethods(Collection<String> knownMet
return this;
}

/**
* Sets custom server {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public ArmeriaServerTelemetryBuilder setSpanNameExtractor(
Function<SpanNameExtractor<ServiceRequestContext>, SpanNameExtractor<ServiceRequestContext>>
serverSpanNameExtractor) {
return setSpanNameExtractor(
(UnaryOperator<SpanNameExtractor<ServiceRequestContext>>) serverSpanNameExtractor::apply);
}

/** Sets custom server {@link SpanNameExtractor} via transform function. */
@CanIgnoreReturnValue
public ArmeriaServerTelemetryBuilder setSpanNameExtractor(
Expand Down
33 changes: 0 additions & 33 deletions ...ibrary/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
import java.util.function.UnaryOperator;
import javax.annotation.Nullable;

Expand Down Expand Up @@ -95,22 +94,6 @@ public GrpcTelemetryBuilder addServerAttributeExtractor(
return this;
}

/**
* Sets custom client {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setClientSpanNameExtractor(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
@SuppressWarnings("unchecked") // cast result to SpanNameExtractor<GrpcRequest>
public GrpcTelemetryBuilder setClientSpanNameExtractor(
Function<SpanNameExtractor<GrpcRequest>, ? extends SpanNameExtractor<? super GrpcRequest>>
clientSpanNameExtractor) {
return setClientSpanNameExtractor(
(UnaryOperator<SpanNameExtractor<GrpcRequest>>)
input -> (SpanNameExtractor<GrpcRequest>) clientSpanNameExtractor.apply(input));
}

/** Sets custom client {@link SpanNameExtractor} via transform function. */
@CanIgnoreReturnValue
public GrpcTelemetryBuilder setClientSpanNameExtractor(
Expand All @@ -119,22 +102,6 @@ public GrpcTelemetryBuilder setClientSpanNameExtractor(
return this;
}

/**
* Sets custom server {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setServerSpanNameExtractor(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
@SuppressWarnings("unchecked") // cast result to SpanNameExtractor<GrpcRequest>
public GrpcTelemetryBuilder setServerSpanNameExtractor(
Function<SpanNameExtractor<GrpcRequest>, ? extends SpanNameExtractor<? super GrpcRequest>>
serverSpanNameExtractor) {
return setServerSpanNameExtractor(
(UnaryOperator<SpanNameExtractor<GrpcRequest>>)
input -> (SpanNameExtractor<GrpcRequest>) serverSpanNameExtractor.apply(input));
}

/** Sets custom server {@link SpanNameExtractor} via transform function. */
@CanIgnoreReturnValue
public GrpcTelemetryBuilder setServerSpanNameExtractor(
Expand Down
15 changes: 0 additions & 15 deletions .../java/io/opentelemetry/instrumentation/javahttpclient/JavaHttpClientTelemetryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.util.Collection;
import java.util.function.Function;
import java.util.function.UnaryOperator;

public final class JavaHttpClientTelemetryBuilder {
Expand Down Expand Up @@ -89,20 +88,6 @@ public JavaHttpClientTelemetryBuilder setKnownMethods(Collection<String> knownMe
return this;
}

/**
* Sets custom {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public JavaHttpClientTelemetryBuilder setSpanNameExtractor(
Function<SpanNameExtractor<HttpRequest>, SpanNameExtractor<HttpRequest>>
spanNameExtractorTransformer) {
return setSpanNameExtractor(
(UnaryOperator<SpanNameExtractor<HttpRequest>>) spanNameExtractorTransformer::apply);
}

/** Sets custom {@link SpanNameExtractor} via transform function. */
@CanIgnoreReturnValue
public JavaHttpClientTelemetryBuilder setSpanNameExtractor(
Expand Down
31 changes: 0 additions & 31 deletions .../java/io/opentelemetry/instrumentation/javahttpserver/JavaHttpServerTelemetryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import io.opentelemetry.instrumentation.javahttpserver.internal.Experimental;
import io.opentelemetry.instrumentation.javahttpserver.internal.JavaHttpServerInstrumenterBuilderUtil;
import java.util.Collection;
import java.util.function.Function;
import java.util.function.UnaryOperator;

public final class JavaHttpServerTelemetryBuilder {
Expand All @@ -40,22 +39,6 @@ public final class JavaHttpServerTelemetryBuilder {
JavaHttpServerExchangeGetter.INSTANCE);
}

/**
* Sets the status extractor for server spans.
*
* @deprecated Use {@link #setStatusExtractor(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public JavaHttpServerTelemetryBuilder setStatusExtractor(
Function<
SpanStatusExtractor<HttpExchange, HttpExchange>,
SpanStatusExtractor<HttpExchange, HttpExchange>>
statusExtractor) {
return setStatusExtractor(
(UnaryOperator<SpanStatusExtractor<HttpExchange, HttpExchange>>) statusExtractor::apply);
}

/** Sets the status extractor for server spans. */
@CanIgnoreReturnValue
public JavaHttpServerTelemetryBuilder setStatusExtractor(
Expand Down Expand Up @@ -118,20 +101,6 @@ public JavaHttpServerTelemetryBuilder setKnownMethods(Collection<String> knownMe
return this;
}

/**
* Sets custom {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setSpanNameExtractor(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public JavaHttpServerTelemetryBuilder setSpanNameExtractor(
Function<SpanNameExtractor<HttpExchange>, SpanNameExtractor<HttpExchange>>
spanNameExtractorTransformer) {
return setSpanNameExtractor(
(UnaryOperator<SpanNameExtractor<HttpExchange>>) spanNameExtractorTransformer::apply);
}

/** Sets custom {@link SpanNameExtractor} via transform function. */
@CanIgnoreReturnValue
public JavaHttpServerTelemetryBuilder setSpanNameExtractor(
Expand Down
Loading
Loading