merge: Update Data Collection stack

Bring the queue option removal and preceding stack updates into this layer.

Author: adinauer

sentry/api/sentry.api

@@ -391,13 +391,11 @@ public final class io/sentry/DataCollection {
 	public fun getHttpBodies ()Ljava/util/Set;
 	public fun getHttpHeaders ()Lio/sentry/DataCollection$HttpHeaders;
 	public fun getQueryParams ()Lio/sentry/KeyValueCollectionBehavior;
-	public fun getQueues ()Ljava/lang/Boolean;
 	public fun getUserInfo ()Ljava/lang/Boolean;
 	public fun setCookies (Lio/sentry/KeyValueCollectionBehavior;)V
 	public fun setDatabaseQueryData (Z)V
 	public fun setHttpBodies (Ljava/util/Set;)V
 	public fun setQueryParams (Lio/sentry/KeyValueCollectionBehavior;)V
-	public fun setQueues (Z)V
 	public fun setUserInfo (Z)V
 }
 

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

@@ -16,7 +16,6 @@ public final class DataCollection {
   private @Nullable KeyValueCollectionBehavior queryParams;
   private @Nullable Set<HttpBodyType> httpBodies;
   private @Nullable Boolean databaseQueryData;
-  private @Nullable Boolean queues;
   private final @NotNull HttpHeaders httpHeaders = new HttpHeaders();
   private final @NotNull Graphql graphql = new Graphql();
 
@@ -73,14 +72,6 @@ public void setDatabaseQueryData(final boolean databaseQueryData) {
     this.databaseQueryData = databaseQueryData;
   }
 
-  public @Nullable Boolean getQueues() {
-    return queues;
-  }
-
-  public void setQueues(final boolean queues) {
-    this.queues = queues;
-  }
-
   public @NotNull HttpHeaders getHttpHeaders() {
     return httpHeaders;
   }
@@ -97,7 +88,6 @@ boolean isExplicitlyConfigured() {
         || queryParams != null
         || httpBodies != null
         || databaseQueryData != null
-        || queues != null
         || httpHeaders.hasOverrides()
         || graphql.hasOverrides();
   }

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

@@ -14,7 +14,6 @@ class DataCollectionTest {
     assertThat(dataCollection.queryParams).isNull()
     assertThat(dataCollection.httpBodies).isNull()
     assertThat(dataCollection.databaseQueryData).isNull()
-    assertThat(dataCollection.queues).isNull()
     assertThat(dataCollection.httpHeaders.request).isNull()
     assertThat(dataCollection.httpHeaders.response).isNull()
     assertThat(dataCollection.graphql.document).isNull()
@@ -82,16 +81,6 @@ class DataCollectionTest {
     assertThat(dataCollection.isExplicitlyConfigured()).isTrue()
   }
 
-  @Test
-  fun `queues false is distinct from unset`() {
-    val dataCollection = DataCollection(false)
-
-    dataCollection.setQueues(false)
-
-    assertThat(dataCollection.queues).isFalse()
-    assertThat(dataCollection.isExplicitlyConfigured()).isTrue()
-  }
-
   @Test
   fun `nested HTTP header override marks configuration explicit`() {
     val dataCollection = DataCollection(false)

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

@@ -59,12 +59,12 @@ class SentryOptionsTest {
   @Test
   fun `setting data collection replaces the default instance`() {
     val options = SentryOptions()
-    val dataCollection = DataCollection().apply { setQueues(false) }
+    val dataCollection = DataCollection().apply { setUserInfo(false) }
 
     options.dataCollection = dataCollection
 
     assertThat(options.dataCollection).isSameInstanceAs(dataCollection)
-    assertThat(options.dataCollection.queues).isFalse()
+    assertThat(options.dataCollection.userInfo).isFalse()
   }
 
   @Test