code review

sentry-core/src/main/java/io/sentry/core/SentryClient.java

@@ -6,6 +6,8 @@
 import io.sentry.core.transport.AsyncConnection;
 import io.sentry.core.util.Nullable;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
 
 public class SentryClient implements ISentryClient {
   static final String SENTRY_PROTOCOL_VERSION = "7";
@@ -59,13 +61,19 @@ public SentryId captureEvent(SentryEvent event, @Nullable Scope scope) {
         event.setFingerprint(scope.getFingerprint());
       }
       if (event.getBreadcrumbs() == null) {
-        event.setBreadcrumbs(scope.getBreadcrumbs());
+        event.setBreadcrumbs(new ArrayList<>(scope.getBreadcrumbs()));
+      } else {
+        event.getBreadcrumbs().addAll(scope.getBreadcrumbs());
       }
       if (event.getTags() == null) {
-        event.setTags(scope.getTags());
+        event.setTags(new HashMap<>(scope.getTags()));
+      } else {
+        event.getTags().putAll(scope.getTags());
       }
       if (event.getExtra() == null) {
-        event.setExtra(scope.getExtra());
+        event.setExtra(new HashMap<>(scope.getExtra()));
+      } else {
+        event.getExtra().putAll(scope.getExtra());
       }
       if (scope.getLevel() != null) {
         event.setLevel(scope.getLevel());

sentry-core/src/main/java/io/sentry/core/SentryEvent.java

@@ -233,7 +233,7 @@ public void setTags(Map<String, String> tags) {
     this.tags = tags;
   }
 
-  public void addTag(String key, String value) {
+  public void setTag(String key, String value) {
     if (tags == null) {
       tags = new HashMap<>();
     }
@@ -248,7 +248,7 @@ public void setExtra(Map<String, Object> extra) {
     this.extra = extra;
   }
 
-  public void addExtra(String key, Object value) {
+  public void setExtra(String key, Object value) {
     if (extra == null) {
       extra = new HashMap<>();
     }

sentry-core/src/test/java/io/sentry/core/SentryClientTest.kt

@@ -181,8 +181,8 @@ class SentryClientTest {
             addBreadcrumb(Breadcrumb().apply {
                 message = "eventMessage"
             })
-            addExtra("eventExtra", "eventExtra")
-            addTag("eventTag", "eventTag")
+            setExtra("eventExtra", "eventExtra")
+            setTag("eventTag", "eventTag")
             addFingerprint("eventFp")
             transaction = "eventTransaction"
             level = SentryLevel.DEBUG