Merge branch 'feat/data-collection-options' into feat/data-collection-resolver

Author: adinauer

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/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()