open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change `setCaptured*Headers(List)` to `setCaptured*Headers(Collection)` (#12901)

This commit is contained in:
Trask Stalnaker 2024-12-23 15:49:55 -08:00 committed by GitHub
parent 5f135ba9ff
commit 6b9e68ebfd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
36 changed files with 235 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt
View File

@ -1,2 +1,11 @@
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>)

5
instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java
View File

@ -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.HttpSpanStatusExtractor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@ -126,7 +127,7 @@ public final class DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> {
*/
@CanIgnoreReturnValue
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
List<String> requestHeaders) {
Collection<String> requestHeaders) {
httpAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -138,7 +139,7 @@ public final class DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> {
*/
@CanIgnoreReturnValue
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
List<String> responseHeaders) {
Collection<String> responseHeaders) {
httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders);
return this;
}

5
instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java
View File

@ -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.HttpSpanStatusExtractor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@ -124,7 +125,7 @@ public final class DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> {
*/
@CanIgnoreReturnValue
public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
List<String> requestHeaders) {
Collection<String> requestHeaders) {
httpAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -136,7 +137,7 @@ public final class DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> {
*/
@CanIgnoreReturnValue
public DefaultHttpServerInstrumenterBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
List<String> responseHeaders) {
Collection<String> responseHeaders) {
httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders);
return this;
}

6
instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractorBuilder.java
View File

