Merge branch 'feat/data-collection-session-replay-network-options' into fix/data-collection-android-installation-id

Author: adinauer

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OpenTelemetryAttributesExtractor.java

@@ -79,18 +79,14 @@ private void addRequestAttributesToScope(
   private static Map<String, String> collectHeaders(
       final @NotNull Attributes attributes, final @NotNull SentryOptions options) {
     Map<String, String> headers = new HashMap<>();
-    final boolean isDataCollectionConfigured =
-        options.getDataCollectionResolver().isDataCollectionConfigured();
 
     attributes.forEach(
         (key, value) -> {
           final @NotNull String attributeKeyAsString = key.getKey();
           if (attributeKeyAsString.startsWith(HTTP_REQUEST_HEADER_PREFIX)) {
             final @NotNull String headerName =
                 StringUtils.removePrefix(attributeKeyAsString, HTTP_REQUEST_HEADER_PREFIX);
-            if (isDataCollectionConfigured
-                || options.isSendDefaultPii()
-                || !HttpUtils.containsSensitiveHeader(headerName)) {
+            if (options.isSendDefaultPii() || !HttpUtils.containsSensitiveHeader(headerName)) {
               if (value instanceof List) {
                 try {
                   final @NotNull List<String> headerValues = (List<String>) value;
@@ -108,10 +104,6 @@ private static Map<String, String> collectHeaders(
             }
           }
         });
-    if (isDataCollectionConfigured) {
-      return HttpUtils.filterHeaders(
-          headers, options.getDataCollectionResolver().getHttpRequestHeaders());
-    }
     return headers;
   }
 

sentry-opentelemetry/sentry-opentelemetry-core/src/test/kotlin/OpenTelemetryAttributesExtractorTest.kt

@@ -6,7 +6,6 @@ import io.opentelemetry.sdk.trace.data.SpanData
 import io.opentelemetry.semconv.HttpAttributes
 import io.opentelemetry.semconv.ServerAttributes
 import io.opentelemetry.semconv.UrlAttributes
-import io.sentry.KeyValueCollectionBehavior
 import io.sentry.Scope
 import io.sentry.SentryOptions
 import io.sentry.protocol.Request
@@ -354,43 +353,6 @@ class OpenTelemetryAttributesExtractorTest {
     thenHeaderIsNotPresentOnRequest("some-header")
   }
 
-  @Test
-  fun `data collection filters request header attributes`() {
-    fixture.options.dataCollection.httpHeaders.request =
-      KeyValueCollectionBehavior.denyList("customer")
-    givenAttributes(
-      mapOf(
-        HttpAttributes.HTTP_REQUEST_METHOD to "GET",
-        AttributeKey.stringArrayKey("http.request.header.content-type") to
-          listOf("application/json"),
-        AttributeKey.stringArrayKey("http.request.header.authorization") to listOf("Bearer token"),
-        AttributeKey.stringArrayKey("http.request.header.x-customer") to listOf("customer value"),
-      )
-    )
-
-    whenExtractingAttributes()
-
-    thenHeaderIsPresentOnRequest("content-type", "application/json")
-    thenHeaderIsPresentOnRequest("authorization", "[Filtered]")
-    thenHeaderIsPresentOnRequest("x-customer", "[Filtered]")
-  }
-
-  @Test
-  fun `data collection can disable request header attributes`() {
-    fixture.options.dataCollection.httpHeaders.request = KeyValueCollectionBehavior.off()
-    givenAttributes(
-      mapOf(
-        HttpAttributes.HTTP_REQUEST_METHOD to "GET",
-        AttributeKey.stringArrayKey("http.request.header.content-type") to
-          listOf("application/json"),
-      )
-    )
-
-    whenExtractingAttributes()
-
-    assertNull(fixture.scope.request!!.headers)
-  }
-
   @Test
   fun `if there are no header attributes does not set headers on request`() {
     givenAttributes(mapOf(HttpAttributes.HTTP_REQUEST_METHOD to "GET"))