diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt index d4bff96027..eea3e7c5d6 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt @@ -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. \ No newline at end of file +*** 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 setCapturedRequestHeaders(java.util.Collection) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder setCapturedResponseHeaders(java.util.Collection) +*** 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 setCapturedRequestHeaders(java.util.Collection) + +++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder setCapturedResponseHeaders(java.util.Collection) diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java index e74dd2e9f4..894d8af163 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java @@ -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 { */ @CanIgnoreReturnValue public DefaultHttpClientInstrumenterBuilder setCapturedRequestHeaders( - List requestHeaders) { + Collection requestHeaders) { httpAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders); return this; } @@ -138,7 +139,7 @@ public final class DefaultHttpClientInstrumenterBuilder { */ @CanIgnoreReturnValue public DefaultHttpClientInstrumenterBuilder setCapturedResponseHeaders( - List responseHeaders) { + Collection responseHeaders) { httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java index caee6c007d..c61e846dc5 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java @@ -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 { */ @CanIgnoreReturnValue public DefaultHttpServerInstrumenterBuilder setCapturedRequestHeaders( - List requestHeaders) { + Collection requestHeaders) { httpAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders); return this; } @@ -136,7 +137,7 @@ public final class DefaultHttpServerInstrumenterBuilder { */ @CanIgnoreReturnValue public DefaultHttpServerInstrumenterBuilder setCapturedResponseHeaders( - List responseHeaders) { + Collection responseHeaders) { httpAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractorBuilder.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractorBuilder.java index 6cc82adb4d..769de08623 100644 --- a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractorBuilder.java +++ b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingAttributesExtractorBuilder.java @@ -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 { */ @CanIgnoreReturnValue public MessagingAttributesExtractorBuilder setCapturedHeaders( - List capturedHeaders) { - this.capturedHeaders = capturedHeaders; + Collection capturedHeaders) { + this.capturedHeaders = new ArrayList<>(capturedHeaders); return this; } diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorBuilder.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorBuilder.java index c1ba07a1cb..39e4e5bcc6 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorBuilder.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorBuilder.java @@ -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 { */ @CanIgnoreReturnValue public HttpClientAttributesExtractorBuilder setCapturedRequestHeaders( - List requestHeaders) { + Collection requestHeaders) { this.capturedRequestHeaders = new ArrayList<>(requestHeaders); return this; } + /** + * Configures the HTTP request headers that will be captured as span attributes as described in HTTP + * semantic conventions. + * + *

The HTTP request header values will be captured under the {@code http.request.header.} + * attribute key. The {@code } 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 setCapturedRequestHeaders( + List requestHeaders) { + return setCapturedRequestHeaders((Collection) requestHeaders); + } + /** * Configures the HTTP response headers that will be captured as span attributes as described in * { */ @CanIgnoreReturnValue public HttpClientAttributesExtractorBuilder setCapturedResponseHeaders( - List responseHeaders) { + Collection responseHeaders) { this.capturedResponseHeaders = new ArrayList<>(responseHeaders); return this; } + /** + * Configures the HTTP response headers that will be captured as span attributes as described in + * HTTP + * semantic conventions. + * + *

The HTTP response header values will be captured under the {@code + * http.response.header.} attribute key. The {@code } 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 setCapturedResponseHeaders( + List responseHeaders) { + return setCapturedResponseHeaders((Collection) responseHeaders); + } + /** * Configures the extractor to recognize an alternative set of HTTP request methods. * diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorBuilder.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorBuilder.java index 9eec4966d8..e811d975d0 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorBuilder.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAttributesExtractorBuilder.java @@ -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 { */ @CanIgnoreReturnValue public HttpServerAttributesExtractorBuilder setCapturedRequestHeaders( - List requestHeaders) { + Collection requestHeaders) { this.capturedRequestHeaders = new ArrayList<>(requestHeaders); return this; } + /** + * Configures the HTTP response headers that will be captured as span attributes as described in + * HTTP + * semantic conventions. + * + *

The HTTP request header values will be captured under the {@code http.request.header.} + * attribute key. The {@code } 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 setCapturedRequestHeaders( + List requestHeaders) { + return setCapturedRequestHeaders((Collection) requestHeaders); + } + /** * Configures the HTTP response headers that will be captured as span attributes as described in * { */ @CanIgnoreReturnValue public HttpServerAttributesExtractorBuilder setCapturedResponseHeaders( - List responseHeaders) { + Collection responseHeaders) { this.capturedResponseHeaders = new ArrayList<>(responseHeaders); return this; } + /** + * Configures the HTTP response headers that will be captured as span attributes as described in + * HTTP + * semantic conventions. + * + *

The HTTP response header values will be captured under the {@code + * http.response.header.} attribute key. The {@code } 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 setCapturedResponseHeaders( + List responseHeaders) { + return setCapturedResponseHeaders((Collection) responseHeaders); + } + /** * Configures the extractor to recognize an alternative set of HTTP request methods. * diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java index c2d3b71536..e39104f64c 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java +++ b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetryBuilder.java @@ -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 requestHeaders) { + public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders( + Collection 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 responseHeaders) { + public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTelemetryBuilder.java b/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTelemetryBuilder.java index d0911db28c..ca896c27bd 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTelemetryBuilder.java +++ b/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTelemetryBuilder.java @@ -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 requestHeaders) { + public ApacheHttpClientTelemetryBuilder setCapturedRequestHeaders( + Collection 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 responseHeaders) { + public ApacheHttpClientTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java index 7d8cd00b29..4903ae358b 100644 --- a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java +++ b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java @@ -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 requestHeaders) { + public ArmeriaClientTelemetryBuilder setCapturedRequestHeaders( + Collection 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 responseHeaders) { + public ArmeriaClientTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaServerTelemetryBuilder.java b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaServerTelemetryBuilder.java index 613898bdad..b2455a9dce 100644 --- a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaServerTelemetryBuilder.java +++ b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaServerTelemetryBuilder.java @@ -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 requestHeaders) { + public ArmeriaServerTelemetryBuilder setCapturedRequestHeaders( + Collection 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 responseHeaders) { + public ArmeriaServerTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java index 5a900eb95c..6f06abac79 100644 --- a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java +++ b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java @@ -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 diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkTelemetryBuilder.java b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkTelemetryBuilder.java index b36104f531..91c26d59df 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkTelemetryBuilder.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkTelemetryBuilder.java @@ -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 capturedHeaders) { - this.capturedHeaders = capturedHeaders; + public AwsSdkTelemetryBuilder setCapturedHeaders(Collection capturedHeaders) { + this.capturedHeaders = new ArrayList<>(capturedHeaders); return this; } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkTelemetryBuilder.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkTelemetryBuilder.java index 11ddca0ea5..5cf5c757b4 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkTelemetryBuilder.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkTelemetryBuilder.java @@ -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 capturedHeaders) { - this.capturedHeaders = capturedHeaders; + public AwsSdkTelemetryBuilder setCapturedHeaders(Collection capturedHeaders) { + this.capturedHeaders = new ArrayList<>(capturedHeaders); return this; } diff --git a/instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/httpclient/JavaHttpClientTelemetryBuilder.java b/instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/httpclient/JavaHttpClientTelemetryBuilder.java index 3c9c15143e..00daa7e70a 100644 --- a/instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/httpclient/JavaHttpClientTelemetryBuilder.java +++ b/instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/httpclient/JavaHttpClientTelemetryBuilder.java @@ -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 requestHeaders) { + public JavaHttpClientTelemetryBuilder setCapturedRequestHeaders( + Collection 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 responseHeaders) { + public JavaHttpClientTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyClientTelemetryBuilder.java b/instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyClientTelemetryBuilder.java index cf6063511e..223dfb2aed 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyClientTelemetryBuilder.java +++ b/instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyClientTelemetryBuilder.java @@ -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 requestHeaders) { + public JettyClientTelemetryBuilder setCapturedRequestHeaders(Collection 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 responseHeaders) { + public JettyClientTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java index 4e4a9940e2..58295bf12e 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java +++ b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetryBuilder.java @@ -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 requestHeaders) { + public JettyClientTelemetryBuilder setCapturedRequestHeaders(Collection 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 responseHeaders) { + public JettyClientTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumenterFactory.java b/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumenterFactory.java index b229bcb303..31b80691c7 100644 --- a/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumenterFactory.java +++ b/instrumentation/jms/jms-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsInstrumenterFactory.java @@ -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 capturedHeaders) { - this.capturedHeaders = capturedHeaders; + public JmsInstrumenterFactory setCapturedHeaders(Collection capturedHeaders) { + this.capturedHeaders = new ArrayList<>(capturedHeaders); return this; } diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetryBuilder.java b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetryBuilder.java index 9fd1585323..07b2f69319 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetryBuilder.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/main/java/io/opentelemetry/instrumentation/kafkaclients/v2_6/KafkaTelemetryBuilder.java @@ -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 capturedHeaders) { - this.capturedHeaders = capturedHeaders; + public KafkaTelemetryBuilder setCapturedHeaders(Collection capturedHeaders) { + this.capturedHeaders = new ArrayList<>(capturedHeaders); return this; } diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaInstrumenterFactory.java b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaInstrumenterFactory.java index 710107d24a..54952e09cd 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaInstrumenterFactory.java +++ b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaInstrumenterFactory.java @@ -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 capturedHeaders) { - this.capturedHeaders = capturedHeaders; + public KafkaInstrumenterFactory setCapturedHeaders(Collection capturedHeaders) { + this.capturedHeaders = new ArrayList<>(capturedHeaders); return this; } diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java index 29a6cfe54a..be742f93e7 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyClientTelemetryBuilder.java @@ -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 capturedRequestHeaders) { + Collection capturedRequestHeaders) { builder.setCapturedRequestHeaders(capturedRequestHeaders); return this; } @@ -71,7 +71,7 @@ public final class NettyClientTelemetryBuilder { */ @CanIgnoreReturnValue public NettyClientTelemetryBuilder setCapturedResponseHeaders( - List capturedResponseHeaders) { + Collection capturedResponseHeaders) { builder.setCapturedResponseHeaders(capturedResponseHeaders); return this; } diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetryBuilder.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetryBuilder.java index f7ba3b7875..bec0b22ecb 100644 --- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetryBuilder.java +++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/NettyServerTelemetryBuilder.java @@ -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 capturedRequestHeaders) { + Collection capturedRequestHeaders) { builder.setCapturedRequestHeaders(capturedRequestHeaders); return this; } @@ -76,7 +76,7 @@ public final class NettyServerTelemetryBuilder { */ @CanIgnoreReturnValue public NettyServerTelemetryBuilder setCapturedResponseHeaders( - List capturedResponseHeaders) { + Collection capturedResponseHeaders) { builder.setCapturedResponseHeaders(capturedResponseHeaders); return this; } diff --git a/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpTelemetryBuilder.java b/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpTelemetryBuilder.java index 13aa7e2203..d8fa780d5d 100644 --- a/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpTelemetryBuilder.java +++ b/instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpTelemetryBuilder.java @@ -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 requestHeaders) { + public OkHttpTelemetryBuilder setCapturedRequestHeaders(Collection 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 responseHeaders) { + public OkHttpTelemetryBuilder setCapturedResponseHeaders(Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackClientTelemetryBuilder.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackClientTelemetryBuilder.java index f2f077b76f..3f82c7a480 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackClientTelemetryBuilder.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackClientTelemetryBuilder.java @@ -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 requestHeaders) { + public RatpackClientTelemetryBuilder setCapturedRequestHeaders( + Collection 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 responseHeaders) { + public RatpackClientTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackServerTelemetryBuilder.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackServerTelemetryBuilder.java index 20cc6201af..1464970409 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackServerTelemetryBuilder.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackServerTelemetryBuilder.java @@ -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 requestHeaders) { + public RatpackServerTelemetryBuilder setCapturedRequestHeaders( + Collection 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 responseHeaders) { + public RatpackServerTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackTelemetryBuilder.java b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackTelemetryBuilder.java index 47f8aa0636..39e60c56c3 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackTelemetryBuilder.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackTelemetryBuilder.java @@ -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 diff --git a/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetryBuilder.java b/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetryBuilder.java index 453ab82d3c..bd7b4ee349 100644 --- a/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetryBuilder.java +++ b/instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletTelemetryBuilder.java @@ -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 requestHeaders) { + public RestletTelemetryBuilder setCapturedRequestHeaders(Collection 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 responseHeaders) { + public RestletTelemetryBuilder setCapturedResponseHeaders(Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletTelemetryBuilder.java b/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletTelemetryBuilder.java index 32a6421d51..d13c5b2892 100644 --- a/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletTelemetryBuilder.java +++ b/instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/RestletTelemetryBuilder.java @@ -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 requestHeaders) { + public RestletTelemetryBuilder setCapturedRequestHeaders(Collection 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 responseHeaders) { + public RestletTelemetryBuilder setCapturedResponseHeaders(Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqTelemetryBuilder.java b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqTelemetryBuilder.java index 856969aa8a..9214c46aed 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqTelemetryBuilder.java +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v4_8/RocketMqTelemetryBuilder.java @@ -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 capturedHeaders) { - this.capturedHeaders = capturedHeaders; + public RocketMqTelemetryBuilder setCapturedHeaders(Collection capturedHeaders) { + this.capturedHeaders = new ArrayList<>(capturedHeaders); return this; } diff --git a/instrumentation/spring/spring-integration-4.1/library/src/main/java/io/opentelemetry/instrumentation/spring/integration/v4_1/SpringIntegrationTelemetryBuilder.java b/instrumentation/spring/spring-integration-4.1/library/src/main/java/io/opentelemetry/instrumentation/spring/integration/v4_1/SpringIntegrationTelemetryBuilder.java index c4a31384e3..035385fa20 100644 --- a/instrumentation/spring/spring-integration-4.1/library/src/main/java/io/opentelemetry/instrumentation/spring/integration/v4_1/SpringIntegrationTelemetryBuilder.java +++ b/instrumentation/spring/spring-integration-4.1/library/src/main/java/io/opentelemetry/instrumentation/spring/integration/v4_1/SpringIntegrationTelemetryBuilder.java @@ -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 capturedHeaders) { - this.capturedHeaders = capturedHeaders; + public SpringIntegrationTelemetryBuilder setCapturedHeaders(Collection capturedHeaders) { + this.capturedHeaders = new ArrayList<>(capturedHeaders); return this; } diff --git a/instrumentation/spring/spring-kafka-2.7/library/src/main/java/io/opentelemetry/instrumentation/spring/kafka/v2_7/SpringKafkaTelemetryBuilder.java b/instrumentation/spring/spring-kafka-2.7/library/src/main/java/io/opentelemetry/instrumentation/spring/kafka/v2_7/SpringKafkaTelemetryBuilder.java index dc74cd179f..649abffecd 100644 --- a/instrumentation/spring/spring-kafka-2.7/library/src/main/java/io/opentelemetry/instrumentation/spring/kafka/v2_7/SpringKafkaTelemetryBuilder.java +++ b/instrumentation/spring/spring-kafka-2.7/library/src/main/java/io/opentelemetry/instrumentation/spring/kafka/v2_7/SpringKafkaTelemetryBuilder.java @@ -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 capturedHeaders) { - this.capturedHeaders = capturedHeaders; + public SpringKafkaTelemetryBuilder setCapturedHeaders(Collection capturedHeaders) { + this.capturedHeaders = new ArrayList<>(capturedHeaders); return this; } diff --git a/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebTelemetryBuilder.java b/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebTelemetryBuilder.java index cc4d69fbad..6ddbd89b7a 100644 --- a/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebTelemetryBuilder.java +++ b/instrumentation/spring/spring-web/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebTelemetryBuilder.java @@ -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 requestHeaders) { + public SpringWebTelemetryBuilder setCapturedRequestHeaders(Collection 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 responseHeaders) { + public SpringWebTelemetryBuilder setCapturedResponseHeaders(Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientTelemetryBuilder.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientTelemetryBuilder.java index 3c99207b9f..71cbef236f 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientTelemetryBuilder.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientTelemetryBuilder.java @@ -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 requestHeaders) { + Collection requestHeaders) { builder.setCapturedRequestHeaders(requestHeaders); return this; } @@ -70,7 +70,7 @@ public final class SpringWebfluxClientTelemetryBuilder { */ @CanIgnoreReturnValue public SpringWebfluxClientTelemetryBuilder setCapturedResponseHeaders( - List responseHeaders) { + Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxServerTelemetryBuilder.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxServerTelemetryBuilder.java index b00dec6ffe..32a32fadee 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxServerTelemetryBuilder.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxServerTelemetryBuilder.java @@ -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 requestHeaders) { + Collection requestHeaders) { builder.setCapturedRequestHeaders(requestHeaders); return this; } @@ -71,7 +71,7 @@ public final class SpringWebfluxServerTelemetryBuilder { */ @CanIgnoreReturnValue public SpringWebfluxServerTelemetryBuilder setCapturedResponseHeaders( - List responseHeaders) { + Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxTelemetryBuilder.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxTelemetryBuilder.java index 678f83608a..4bb2c305b9 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxTelemetryBuilder.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxTelemetryBuilder.java @@ -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 diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java index b2f6c63785..df47ef5b61 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcTelemetryBuilder.java @@ -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 requestHeaders) { + public SpringWebMvcTelemetryBuilder setCapturedRequestHeaders(Collection 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 responseHeaders) { + public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; } diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java index bc5df58458..276af5a26b 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcTelemetryBuilder.java @@ -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 requestHeaders) { + public SpringWebMvcTelemetryBuilder setCapturedRequestHeaders(Collection 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 responseHeaders) { + public SpringWebMvcTelemetryBuilder setCapturedResponseHeaders( + Collection responseHeaders) { builder.setCapturedResponseHeaders(responseHeaders); return this; }