Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,6 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection<String> known
return this;
}

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

/**
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
* one.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,6 @@ public ApacheHttpClientTelemetryBuilder setKnownMethods(Collection<String> known
return this;
}

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

/**
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
* one.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,6 @@ public final class ArmeriaClientTelemetryBuilder {
builder = ArmeriaInstrumenterBuilderFactory.getClientBuilder(openTelemetry);
}

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

/**
* Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a
* customized one.
Expand Down Expand Up @@ -114,18 +102,6 @@ public ArmeriaClientTelemetryBuilder setKnownMethods(Collection<String> knownMet
return this;
}

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

/**
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
* one.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,6 @@ public final class ArmeriaServerTelemetryBuilder {
builder = ArmeriaInstrumenterBuilderFactory.getServerBuilder(openTelemetry);
}

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

/**
* Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a
* customized one.
Expand Down Expand Up @@ -112,18 +100,6 @@ public ArmeriaServerTelemetryBuilder setKnownMethods(Collection<String> knownMet
return this;
}

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

/**
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
* one.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,6 @@ public final class HelidonTelemetryBuilder {
HelidonRequestGetter.INSTANCE);
}

/**
* Sets the status extractor for server spans.
*
* @deprecated Use {@link #setSpanStatusExtractorCustomizer(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public HelidonTelemetryBuilder setStatusExtractor(
UnaryOperator<SpanStatusExtractor<ServerRequest, ServerResponse>> statusExtractor) {
return setSpanStatusExtractorCustomizer(statusExtractor);
}

/**
* Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a
* customized one.
Expand Down Expand Up @@ -116,18 +104,6 @@ public HelidonTelemetryBuilder setKnownMethods(Collection<String> knownMethods)
return this;
}

/**
* Sets custom server {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public HelidonTelemetryBuilder setSpanNameExtractor(
UnaryOperator<SpanNameExtractor<ServerRequest>> serverSpanNameExtractor) {
return setSpanNameExtractorCustomizer(serverSpanNameExtractor);
}

/**
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
* one.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,6 @@ public JavaHttpClientTelemetryBuilder setKnownMethods(Collection<String> knownMe
return this;
}

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

/**
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
* one.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,6 @@ public final class JavaHttpServerTelemetryBuilder {
JavaHttpServerExchangeGetter.INSTANCE);
}

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

/**
* Sets a customizer that receives the default {@link SpanStatusExtractor} and returns a
* customized one.
Expand Down Expand Up @@ -117,18 +105,6 @@ public JavaHttpServerTelemetryBuilder setKnownMethods(Collection<String> knownMe
return this;
}

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

/**
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
* one.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,18 +102,6 @@ public JettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMetho
return this;
}

/**
* Sets custom {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public JettyClientTelemetryBuilder setSpanNameExtractor(
UnaryOperator<SpanNameExtractor<Request>> spanNameExtractorTransformer) {
return setSpanNameExtractorCustomizer(spanNameExtractorTransformer);
}

/**
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
* one.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,18 +102,6 @@ public JettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMetho
return this;
}

/**
* Sets custom {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public JettyClientTelemetryBuilder setSpanNameExtractor(
UnaryOperator<SpanNameExtractor<Request>> spanNameExtractorTransformer) {
return setSpanNameExtractorCustomizer(spanNameExtractorTransformer);
}

/**
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
* one.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,6 @@ abstract class AbstractKtorClientTelemetryBuilder(
})
}

@Deprecated("Use spanNameExtractor(UnaryOperator) instead", ReplaceWith("spanNameExtractor(spanNameExtractorTransformer::apply)"))
fun spanNameExtractor(spanNameExtractorTransformer: Function<SpanNameExtractor<HttpRequestData>, SpanNameExtractor<HttpRequestData>>) {
spanNameExtractor(spanNameExtractorTransformer::apply)
}

fun spanNameExtractor(spanNameExtractor: UnaryOperator<SpanNameExtractor<HttpRequestData>>) {
builder.setSpanNameExtractorCustomizer(spanNameExtractor)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,6 @@ abstract class AbstractKtorServerTelemetryBuilder(private val instrumentationNam
)
}

@Deprecated("Use spanNameExtractor(UnaryOperator) instead", ReplaceWith("spanNameExtractor(spanNameExtractorTransformer::apply)"))
fun spanNameExtractor(spanNameExtractorTransformer: Function<SpanNameExtractor<ApplicationRequest>, SpanNameExtractor<ApplicationRequest>>) {
spanNameExtractor(spanNameExtractorTransformer::apply)
}

fun spanNameExtractor(spanNameExtractor: UnaryOperator<SpanNameExtractor<ApplicationRequest>>) {
builder.setSpanNameExtractorCustomizer(spanNameExtractor)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,6 @@ public NettyClientTelemetryBuilder setKnownMethods(Collection<String> knownMetho
return this;
}

/**
* Sets custom {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public NettyClientTelemetryBuilder setSpanNameExtractor(
UnaryOperator<SpanNameExtractor<NettyRequest>> spanNameExtractorTransformer) {
return setSpanNameExtractorCustomizer(spanNameExtractorTransformer);
}

/**
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
* one.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,18 +86,6 @@ public OkHttpTelemetryBuilder setKnownMethods(Collection<String> knownMethods) {
return this;
}

/**
* Sets custom {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public OkHttpTelemetryBuilder setSpanNameExtractor(
UnaryOperator<SpanNameExtractor<Interceptor.Chain>> spanNameExtractorTransformer) {
return setSpanNameExtractorCustomizer(spanNameExtractorTransformer);
}

/**
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
* one.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,6 @@ public RatpackClientTelemetryBuilder setKnownMethods(Collection<String> knownMet
return this;
}

/**
* Sets custom client {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public RatpackClientTelemetryBuilder setSpanNameExtractor(
UnaryOperator<SpanNameExtractor<RequestSpec>> clientSpanNameExtractor) {
return setSpanNameExtractorCustomizer(clientSpanNameExtractor);
}

/**
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
* one.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,6 @@ public RatpackServerTelemetryBuilder setKnownMethods(Collection<String> knownMet
return this;
}

/**
* Sets custom server {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public RatpackServerTelemetryBuilder setSpanNameExtractor(
UnaryOperator<SpanNameExtractor<Request>> serverSpanNameExtractor) {
return setSpanNameExtractorCustomizer(serverSpanNameExtractor);
}

/**
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
* one.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,6 @@ public RestletTelemetryBuilder setKnownMethods(Collection<String> knownMethods)
return this;
}

/**
* Sets custom {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public RestletTelemetryBuilder setSpanNameExtractor(
UnaryOperator<SpanNameExtractor<Request>> spanNameExtractorTransformer) {
return setSpanNameExtractorCustomizer(spanNameExtractorTransformer);
}

/**
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
* one.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,6 @@ public RestletTelemetryBuilder setKnownMethods(Collection<String> knownMethods)
return this;
}

/**
* Sets custom {@link SpanNameExtractor} via transform function.
*
* @deprecated Use {@link #setSpanNameExtractorCustomizer(UnaryOperator)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
public RestletTelemetryBuilder setSpanNameExtractor(
UnaryOperator<SpanNameExtractor<Request>> spanNameExtractorTransformer) {
return setSpanNameExtractorCustomizer(spanNameExtractorTransformer);
}

/**
* Sets a customizer that receives the default {@link SpanNameExtractor} and returns a customized
* one.
Expand Down
Loading
Loading