Merge 9ab47a4 into 43aac6b

sentry-spring/src/main/java/io/sentry/spring/SentryUserFilter.java

@@ -62,15 +62,15 @@ private void apply(final @NotNull User existingUser, final @Nullable User userFr
       Optional.ofNullable(userFromProvider.getId()).ifPresent(existingUser::setId);
       Optional.ofNullable(userFromProvider.getIpAddress()).ifPresent(existingUser::setIpAddress);
       Optional.ofNullable(userFromProvider.getUsername()).ifPresent(existingUser::setUsername);
-      if (userFromProvider.getOthers() != null && !userFromProvider.getOthers().isEmpty()) {
-        Map<String, String> existingUserOthers = existingUser.getOthers();
-        if (existingUserOthers == null) {
-          existingUserOthers = new ConcurrentHashMap<>();
+      if (userFromProvider.getData() != null && !userFromProvider.getData().isEmpty()) {
+        Map<String, String> existingUserData = existingUser.getData();
+        if (existingUserData == null) {
+          existingUserData = new ConcurrentHashMap<>();
         }
-        for (final Map.Entry<String, String> entry : userFromProvider.getOthers().entrySet()) {
-          existingUserOthers.put(entry.getKey(), entry.getValue());
+        for (final Map.Entry<String, String> entry : userFromProvider.getData().entrySet()) {
+          existingUserData.put(entry.getKey(), entry.getValue());
         }
-        existingUser.setOthers(existingUserOthers);
+        existingUser.setData(existingUserData);
       }
     }
   }

sentry/api/sentry.api

@@ -2970,6 +2970,7 @@ public final class io/sentry/protocol/TransactionNameSource : java/lang/Enum {
 public final class io/sentry/protocol/User : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
 	public fun <init> ()V
 	public fun <init> (Lio/sentry/protocol/User;)V
+	public fun getData ()Ljava/util/Map;
 	public fun getEmail ()Ljava/lang/String;
 	public fun getId ()Ljava/lang/String;
 	public fun getIpAddress ()Ljava/lang/String;
@@ -2978,6 +2979,7 @@ public final class io/sentry/protocol/User : io/sentry/JsonSerializable, io/sent
 	public fun getUnknown ()Ljava/util/Map;
 	public fun getUsername ()Ljava/lang/String;
 	public fun serialize (Lio/sentry/JsonObjectWriter;Lio/sentry/ILogger;)V
+	public fun setData (Ljava/util/Map;)V
 	public fun setEmail (Ljava/lang/String;)V
 	public fun setId (Ljava/lang/String;)V
 	public fun setIpAddress (Ljava/lang/String;)V
@@ -2994,6 +2996,7 @@ public final class io/sentry/protocol/User$Deserializer : io/sentry/JsonDeserial
 }
 
 public final class io/sentry/protocol/User$JsonKeys {
+	public static final field DATA Ljava/lang/String;
 	public static final field EMAIL Ljava/lang/String;
 	public static final field ID Ljava/lang/String;
 	public static final field IP_ADDRESS Ljava/lang/String;

sentry/src/main/java/io/sentry/Baggage.java

@@ -296,9 +296,9 @@ public void setValuesFromTransaction(
       return user.getSegment();
     }
 
-    final Map<String, String> others = user.getOthers();
-    if (others != null) {
-      return others.get("segment");
+    final Map<String, String> userData = user.getData();
+    if (userData != null) {
+      return userData.get("segment");
     } else {
       return null;
     }

sentry/src/main/java/io/sentry/protocol/User.java

@@ -40,7 +40,7 @@ public final class User implements JsonUnknown, JsonSerializable {
    * Additional arbitrary fields, as stored in the database (and sometimes as sent by clients). All
    * data from `self.other` should end up here after store normalization.
    */
-  private @Nullable Map<String, @NotNull String> other;
+  private @Nullable Map<String, @NotNull String> data;
 
   /** unknown fields, only internal usage. */
   private @Nullable Map<String, @NotNull Object> unknown;
@@ -53,7 +53,7 @@ public User(final @NotNull User user) {
     this.id = user.id;
     this.ipAddress = user.ipAddress;
     this.segment = user.segment;
-    this.other = CollectionUtils.newConcurrentHashMap(user.other);
+    this.data = CollectionUtils.newConcurrentHashMap(user.data);
     this.unknown = CollectionUtils.newConcurrentHashMap(user.unknown);
   }
 
@@ -150,19 +150,43 @@ public void setIpAddress(final @Nullable String ipAddress) {
   /**
    * Gets other user related data.
    *
+   * @deprecated use getData instead
    * @return the other user data.
    */
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
   public @Nullable Map<String, @NotNull String> getOthers() {
-    return other;
+    return getData();
   }
 
   /**
    * Sets other user related data.
    *
+   * @deprecated use setData instead
    * @param other the other user related data..
    */
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
   public void setOthers(final @Nullable Map<String, @NotNull String> other) {
-    this.other = CollectionUtils.newConcurrentHashMap(other);
+    this.setData(other);
+  }
+
+  /**
+   * Gets additional arbitrary fields of the user.
+   *
+   * @return the other user data.
+   */
+  public @Nullable Map<String, @NotNull String> getData() {
+    return data;
+  }
+
+  /**
+   * Sets additional arbitrary fields of the user.
+   *
+   * @param data the other user related data..
+   */
+  public void setData(final @Nullable Map<String, @NotNull String> data) {
+    this.data = CollectionUtils.newConcurrentHashMap(data);
   }
 
   // region json
@@ -185,6 +209,7 @@ public static final class JsonKeys {
     public static final String SEGMENT = "segment";
     public static final String IP_ADDRESS = "ip_address";
     public static final String OTHER = "other";
+    public static final String DATA = "data";
   }
 
   @Override
@@ -206,8 +231,8 @@ public void serialize(@NotNull JsonObjectWriter writer, @NotNull ILogger logger)
     if (ipAddress != null) {
       writer.name(JsonKeys.IP_ADDRESS).value(ipAddress);
     }
-    if (other != null) {
-      writer.name(JsonKeys.OTHER).value(logger, other);
+    if (data != null) {
+      writer.name(JsonKeys.DATA).value(logger, data);
     }
     if (unknown != null) {
       for (String key : unknown.keySet()) {
@@ -245,11 +270,18 @@ public static final class Deserializer implements JsonDeserializer<User> {
           case JsonKeys.IP_ADDRESS:
             user.ipAddress = reader.nextStringOrNull();
             break;
-          case JsonKeys.OTHER:
-            user.other =
+          case JsonKeys.DATA:
+            user.data =
                 CollectionUtils.newConcurrentHashMap(
                     (Map<String, String>) reader.nextObjectOrNull());
             break;
+          case JsonKeys.OTHER:
+            if (user.data == null || user.data.isEmpty()) {
+              user.data =
+                  CollectionUtils.newConcurrentHashMap(
+                      (Map<String, String>) reader.nextObjectOrNull());
+            }
+            break;
           default:
             if (unknown == null) {
               unknown = new ConcurrentHashMap<>();

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

@@ -30,8 +30,8 @@ class ScopeTest {
         user.id = "123"
         user.ipAddress = "123.x"
         user.username = "userName"
-        val others = mutableMapOf(Pair("others", "others"))
-        user.others = others
+        val data = mutableMapOf(Pair("data", "data"))
+        user.data = data
 
         scope.user = user
 

sentry/src/test/java/io/sentry/protocol/UserSerializationTest.kt

@@ -43,6 +43,15 @@ class UserSerializationTest {
         assertEquals(expectedJson, actualJson)
     }
 
+    @Test
+    fun deserializeLegacy() {
+        val inputJson = sanitizedFile("json/user_legacy.json")
+        val expectedJson = sanitizedFile("json/user.json")
+        val actual = deserialize(inputJson)
+        val actualJson = serialize(actual)
+        assertEquals(expectedJson, actualJson)
+    }
+
     // Helper
 
     private fun sanitizedFile(path: String): String {

sentry/src/test/java/io/sentry/protocol/UserTest.kt

@@ -17,7 +17,7 @@ class UserTest {
         assertNotNull(clone)
         assertNotSame(user, clone)
 
-        assertNotSame(user.others, clone.others)
+        assertNotSame(user.data, clone.data)
 
         assertNotSame(user.unknown, clone.unknown)
     }
@@ -32,7 +32,7 @@ class UserTest {
         assertEquals("123.x", clone.ipAddress)
         assertEquals("userName", clone.username)
         assertEquals("userSegment", clone.segment)
-        assertEquals("others", clone.others!!["others"])
+        assertEquals("data", clone.data!!["data"])
         assertEquals("unknown", clone.unknown!!["unknown"])
     }
 
@@ -46,8 +46,8 @@ class UserTest {
         user.ipAddress = "456.x"
         user.username = "newUserName"
         user.segment = "newUserSegment"
-        user.others!!["others"] = "newOthers"
-        user.others!!["anotherOne"] = "anotherOne"
+        user.data!!["data"] = "newOthers"
+        user.data!!["anotherOne"] = "anotherOne"
         val newUnknown = mapOf(Pair("unknown", "newUnknown"), Pair("otherUnknown", "otherUnknown"))
         user.setUnknown(newUnknown)
 
@@ -56,27 +56,27 @@ class UserTest {
         assertEquals("123.x", clone.ipAddress)
         assertEquals("userName", clone.username)
         assertEquals("userSegment", clone.segment)
-        assertEquals("others", clone.others!!["others"])
-        assertEquals(1, clone.others!!.size)
+        assertEquals("data", clone.data!!["data"])
+        assertEquals(1, clone.data!!.size)
         assertEquals("unknown", clone.unknown!!["unknown"])
         assertEquals(1, clone.unknown!!.size)
     }
 
     @Test
-    fun `setting null others do not crash`() {
+    fun `setting null data do not crash`() {
         val user = createUser()
-        user.others = null
+        user.data = null
 
-        assertNull(user.others)
+        assertNull(user.data)
     }
 
     @Test
-    fun `when setOther receives immutable map as an argument, its still possible to add more others to the user`() {
+    fun `when setOther receives immutable map as an argument, its still possible to add more data to the user`() {
         val user = User().apply {
-            others = Collections.unmodifiableMap(mapOf("key1" to "value1"))
-            others!!["key2"] = "value2"
+            data = Collections.unmodifiableMap(mapOf("key1" to "value1"))
+            data!!["key2"] = "value2"
         }
-        assertNotNull(user.others) {
+        assertNotNull(user.data) {
             assertEquals(mapOf("key1" to "value1", "key2" to "value2"), it)
         }
     }
@@ -88,8 +88,8 @@ class UserTest {
             ipAddress = "123.x"
             username = "userName"
             segment = "userSegment"
-            val others = mutableMapOf(Pair("others", "others"))
-            setOthers(others)
+            val data = mutableMapOf(Pair("data", "data"))
+            setData(data)
             val unknown = mapOf(Pair("unknown", "unknown"))
             setUnknown(unknown)
         }

sentry/src/test/resources/json/sentry_base_event.json

@@ -159,7 +159,7 @@
     "id": "efb2084b-1871-4b59-8897-b4bd9f196a01",
     "username": "60c05dff-7140-4d94-9a61-c9cdd9ca9b96",
     "ip_address": "51d22b77-f663-4dbe-8103-8b749d1d9a48",
-    "other":
+    "data":
     {
       "dc2813d0-0f66-4a3f-a995-71268f61a8fa": "991659ad-7c59-4dd3-bb89-0bd5c74014bd"
     }

sentry/src/test/resources/json/sentry_event.json

@@ -306,7 +306,7 @@
         "id": "efb2084b-1871-4b59-8897-b4bd9f196a01",
         "username": "60c05dff-7140-4d94-9a61-c9cdd9ca9b96",
         "ip_address": "51d22b77-f663-4dbe-8103-8b749d1d9a48",
-        "other":
+        "data":
         {
             "dc2813d0-0f66-4a3f-a995-71268f61a8fa": "991659ad-7c59-4dd3-bb89-0bd5c74014bd"
         }

sentry/src/test/resources/json/sentry_transaction.json

@@ -202,7 +202,7 @@
         "id": "efb2084b-1871-4b59-8897-b4bd9f196a01",
         "username": "60c05dff-7140-4d94-9a61-c9cdd9ca9b96",
         "ip_address": "51d22b77-f663-4dbe-8103-8b749d1d9a48",
-        "other":
+        "data":
         {
             "dc2813d0-0f66-4a3f-a995-71268f61a8fa": "991659ad-7c59-4dd3-bb89-0bd5c74014bd"
         }

sentry/src/test/resources/json/sentry_transaction_legacy_date_format.json

@@ -202,7 +202,7 @@
         "id": "efb2084b-1871-4b59-8897-b4bd9f196a01",
         "username": "60c05dff-7140-4d94-9a61-c9cdd9ca9b96",
         "ip_address": "51d22b77-f663-4dbe-8103-8b749d1d9a48",
-        "other":
+        "data":
         {
             "dc2813d0-0f66-4a3f-a995-71268f61a8fa": "991659ad-7c59-4dd3-bb89-0bd5c74014bd"
         }

sentry/src/test/resources/json/sentry_transaction_no_measurement_unit.json

@@ -194,7 +194,7 @@
         "id": "efb2084b-1871-4b59-8897-b4bd9f196a01",
         "username": "60c05dff-7140-4d94-9a61-c9cdd9ca9b96",
         "ip_address": "51d22b77-f663-4dbe-8103-8b749d1d9a48",
-        "other":
+        "data":
         {
             "dc2813d0-0f66-4a3f-a995-71268f61a8fa": "991659ad-7c59-4dd3-bb89-0bd5c74014bd"
         }

sentry/src/test/resources/json/user.json

@@ -3,8 +3,8 @@
     "id": "efb2084b-1871-4b59-8897-b4bd9f196a01",
     "username": "60c05dff-7140-4d94-9a61-c9cdd9ca9b96",
     "ip_address": "51d22b77-f663-4dbe-8103-8b749d1d9a48",
-    "other":
+    "data":
     {
         "dc2813d0-0f66-4a3f-a995-71268f61a8fa": "991659ad-7c59-4dd3-bb89-0bd5c74014bd"
     }
-}
+}

sentry/src/test/resources/json/user_legacy.json

@@ -0,0 +1,10 @@
+{
+    "email": "c4d61c1b-c144-431e-868f-37a46be5e5f2",
+    "id": "efb2084b-1871-4b59-8897-b4bd9f196a01",
+    "username": "60c05dff-7140-4d94-9a61-c9cdd9ca9b96",
+    "ip_address": "51d22b77-f663-4dbe-8103-8b749d1d9a48",
+    "other":
+    {
+        "dc2813d0-0f66-4a3f-a995-71268f61a8fa": "991659ad-7c59-4dd3-bb89-0bd5c74014bd"
+    }
+}