feat: Sync RN scope to native

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Expose session timeout. #887
+- Added `event.origin` and `event.environment` tags to determine where events originate from. #890
 
 ## 1.4.1
 
@@ -134,7 +135,7 @@ New way to import and init the SDK:
 import * as Sentry from "@sentry/react-native";
 
 Sentry.init({
-  dsn: "DSN",
+  dsn: "DSN"
 });
 ```
 
@@ -370,7 +371,7 @@ To activate it set:
 
 ```js
 Sentry.config("___DSN___", {
-  deactivateStacktraceMerging: false,
+  deactivateStacktraceMerging: false
 });
 ```
 

RNSentry.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.preserve_paths = '*.js'
 
   s.dependency 'React'
-  s.dependency 'Sentry', '~> 5.1.0'
+  s.dependency 'Sentry', '~> 5.1.1'
 
   s.source_files = 'ios/RNSentry.{h,m}'
   s.public_header_files = 'ios/RNSentry.h'

android/src/main/java/io/sentry/RNSentryModule.java

@@ -10,13 +10,16 @@
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableMapKeySetIterator;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.module.annotations.ReactModule;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -28,10 +31,15 @@
 import io.sentry.android.core.AnrIntegration;
 import io.sentry.android.core.NdkIntegration;
 import io.sentry.android.core.SentryAndroid;
+import io.sentry.core.Sentry;
+import io.sentry.core.Breadcrumb;
 import io.sentry.core.Integration;
+import io.sentry.core.SentryLevel;
 import io.sentry.core.SentryOptions;
 import io.sentry.core.UncaughtExceptionHandlerIntegration;
+import io.sentry.core.protocol.SdkVersion;
 import io.sentry.core.protocol.SentryException;
+import io.sentry.core.protocol.User;
 
 @ReactModule(name = RNSentryModule.NAME)
 public class RNSentryModule extends ReactContextBaseJavaModule {
@@ -108,6 +116,27 @@ public void startWithOptions(final ReadableMap rnOptions, Promise promise) {
                 } catch (Exception e) {
                     // We do nothing
                 }
+
+                // Add on the correct event.origin tag.
+                // it needs to be here so we can determine where it originated from.
+                SdkVersion sdkVersion = event.getSdk();
+                if (sdkVersion != null) {
+                    String sdkName = sdkVersion.getName();
+                    if (sdkName != null) {
+                        if (sdkName.equals("sentry.javascript.react-native")) {
+                            event.setTag("event.origin", "javascript");
+                        } else if (sdkName.equals("sentry.java.android") || sdkName.equals("sentry.native")) {
+                            event.setTag("event.origin", "android");
+
+                            if (sdkName.equals("sentry.native")) {
+                                event.setTag("event.environment", "native");
+                            } else {
+                                event.setTag("event.environment", "java");
+                            }
+                        }
+                    }
+                }
+
                 return event;
             });
 
@@ -190,4 +219,114 @@ private Level logLevel(int level) {
                 return Level.OFF;
         }
     }
+
+    @ReactMethod
+    public void setUser(final ReadableMap user) {
+        if (user == null) {
+            Sentry.setUser(null);
+        } else {
+            User userInstance = new User();
+
+            // only support these defined keys for now.
+            if (user.hasKey("email")) {
+                userInstance.setEmail(user.getString("email"));
+            } else {
+                userInstance.setEmail(null);
+            }
+
+            if (user.hasKey("id")) {
+                userInstance.setId(user.getString("id"));
+            } else {
+                userInstance.setId(null);
+            }
+
+            if (user.hasKey("username")) {
+                userInstance.setUsername(user.getString("username"));
+            } else {
+                userInstance.setUsername(null);
+            }
+
+            if (user.hasKey("ip_address")) {
+                userInstance.setIpAddress(user.getString("ip_address"));
+            } else {
+                userInstance.setIpAddress(null);
+            }
+
+            Sentry.setUser(userInstance);
+        }
+    }
+
+    @ReactMethod
+    public void addBreadcrumb(final ReadableMap breadcrumb) {
+        Breadcrumb breadcrumbInstance = new Breadcrumb();
+
+        if (breadcrumb.hasKey("message")) {
+            breadcrumbInstance.setMessage(breadcrumb.getString("message"));
+        }
+
+        if (breadcrumb.hasKey("type")) {
+            breadcrumbInstance.setType(breadcrumb.getString("type"));
+        }
+
+        if (breadcrumb.hasKey("category")) {
+            breadcrumbInstance.setCategory(breadcrumb.getString("category"));
+        }
+
+        if (breadcrumb.hasKey("level")) {
+            switch (breadcrumb.getString("level")) {
+                case "fatal":
+                    breadcrumbInstance.setLevel(SentryLevel.FATAL);
+                    break;
+                case "warning":
+                    breadcrumbInstance.setLevel(SentryLevel.WARNING);
+                    break;
+                case "info":
+                    breadcrumbInstance.setLevel(SentryLevel.INFO);
+                    break;
+                case "debug":
+                    breadcrumbInstance.setLevel(SentryLevel.DEBUG);
+                    break;
+                case "error":
+                    breadcrumbInstance.setLevel(SentryLevel.ERROR);
+                    break;
+                default:
+                    breadcrumbInstance.setLevel(SentryLevel.ERROR);
+                    break;
+            }
+        }
+
+        if (breadcrumb.hasKey("data")) {
+            ReadableMap data = breadcrumb.getMap("data");
+            ReadableMapKeySetIterator it = data.keySetIterator();
+            while (it.hasNextKey()) {
+                String key = it.nextKey();
+                String value = data.getString(key);
+
+                breadcrumbInstance.setData(key, value);
+            }
+        }
+
+        Sentry.addBreadcrumb(breadcrumbInstance);
+    }
+
+    // @ReactMethod
+    // public void setFingerprint(ReadableArray fingerprint) {
+    //     ArrayList<String> fingerprintList = new ArrayList<String>();
+
+    //     for (int i = 0; i < fingerprint.size(); i++) {
+    //         fingerprintList.add(fingerprint.getString(i));
+    //     }
+
+    //     Sentry.setFingerprint(fingerprintList);
+    // }
+
+    @ReactMethod
+    public void setExtra(String key, String extra) {
+        Sentry.setExtra(key, extra);
+    }
+
+    @ReactMethod
+    public void setTag(String key, String value) {
+        Sentry.setTag(key, value);
+    }
 }

ios/RNSentry.m

@@ -46,6 +46,14 @@ + (BOOL)requiresMainQueueSetup {
             return nil;
         }
 
+        // set the event.origin tag to be ios if the event originated from the sentry-cocoa sdk.
+        if (event.sdk && [event.sdk[@"name"] isEqualToString:@"sentry.cocoa"]) {
+            NSMutableDictionary *newTags = [NSMutableDictionary new];
+            [newTags addEntriesFromDictionary:event.tags];
+            [newTags setValue:@"ios" forKey:@"event.origin"];
+            event.tags = newTags;
+        }
+
         return event;
     };
 
@@ -124,6 +132,80 @@ + (BOOL)requiresMainQueueSetup {
     });
 }
 
+RCT_EXPORT_METHOD(setUser:(NSDictionary *)user)
+{
+    [SentrySDK configureScope:^(SentryScope * _Nonnull scope) {
+        if (nil == user) {
+            [scope setUser:nil];
+        } else {
+            SentryUser* userInstance = [[SentryUser alloc] init];
+
+            [userInstance setUserId:user[@"id"]];
+            [userInstance setEmail:user[@"email"]];
+            [userInstance setUsername:user[@"username"]];
+
+            [scope setUser:userInstance];
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(addBreadcrumb:(NSDictionary *)breadcrumb)
+{
+    [SentrySDK configureScope:^(SentryScope * _Nonnull scope) {
+        SentryBreadcrumb* breadcrumbInstance = [[SentryBreadcrumb alloc] init];
+
+        NSString * levelString = breadcrumb[@"level"];
+        SentryLevel sentryLevel;
+        if ([levelString isEqualToString:@"fatal"]) {
+            sentryLevel = kSentryLevelFatal;
+        } else if ([levelString isEqualToString:@"warning"]) {
+            sentryLevel = kSentryLevelWarning;
+        } else if ([levelString isEqualToString:@"info"]) {
+            sentryLevel = kSentryLevelInfo;
+        } else if ([levelString isEqualToString:@"debug"]) {
+            sentryLevel = kSentryLevelDebug;
+        } else {
+            sentryLevel = kSentryLevelError;
+        }
+        [breadcrumbInstance setLevel:sentryLevel];
+
+        [breadcrumbInstance setCategory:breadcrumb[@"category"]];
+
+        [breadcrumbInstance setType:breadcrumb[@"type"]];
+
+        [breadcrumbInstance setMessage:breadcrumb[@"message"]];
+
+        [breadcrumbInstance setData:breadcrumb[@"data"]];
+
+        [scope addBreadcrumb:breadcrumbInstance];
+    }];
+}
+
+RCT_EXPORT_METHOD(setExtra:(NSString *)key
+                  extra:(NSString *)extra
+)
+{
+    [SentrySDK configureScope:^(SentryScope * _Nonnull scope) {
+        [scope setExtraValue:extra forKey:key];
+    }];
+}
+
+RCT_EXPORT_METHOD(setTag:(NSString *)key
+                  value:(NSString *)value
+)
+{
+    [SentrySDK configureScope:^(SentryScope * _Nonnull scope) {
+        [scope setTagValue:value forKey:key];
+    }];
+}
+
+// RCT_EXPORT_METHOD(setFingerprint:(NSArray<NSString *> *)fingerprint)
+// {
+//     [SentrySDK configureScope:^(SentryScope * _Nonnull scope) {
+//         [scope setFingerprint:fingerprint];
+//     }];
+// }
+
 RCT_EXPORT_METHOD(crash)
 {
     [SentrySDK crash];

package.json

@@ -36,6 +36,7 @@
   "dependencies": {
     "@sentry/browser": "^5.15.5",
     "@sentry/core": "^5.15.5",
+    "@sentry/hub": "^5.15.5",
     "@sentry/integrations": "^5.15.5",
     "@sentry/types": "^5.15.5",
     "@sentry/utils": "^5.15.5",