chore: Merge data collection base into cookie filtering

Bring the latest data collection behavior into the cookie filtering branch and retain coverage for both cookie and request header filtering.

Co-Authored-By: Claude <noreply@anthropic.com>

Author: adinauer

sentry-apollo-4/src/test/java/io/sentry/apollo4/SentryApollo4BuilderExtensionsClientErrorsTest.kt

@@ -397,6 +397,23 @@ abstract class SentryApollo4BuilderExtensionsClientErrorsTest(
       )
   }
 
+  @Test
+  fun `data collection filters request headers`() {
+    val sut =
+      fixture.getSut(responseBody = fixture.responseBodyNotOk) {
+        dataCollection.httpHeaders.request = KeyValueCollectionBehavior.denyList("accept")
+      }
+    executeQuery(sut)
+
+    verify(fixture.scopes)
+      .captureEvent(
+        check {
+          assertEquals("[Filtered]", it.request!!.headers?.get("Accept"))
+        },
+        any<Hint>(),
+      )
+  }
+
   @Test
   fun `data collection can disable request headers`() {
     val sut =

sentry/src/main/java/io/sentry/DataCollection.java

@@ -10,7 +10,8 @@
 /** Configures data that the SDK collects automatically. */
 public final class DataCollection {
 
-  private boolean overridden;
+  // Forces Data Collection to be used even when no individual option has been configured.
+  private boolean forceDataCollection;
   private @Nullable Boolean userInfo;
   private @Nullable KeyValueCollectionBehavior cookies;
   private @Nullable KeyValueCollectionBehavior urlQueryParams;
@@ -23,8 +24,8 @@ public DataCollection() {
     this(true);
   }
 
-  DataCollection(final boolean overridden) {
-    this.overridden = overridden;
+  DataCollection(final boolean forceDataCollection) {
+    this.forceDataCollection = forceDataCollection;
   }
 
   public @Nullable Boolean getUserInfo() {
@@ -82,7 +83,7 @@ public void setDatabaseQueryData(final boolean databaseQueryData) {
 
   @ApiStatus.Internal
   boolean isExplicitlyConfigured() {
-    return overridden
+    return forceDataCollection
         || userInfo != null
         || cookies != null
         || urlQueryParams != null

sentry/src/test/java/io/sentry/DataCollectionResolverTest.kt

@@ -42,7 +42,7 @@ class DataCollectionResolverTest {
   }
 
   @Test
-  fun `user info override takes precedence over sendDefaultPii`() {
+  fun `user info uses configured Data Collection value`() {
     val options = SentryOptions().apply { isSendDefaultPii = true }
 
     options.dataCollection.setUserInfo(false)
@@ -68,36 +68,78 @@ class DataCollectionResolverTest {
   }
 
   @Test
-  fun `database query data falls back to sendDefaultPii and override takes precedence`() {
-    val options = SentryOptions().apply { isSendDefaultPii = true }
+  fun `database query data uses sendDefaultPii when Data Collection is absent`() {
+    val options = SentryOptions()
+
+    assertThat(options.dataCollectionResolver.isDatabaseQueryData).isFalse()
+
+    options.isSendDefaultPii = true
 
     assertThat(options.dataCollectionResolver.isDatabaseQueryData).isTrue()
+  }
+
+  @Test
+  fun `database query data uses configured Data Collection value`() {
+    val options = SentryOptions().apply { isSendDefaultPii = true }
 
     options.dataCollection.setDatabaseQueryData(false)
 
     assertThat(options.dataCollectionResolver.isDatabaseQueryData).isFalse()
+
+    options.isSendDefaultPii = false
+    options.dataCollection.setDatabaseQueryData(true)
+
+    assertThat(options.dataCollectionResolver.isDatabaseQueryData).isTrue()
   }
 
   @Test
-  fun `GraphQL document falls back to sendDefaultPii and override takes precedence`() {
-    val options = SentryOptions().apply { isSendDefaultPii = true }
+  fun `GraphQL document uses sendDefaultPii when Data Collection is absent`() {
+    val options = SentryOptions()
+
+    assertThat(options.dataCollectionResolver.isGraphqlDocument).isFalse()
+
+    options.isSendDefaultPii = true
 
     assertThat(options.dataCollectionResolver.isGraphqlDocument).isTrue()
+  }
+
+  @Test
+  fun `GraphQL document uses configured Data Collection value`() {
+    val options = SentryOptions().apply { isSendDefaultPii = true }
 
     options.dataCollection.graphql.setDocument(false)
 
     assertThat(options.dataCollectionResolver.isGraphqlDocument).isFalse()
+
+    options.isSendDefaultPii = false
+    options.dataCollection.graphql.setDocument(true)
+
+    assertThat(options.dataCollectionResolver.isGraphqlDocument).isTrue()
   }
 
   @Test
-  fun `GraphQL variables fall back to sendDefaultPii and override takes precedence`() {
-    val options = SentryOptions().apply { isSendDefaultPii = true }
+  fun `GraphQL variables use sendDefaultPii when Data Collection is absent`() {
+    val options = SentryOptions()
+
+    assertThat(options.dataCollectionResolver.isGraphqlVariables).isFalse()
+
+    options.isSendDefaultPii = true
 
     assertThat(options.dataCollectionResolver.isGraphqlVariables).isTrue()
+  }
+
+  @Test
+  fun `GraphQL variables use configured Data Collection value`() {
+    val options = SentryOptions().apply { isSendDefaultPii = true }
 
     options.dataCollection.graphql.setVariables(false)
 
     assertThat(options.dataCollectionResolver.isGraphqlVariables).isFalse()
+
+    options.isSendDefaultPii = false
+    options.dataCollection.graphql.setVariables(true)
+
+    assertThat(options.dataCollectionResolver.isGraphqlVariables).isTrue()
   }
 
   @Test
@@ -210,7 +252,7 @@ class DataCollectionResolverTest {
   }
 
   @Test
-  fun `cookies override takes precedence over sendDefaultPii`() {
+  fun `cookies use configured Data Collection behavior`() {
     val options = SentryOptions().apply { isSendDefaultPii = false }
     val behavior = KeyValueCollectionBehavior.allowList("language", "theme")
 
@@ -228,7 +270,7 @@ class DataCollectionResolverTest {
   }
 
   @Test
-  fun `URL query params override takes precedence`() {
+  fun `URL query params use configured Data Collection behavior`() {
     val options = SentryOptions()
     val behavior = KeyValueCollectionBehavior.allowList("language", "theme")
 
@@ -246,7 +288,7 @@ class DataCollectionResolverTest {
   }
 
   @Test
-  fun `HTTP request headers override takes precedence`() {
+  fun `HTTP request headers use configured Data Collection behavior`() {
     val options = SentryOptions()
     val behavior = KeyValueCollectionBehavior.allowList("content-type")
 
@@ -264,7 +306,7 @@ class DataCollectionResolverTest {
   }
 
   @Test
-  fun `HTTP response headers override takes precedence`() {
+  fun `HTTP response headers use configured Data Collection behavior`() {
     val options = SentryOptions()
     val behavior = KeyValueCollectionBehavior.off()
 

sentry/src/test/java/io/sentry/DataCollectionTest.kt

@@ -6,7 +6,7 @@ import kotlin.test.assertFailsWith
 
 class DataCollectionTest {
   @Test
-  fun `public constructor creates explicit empty configuration`() {
+  fun `public constructor forces Data Collection for empty configuration`() {
     val dataCollection = DataCollection()
 
     assertThat(dataCollection.userInfo).isNull()
@@ -22,7 +22,7 @@ class DataCollectionTest {
   }
 
   @Test
-  fun `SDK-owned configuration starts unconfigured`() {
+  fun `SDK-owned configuration does not force Data Collection`() {
     val dataCollection = DataCollection(false)
 
     assertThat(dataCollection.isExplicitlyConfigured()).isFalse()