Merge external map properties (#1656)

Fixes #874
getsentry · Aug 18, 2021 · d9f2498 · d9f2498
1 parent fd71717
commit d9f2498
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+* Feat: Merge external map properties (#1656)
+
 ## 5.1.0
 
 * Feat: Spring WebClient integration (#1621)

diff --git a/sentry/src/main/java/io/sentry/config/CompositePropertiesProvider.java b/sentry/src/main/java/io/sentry/config/CompositePropertiesProvider.java
@@ -31,12 +31,10 @@ public CompositePropertiesProvider(@NotNull List<PropertiesProvider> providers)
 
   @Override
   public @NotNull Map<String, String> getMap(final @NotNull String property) {
+    final Map<String, String> result = new ConcurrentHashMap<>();
     for (final PropertiesProvider provider : providers) {
-      final Map<String, String> result = provider.getMap(property);
-      if (!result.isEmpty()) {
-        return result;
-      }
+      result.putAll(provider.getMap(property));
     }
-    return new ConcurrentHashMap<>();
+    return result;
   }
 }
diff --git a/sentry/src/test/java/io/sentry/config/CompositePropertiesProviderTest.kt b/sentry/src/test/java/io/sentry/config/CompositePropertiesProviderTest.kt
@@ -31,4 +31,18 @@ class CompositePropertiesProviderTest {
         whenever(second.getProperty("property")).thenReturn(null)
         assertNull(provider.getProperty("property"))
     }
+
+    @Test
+    fun `combines map results from multiple providers into single map`() {
+        whenever(first.getMap("tags")).thenReturn(mapOf("first_tag" to "val1"))
+        whenever(second.getMap("tags")).thenReturn(mapOf("second_tag" to "val2"))
+        assertEquals(mapOf("first_tag" to "val1", "second_tag" to "val2"), provider.getMap("tags"))
+    }
+
+    @Test
+    fun `when multiple providers return same map entries, the last one takes the precedence`() {
+        whenever(first.getMap("tags")).thenReturn(mapOf("first_tag" to "val1", "conflicting_tag" to "val3"))
+        whenever(second.getMap("tags")).thenReturn(mapOf("second_tag" to "val2", "conflicting_tag" to "val4"))
+        assertEquals(mapOf("first_tag" to "val1", "second_tag" to "val2", "conflicting_tag" to "val4"), provider.getMap("tags"))
+    }
 }