Merge aff18bf into 4ed1be9

getsentry · Oct 23, 2024 · e045c61 · e045c61
2 parents 4ed1be9 + aff18bf
commit e045c61
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@
 
 ## Unreleased
 
+### Fixes
+
+- Adds breadcrumb origin field to prevent exception capture context from being overwritten by native scope sync ([#4124](https://github.com/getsentry/sentry-react-native/pull/4124))
+
 ### Dependencies
 
 - Bump JavaScript SDK from v8.34.0 to v8.35.0 ([#4196](https://github.com/getsentry/sentry-react-native/pull/4196))

diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryBreadcrumb.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryBreadcrumb.java
@@ -51,6 +51,10 @@ public static Breadcrumb fromMap(ReadableMap from) {
       breadcrumb.setCategory(from.getString("category"));
     }
 
+    if (from.hasKey("origin")) {
+      breadcrumb.setOrigin(from.getString("origin"));
+    }
+
     if (from.hasKey("level")) {
       switch (from.getString("level")) {
         case "fatal":

diff --git a/packages/core/ios/RNSentryBreadcrumb.m b/packages/core/ios/RNSentryBreadcrumb.m
@@ -23,6 +23,7 @@ +(SentryBreadcrumb*) from: (NSDictionary *) dict
 
     [crumb setLevel:sentryLevel];
     [crumb setCategory:dict[@"category"]];
+    [crumb setOrigin:dict[@"origin"]];
     [crumb setType:dict[@"type"]];
     [crumb setMessage:dict[@"message"]];
     [crumb setData:dict[@"data"]];