This adds stacktrace merging for react-native 0.45

Author: HazAT

ios/RNSentry.m

@@ -202,23 +202,54 @@ - (void)setReleaseVersionDist:(SentryEvent *)event {
     if (NSClassFromString(@"RCTBatchedBridge")) {
         [self swizzleCallNativeModule:NSClassFromString(@"RCTBatchedBridge")];
     } else {
-        // TODO fix stacktrace merging
-        reject(@"SentryException", @"stacktrace merging not supported", nil);
-        return;
+        [self swizzleInvokeWithBridge:NSClassFromString(@"RCTModuleMethod")];
     }
     resolve(@YES);
 }
 
-- (void)swizzleCallNativeModule:(Class)class {
+- (void)swizzleInvokeWithBridge:(Class)class {
     static const void *key = &key;
-    SEL selector = @selector(callNativeModule:method:params:);
+    SEL selector = @selector(invokeWithBridge:module:arguments:);
     uintptr_t callNativeModuleAddress = [class instanceMethodForSelector:selector];
 
     SentrySwizzleInstanceMethod(class,
                                 selector,
                                 SentrySWReturnType(id),
+                                SentrySWArguments(RCTBridge *bridge, id module, NSArray *arguments),
+                                SentrySWReplacement({
+        // TODO: refactor this block, its used twice
+        NSMutableArray *newParams = [NSMutableArray array];
+        if (arguments != nil && arguments.count > 0) {
+            for (id param in arguments) {
+                if ([param isKindOfClass:NSDictionary.class] && param[@"__sentry_stack"]) {
+                    @synchronized (SentryClient.sharedClient) {
+                        NSMutableDictionary *prevExtra = SentryClient.sharedClient.extra.mutableCopy;
+                        [prevExtra setValue:[NSNumber numberWithUnsignedInteger:callNativeModuleAddress] forKey:@"__sentry_address"];
+                        [prevExtra setValue:SentryParseJavaScriptStacktrace([RCTConvert NSString:param[@"__sentry_stack"]]) forKey:@"__sentry_stack"];
+                        SentryClient.sharedClient.extra = prevExtra;
+                    }
+                } else {
+                    if (param != nil) {
+                        [newParams addObject:param];
+                    }
+                }
+            }
+        }
+        return SentrySWCallOriginal(bridge, module, newParams);
+    }), SentrySwizzleModeOncePerClassAndSuperclasses, key);
+}
+
+- (void)swizzleCallNativeModule:(Class)class {
+    static const void *key = &key;
+    SEL selctor = @selector(callNativeModule:method:params:);
+    uintptr_t callNativeModuleAddress = [class instanceMethodForSelector:selctor];
+
+    SentrySwizzleInstanceMethod(class,
+                                selctor,
+                                SentrySWReturnType(id),
                                 SentrySWArguments(NSUInteger moduleID, NSUInteger methodID, NSArray *params),
                                 SentrySWReplacement({
+        // TODO: refactor this block, its used twice
         NSMutableArray *newParams = [NSMutableArray array];
         if (params != nil && params.count > 0) {
             for (id param in params) {

lib/Sentry.js

@@ -256,16 +256,18 @@ class NativeClient {
           return;
         }
         this._ignoredModules = {};
-        __fbBatchedBridgeConfig.remoteModuleConfig.forEach((module, moduleID) => {
-          if (
-            module !== null &&
-            this.options.ignoreModulesExclude.indexOf(module[0]) === -1 &&
-            (DEFAULT_MODULE_IGNORES.indexOf(module[0]) >= 0 ||
-              this.options.ignoreModulesInclude.indexOf(module[0]) >= 0)
-          ) {
-            this._ignoredModules[moduleID] = true;
-          }
-        });
+        if (typeof __fbBatchedBridgeConfig !== 'undefined') {
+          __fbBatchedBridgeConfig.remoteModuleConfig.forEach((module, moduleID) => {
+            if (
+              module !== null &&
+              this.options.ignoreModulesExclude.indexOf(module[0]) === -1 &&
+              (DEFAULT_MODULE_IGNORES.indexOf(module[0]) >= 0 ||
+                this.options.ignoreModulesInclude.indexOf(module[0]) >= 0)
+            ) {
+              this._ignoredModules[moduleID] = true;
+            }
+          });
+        }
         this._activatedMerging = true;
         this._overwriteEnqueueNativeCall();
       })