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

Author: adinauer

sentry-opentelemetry/sentry-opentelemetry-core/src/test/kotlin/OpenTelemetryAttributesExtractorTest.kt

@@ -70,7 +70,7 @@ class OpenTelemetryAttributesExtractorTest {
 
   @Test
   fun `data collection can disable URL query attributes`() {
-    fixture.options.dataCollection.queryParams = KeyValueCollectionBehavior.off()
+    fixture.options.dataCollection.urlQueryParams = KeyValueCollectionBehavior.off()
     givenAttributes(
       mapOf(
         HttpAttributes.HTTP_REQUEST_METHOD to "GET",

sentry-servlet/src/test/kotlin/io/sentry/servlet/SentryRequestHttpServletRequestProcessorTest.kt

@@ -57,7 +57,7 @@ class SentryRequestHttpServletRequestProcessorTest {
       MockMvcRequestBuilders.get(URI.create("http://example.com?name=value"))
         .buildRequest(MockServletContext())
     val options =
-      SentryOptions().also { it.dataCollection.queryParams = KeyValueCollectionBehavior.off() }
+      SentryOptions().also { it.dataCollection.urlQueryParams = KeyValueCollectionBehavior.off() }
     val event = SentryEvent()
 
     SentryRequestHttpServletRequestProcessor(request, options).process(event, Hint())

sentry/api/sentry.api

@@ -391,12 +391,12 @@ public final class io/sentry/DataCollection {
 	public fun getGraphql ()Lio/sentry/DataCollection$Graphql;
 	public fun getHttpBodies ()Ljava/util/Set;
 	public fun getHttpHeaders ()Lio/sentry/DataCollection$HttpHeaders;
-	public fun getQueryParams ()Lio/sentry/KeyValueCollectionBehavior;
+	public fun getUrlQueryParams ()Lio/sentry/KeyValueCollectionBehavior;
 	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 setUrlQueryParams (Lio/sentry/KeyValueCollectionBehavior;)V
 	public fun setUserInfo (Z)V
 }
 
@@ -420,7 +420,7 @@ 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 getQueryParams ()Lio/sentry/KeyValueCollectionBehavior;
+	public fun getUrlQueryParams ()Lio/sentry/KeyValueCollectionBehavior;
 	public fun isDataCollectionConfigured ()Z
 	public fun isDatabaseQueryData ()Z
 	public fun isDatabaseQueryDataWithLegacyAlways ()Z

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

@@ -13,7 +13,7 @@ public final class DataCollection {
   private boolean overridden;
   private @Nullable Boolean userInfo;
   private @Nullable KeyValueCollectionBehavior cookies;
-  private @Nullable KeyValueCollectionBehavior queryParams;
+  private @Nullable KeyValueCollectionBehavior urlQueryParams;
   private @Nullable Set<HttpBodyType> httpBodies;
   private @Nullable Boolean databaseQueryData;
   private final @NotNull HttpHeaders httpHeaders = new HttpHeaders();
@@ -43,12 +43,12 @@ public void setCookies(final @Nullable KeyValueCollectionBehavior cookies) {
     this.cookies = cookies;
   }
 
-  public @Nullable KeyValueCollectionBehavior getQueryParams() {
-    return queryParams;
+  public @Nullable KeyValueCollectionBehavior getUrlQueryParams() {
+    return urlQueryParams;
   }
 
-  public void setQueryParams(final @Nullable KeyValueCollectionBehavior queryParams) {
-    this.queryParams = queryParams;
+  public void setUrlQueryParams(final @Nullable KeyValueCollectionBehavior urlQueryParams) {
+    this.urlQueryParams = urlQueryParams;
   }
 
   public @Nullable Set<HttpBodyType> getHttpBodies() {
@@ -85,7 +85,7 @@ boolean isExplicitlyConfigured() {
     return overridden
         || userInfo != null
         || cookies != null
-        || queryParams != null
+        || urlQueryParams != null
         || httpBodies != null
         || databaseQueryData != null
         || httpHeaders.hasOverrides()

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

@@ -80,8 +80,8 @@ public boolean isGraphqlVariablesWithLegacyAlways() {
     return options.isSendDefaultPii() ? EMPTY_DENY_LIST : OFF;
   }
 
-  public @NotNull KeyValueCollectionBehavior getQueryParams() {
-    return explicitOrEmptyDenyList(options.getDataCollection().getQueryParams());
+  public @NotNull KeyValueCollectionBehavior getUrlQueryParams() {
+    return explicitOrEmptyDenyList(options.getDataCollection().getUrlQueryParams());
   }
 
   public @NotNull KeyValueCollectionBehavior getHttpRequestHeaders() {

sentry/src/main/java/io/sentry/util/UrlUtils.java

@@ -50,7 +50,7 @@ public final class UrlUtils {
   public static @Nullable String filterQueryParams(
       final @Nullable String query, final @NotNull DataCollectionResolver resolver) {
     return resolver.isDataCollectionConfigured()
-        ? HttpUtils.filterQueryParams(query, resolver.getQueryParams())
+        ? HttpUtils.filterQueryParams(query, resolver.getUrlQueryParams())
         : query;
   }
 

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

@@ -25,7 +25,7 @@ class DataCollectionResolverTest {
 
     assertThat(options.dataCollectionResolver.isDataCollectionConfigured).isFalse()
 
-    options.dataCollection.queryParams = KeyValueCollectionBehavior.denyList()
+    options.dataCollection.urlQueryParams = KeyValueCollectionBehavior.denyList()
 
     assertThat(options.dataCollectionResolver.isDataCollectionConfigured).isTrue()
   }
@@ -242,21 +242,21 @@ class DataCollectionResolverTest {
   }
 
   @Test
-  fun `query params use default deny list when unset`() {
+  fun `URL query params use default deny list when unset`() {
     val options = SentryOptions()
 
-    assertThat(options.dataCollectionResolver.queryParams)
+    assertThat(options.dataCollectionResolver.urlQueryParams)
       .isEqualTo(KeyValueCollectionBehavior.denyList())
   }
 
   @Test
-  fun `query params override takes precedence`() {
+  fun `URL query params override takes precedence`() {
     val options = SentryOptions()
     val behavior = KeyValueCollectionBehavior.allowList("language", "theme")
 
-    options.dataCollection.queryParams = behavior
+    options.dataCollection.urlQueryParams = behavior
 
-    assertThat(options.dataCollectionResolver.queryParams).isEqualTo(behavior)
+    assertThat(options.dataCollectionResolver.urlQueryParams).isEqualTo(behavior)
   }
 
   @Test

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

@@ -11,7 +11,7 @@ class DataCollectionTest {
 
     assertThat(dataCollection.userInfo).isNull()
     assertThat(dataCollection.cookies).isNull()
-    assertThat(dataCollection.queryParams).isNull()
+    assertThat(dataCollection.urlQueryParams).isNull()
     assertThat(dataCollection.httpBodies).isNull()
     assertThat(dataCollection.databaseQueryData).isNull()
     assertThat(dataCollection.httpHeaders.request).isNull()

sentry/src/test/java/io/sentry/util/UrlUtilsTest.kt

@@ -54,7 +54,7 @@ class UrlUtilsTest {
   @Test
   fun `resolver aware helpers remove query values in off mode`() {
     val options =
-      SentryOptions().also { it.dataCollection.queryParams = KeyValueCollectionBehavior.off() }
+      SentryOptions().also { it.dataCollection.urlQueryParams = KeyValueCollectionBehavior.off() }
     val details = UrlUtils.parse("https://example.com?name=value", options.dataCollectionResolver)
     val request = Request()
     val breadcrumb =