Merge pull request #214 from getsentry/bugfix/stacktrace-merging-performance

Improve performance on stacktrace merging

Author: HazAT

ios/RNSentry.m

@@ -14,7 +14,7 @@
 
 @interface RNSentry()
 
-@property (nonatomic, strong) NSDictionary *lastReceivedException;
+@property (nonatomic, strong) NSMutableDictionary *moduleMapping;
 
 @end
 
@@ -201,6 +201,7 @@ - (void)setReleaseVersionDist:(SentryEvent *)event {
     static dispatch_once_t onceStartToken;
     dispatch_once(&onceStartToken, ^{
         NSError *error = nil;
+        self.moduleMapping = [[NSMutableDictionary alloc] init];
         SentryClient *client = [[SentryClient alloc] initWithDsn:dsnString didFailWithError:&error];
         client.beforeSerializeEvent = ^(SentryEvent * _Nonnull event) {
             [self injectReactNativeFrames:event];
@@ -240,7 +241,7 @@ - (void)swizzleInvokeWithBridge:(Class)class {
     static const void *key = &key;
     SEL selector = @selector(invokeWithBridge:module:arguments:);
     uintptr_t callNativeModuleAddress = [class instanceMethodForSelector:selector];
-
+    __block RNSentry *_self = self;
     SentrySwizzleInstanceMethod(class,
                                 selector,
                                 SentrySWReturnType(id),
@@ -251,6 +252,8 @@ - (void)swizzleInvokeWithBridge:(Class)class {
         if (arguments != nil && arguments.count > 0) {
             for (id param in arguments) {
                 if ([param isKindOfClass:NSDictionary.class] && param[@"__sentry_stack"]) {
+                    [_self.moduleMapping setValue:[NSString stringWithFormat:@"%@", [module class]] forKey:[NSString stringWithFormat:@"%@", param[@"__sentry_moduleID"]]];
+                    [RNSentryEventEmitter emitModuleTableUpdate:_self.moduleMapping];
                     [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithUnsignedInteger:callNativeModuleAddress] forKey:@"RNSentry.__sentry_address"];
                     [[NSUserDefaults standardUserDefaults] setObject:[RCTConvert NSString:param[@"__sentry_stack"]] forKey:@"RNSentry.__sentry_stack"];
                     [[NSUserDefaults standardUserDefaults] synchronize];

ios/RNSentryEventEmitter.h

@@ -12,5 +12,6 @@
 @interface RNSentryEventEmitter : RCTEventEmitter <RCTBridgeModule>
 
 + (void)emitStoredEvent;
++ (void)emitModuleTableUpdate:(NSDictionary *)moduleTable;
 
 @end

ios/RNSentryEventEmitter.m

@@ -10,6 +10,7 @@
 
 NSString *const kEventSentSuccessfully = @"Sentry/eventSentSuccessfully";
 NSString *const kEventStored = @"Sentry/eventStored";
+NSString *const kModuleTable = @"Sentry/moduleTable";
 
 @implementation RNSentryEventEmitter
 
@@ -18,12 +19,13 @@ @implementation RNSentryEventEmitter
 - (NSDictionary<NSString *, NSString *> *)constantsToExport {
     return @{
              @"EVENT_SENT_SUCCESSFULLY": kEventSentSuccessfully,
-             @"EVENT_STORED": kEventStored
+             @"EVENT_STORED": kEventStored,
+             @"MODULE_TABLE": kModuleTable
              };
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[kEventSentSuccessfully, kEventStored];
+    return @[kEventSentSuccessfully, kEventStored, kModuleTable];
 }
 
 
@@ -44,6 +46,13 @@ + (void)emitStoredEvent {
     [self postNotificationName:kEventStored withPayload:@""];
 }
 
++ (void)emitModuleTableUpdate:(NSDictionary *)moduleTable {
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:moduleTable
+                                                       options:0
+                                                         error:nil];
+    [self postNotificationName:kModuleTable withPayload:[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]];
+}
+
 + (void)postNotificationName:(NSString *)name withPayload:(NSObject *)object {
     NSDictionary<NSString *, id> *payload = @{@"payload": object};
 

lib/NativeClient.js

@@ -1,5 +1,5 @@
-import {NativeModules} from 'react-native';
-const {RNSentry} = NativeModules;
+import {NativeModules, NativeEventEmitter} from 'react-native';
+const {RNSentry, RNSentryEventEmitter} = NativeModules;
 
 const DEFAULT_MODULE_IGNORES = [
   'AccessibilityManager',
@@ -58,6 +58,10 @@ export class NativeClient {
     RNSentry.startWithDsnString(this._dsn);
     if (this.options.deactivateStacktraceMerging === false) {
       this._activateStacktraceMerging();
+      const eventEmitter = new NativeEventEmitter(RNSentryEventEmitter);
+      eventEmitter.addListener(RNSentryEventEmitter.MODULE_TABLE, moduleTable => {
+        this._updateIgnoredModules(JSON.parse(moduleTable.payload));
+      });
     }
     RNSentry.setLogLevel(options.logLevel);
   }
@@ -94,6 +98,29 @@ export class NativeClient {
     RNSentry.clearContext();
   }
 
+  _updateIgnoredModules(modules) {
+    const values = Object.values(modules);
+    const keys = Object.keys(modules);
+    for (let i = 0; i < values.length; i++) {
+      const moduleName = values[i].replace(/RCT/, '');
+      const moduleID = keys[i];
+      if (this._ignoredModules[moduleID]) {
+        continue;
+      }
+      this._addIgnoredModule(moduleID, moduleName);
+    }
+  }
+
+  _addIgnoredModule(moduleID, moduleName) {
+    if (
+      this.options.ignoreModulesExclude.indexOf(moduleName) === -1 &&
+      (DEFAULT_MODULE_IGNORES.indexOf(moduleName) >= 0 ||
+        this.options.ignoreModulesInclude.indexOf(moduleName) >= 0)
+    ) {
+      this._ignoredModules[moduleID] = true;
+    }
+  }
+
   _activateStacktraceMerging = async () => {
     return RNSentry.activateStacktraceMerging()
       .then(activated => {
@@ -105,26 +132,15 @@ export class NativeClient {
         if (typeof __fbBatchedBridgeConfig !== 'undefined') {
           /* global __fbBatchedBridgeConfig */
           __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 (module !== null) {
+              this._addIgnoredModule(moduleID, module[0]);
             }
           });
         } else if (BatchedBridge._remoteModuleTable) {
-          for (let module in BatchedBridge._remoteModuleTable) {
-            if (BatchedBridge._remoteModuleTable.hasOwnProperty(module)) {
-              let moduleName = BatchedBridge._remoteModuleTable[module];
-              if (
-                this.options.ignoreModulesExclude.indexOf(moduleName) === -1 &&
-                (DEFAULT_MODULE_IGNORES.indexOf(moduleName) >= 0 ||
-                  this.options.ignoreModulesInclude.indexOf(moduleName) >= 0)
-              ) {
-                this._ignoredModules[module] = true;
-              }
+          for (let moduleID in BatchedBridge._remoteModuleTable) {
+            if (BatchedBridge._remoteModuleTable.hasOwnProperty(moduleID)) {
+              let moduleName = BatchedBridge._remoteModuleTable[moduleID];
+              this._addIgnoredModule(moduleID, moduleName);
             }
           }
         }
@@ -152,7 +168,8 @@ export class NativeClient {
         return original.apply(this, arguments);
       }
       params.push({
-        __sentry_stack: new Error().stack
+        __sentry_stack: new Error().stack,
+        __sentry_moduleID: moduleID
       });
       return original.apply(this, arguments);
     };