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

Author: adinauer

sentry/api/sentry.api

@@ -390,12 +390,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
 }
 

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