feat(core): [Data Collection 3] Add policy resolver

sentry/api/sentry.api

@@ -415,6 +415,22 @@ public final class io/sentry/DataCollection$HttpHeaders {
 	public fun setResponse (Lio/sentry/KeyValueCollectionBehavior;)V
 }
 
+public final class io/sentry/DataCollectionResolver {
+	public fun getCookies ()Lio/sentry/KeyValueCollectionBehavior;
+	public fun getHttpRequestHeaders ()Lio/sentry/KeyValueCollectionBehavior;
+	public fun getHttpResponseHeaders ()Lio/sentry/KeyValueCollectionBehavior;
+	public fun getUrlQueryParams ()Lio/sentry/KeyValueCollectionBehavior;
+	public fun isDataCollectionConfigured ()Z
+	public fun isDatabaseQueryData ()Z
+	public fun isGraphqlDocument ()Z
+	public fun isGraphqlVariables ()Z
+	public fun isIncomingRequestBody ()Z
+	public fun isIncomingResponseBody ()Z
+	public fun isOutgoingRequestBody ()Z
+	public fun isOutgoingResponseBody ()Z
+	public fun isUserInfo ()Z
+}
+
 public final class io/sentry/DateUtils {
 	public static fun dateToSeconds (Ljava/util/Date;)D
 	public static fun doubleToBigDecimal (D)Ljava/math/BigDecimal;
@@ -3696,6 +3712,7 @@ public class io/sentry/SentryOptions {
 	public fun getContinuousProfiler ()Lio/sentry/IContinuousProfiler;
 	public fun getCron ()Lio/sentry/SentryOptions$Cron;
 	public fun getDataCollection ()Lio/sentry/DataCollection;
+	public fun getDataCollectionResolver ()Lio/sentry/DataCollectionResolver;
 	public fun getDateProvider ()Lio/sentry/SentryDateProvider;
 	public fun getDeadlineTimeout ()J
 	public fun getDebugMetaLoader ()Lio/sentry/internal/debugmeta/IDebugMetaLoader;

sentry/src/main/java/io/sentry/DataCollectionResolver.java

@@ -0,0 +1,105 @@
+package io.sentry;
+
+import java.util.Set;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/** Resolves effective Data Collection policies for SDK integrations. */
+@ApiStatus.Internal
+public final class DataCollectionResolver {
+
+  private static final @NotNull KeyValueCollectionBehavior OFF = KeyValueCollectionBehavior.off();
+  private static final @NotNull KeyValueCollectionBehavior EMPTY_DENY_LIST =
+      KeyValueCollectionBehavior.denyList();
+
+  private final @NotNull SentryOptions options;
+
+  DataCollectionResolver(final @NotNull SentryOptions options) {
+    this.options = options;
+  }
+
+  public boolean isDataCollectionConfigured() {
+    return options.getDataCollection().isExplicitlyConfigured();
+  }
+
+  public boolean isUserInfo() {
+    return explicitOrSendDefaultPii(options.getDataCollection().getUserInfo(), true);
+  }
+
+  public boolean isDatabaseQueryData() {
+    return explicitOrSendDefaultPii(options.getDataCollection().getDatabaseQueryData(), true);
+  }
+
+  public boolean isGraphqlDocument() {
+    return explicitOrSendDefaultPii(options.getDataCollection().getGraphql().getDocument(), true);
+  }
+
+  public boolean isGraphqlVariables() {
+    return explicitOrSendDefaultPii(options.getDataCollection().getGraphql().getVariables(), true);
+  }
+
+  public @NotNull KeyValueCollectionBehavior getCookies() {
+    final @NotNull DataCollection dataCollection = options.getDataCollection();
+    final @Nullable KeyValueCollectionBehavior cookies = dataCollection.getCookies();
+
+    if (cookies != null) {
+      return cookies;
+    }
+    if (isDataCollectionConfigured()) {
+      return EMPTY_DENY_LIST;
+    }
+    return options.isSendDefaultPii() ? EMPTY_DENY_LIST : OFF;
+  }
+
+  public @NotNull KeyValueCollectionBehavior getUrlQueryParams() {
+    return explicitOrEmptyDenyList(options.getDataCollection().getUrlQueryParams());
+  }
+
+  public @NotNull KeyValueCollectionBehavior getHttpRequestHeaders() {
+    return explicitOrEmptyDenyList(options.getDataCollection().getHttpHeaders().getRequest());
+  }
+
+  public @NotNull KeyValueCollectionBehavior getHttpResponseHeaders() {
+    return explicitOrEmptyDenyList(options.getDataCollection().getHttpHeaders().getResponse());
+  }
+
+  public boolean isIncomingRequestBody() {
+    return isHttpBodyEnabled(HttpBodyType.INCOMING_REQUEST, options.isSendDefaultPii());
+  }
+
+  public boolean isOutgoingRequestBody() {
+    return isHttpBodyEnabled(HttpBodyType.OUTGOING_REQUEST, true);
+  }
+
+  public boolean isIncomingResponseBody() {
+    return isHttpBodyEnabled(HttpBodyType.INCOMING_RESPONSE, true);
+  }
+
+  public boolean isOutgoingResponseBody() {
+    return isHttpBodyEnabled(HttpBodyType.OUTGOING_RESPONSE, options.isSendDefaultPii());
+  }
+
+  private boolean explicitOrSendDefaultPii(
+      final @Nullable Boolean explicit, final boolean defaultValue) {
+    if (explicit != null) {
+      return explicit;
+    }
+    return isDataCollectionConfigured() ? defaultValue : options.isSendDefaultPii();
+  }
+
+  private @NotNull KeyValueCollectionBehavior explicitOrEmptyDenyList(
+      final @Nullable KeyValueCollectionBehavior explicit) {
+    return explicit != null ? explicit : EMPTY_DENY_LIST;
+  }
+
+  private boolean isHttpBodyEnabled(
+      final @NotNull HttpBodyType bodyType, final boolean legacyFallback) {
+    final @NotNull DataCollection dataCollection = options.getDataCollection();
+    final @Nullable Set<HttpBodyType> httpBodies = dataCollection.getHttpBodies();
+    if (httpBodies != null) {
+      return httpBodies.contains(bodyType);
+    }
+    return isDataCollectionConfigured() || legacyFallback;
+  }
+}

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

@@ -340,6 +340,9 @@ public class SentryOptions {
 
   private @NotNull DataCollection dataCollection = new DataCollection(false);
 
+  private final @NotNull DataCollectionResolver dataCollectionResolver =
+      new DataCollectionResolver(this);
+
   /** SSLSocketFactory for self-signed certificate trust * */
   private @Nullable SSLSocketFactory sslSocketFactory;
 
@@ -1720,6 +1723,12 @@ public void setDataCollection(final @NotNull DataCollection dataCollection) {
     }
   }
 
+  /** Returns the Data Collection policy resolver used by SDK integrations. */
+  @ApiStatus.Internal
+  public @NotNull DataCollectionResolver getDataCollectionResolver() {
+    return dataCollectionResolver;
+  }
+
   /**
    * Adds a Scope observer
    *

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

@@ -0,0 +1,231 @@
+package io.sentry
+
+import com.google.common.truth.Truth.assertThat
+import kotlin.test.Test
+
+class DataCollectionResolverTest {
+  @Test
+  fun `one resolver is reused per options instance`() {
+    val options = SentryOptions()
+
+    assertThat(options.dataCollectionResolver).isSameInstanceAs(options.dataCollectionResolver)
+  }
+
+  @Test
+  fun `each options instance owns its resolver`() {
+    val first = SentryOptions()
+    val second = SentryOptions()
+
+    assertThat(first.dataCollectionResolver).isNotSameInstanceAs(second.dataCollectionResolver)
+  }
+
+  @Test
+  fun `data collection configured reflects namespace explicitness`() {
+    val options = SentryOptions()
+
+    assertThat(options.dataCollectionResolver.isDataCollectionConfigured).isFalse()
+
+    options.dataCollection.urlQueryParams = KeyValueCollectionBehavior.denyList()
+
+    assertThat(options.dataCollectionResolver.isDataCollectionConfigured).isTrue()
+  }
+
+  @Test
+  fun `user info falls back to sendDefaultPii when unset`() {
+    val options = SentryOptions()
+
+    assertThat(options.dataCollectionResolver.isUserInfo).isFalse()
+
+    options.isSendDefaultPii = true
+
+    assertThat(options.dataCollectionResolver.isUserInfo).isTrue()
+  }
+
+  @Test
+  fun `user info override takes precedence over sendDefaultPii`() {
+    val options = SentryOptions().apply { isSendDefaultPii = true }
+
+    options.dataCollection.setUserInfo(false)
+
+    assertThat(options.dataCollectionResolver.isUserInfo).isFalse()
+
+    options.isSendDefaultPii = false
+    options.dataCollection.setUserInfo(true)
+
+    assertThat(options.dataCollectionResolver.isUserInfo).isTrue()
+  }
+
+  @Test
+  fun `omitted booleans use data collection defaults once namespace is explicit`() {
+    val options = SentryOptions().apply { isSendDefaultPii = false }
+
+    options.dataCollection.cookies = KeyValueCollectionBehavior.off()
+
+    assertThat(options.dataCollectionResolver.isUserInfo).isTrue()
+    assertThat(options.dataCollectionResolver.isDatabaseQueryData).isTrue()
+    assertThat(options.dataCollectionResolver.isGraphqlDocument).isTrue()
+    assertThat(options.dataCollectionResolver.isGraphqlVariables).isTrue()
+  }
+
+  @Test
+  fun `database query data falls back to sendDefaultPii and override takes precedence`() {
+    val options = SentryOptions().apply { isSendDefaultPii = true }
+
+    assertThat(options.dataCollectionResolver.isDatabaseQueryData).isTrue()
+
+    options.dataCollection.setDatabaseQueryData(false)
+
+    assertThat(options.dataCollectionResolver.isDatabaseQueryData).isFalse()
+  }
+
+  @Test
+  fun `GraphQL document falls back to sendDefaultPii and override takes precedence`() {
+    val options = SentryOptions().apply { isSendDefaultPii = true }
+
+    assertThat(options.dataCollectionResolver.isGraphqlDocument).isTrue()
+
+    options.dataCollection.graphql.setDocument(false)
+
+    assertThat(options.dataCollectionResolver.isGraphqlDocument).isFalse()
+  }
+
+  @Test
+  fun `cookies are off when unset and sendDefaultPii is false`() {
+    val options = SentryOptions()
+
+    assertThat(options.dataCollectionResolver.cookies).isEqualTo(KeyValueCollectionBehavior.off())
+  }
+
+  @Test
+  fun `cookies use default deny list when unset and sendDefaultPii is true`() {
+    val options = SentryOptions().apply { isSendDefaultPii = true }
+
+    assertThat(options.dataCollectionResolver.cookies)
+      .isEqualTo(KeyValueCollectionBehavior.denyList())
+  }
+
+  @Test
+  fun `cookies use default deny list when namespace is explicit`() {
+    val options = SentryOptions().apply { isSendDefaultPii = false }
+
+    options.dataCollection.setUserInfo(false)
+
+    assertThat(options.dataCollectionResolver.cookies)
+      .isEqualTo(KeyValueCollectionBehavior.denyList())
+  }
+
+  @Test
+  fun `cookies override takes precedence over sendDefaultPii`() {
+    val options = SentryOptions().apply { isSendDefaultPii = false }
+    val behavior = KeyValueCollectionBehavior.allowList("language", "theme")
+
+    options.dataCollection.cookies = behavior
+
+    assertThat(options.dataCollectionResolver.cookies).isEqualTo(behavior)
+  }
+
+  @Test
+  fun `URL query params use default deny list when unset`() {
+    val options = SentryOptions()
+
+    assertThat(options.dataCollectionResolver.urlQueryParams)
+      .isEqualTo(KeyValueCollectionBehavior.denyList())
+  }
+
+  @Test
+  fun `URL query params override takes precedence`() {
+    val options = SentryOptions()
+    val behavior = KeyValueCollectionBehavior.allowList("language", "theme")
+
+    options.dataCollection.urlQueryParams = behavior
+
+    assertThat(options.dataCollectionResolver.urlQueryParams).isEqualTo(behavior)
+  }
+
+  @Test
+  fun `HTTP request headers use default deny list when unset`() {
+    val options = SentryOptions()
+
+    assertThat(options.dataCollectionResolver.httpRequestHeaders)
+      .isEqualTo(KeyValueCollectionBehavior.denyList())
+  }
+
+  @Test
+  fun `HTTP request headers override takes precedence`() {
+    val options = SentryOptions()
+    val behavior = KeyValueCollectionBehavior.allowList("content-type")
+
+    options.dataCollection.httpHeaders.request = behavior
+
+    assertThat(options.dataCollectionResolver.httpRequestHeaders).isEqualTo(behavior)
+  }
+
+  @Test
+  fun `HTTP response headers use default deny list when unset`() {
+    val options = SentryOptions()
+
+    assertThat(options.dataCollectionResolver.httpResponseHeaders)
+      .isEqualTo(KeyValueCollectionBehavior.denyList())
+  }
+
+  @Test
+  fun `HTTP response headers override takes precedence`() {
+    val options = SentryOptions()
+    val behavior = KeyValueCollectionBehavior.off()
+
+    options.dataCollection.httpHeaders.response = behavior
+
+    assertThat(options.dataCollectionResolver.httpResponseHeaders).isEqualTo(behavior)
+  }
+
+  @Test
+  fun `HTTP bodies preserve direction-specific legacy fallbacks when data collection is absent`() {
+    val options = SentryOptions()
+
+    assertThat(options.dataCollectionResolver.isIncomingRequestBody).isFalse()
+    assertThat(options.dataCollectionResolver.isOutgoingRequestBody).isTrue()
+    assertThat(options.dataCollectionResolver.isIncomingResponseBody).isTrue()
+    assertThat(options.dataCollectionResolver.isOutgoingResponseBody).isFalse()
+
+    options.isSendDefaultPii = true
+
+    assertThat(options.dataCollectionResolver.isIncomingRequestBody).isTrue()
+    assertThat(options.dataCollectionResolver.isOutgoingRequestBody).isTrue()
+    assertThat(options.dataCollectionResolver.isIncomingResponseBody).isTrue()
+    assertThat(options.dataCollectionResolver.isOutgoingResponseBody).isTrue()
+  }
+
+  @Test
+  fun `explicit empty data collection enables every HTTP body direction`() {
+    val options = SentryOptions().apply { dataCollection = DataCollection() }
+
+    assertThat(options.dataCollectionResolver.isIncomingRequestBody).isTrue()
+    assertThat(options.dataCollectionResolver.isOutgoingRequestBody).isTrue()
+    assertThat(options.dataCollectionResolver.isIncomingResponseBody).isTrue()
+    assertThat(options.dataCollectionResolver.isOutgoingResponseBody).isTrue()
+  }
+
+  @Test
+  fun `explicit HTTP body set controls every direction`() {
+    val options = SentryOptions().apply { isSendDefaultPii = true }
+
+    options.dataCollection.httpBodies =
+      setOf(HttpBodyType.INCOMING_REQUEST, HttpBodyType.OUTGOING_RESPONSE)
+
+    assertThat(options.dataCollectionResolver.isIncomingRequestBody).isTrue()
+    assertThat(options.dataCollectionResolver.isOutgoingRequestBody).isFalse()
+    assertThat(options.dataCollectionResolver.isIncomingResponseBody).isFalse()
+    assertThat(options.dataCollectionResolver.isOutgoingResponseBody).isTrue()
+  }
+
+  @Test
+  fun `GraphQL variables fall back to sendDefaultPii and override takes precedence`() {
+    val options = SentryOptions().apply { isSendDefaultPii = true }
+
+    assertThat(options.dataCollectionResolver.isGraphqlVariables).isTrue()
+
+    options.dataCollection.graphql.setVariables(false)
+
+    assertThat(options.dataCollectionResolver.isGraphqlVariables).isFalse()
+  }
+}