Merge branch 'feat/data-collection-cookies' into feat/data-collection-user-info

Author: adinauer

sentry/src/main/java/io/sentry/SentryOptions.java

@@ -1718,7 +1718,9 @@ public void setSendDefaultPii(boolean sendDefaultPii) {
    * <p>Passing an empty {@link DataCollection} opts into the documented data-collection defaults.
    */
   public void setDataCollection(final @NotNull DataCollection dataCollection) {
-    this.dataCollection = dataCollection;
+    if (dataCollection != null) {
+      this.dataCollection = dataCollection;
+    }
   }
 
   /** Returns the Data Collection policy resolver used by SDK integrations. */

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

@@ -67,6 +67,21 @@ class SentryOptionsTest {
     assertThat(options.dataCollection.userInfo).isFalse()
   }
 
+  @Test
+  fun `setting null data collection preserves the current instance`() {
+    val options = SentryOptions()
+    val dataCollection = DataCollection().apply { setUserInfo(false) }
+    options.dataCollection = dataCollection
+
+    SentryOptions::class
+      .java
+      .getMethod("setDataCollection", DataCollection::class.java)
+      .invoke(options, null)
+
+    assertThat(options.dataCollection).isSameInstanceAs(dataCollection)
+    assertThat(options.dataCollection.userInfo).isFalse()
+  }
+
   @Test
   fun `when options is initialized, logger is not null`() {
     assertNotNull(SentryOptions().logger)