@ -9,6 +9,8 @@ import static java.util.Collections.emptyList;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/** A builder of {@link MessagingAttributesExtractor}. */
@ -35,8 +37,8 @@ public final class MessagingAttributesExtractorBuilder<REQUEST, RESPONSE> {
*/
@CanIgnoreReturnValue
public MessagingAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedHeaders(
List<String> capturedHeaders) {
this.capturedHeaders = capturedHeaders;
Collection<String> capturedHeaders) {
this.capturedHeaders = new ArrayList<>(capturedHeaders);
return this;
}

43
instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorBuilder.java
View File

@ -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.ServerAddressAndPortExtractor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@ -57,11 +58,29 @@ public final class HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE> {
*/
@CanIgnoreReturnValue
public HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
List<String> requestHeaders) {
Collection<String> requestHeaders) {
this.capturedRequestHeaders = new ArrayList<>(requestHeaders);
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
* <a
@ -76,11 +95,31 @@ public final class HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE> {
*/
@CanIgnoreReturnValue
public HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
List<String> responseHeaders) {
Collection<String> responseHeaders) {
this.capturedResponseHeaders = new ArrayList<>(responseHeaders);
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.
*

44
instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorBuilder.java
View File

@ -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.url.internal.InternalUrlAttributesExtractor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@ -63,11 +64,30 @@ public final class HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE> {
*/
@CanIgnoreReturnValue
public HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedRequestHeaders(
List<String> requestHeaders) {
Collection<String> requestHeaders) {
this.capturedRequestHeaders = new ArrayList<>(requestHeaders);
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
* <a
@ -82,11 +102,31 @@ public final class HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE> {
*/
@CanIgnoreReturnValue
public HttpServerAttributesExtractorBuilder<REQUEST, RESPONSE> setCapturedResponseHeaders(
List<String> responseHeaders) {
Collection<String> responseHeaders) {
this.capturedResponseHeaders = new ArrayList<>(responseHeaders);
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.
*

8
instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java
View File

@ -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.SpanNameExtractor;
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
import org.apache.http.HttpResponse;
@ -69,7 +69,8 @@ public final class ApacheHttpClientTelemetryBuilder {
* @param requestHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders(
Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -80,7 +81,8 @@ public final class ApacheHttpClientTelemetryBuilder {
* @param responseHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(
Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

8
instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTelemetryBuilder.java
View File

@ -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.SpanNameExtractor;
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
import org.apache.hc.core5.http.HttpResponse;
@ -54,7 +54,8 @@ public final class ApacheHttpClientTelemetryBuilder {
* @param requestHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders(
Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -65,7 +66,8 @@ public final class ApacheHttpClientTelemetryBuilder {
* @param responseHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders(
Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

8
instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java
View File

@ -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.ArmeriaInstrumenterBuilderUtil;
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
@ -65,7 +65,8 @@ public final class ArmeriaClientTelemetryBuilder {
* @param requestHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public ArmeriaClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
public ArmeriaClientTelemetryBuilder setCapturedRequestHeaders(
Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -76,7 +77,8 @@ public final class ArmeriaClientTelemetryBuilder {
* @param responseHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public ArmeriaClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
public ArmeriaClientTelemetryBuilder setCapturedResponseHeaders(
Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

8
instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaServerTelemetryBuilder.java
View File

@ -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.ArmeriaInstrumenterBuilderUtil;
import io.opentelemetry.instrumentation.armeria.v1_3.internal.Experimental;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
@ -63,7 +63,8 @@ public final class ArmeriaServerTelemetryBuilder {
* @param requestHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public ArmeriaServerTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
public ArmeriaServerTelemetryBuilder setCapturedRequestHeaders(
Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -74,7 +75,8 @@ public final class ArmeriaServerTelemetryBuilder {
* @param responseHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public ArmeriaServerTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
public ArmeriaServerTelemetryBuilder setCapturedResponseHeaders(
Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

13
instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java
View File

@ -20,6 +20,7 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExt
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.Experimental;
import java.util.Collection;
import java.util.List;
import java.util.Set;
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.
*
* @param requestHeaders A list of HTTP header names.
* @deprecated Use {@link ArmeriaClientTelemetryBuilder#setCapturedRequestHeaders(List)} instead.
* @deprecated Use {@link ArmeriaClientTelemetryBuilder#setCapturedRequestHeaders(Collection)}
* instead.
*/
@Deprecated
@CanIgnoreReturnValue
@ -171,7 +173,8 @@ public final class ArmeriaTelemetryBuilder {
* Configures the HTTP client response headers that will be captured as span attributes.
*
* @param responseHeaders A list of HTTP header names.
* @deprecated Use {@link ArmeriaClientTelemetryBuilder#setCapturedResponseHeaders(List)} instead.
* @deprecated Use {@link ArmeriaClientTelemetryBuilder#setCapturedResponseHeaders(Collection)}
* instead.
*/
@Deprecated
@CanIgnoreReturnValue
@ -184,7 +187,8 @@ public final class ArmeriaTelemetryBuilder {
* Configures the HTTP server request headers that will be captured as span attributes.
*
* @param requestHeaders A list of HTTP header names.
* @deprecated Use {@link ArmeriaServerTelemetryBuilder#setCapturedRequestHeaders(List)} instead.
* @deprecated Use {@link ArmeriaServerTelemetryBuilder#setCapturedRequestHeaders(Collection)}
* instead.
*/
@Deprecated
@CanIgnoreReturnValue
@ -197,7 +201,8 @@ public final class ArmeriaTelemetryBuilder {
* Configures the HTTP server response headers that will be captured as span attributes.
*
* @param responseHeaders A list of HTTP header names.
* @deprecated Use {@link ArmeriaServerTelemetryBuilder#setCapturedResponseHeaders(List)} instead.
* @deprecated Use {@link ArmeriaServerTelemetryBuilder#setCapturedResponseHeaders(Collection)}
* instead.
*/
@Deprecated
@CanIgnoreReturnValue

6
instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkTelemetryBuilder.java
View File

@ -9,6 +9,8 @@ import static java.util.Collections.emptyList;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import io.opentelemetry.api.OpenTelemetry;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/** A builder of {@link AwsSdkTelemetry}. */
@ -30,8 +32,8 @@ public class AwsSdkTelemetryBuilder {
* @param capturedHeaders A list of messaging header names.
*/
@CanIgnoreReturnValue
public AwsSdkTelemetryBuilder setCapturedHeaders(List<String> capturedHeaders) {
this.capturedHeaders = capturedHeaders;
public AwsSdkTelemetryBuilder setCapturedHeaders(Collection<String> capturedHeaders) {
this.capturedHeaders = new ArrayList<>(capturedHeaders);
return this;
}

6
instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkTelemetryBuilder.java
View File

@ -9,6 +9,8 @@ import static java.util.Collections.emptyList;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import io.opentelemetry.api.OpenTelemetry;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/** A builder of {@link AwsSdkTelemetry}. */
@ -33,8 +35,8 @@ public final class AwsSdkTelemetryBuilder {
* @param capturedHeaders A list of messaging header names.
*/
@CanIgnoreReturnValue
public AwsSdkTelemetryBuilder setCapturedHeaders(List<String> capturedHeaders) {
this.capturedHeaders = capturedHeaders;
public AwsSdkTelemetryBuilder setCapturedHeaders(Collection<String> capturedHeaders) {
this.capturedHeaders = new ArrayList<>(capturedHeaders);
return this;
}

8
instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/httpclient/JavaHttpClientTelemetryBuilder.java
View File

@ -16,7 +16,7 @@ import io.opentelemetry.instrumentation.httpclient.internal.HttpHeadersSetter;
import io.opentelemetry.instrumentation.httpclient.internal.JavaHttpClientInstrumenterBuilderFactory;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
@ -66,7 +66,8 @@ public final class JavaHttpClientTelemetryBuilder {
* @param requestHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public JavaHttpClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
public JavaHttpClientTelemetryBuilder setCapturedRequestHeaders(
Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -77,7 +78,8 @@ public final class JavaHttpClientTelemetryBuilder {
* @param responseHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public JavaHttpClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
public JavaHttpClientTelemetryBuilder setCapturedResponseHeaders(
Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

7
instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyClientTelemetryBuilder.java
View File

@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
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.JettyHttpClientInstrumenterBuilderFactory;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
import org.eclipse.jetty.client.HttpClientTransport;
@ -81,7 +81,7 @@ public final class JettyClientTelemetryBuilder {
* @param requestHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public JettyClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
public JettyClientTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -92,7 +92,8 @@ public final class JettyClientTelemetryBuilder {
* @param responseHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public JettyClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
public JettyClientTelemetryBuilder setCapturedResponseHeaders(
Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

7
instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java
View File

@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
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.JettyHttpClientInstrumenterBuilderFactory;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
import org.eclipse.jetty.client.HttpClientTransport;
@ -81,7 +81,7 @@ public final class JettyClientTelemetryBuilder {
* @param requestHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public JettyClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
public JettyClientTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -92,7 +92,8 @@ public final class JettyClientTelemetryBuilder {
* @param responseHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public JettyClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
public JettyClientTelemetryBuilder setCapturedResponseHeaders(
Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

6
instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumenterFactory.java
View File

@ -17,6 +17,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
import io.opentelemetry.instrumentation.api.internal.PropagatorBasedSpanLinksExtractor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
public final class JmsInstrumenterFactory {
@ -32,8 +34,8 @@ public final class JmsInstrumenterFactory {
}
@CanIgnoreReturnValue
public JmsInstrumenterFactory setCapturedHeaders(List<String> capturedHeaders) {
this.capturedHeaders = capturedHeaders;
public JmsInstrumenterFactory setCapturedHeaders(Collection<String> capturedHeaders) {
this.capturedHeaders = new ArrayList<>(capturedHeaders);
return this;
}

5
instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetryBuilder.java
View File

@ -15,6 +15,7 @@ import io.opentelemetry.instrumentation.kafka.internal.KafkaProcessRequest;
import io.opentelemetry.instrumentation.kafka.internal.KafkaProducerRequest;
import io.opentelemetry.instrumentation.kafka.internal.KafkaReceiveRequest;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import org.apache.kafka.clients.producer.RecordMetadata;
@ -73,8 +74,8 @@ public final class KafkaTelemetryBuilder {
* @param capturedHeaders A list of messaging header names.
*/
@CanIgnoreReturnValue
public KafkaTelemetryBuilder setCapturedHeaders(List<String> capturedHeaders) {
this.capturedHeaders = capturedHeaders;
public KafkaTelemetryBuilder setCapturedHeaders(Collection<String> capturedHeaders) {
this.capturedHeaders = new ArrayList<>(capturedHeaders);
return this;
}

6
instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaInstrumenterFactory.java
View File

@ -19,6 +19,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.api.instrumenter.InstrumenterBuilder;
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
import io.opentelemetry.instrumentation.api.internal.PropagatorBasedSpanLinksExtractor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.apache.kafka.clients.producer.RecordMetadata;
@ -48,8 +50,8 @@ public final class KafkaInstrumenterFactory {
}
@CanIgnoreReturnValue
public KafkaInstrumenterFactory setCapturedHeaders(List<String> capturedHeaders) {
this.capturedHeaders = capturedHeaders;
public KafkaInstrumenterFactory setCapturedHeaders(Collection<String> capturedHeaders) {
this.capturedHeaders = new ArrayList<>(capturedHeaders);
return this;
}

6
instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java
View File

@ -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.NettyConnectionInstrumentationFlag;
import io.opentelemetry.instrumentation.netty.v4_1.internal.Experimental;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
@ -59,7 +59,7 @@ public final class NettyClientTelemetryBuilder {
*/
@CanIgnoreReturnValue
public NettyClientTelemetryBuilder setCapturedRequestHeaders(
List<String> capturedRequestHeaders) {
Collection<String> capturedRequestHeaders) {
builder.setCapturedRequestHeaders(capturedRequestHeaders);
return this;
}
@ -71,7 +71,7 @@ public final class NettyClientTelemetryBuilder {
*/
@CanIgnoreReturnValue
public NettyClientTelemetryBuilder setCapturedResponseHeaders(
List<String> capturedResponseHeaders) {
Collection<String> capturedResponseHeaders) {
builder.setCapturedResponseHeaders(capturedResponseHeaders);
return this;
}

6
instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetryBuilder.java
View File

@ -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.ProtocolEventHandler;
import io.opentelemetry.instrumentation.netty.v4_1.internal.server.NettyServerInstrumenterBuilderUtil;
import java.util.List;
import java.util.Collection;
import java.util.Set;
/** A builder of {@link NettyServerTelemetry}. */
@ -64,7 +64,7 @@ public final class NettyServerTelemetryBuilder {
*/
@CanIgnoreReturnValue
public NettyServerTelemetryBuilder setCapturedRequestHeaders(
List<String> capturedRequestHeaders) {
Collection<String> capturedRequestHeaders) {
builder.setCapturedRequestHeaders(capturedRequestHeaders);
return this;
}
@ -76,7 +76,7 @@ public final class NettyServerTelemetryBuilder {
*/
@CanIgnoreReturnValue
public NettyServerTelemetryBuilder setCapturedResponseHeaders(
List<String> capturedResponseHeaders) {
Collection<String> capturedResponseHeaders) {
builder.setCapturedResponseHeaders(capturedResponseHeaders);
return this;
}

6
instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpTelemetryBuilder.java
View File

@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
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.OkHttpClientInstrumenterBuilderFactory;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
import okhttp3.Interceptor;
@ -66,7 +66,7 @@ public final class OkHttpTelemetryBuilder {
* @param requestHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public OkHttpTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
public OkHttpTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -77,7 +77,7 @@ public final class OkHttpTelemetryBuilder {
* @param responseHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public OkHttpTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
public OkHttpTelemetryBuilder setCapturedResponseHeaders(Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

8
instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackClientTelemetryBuilder.java
View File

@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
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.RatpackClientInstrumenterBuilderFactory;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
import ratpack.http.client.HttpResponse;
@ -48,7 +48,8 @@ public final class RatpackClientTelemetryBuilder {
* @param requestHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public RatpackClientTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
public RatpackClientTelemetryBuilder setCapturedRequestHeaders(
Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -59,7 +60,8 @@ public final class RatpackClientTelemetryBuilder {
* @param responseHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public RatpackClientTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
public RatpackClientTelemetryBuilder setCapturedResponseHeaders(
Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

8
instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackServerTelemetryBuilder.java
View File

@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
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.RatpackServerInstrumenterBuilderFactory;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
import ratpack.http.Request;
@ -52,7 +52,8 @@ public final class RatpackServerTelemetryBuilder {
* @param requestHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public RatpackServerTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
public RatpackServerTelemetryBuilder setCapturedRequestHeaders(
Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -63,7 +64,8 @@ public final class RatpackServerTelemetryBuilder {
* @param responseHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public RatpackServerTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
public RatpackServerTelemetryBuilder setCapturedResponseHeaders(
Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

13
instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackTelemetryBuilder.java
View File

@ -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.RatpackClientInstrumenterBuilderFactory;
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.RatpackServerInstrumenterBuilderFactory;
import java.util.Collection;
import java.util.List;
import java.util.Set;
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.
*
* @param requestHeaders A list of HTTP header names.
* @deprecated Use {@link RatpackServerTelemetryBuilder#setCapturedRequestHeaders(List)} instead.
* @deprecated Use {@link RatpackServerTelemetryBuilder#setCapturedRequestHeaders(Collection)}
* instead.
*/
@Deprecated
@CanIgnoreReturnValue
@ -89,7 +91,8 @@ public final class RatpackTelemetryBuilder {
* Configures the HTTP server response headers that will be captured as span attributes.
*
* @param responseHeaders A list of HTTP header names.
* @deprecated Use {@link RatpackServerTelemetryBuilder#setCapturedResponseHeaders(List)} instead.
* @deprecated Use {@link RatpackServerTelemetryBuilder#setCapturedResponseHeaders(Collection)}
* instead.
*/
@Deprecated
@CanIgnoreReturnValue
@ -102,7 +105,8 @@ public final class RatpackTelemetryBuilder {
* Configures the HTTP client request headers that will be captured as span attributes.
*
* @param requestHeaders A list of HTTP header names.
* @deprecated Use {@link RatpackClientTelemetryBuilder#setCapturedRequestHeaders(List)} instead.
* @deprecated Use {@link RatpackClientTelemetryBuilder#setCapturedRequestHeaders(Collection)}
* instead.
*/
@Deprecated
@CanIgnoreReturnValue
@ -115,7 +119,8 @@ public final class RatpackTelemetryBuilder {
* Configures the HTTP client response headers that will be captured as span attributes.
*
* @param responseHeaders A list of HTTP header names.
* @deprecated Use {@link RatpackClientTelemetryBuilder#setCapturedResponseHeaders(List)} instead.
* @deprecated Use {@link RatpackClientTelemetryBuilder#setCapturedResponseHeaders(Collection)}
* instead.
*/
@Deprecated
@CanIgnoreReturnValue

6
instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetryBuilder.java
View File

@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
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.RestletTelemetryBuilderFactory;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
import org.restlet.data.Request;
@ -50,7 +50,7 @@ public final class RestletTelemetryBuilder {
* @param requestHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public RestletTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
public RestletTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -61,7 +61,7 @@ public final class RestletTelemetryBuilder {
* @param responseHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public RestletTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
public RestletTelemetryBuilder setCapturedResponseHeaders(Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

6
instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletTelemetryBuilder.java
View File

@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
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.RestletTelemetryBuilderFactory;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
import org.restlet.Request;
@ -50,7 +50,7 @@ public final class RestletTelemetryBuilder {
* @param requestHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public RestletTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
public RestletTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -61,7 +61,7 @@ public final class RestletTelemetryBuilder {
* @param responseHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public RestletTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
public RestletTelemetryBuilder setCapturedResponseHeaders(Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

6
instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqTelemetryBuilder.java
View File

@ -9,6 +9,8 @@ import static java.util.Collections.emptyList;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import io.opentelemetry.api.OpenTelemetry;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/** A builder of {@link RocketMqTelemetry}. */
@ -41,8 +43,8 @@ public final class RocketMqTelemetryBuilder {
* @param capturedHeaders A list of messaging header names.
*/
@CanIgnoreReturnValue
public RocketMqTelemetryBuilder setCapturedHeaders(List<String> capturedHeaders) {
this.capturedHeaders = capturedHeaders;
public RocketMqTelemetryBuilder setCapturedHeaders(Collection<String> capturedHeaders) {
this.capturedHeaders = new ArrayList<>(capturedHeaders);
return this;
}

5
instrumentation/spring/spring-integration-4.1/library/src/main/java/io/opentelemetry/instrumentation/spring/integration/v4_1/SpringIntegrationTelemetryBuilder.java
View File

@ -17,6 +17,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/** A builder of {@link SpringIntegrationTelemetry}. */
@ -51,8 +52,8 @@ public final class SpringIntegrationTelemetryBuilder {
* @param capturedHeaders A list of messaging header names.
*/
@CanIgnoreReturnValue
public SpringIntegrationTelemetryBuilder setCapturedHeaders(List<String> capturedHeaders) {
this.capturedHeaders = capturedHeaders;
public SpringIntegrationTelemetryBuilder setCapturedHeaders(Collection<String> capturedHeaders) {
this.capturedHeaders = new ArrayList<>(capturedHeaders);
return this;
}

6
instrumentation/spring/spring-kafka-2.7/library/src/main/java/io/opentelemetry/instrumentation/spring/kafka/v2_7/SpringKafkaTelemetryBuilder.java
View File

@ -11,6 +11,8 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.kafka.internal.KafkaInstrumenterFactory;
import io.opentelemetry.instrumentation.spring.kafka.v2_7.internal.SpringKafkaErrorCauseExtractor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/** A builder of {@link SpringKafkaTelemetry}. */
@ -28,8 +30,8 @@ public final class SpringKafkaTelemetryBuilder {
}
@CanIgnoreReturnValue
public SpringKafkaTelemetryBuilder setCapturedHeaders(List<String> capturedHeaders) {
this.capturedHeaders = capturedHeaders;
public SpringKafkaTelemetryBuilder setCapturedHeaders(Collection<String> capturedHeaders) {
this.capturedHeaders = new ArrayList<>(capturedHeaders);
return this;
}

6
instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebTelemetryBuilder.java
View File

@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
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.WebTelemetryUtil;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
import org.springframework.http.HttpRequest;
@ -74,7 +74,7 @@ public final class SpringWebTelemetryBuilder {
* @param requestHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public SpringWebTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
public SpringWebTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -85,7 +85,7 @@ public final class SpringWebTelemetryBuilder {
* @param responseHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public SpringWebTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
public SpringWebTelemetryBuilder setCapturedResponseHeaders(Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

6
instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientTelemetryBuilder.java
View File

@ -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.SpringWebfluxBuilderUtil;
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.function.Function;
import org.springframework.web.reactive.function.client.ClientRequest;
@ -58,7 +58,7 @@ public final class SpringWebfluxClientTelemetryBuilder {
*/
@CanIgnoreReturnValue
public SpringWebfluxClientTelemetryBuilder setCapturedRequestHeaders(
List<String> requestHeaders) {
Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -70,7 +70,7 @@ public final class SpringWebfluxClientTelemetryBuilder {
*/
@CanIgnoreReturnValue
public SpringWebfluxClientTelemetryBuilder setCapturedResponseHeaders(
List<String> responseHeaders) {
Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

6
instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxServerTelemetryBuilder.java
View File

@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
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.SpringWebfluxBuilderUtil;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
import org.springframework.web.server.ServerWebExchange;
@ -58,7 +58,7 @@ public final class SpringWebfluxServerTelemetryBuilder {
*/
@CanIgnoreReturnValue
public SpringWebfluxServerTelemetryBuilder setCapturedRequestHeaders(
List<String> requestHeaders) {
Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -71,7 +71,7 @@ public final class SpringWebfluxServerTelemetryBuilder {
*/
@CanIgnoreReturnValue
public SpringWebfluxServerTelemetryBuilder setCapturedResponseHeaders(
List<String> responseHeaders) {
Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

17
instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxTelemetryBuilder.java
View File

@ -15,6 +15,7 @@ import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExt
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.WebClientHttpAttributesGetter;
import java.util.Collection;
import java.util.List;
import java.util.Set;
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.
*
* @param requestHeaders A list of HTTP header names.
* @deprecated Use {@link SpringWebfluxClientTelemetryBuilder#setCapturedRequestHeaders(List)}
* instead.
* @deprecated Use {@link
* SpringWebfluxClientTelemetryBuilder#setCapturedRequestHeaders(Collection)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
@ -84,8 +85,8 @@ public final class SpringWebfluxTelemetryBuilder {
* Configures the HTTP WebClient response headers that will be captured as span attributes.
*
* @param responseHeaders A list of HTTP header names.
* @deprecated Use {@link SpringWebfluxClientTelemetryBuilder#setCapturedResponseHeaders(List)}
* instead.
* @deprecated Use {@link
* SpringWebfluxClientTelemetryBuilder#setCapturedResponseHeaders(Collection)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
@ -115,8 +116,8 @@ public final class SpringWebfluxTelemetryBuilder {
* instrumentation.
*
* @param requestHeaders A list of HTTP header names.
* @deprecated Use {@link SpringWebfluxServerTelemetryBuilder#setCapturedRequestHeaders(List)}
* instead.
* @deprecated Use {@link
* SpringWebfluxServerTelemetryBuilder#setCapturedRequestHeaders(Collection)} instead.
*/
@Deprecated
@CanIgnoreReturnValue
@ -131,8 +132,8 @@ public final class SpringWebfluxTelemetryBuilder {
* instrumentation.
*
* @param responseHeaders A list of HTTP header names.
* @deprecated Use {@link SpringWebfluxServerTelemetryBuilder#setCapturedResponseHeaders(List)}
* instead.
* @deprecated Use {@link
* SpringWebfluxServerTelemetryBuilder#setCapturedResponseHeaders(Collection)} instead.
*/
@Deprecated
@CanIgnoreReturnValue

7
instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java
View File

@ -13,7 +13,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
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.SpringMvcBuilderUtil;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
import javax.servlet.http.HttpServletRequest;
@ -59,7 +59,7 @@ public final class SpringWebMvcTelemetryBuilder {
* @param requestHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public SpringWebMvcTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
public SpringWebMvcTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -70,7 +70,8 @@ public final class SpringWebMvcTelemetryBuilder {
* @param responseHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders(
Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}

7
instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java
View File

@ -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 jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.function.Function;
@ -58,7 +58,7 @@ public final class SpringWebMvcTelemetryBuilder {
* @param requestHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public SpringWebMvcTelemetryBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
public SpringWebMvcTelemetryBuilder setCapturedRequestHeaders(Collection<String> requestHeaders) {
builder.setCapturedRequestHeaders(requestHeaders);
return this;
}
@ -69,7 +69,8 @@ public final class SpringWebMvcTelemetryBuilder {
* @param responseHeaders A list of HTTP header names.
*/
@CanIgnoreReturnValue
public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders(
Collection<String> responseHeaders) {
builder.setCapturedResponseHeaders(responseHeaders);
return this;
}