Change `setCaptured*Headers(List)` to `setCaptured*Headers(Collection)` (#12901)
This commit is contained in:
parent
5f135ba9ff
commit
6b9e68ebfd
|
@ -1,2 +1,11 @@
|
||||||
Comparing source compatibility of opentelemetry-instrumentation-api-2.12.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.11.0.jar
|
Comparing source compatibility of opentelemetry-instrumentation-api-2.12.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.11.0.jar
|
||||||
No changes.
|
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder (not serializable)
|
||||||
|
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
|
||||||
|
GENERIC TEMPLATES: === REQUEST:java.lang.Object, === RESPONSE:java.lang.Object
|
||||||
|
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder<REQUEST,RESPONSE> setCapturedRequestHeaders(java.util.Collection<java.lang.String>)
|
||||||
|
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder<REQUEST,RESPONSE> setCapturedResponseHeaders(java.util.Collection<java.lang.String>)
|
||||||
|
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder (not serializable)
|
||||||
|
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
|
||||||
|
GENERIC TEMPLATES: === REQUEST:java.lang.Object, === RESPONSE:java.lang.Object
|
||||||
|
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder<REQUEST,RESPONSE> setCapturedRequestHeaders(java.util.Collection<java.lang.String>)
|
||||||
|
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder<REQUEST,RESPONSE> setCapturedResponseHeaders(java.util.Collection<java.lang.String>)
|
||||||
|
|
|
@ -28,6 +28,7 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
@ -126,7 +127,7 @@ public final class DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
|
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
|
||||||
List<String> requestHeaders) {
|
Collection<String> requestHeaders) {
|
||||||
httpAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders);
|
httpAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -138,7 +139,7 @@ public final class DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
|
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
|
||||||
List<String> responseHeaders) {
|
Collection<String> responseHeaders) {
|
||||||
httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders);
|
httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,6 +27,7 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
@ -124,7 +125,7 @@ public final class DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
|
public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
|
||||||
List<String> requestHeaders) {
|
Collection<String> requestHeaders) {
|
||||||
httpAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders);
|
httpAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -136,7 +137,7 @@ public final class DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
|
public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
|
||||||
List<String> responseHeaders) {
|
Collection<String> responseHeaders) {
|
||||||
httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders);
|
httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,8 @@ import static java.util.Collections.emptyList;
|
||||||
|
|
||||||
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
||||||
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
|
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/** A builder of {@link MessagingAttributesExtractor}. */
|
/** A builder of {@link MessagingAttributesExtractor}. */
|
||||||
|
@ -35,8 +37,8 @@ public final class MessagingAttributesExtractorBuilder<REQUEST, RESPONSE> {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public MessagingAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedHeaders(
|
public MessagingAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedHeaders(
|
||||||
List<String> capturedHeaders) {
|
Collection<String> capturedHeaders) {
|
||||||
this.capturedHeaders = capturedHeaders;
|
this.capturedHeaders = new ArrayList<>(capturedHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.api.semconv.network.internal.InternalNet
|
||||||
import io.opentelemetry.instrumentation.api.semconv.network.internal.InternalServerAttributesExtractor;
|
import io.opentelemetry.instrumentation.api.semconv.network.internal.InternalServerAttributesExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.network.internal.ServerAddressAndPortExtractor;
|
import io.opentelemetry.instrumentation.api.semconv.network.internal.ServerAddressAndPortExtractor;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
@ -57,11 +58,29 @@ public final class HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE> {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
|
public HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
|
||||||
List<String> requestHeaders) {
|
Collection<String> requestHeaders) {
|
||||||
this.capturedRequestHeaders = new ArrayList<>(requestHeaders);
|
this.capturedRequestHeaders = new ArrayList<>(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configures the HTTP request headers that will be captured as span attributes as described in <a
|
||||||
|
* href="https://github.com/open-telemetry/semantic-conventions/blob/v1.23.0/docs/http/http-spans.md#http-client">HTTP
|
||||||
|
* semantic conventions</a>.
|
||||||
|
*
|
||||||
|
* <p>The HTTP request header values will be captured under the {@code http.request.header.<key>}
|
||||||
|
* attribute key. The {@code <key>} part in the attribute key is the lowercase header name.
|
||||||
|
*
|
||||||
|
* @param requestHeaders A list of HTTP header names.
|
||||||
|
*/
|
||||||
|
// don't deprecate this since users will get deprecation warning without a clean way to suppress
|
||||||
|
// it if they're using List
|
||||||
|
@CanIgnoreReturnValue
|
||||||
|
public HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
|
||||||
|
List<String> requestHeaders) {
|
||||||
|
return setCapturedRequestHeaders((Collection<String>) requestHeaders);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configures the HTTP response headers that will be captured as span attributes as described in
|
* Configures the HTTP response headers that will be captured as span attributes as described in
|
||||||
* <a
|
* <a
|
||||||
|
@ -76,11 +95,31 @@ public final class HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE> {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
|
public HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
|
||||||
List<String> responseHeaders) {
|
Collection<String> responseHeaders) {
|
||||||
this.capturedResponseHeaders = new ArrayList<>(responseHeaders);
|
this.capturedResponseHeaders = new ArrayList<>(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configures the HTTP response headers that will be captured as span attributes as described in
|
||||||
|
* <a
|
||||||
|
* href="https://github.com/open-telemetry/semantic-conventions/blob/v1.23.0/docs/http/http-spans.md#common-attributes">HTTP
|
||||||
|
* semantic conventions</a>.
|
||||||
|
*
|
||||||
|
* <p>The HTTP response header values will be captured under the {@code
|
||||||
|
* http.response.header.<key>} attribute key. The {@code <key>} part in the attribute key is the
|
||||||
|
* lowercase header name.
|
||||||
|
*
|
||||||
|
* @param responseHeaders A list of HTTP header names.
|
||||||
|
*/
|
||||||
|
// don't deprecate this since users will get deprecation warning without a clean way to suppress
|
||||||
|
// it if they're using List
|
||||||
|
@CanIgnoreReturnValue
|
||||||
|
public HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
|
||||||
|
List<String> responseHeaders) {
|
||||||
|
return setCapturedResponseHeaders((Collection<String>) responseHeaders);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configures the extractor to recognize an alternative set of HTTP request methods.
|
* Configures the extractor to recognize an alternative set of HTTP request methods.
|
||||||
*
|
*
|
||||||
|
|
|
@ -19,6 +19,7 @@ import io.opentelemetry.instrumentation.api.semconv.network.internal.InternalNet
|
||||||
import io.opentelemetry.instrumentation.api.semconv.network.internal.InternalServerAttributesExtractor;
|
import io.opentelemetry.instrumentation.api.semconv.network.internal.InternalServerAttributesExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.url.internal.InternalUrlAttributesExtractor;
|
import io.opentelemetry.instrumentation.api.semconv.url.internal.InternalUrlAttributesExtractor;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
@ -63,11 +64,30 @@ public final class HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE> {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
|
public HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
|
||||||
List<String> requestHeaders) {
|
Collection<String> requestHeaders) {
|
||||||
this.capturedRequestHeaders = new ArrayList<>(requestHeaders);
|
this.capturedRequestHeaders = new ArrayList<>(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configures the HTTP response headers that will be captured as span attributes as described in
|
||||||
|
* <a
|
||||||
|
* href="https://github.com/open-telemetry/semantic-conventions/blob/v1.23.0/docs/http/http-spans.md#http-server-semantic-conventions">HTTP
|
||||||
|
* semantic conventions</a>.
|
||||||
|
*
|
||||||
|
* <p>The HTTP request header values will be captured under the {@code http.request.header.<key>}
|
||||||
|
* attribute key. The {@code <key>} part in the attribute key is the lowercase header name.
|
||||||
|
*
|
||||||
|
* @param requestHeaders A list of HTTP header names.
|
||||||
|
*/
|
||||||
|
// don't deprecate this since users will get deprecation warning without a clean way to suppress
|
||||||
|
// it if they're using List
|
||||||
|
@CanIgnoreReturnValue
|
||||||
|
public HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
|
||||||
|
List<String> requestHeaders) {
|
||||||
|
return setCapturedRequestHeaders((Collection<String>) requestHeaders);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configures the HTTP response headers that will be captured as span attributes as described in
|
* Configures the HTTP response headers that will be captured as span attributes as described in
|
||||||
* <a
|
* <a
|
||||||
|
@ -82,11 +102,31 @@ public final class HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE> {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
|
public HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
|
||||||
List<String> responseHeaders) {
|
Collection<String> responseHeaders) {
|
||||||
this.capturedResponseHeaders = new ArrayList<>(responseHeaders);
|
this.capturedResponseHeaders = new ArrayList<>(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configures the HTTP response headers that will be captured as span attributes as described in
|
||||||
|
* <a
|
||||||
|
* href="https://github.com/open-telemetry/semantic-conventions/blob/v1.23.0/docs/http/http-spans.md#common-attributes">HTTP
|
||||||
|
* semantic conventions</a>.
|
||||||
|
*
|
||||||
|
* <p>The HTTP response header values will be captured under the {@code
|
||||||
|
* http.response.header.<key>} attribute key. The {@code <key>} part in the attribute key is the
|
||||||
|
* lowercase header name.
|
||||||
|
*
|
||||||
|
* @param responseHeaders A list of HTTP header names.
|
||||||
|
*/
|
||||||
|
// don't deprecate this since users will get deprecation warning without a clean way to suppress
|
||||||
|
// it if they're using List
|
||||||
|
@CanIgnoreReturnValue
|
||||||
|
public HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
|
||||||
|
List<String> responseHeaders) {
|
||||||
|
return setCapturedResponseHeaders((Collection<String>) responseHeaders);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configures the extractor to recognize an alternative set of HTTP request methods.
|
* Configures the extractor to recognize an alternative set of HTTP request methods.
|
||||||
*
|
*
|
||||||
|
|
|
@ -12,7 +12,7 @@ import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHt
|
||||||
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
|
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
|
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import org.apache.http.HttpResponse;
|
import org.apache.http.HttpResponse;
|
||||||
|
@ -69,7 +69,8 @@ public final class ApacheHttpClientTelemetryBuilder {
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
|
public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders(
|
||||||
|
Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -80,7 +81,8 @@ public final class ApacheHttpClientTelemetryBuilder {
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
|
public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(
|
||||||
|
Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHt
|
||||||
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
|
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
|
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import org.apache.hc.core5.http.HttpResponse;
|
import org.apache.hc.core5.http.HttpResponse;
|
||||||
|
@ -54,7 +54,8 @@ public final class ApacheHttpClientTelemetryBuilder {
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
|
public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders(
|
||||||
|
Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -65,7 +66,8 @@ public final class ApacheHttpClientTelemetryBuilder {
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
|
public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(
|
||||||
|
Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExt
|
||||||
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderFactory;
|
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderFactory;
|
||||||
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderUtil;
|
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderUtil;
|
||||||
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
|
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
|
@ -65,7 +65,8 @@ public final class ArmeriaClientTelemetryBuilder {
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public ArmeriaClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
|
public ArmeriaClientTelemetryBuilder setCapturedRequestHeaders(
|
||||||
|
Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -76,7 +77,8 @@ public final class ArmeriaClientTelemetryBuilder {
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public ArmeriaClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
|
public ArmeriaClientTelemetryBuilder setCapturedResponseHeaders(
|
||||||
|
Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExt
|
||||||
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderFactory;
|
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderFactory;
|
||||||
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderUtil;
|
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderUtil;
|
||||||
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
|
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
|
@ -63,7 +63,8 @@ public final class ArmeriaServerTelemetryBuilder {
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public ArmeriaServerTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
|
public ArmeriaServerTelemetryBuilder setCapturedRequestHeaders(
|
||||||
|
Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -74,7 +75,8 @@ public final class ArmeriaServerTelemetryBuilder {
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public ArmeriaServerTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
|
public ArmeriaServerTelemetryBuilder setCapturedResponseHeaders(
|
||||||
|
Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,7 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExt
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
|
||||||
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderFactory;
|
import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaInstrumenterBuilderFactory;
|
||||||
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
|
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
@ -158,7 +159,8 @@ public final class ArmeriaTelemetryBuilder {
|
||||||
* Configures the HTTP client request headers that will be captured as span attributes.
|
* Configures the HTTP client request headers that will be captured as span attributes.
|
||||||
*
|
*
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
* @deprecated Use {@link ArmeriaClientTelemetryBuilder#setCapturedRequestHeaders(List)} instead.
|
* @deprecated Use {@link ArmeriaClientTelemetryBuilder#setCapturedRequestHeaders(Collection)}
|
||||||
|
* instead.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
|
@ -171,7 +173,8 @@ public final class ArmeriaTelemetryBuilder {
|
||||||
* Configures the HTTP client response headers that will be captured as span attributes.
|
* Configures the HTTP client response headers that will be captured as span attributes.
|
||||||
*
|
*
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
* @deprecated Use {@link ArmeriaClientTelemetryBuilder#setCapturedResponseHeaders(List)} instead.
|
* @deprecated Use {@link ArmeriaClientTelemetryBuilder#setCapturedResponseHeaders(Collection)}
|
||||||
|
* instead.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
|
@ -184,7 +187,8 @@ public final class ArmeriaTelemetryBuilder {
|
||||||
* Configures the HTTP server request headers that will be captured as span attributes.
|
* Configures the HTTP server request headers that will be captured as span attributes.
|
||||||
*
|
*
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
* @deprecated Use {@link ArmeriaServerTelemetryBuilder#setCapturedRequestHeaders(List)} instead.
|
* @deprecated Use {@link ArmeriaServerTelemetryBuilder#setCapturedRequestHeaders(Collection)}
|
||||||
|
* instead.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
|
@ -197,7 +201,8 @@ public final class ArmeriaTelemetryBuilder {
|
||||||
* Configures the HTTP server response headers that will be captured as span attributes.
|
* Configures the HTTP server response headers that will be captured as span attributes.
|
||||||
*
|
*
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
* @deprecated Use {@link ArmeriaServerTelemetryBuilder#setCapturedResponseHeaders(List)} instead.
|
* @deprecated Use {@link ArmeriaServerTelemetryBuilder#setCapturedResponseHeaders(Collection)}
|
||||||
|
* instead.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
|
|
|
@ -9,6 +9,8 @@ import static java.util.Collections.emptyList;
|
||||||
|
|
||||||
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
||||||
import io.opentelemetry.api.OpenTelemetry;
|
import io.opentelemetry.api.OpenTelemetry;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/** A builder of {@link AwsSdkTelemetry}. */
|
/** A builder of {@link AwsSdkTelemetry}. */
|
||||||
|
@ -30,8 +32,8 @@ public class AwsSdkTelemetryBuilder {
|
||||||
* @param capturedHeaders A list of messaging header names.
|
* @param capturedHeaders A list of messaging header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public AwsSdkTelemetryBuilder setCapturedHeaders(List<String> capturedHeaders) {
|
public AwsSdkTelemetryBuilder setCapturedHeaders(Collection<String> capturedHeaders) {
|
||||||
this.capturedHeaders = capturedHeaders;
|
this.capturedHeaders = new ArrayList<>(capturedHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,8 @@ import static java.util.Collections.emptyList;
|
||||||
|
|
||||||
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
||||||
import io.opentelemetry.api.OpenTelemetry;
|
import io.opentelemetry.api.OpenTelemetry;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/** A builder of {@link AwsSdkTelemetry}. */
|
/** A builder of {@link AwsSdkTelemetry}. */
|
||||||
|
@ -33,8 +35,8 @@ public final class AwsSdkTelemetryBuilder {
|
||||||
* @param capturedHeaders A list of messaging header names.
|
* @param capturedHeaders A list of messaging header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public AwsSdkTelemetryBuilder setCapturedHeaders(List<String> capturedHeaders) {
|
public AwsSdkTelemetryBuilder setCapturedHeaders(Collection<String> capturedHeaders) {
|
||||||
this.capturedHeaders = capturedHeaders;
|
this.capturedHeaders = new ArrayList<>(capturedHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ import io.opentelemetry.instrumentation.httpclient.internal.HttpHeadersSetter;
|
||||||
import io.opentelemetry.instrumentation.httpclient.internal.JavaHttpClientInstrumenterBuilderFactory;
|
import io.opentelemetry.instrumentation.httpclient.internal.JavaHttpClientInstrumenterBuilderFactory;
|
||||||
import java.net.http.HttpRequest;
|
import java.net.http.HttpRequest;
|
||||||
import java.net.http.HttpResponse;
|
import java.net.http.HttpResponse;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
|
@ -66,7 +66,8 @@ public final class JavaHttpClientTelemetryBuilder {
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public JavaHttpClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
|
public JavaHttpClientTelemetryBuilder setCapturedRequestHeaders(
|
||||||
|
Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -77,7 +78,8 @@ public final class JavaHttpClientTelemetryBuilder {
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public JavaHttpClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
|
public JavaHttpClientTelemetryBuilder setCapturedResponseHeaders(
|
||||||
|
Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
|
||||||
import io.opentelemetry.instrumentation.jetty.httpclient.v12_0.internal.Experimental;
|
import io.opentelemetry.instrumentation.jetty.httpclient.v12_0.internal.Experimental;
|
||||||
import io.opentelemetry.instrumentation.jetty.httpclient.v12_0.internal.JettyHttpClientInstrumenterBuilderFactory;
|
import io.opentelemetry.instrumentation.jetty.httpclient.v12_0.internal.JettyHttpClientInstrumenterBuilderFactory;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import org.eclipse.jetty.client.HttpClientTransport;
|
import org.eclipse.jetty.client.HttpClientTransport;
|
||||||
|
@ -81,7 +81,7 @@ public final class JettyClientTelemetryBuilder {
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public JettyClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
|
public JettyClientTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -92,7 +92,8 @@ public final class JettyClientTelemetryBuilder {
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public JettyClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
|
public JettyClientTelemetryBuilder setCapturedResponseHeaders(
|
||||||
|
Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
|
||||||
import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal.Experimental;
|
import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal.Experimental;
|
||||||
import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal.JettyHttpClientInstrumenterBuilderFactory;
|
import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal.JettyHttpClientInstrumenterBuilderFactory;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import org.eclipse.jetty.client.HttpClientTransport;
|
import org.eclipse.jetty.client.HttpClientTransport;
|
||||||
|
@ -81,7 +81,7 @@ public final class JettyClientTelemetryBuilder {
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public JettyClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
|
public JettyClientTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -92,7 +92,8 @@ public final class JettyClientTelemetryBuilder {
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public JettyClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
|
public JettyClientTelemetryBuilder setCapturedResponseHeaders(
|
||||||
|
Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
|
||||||
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
|
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
|
||||||
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
|
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.internal.PropagatorBasedSpanLinksExtractor;
|
import io.opentelemetry.instrumentation.api.internal.PropagatorBasedSpanLinksExtractor;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public final class JmsInstrumenterFactory {
|
public final class JmsInstrumenterFactory {
|
||||||
|
@ -32,8 +34,8 @@ public final class JmsInstrumenterFactory {
|
||||||
}
|
}
|
||||||
|
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public JmsInstrumenterFactory setCapturedHeaders(List<String> capturedHeaders) {
|
public JmsInstrumenterFactory setCapturedHeaders(Collection<String> capturedHeaders) {
|
||||||
this.capturedHeaders = capturedHeaders;
|
this.capturedHeaders = new ArrayList<>(capturedHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,7 @@ import io.opentelemetry.instrumentation.kafka.internal.KafkaProcessRequest;
|
||||||
import io.opentelemetry.instrumentation.kafka.internal.KafkaProducerRequest;
|
import io.opentelemetry.instrumentation.kafka.internal.KafkaProducerRequest;
|
||||||
import io.opentelemetry.instrumentation.kafka.internal.KafkaReceiveRequest;
|
import io.opentelemetry.instrumentation.kafka.internal.KafkaReceiveRequest;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import org.apache.kafka.clients.producer.RecordMetadata;
|
import org.apache.kafka.clients.producer.RecordMetadata;
|
||||||
|
@ -73,8 +74,8 @@ public final class KafkaTelemetryBuilder {
|
||||||
* @param capturedHeaders A list of messaging header names.
|
* @param capturedHeaders A list of messaging header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public KafkaTelemetryBuilder setCapturedHeaders(List<String> capturedHeaders) {
|
public KafkaTelemetryBuilder setCapturedHeaders(Collection<String> capturedHeaders) {
|
||||||
this.capturedHeaders = capturedHeaders;
|
this.capturedHeaders = new ArrayList<>(capturedHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
|
||||||
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
|
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
|
||||||
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
|
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.internal.PropagatorBasedSpanLinksExtractor;
|
import io.opentelemetry.instrumentation.api.internal.PropagatorBasedSpanLinksExtractor;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.apache.kafka.clients.producer.RecordMetadata;
|
import org.apache.kafka.clients.producer.RecordMetadata;
|
||||||
|
@ -48,8 +50,8 @@ public final class KafkaInstrumenterFactory {
|
||||||
}
|
}
|
||||||
|
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public KafkaInstrumenterFactory setCapturedHeaders(List<String> capturedHeaders) {
|
public KafkaInstrumenterFactory setCapturedHeaders(Collection<String> capturedHeaders) {
|
||||||
this.capturedHeaders = capturedHeaders;
|
this.capturedHeaders = new ArrayList<>(capturedHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyCli
|
||||||
import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyClientInstrumenterFactory;
|
import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyClientInstrumenterFactory;
|
||||||
import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyConnectionInstrumentationFlag;
|
import io.opentelemetry.instrumentation.netty.v4.common.internal.client.NettyConnectionInstrumentationFlag;
|
||||||
import io.opentelemetry.instrumentation.netty.v4_1.internal.Experimental;
|
import io.opentelemetry.instrumentation.netty.v4_1.internal.Experimental;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
|
@ -59,7 +59,7 @@ public final class NettyClientTelemetryBuilder {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public NettyClientTelemetryBuilder setCapturedRequestHeaders(
|
public NettyClientTelemetryBuilder setCapturedRequestHeaders(
|
||||||
List<String> capturedRequestHeaders) {
|
Collection<String> capturedRequestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(capturedRequestHeaders);
|
builder.setCapturedRequestHeaders(capturedRequestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -71,7 +71,7 @@ public final class NettyClientTelemetryBuilder {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public NettyClientTelemetryBuilder setCapturedResponseHeaders(
|
public NettyClientTelemetryBuilder setCapturedResponseHeaders(
|
||||||
List<String> capturedResponseHeaders) {
|
Collection<String> capturedResponseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(capturedResponseHeaders);
|
builder.setCapturedResponseHeaders(capturedResponseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,7 @@ import io.opentelemetry.instrumentation.netty.v4.common.internal.server.NettyHtt
|
||||||
import io.opentelemetry.instrumentation.netty.v4_1.internal.Experimental;
|
import io.opentelemetry.instrumentation.netty.v4_1.internal.Experimental;
|
||||||
import io.opentelemetry.instrumentation.netty.v4_1.internal.ProtocolEventHandler;
|
import io.opentelemetry.instrumentation.netty.v4_1.internal.ProtocolEventHandler;
|
||||||
import io.opentelemetry.instrumentation.netty.v4_1.internal.server.NettyServerInstrumenterBuilderUtil;
|
import io.opentelemetry.instrumentation.netty.v4_1.internal.server.NettyServerInstrumenterBuilderUtil;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
/** A builder of {@link NettyServerTelemetry}. */
|
/** A builder of {@link NettyServerTelemetry}. */
|
||||||
|
@ -64,7 +64,7 @@ public final class NettyServerTelemetryBuilder {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public NettyServerTelemetryBuilder setCapturedRequestHeaders(
|
public NettyServerTelemetryBuilder setCapturedRequestHeaders(
|
||||||
List<String> capturedRequestHeaders) {
|
Collection<String> capturedRequestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(capturedRequestHeaders);
|
builder.setCapturedRequestHeaders(capturedRequestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,7 @@ public final class NettyServerTelemetryBuilder {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public NettyServerTelemetryBuilder setCapturedResponseHeaders(
|
public NettyServerTelemetryBuilder setCapturedResponseHeaders(
|
||||||
List<String> capturedResponseHeaders) {
|
Collection<String> capturedResponseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(capturedResponseHeaders);
|
builder.setCapturedResponseHeaders(capturedResponseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
|
||||||
import io.opentelemetry.instrumentation.okhttp.v3_0.internal.Experimental;
|
import io.opentelemetry.instrumentation.okhttp.v3_0.internal.Experimental;
|
||||||
import io.opentelemetry.instrumentation.okhttp.v3_0.internal.OkHttpClientInstrumenterBuilderFactory;
|
import io.opentelemetry.instrumentation.okhttp.v3_0.internal.OkHttpClientInstrumenterBuilderFactory;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import okhttp3.Interceptor;
|
import okhttp3.Interceptor;
|
||||||
|
@ -66,7 +66,7 @@ public final class OkHttpTelemetryBuilder {
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public OkHttpTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
|
public OkHttpTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -77,7 +77,7 @@ public final class OkHttpTelemetryBuilder {
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public OkHttpTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
|
public OkHttpTelemetryBuilder setCapturedResponseHeaders(Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
|
||||||
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.Experimental;
|
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.Experimental;
|
||||||
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackClientInstrumenterBuilderFactory;
|
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackClientInstrumenterBuilderFactory;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import ratpack.http.client.HttpResponse;
|
import ratpack.http.client.HttpResponse;
|
||||||
|
@ -48,7 +48,8 @@ public final class RatpackClientTelemetryBuilder {
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public RatpackClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
|
public RatpackClientTelemetryBuilder setCapturedRequestHeaders(
|
||||||
|
Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -59,7 +60,8 @@ public final class RatpackClientTelemetryBuilder {
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public RatpackClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
|
public RatpackClientTelemetryBuilder setCapturedResponseHeaders(
|
||||||
|
Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
|
||||||
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.Experimental;
|
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.Experimental;
|
||||||
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackServerInstrumenterBuilderFactory;
|
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackServerInstrumenterBuilderFactory;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import ratpack.http.Request;
|
import ratpack.http.Request;
|
||||||
|
@ -52,7 +52,8 @@ public final class RatpackServerTelemetryBuilder {
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public RatpackServerTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
|
public RatpackServerTelemetryBuilder setCapturedRequestHeaders(
|
||||||
|
Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -63,7 +64,8 @@ public final class RatpackServerTelemetryBuilder {
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public RatpackServerTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
|
public RatpackServerTelemetryBuilder setCapturedResponseHeaders(
|
||||||
|
Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,6 +16,7 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExt
|
||||||
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.Experimental;
|
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.Experimental;
|
||||||
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackClientInstrumenterBuilderFactory;
|
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackClientInstrumenterBuilderFactory;
|
||||||
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackServerInstrumenterBuilderFactory;
|
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackServerInstrumenterBuilderFactory;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
@ -76,7 +77,8 @@ public final class RatpackTelemetryBuilder {
|
||||||
* Configures the HTTP server request headers that will be captured as span attributes.
|
* Configures the HTTP server request headers that will be captured as span attributes.
|
||||||
*
|
*
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
* @deprecated Use {@link RatpackServerTelemetryBuilder#setCapturedRequestHeaders(List)} instead.
|
* @deprecated Use {@link RatpackServerTelemetryBuilder#setCapturedRequestHeaders(Collection)}
|
||||||
|
* instead.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
|
@ -89,7 +91,8 @@ public final class RatpackTelemetryBuilder {
|
||||||
* Configures the HTTP server response headers that will be captured as span attributes.
|
* Configures the HTTP server response headers that will be captured as span attributes.
|
||||||
*
|
*
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
* @deprecated Use {@link RatpackServerTelemetryBuilder#setCapturedResponseHeaders(List)} instead.
|
* @deprecated Use {@link RatpackServerTelemetryBuilder#setCapturedResponseHeaders(Collection)}
|
||||||
|
* instead.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
|
@ -102,7 +105,8 @@ public final class RatpackTelemetryBuilder {
|
||||||
* Configures the HTTP client request headers that will be captured as span attributes.
|
* Configures the HTTP client request headers that will be captured as span attributes.
|
||||||
*
|
*
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
* @deprecated Use {@link RatpackClientTelemetryBuilder#setCapturedRequestHeaders(List)} instead.
|
* @deprecated Use {@link RatpackClientTelemetryBuilder#setCapturedRequestHeaders(Collection)}
|
||||||
|
* instead.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
|
@ -115,7 +119,8 @@ public final class RatpackTelemetryBuilder {
|
||||||
* Configures the HTTP client response headers that will be captured as span attributes.
|
* Configures the HTTP client response headers that will be captured as span attributes.
|
||||||
*
|
*
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
* @deprecated Use {@link RatpackClientTelemetryBuilder#setCapturedResponseHeaders(List)} instead.
|
* @deprecated Use {@link RatpackClientTelemetryBuilder#setCapturedResponseHeaders(Collection)}
|
||||||
|
* instead.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
|
|
|
@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
|
||||||
import io.opentelemetry.instrumentation.restlet.v1_1.internal.Experimental;
|
import io.opentelemetry.instrumentation.restlet.v1_1.internal.Experimental;
|
||||||
import io.opentelemetry.instrumentation.restlet.v1_1.internal.RestletTelemetryBuilderFactory;
|
import io.opentelemetry.instrumentation.restlet.v1_1.internal.RestletTelemetryBuilderFactory;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import org.restlet.data.Request;
|
import org.restlet.data.Request;
|
||||||
|
@ -50,7 +50,7 @@ public final class RestletTelemetryBuilder {
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public RestletTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
|
public RestletTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -61,7 +61,7 @@ public final class RestletTelemetryBuilder {
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public RestletTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
|
public RestletTelemetryBuilder setCapturedResponseHeaders(Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
|
||||||
import io.opentelemetry.instrumentation.restlet.v2_0.internal.Experimental;
|
import io.opentelemetry.instrumentation.restlet.v2_0.internal.Experimental;
|
||||||
import io.opentelemetry.instrumentation.restlet.v2_0.internal.RestletTelemetryBuilderFactory;
|
import io.opentelemetry.instrumentation.restlet.v2_0.internal.RestletTelemetryBuilderFactory;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import org.restlet.Request;
|
import org.restlet.Request;
|
||||||
|
@ -50,7 +50,7 @@ public final class RestletTelemetryBuilder {
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public RestletTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
|
public RestletTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -61,7 +61,7 @@ public final class RestletTelemetryBuilder {
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public RestletTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
|
public RestletTelemetryBuilder setCapturedResponseHeaders(Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,8 @@ import static java.util.Collections.emptyList;
|
||||||
|
|
||||||
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
||||||
import io.opentelemetry.api.OpenTelemetry;
|
import io.opentelemetry.api.OpenTelemetry;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/** A builder of {@link RocketMqTelemetry}. */
|
/** A builder of {@link RocketMqTelemetry}. */
|
||||||
|
@ -41,8 +43,8 @@ public final class RocketMqTelemetryBuilder {
|
||||||
* @param capturedHeaders A list of messaging header names.
|
* @param capturedHeaders A list of messaging header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public RocketMqTelemetryBuilder setCapturedHeaders(List<String> capturedHeaders) {
|
public RocketMqTelemetryBuilder setCapturedHeaders(Collection<String> capturedHeaders) {
|
||||||
this.capturedHeaders = capturedHeaders;
|
this.capturedHeaders = new ArrayList<>(capturedHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
|
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
|
||||||
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
|
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/** A builder of {@link SpringIntegrationTelemetry}. */
|
/** A builder of {@link SpringIntegrationTelemetry}. */
|
||||||
|
@ -51,8 +52,8 @@ public final class SpringIntegrationTelemetryBuilder {
|
||||||
* @param capturedHeaders A list of messaging header names.
|
* @param capturedHeaders A list of messaging header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public SpringIntegrationTelemetryBuilder setCapturedHeaders(List<String> capturedHeaders) {
|
public SpringIntegrationTelemetryBuilder setCapturedHeaders(Collection<String> capturedHeaders) {
|
||||||
this.capturedHeaders = capturedHeaders;
|
this.capturedHeaders = new ArrayList<>(capturedHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,8 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue;
|
||||||
import io.opentelemetry.api.OpenTelemetry;
|
import io.opentelemetry.api.OpenTelemetry;
|
||||||
import io.opentelemetry.instrumentation.kafka.internal.KafkaInstrumenterFactory;
|
import io.opentelemetry.instrumentation.kafka.internal.KafkaInstrumenterFactory;
|
||||||
import io.opentelemetry.instrumentation.spring.kafka.v2_7.internal.SpringKafkaErrorCauseExtractor;
|
import io.opentelemetry.instrumentation.spring.kafka.v2_7.internal.SpringKafkaErrorCauseExtractor;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/** A builder of {@link SpringKafkaTelemetry}. */
|
/** A builder of {@link SpringKafkaTelemetry}. */
|
||||||
|
@ -28,8 +30,8 @@ public final class SpringKafkaTelemetryBuilder {
|
||||||
}
|
}
|
||||||
|
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public SpringKafkaTelemetryBuilder setCapturedHeaders(List<String> capturedHeaders) {
|
public SpringKafkaTelemetryBuilder setCapturedHeaders(Collection<String> capturedHeaders) {
|
||||||
this.capturedHeaders = capturedHeaders;
|
this.capturedHeaders = new ArrayList<>(capturedHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
|
||||||
import io.opentelemetry.instrumentation.spring.web.v3_1.internal.Experimental;
|
import io.opentelemetry.instrumentation.spring.web.v3_1.internal.Experimental;
|
||||||
import io.opentelemetry.instrumentation.spring.web.v3_1.internal.WebTelemetryUtil;
|
import io.opentelemetry.instrumentation.spring.web.v3_1.internal.WebTelemetryUtil;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import org.springframework.http.HttpRequest;
|
import org.springframework.http.HttpRequest;
|
||||||
|
@ -74,7 +74,7 @@ public final class SpringWebTelemetryBuilder {
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public SpringWebTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
|
public SpringWebTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -85,7 +85,7 @@ public final class SpringWebTelemetryBuilder {
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public SpringWebTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
|
public SpringWebTelemetryBuilder setCapturedResponseHeaders(Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExt
|
||||||
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.Experimental;
|
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.Experimental;
|
||||||
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.SpringWebfluxBuilderUtil;
|
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.SpringWebfluxBuilderUtil;
|
||||||
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.WebClientHttpAttributesGetter;
|
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.WebClientHttpAttributesGetter;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import org.springframework.web.reactive.function.client.ClientRequest;
|
import org.springframework.web.reactive.function.client.ClientRequest;
|
||||||
|
@ -58,7 +58,7 @@ public final class SpringWebfluxClientTelemetryBuilder {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public SpringWebfluxClientTelemetryBuilder setCapturedRequestHeaders(
|
public SpringWebfluxClientTelemetryBuilder setCapturedRequestHeaders(
|
||||||
List<String> requestHeaders) {
|
Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ public final class SpringWebfluxClientTelemetryBuilder {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public SpringWebfluxClientTelemetryBuilder setCapturedResponseHeaders(
|
public SpringWebfluxClientTelemetryBuilder setCapturedResponseHeaders(
|
||||||
List<String> responseHeaders) {
|
Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
|
||||||
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.Experimental;
|
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.Experimental;
|
||||||
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.SpringWebfluxBuilderUtil;
|
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.SpringWebfluxBuilderUtil;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import org.springframework.web.server.ServerWebExchange;
|
import org.springframework.web.server.ServerWebExchange;
|
||||||
|
@ -58,7 +58,7 @@ public final class SpringWebfluxServerTelemetryBuilder {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public SpringWebfluxServerTelemetryBuilder setCapturedRequestHeaders(
|
public SpringWebfluxServerTelemetryBuilder setCapturedRequestHeaders(
|
||||||
List<String> requestHeaders) {
|
Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -71,7 +71,7 @@ public final class SpringWebfluxServerTelemetryBuilder {
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public SpringWebfluxServerTelemetryBuilder setCapturedResponseHeaders(
|
public SpringWebfluxServerTelemetryBuilder setCapturedResponseHeaders(
|
||||||
List<String> responseHeaders) {
|
Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,7 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExt
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
|
||||||
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.Experimental;
|
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.Experimental;
|
||||||
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.WebClientHttpAttributesGetter;
|
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.WebClientHttpAttributesGetter;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
@ -69,8 +70,8 @@ public final class SpringWebfluxTelemetryBuilder {
|
||||||
* Configures the HTTP WebClient request headers that will be captured as span attributes.
|
* Configures the HTTP WebClient request headers that will be captured as span attributes.
|
||||||
*
|
*
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
* @deprecated Use {@link SpringWebfluxClientTelemetryBuilder#setCapturedRequestHeaders(List)}
|
* @deprecated Use {@link
|
||||||
* instead.
|
* SpringWebfluxClientTelemetryBuilder#setCapturedRequestHeaders(Collection)} instead.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
|
@ -84,8 +85,8 @@ public final class SpringWebfluxTelemetryBuilder {
|
||||||
* Configures the HTTP WebClient response headers that will be captured as span attributes.
|
* Configures the HTTP WebClient response headers that will be captured as span attributes.
|
||||||
*
|
*
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
* @deprecated Use {@link SpringWebfluxClientTelemetryBuilder#setCapturedResponseHeaders(List)}
|
* @deprecated Use {@link
|
||||||
* instead.
|
* SpringWebfluxClientTelemetryBuilder#setCapturedResponseHeaders(Collection)} instead.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
|
@ -115,8 +116,8 @@ public final class SpringWebfluxTelemetryBuilder {
|
||||||
* instrumentation.
|
* instrumentation.
|
||||||
*
|
*
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
* @deprecated Use {@link SpringWebfluxServerTelemetryBuilder#setCapturedRequestHeaders(List)}
|
* @deprecated Use {@link
|
||||||
* instead.
|
* SpringWebfluxServerTelemetryBuilder#setCapturedRequestHeaders(Collection)} instead.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
|
@ -131,8 +132,8 @@ public final class SpringWebfluxTelemetryBuilder {
|
||||||
* instrumentation.
|
* instrumentation.
|
||||||
*
|
*
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
* @deprecated Use {@link SpringWebfluxServerTelemetryBuilder#setCapturedResponseHeaders(List)}
|
* @deprecated Use {@link
|
||||||
* instead.
|
* SpringWebfluxServerTelemetryBuilder#setCapturedResponseHeaders(Collection)} instead.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
|
|
|
@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
|
||||||
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
|
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder;
|
||||||
import io.opentelemetry.instrumentation.spring.webmvc.v5_3.internal.Experimental;
|
import io.opentelemetry.instrumentation.spring.webmvc.v5_3.internal.Experimental;
|
||||||
import io.opentelemetry.instrumentation.spring.webmvc.v5_3.internal.SpringMvcBuilderUtil;
|
import io.opentelemetry.instrumentation.spring.webmvc.v5_3.internal.SpringMvcBuilderUtil;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
@ -59,7 +59,7 @@ public final class SpringWebMvcTelemetryBuilder {
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public SpringWebMvcTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
|
public SpringWebMvcTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,8 @@ public final class SpringWebMvcTelemetryBuilder {
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
|
public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders(
|
||||||
|
Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,7 @@ import io.opentelemetry.instrumentation.spring.webmvc.v6_0.internal.Experimental
|
||||||
import io.opentelemetry.instrumentation.spring.webmvc.v6_0.internal.SpringMvcBuilderUtil;
|
import io.opentelemetry.instrumentation.spring.webmvc.v6_0.internal.SpringMvcBuilderUtil;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
import java.util.List;
|
import java.util.Collection;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ public final class SpringWebMvcTelemetryBuilder {
|
||||||
* @param requestHeaders A list of HTTP header names.
|
* @param requestHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public SpringWebMvcTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
|
public SpringWebMvcTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
|
||||||
builder.setCapturedRequestHeaders(requestHeaders);
|
builder.setCapturedRequestHeaders(requestHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -69,7 +69,8 @@ public final class SpringWebMvcTelemetryBuilder {
|
||||||
* @param responseHeaders A list of HTTP header names.
|
* @param responseHeaders A list of HTTP header names.
|
||||||
*/
|
*/
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
|
public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders(
|
||||||
|
Collection<String> responseHeaders) {
|
||||||
builder.setCapturedResponseHeaders(responseHeaders);
|
builder.setCapturedResponseHeaders(responseHeaders);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue