Fix session tracking auto-capture, improve stability

Author: kattrali

android/build.gradle

@@ -13,6 +13,6 @@ android {
 }
 
 dependencies {
-    compile 'com.bugsnag:bugsnag-android:4.2.1'
+    compile 'com.bugsnag:bugsnag-android:4.3.1'
     compile 'com.facebook.react:react-native:0.20.1'
 }

android/src/main/java/com/bugsnag/BugsnagReactNative.java

@@ -64,6 +64,11 @@ public String getName() {
     return "BugsnagReactNative";
   }
 
+  @ReactMethod
+  public void startSession() {
+      Bugsnag.startSession();
+  }
+
   @ReactMethod
   public void startWithOptions(ReadableMap options) {
       String apiKey = null;
@@ -232,11 +237,6 @@ private void configureRuntimeOptions(Client client, ReadableMap options) {
           }
       }
 
-      if (options.hasKey("autoCaptureSessions")) {
-          boolean autoCapture = options.getBoolean("autoCaptureSessions");
-          config.setAutoCaptureSessions(autoCapture);
-      }
-
       if (options.hasKey("codeBundleId")) {
           String codeBundleId = options.getString("codeBundleId");
           if (codeBundleId != null && codeBundleId.length() > 0)
@@ -257,6 +257,13 @@ private void configureRuntimeOptions(Client client, ReadableMap options) {
           boolean autoCapture = options.getBoolean("automaticallyCollectBreadcrumbs");
           config.setAutomaticallyCollectBreadcrumbs(autoCapture);
       }
+      // Process session tracking last in case the effects of other options
+      // should be captured as a part of the session
+      if (options.hasKey("autoCaptureSessions")) {
+          boolean autoCapture = options.getBoolean("autoCaptureSessions");
+          config.setAutoCaptureSessions(autoCapture);
+          client.startFirstSession();
+      }
   }
 }
 

cocoa/BugsnagReactNative.h

@@ -27,5 +27,6 @@
 - (void)notify:(NSDictionary *)payload;
 - (void)setUser:(NSDictionary *)userInfo;
 - (void)clearUser;
+- (void)startSession;
 
 @end

cocoa/BugsnagReactNative.m

@@ -187,6 +187,10 @@ + (void)startWithConfiguration:(BugsnagConfiguration *)config {
     [[Bugsnag configuration] setUser:identifier withName:name andEmail:email];
 }
 
+RCT_EXPORT_METHOD(startSession) {
+    [Bugsnag startSession];
+}
+
 RCT_EXPORT_METHOD(clearUser) {
     [[Bugsnag configuration] setUser:nil withName:nil andEmail:nil];
 }

cocoa/vendor/bugsnag-cocoa/Source/BugsnagCrashReport.h

@@ -197,6 +197,6 @@ __deprecated_msg("Use toJson: instead.");
 /**
  * Returns the enhanced error message for the thread, or nil if none exists.
  */
-- (NSString *_Nullable)enhancedErrorMessageForThread:(NSDictionary *_Nullable)thread;
+- (NSString *_Nullable)enhancedErrorMessageForThread:(NSDictionary *_Nullable)thread __deprecated;
 
 @end

cocoa/vendor/bugsnag-cocoa/Source/BugsnagCrashReport.m

@@ -177,6 +177,13 @@ @interface NSDictionary (BSGKSMerge)
 - (NSDictionary *)BSG_mergedInto:(NSDictionary *)dest;
 @end
 
+@interface RegisterErrorData : NSObject
+@property (nonatomic, strong) NSString *errorClass;
+@property (nonatomic, strong) NSString *errorMessage;
++ (instancetype)errorDataFromThreads:(NSArray *)threads;
+- (instancetype)initWithClass:(NSString *_Nonnull)errorClass message:(NSString *_Nonnull)errorMessage NS_DESIGNATED_INITIALIZER;
+@end
+
 @interface BugsnagCrashReport ()
 
 /**
@@ -217,10 +224,16 @@ - (instancetype)initWithKSReport:(NSDictionary *)report {
 
         _error = [report valueForKeyPath:@"crash.error"];
         _errorType = _error[BSGKeyType];
-        _errorClass = BSGParseErrorClass(_error, _errorType);
-        _errorMessage = BSGParseErrorMessage(report, _error, _errorType);
-        _binaryImages = report[@"binary_images"];
         _threads = [report valueForKeyPath:@"crash.threads"];
+        RegisterErrorData *data = [RegisterErrorData errorDataFromThreads:_threads];
+        if (data) {
+            _errorClass = data.errorClass;
+            _errorMessage = data.errorMessage;
+        } else {
+            _errorClass = BSGParseErrorClass(_error, _errorType);
+            _errorMessage = BSGParseErrorMessage(report, _error, _errorType);
+        }
+        _binaryImages = report[@"binary_images"];
         _breadcrumbs = BSGParseBreadcrumbs(report);
         _severity = BSGParseSeverity(
             [report valueForKeyPath:@"user.state.crash.severity"]);
@@ -542,12 +555,6 @@ - (NSArray *)serializeThreadsWithException:(NSMutableDictionary *)exception {
         BOOL isCrashedThread = [thread[@"crashed"] boolValue];
 
         if (isCrashedThread) {
-            NSString *errMsg = [self enhancedErrorMessageForThread:thread];
-            
-            if (errMsg) { // use enhanced error message (currently swift assertions)
-                BSGDictInsertIfNotNil(exception, errMsg, BSGKeyMessage);
-            }
-            
             NSUInteger seen = 0;
             NSMutableArray *stacktrace = [NSMutableArray array];
 
@@ -593,41 +600,47 @@ - (NSArray *)serializeThreadsWithException:(NSMutableDictionary *)exception {
     return bugsnagThreads;
 }
 
-/**
- * Returns the enhanced error message for the thread, or nil if none exists.
- *
- * This relies very heavily on heuristics rather than any documented APIs.
- */
-- (NSString *)enhancedErrorMessageForThread:(NSDictionary *)thread {
-    NSDictionary *notableAddresses = thread[@"notable_addresses"];
-    NSMutableArray *msgBuffer = [NSMutableArray new];
-    BOOL hasReservedWord = NO;
-    
-    if (notableAddresses) {
+- (NSString *_Nullable)enhancedErrorMessageForThread:(NSDictionary *_Nullable)thread {
+    return [self errorMessage];
+}
+
+@end
+
+@implementation RegisterErrorData
++ (instancetype)errorDataFromThreads:(NSArray *)threads {
+    for (NSDictionary *thread in threads) {
+        if (![thread[@"crashed"] boolValue]) {
+            continue;
+        }
+        NSDictionary *notableAddresses = thread[@"notable_addresses"];
+        NSMutableArray *interestingValues = [NSMutableArray new];
+        NSString *reservedWord = nil;
+
         for (NSString *key in notableAddresses) {
-            if (![key hasPrefix:@"stack"]) { // skip stack frames, only use register values
-                NSDictionary *data = notableAddresses[key];
-                NSString *contentValue = data[@"value"];
-                
-                hasReservedWord = hasReservedWord || [self isReservedWord:contentValue];
-                
+            if ([key hasPrefix:@"stack"]) { // skip stack frames, only use register values
+                continue;
+            }
+            NSDictionary *data = notableAddresses[key];
+            if (![@"string" isEqualToString:data[BSGKeyType]]) {
+                continue;
+            }
+            NSString *contentValue = data[@"value"];
+
+            if ([self isReservedWord:contentValue]) {
+                reservedWord = contentValue;
+            } else if (!([[contentValue componentsSeparatedByString:@"/"] count] > 2)) {
                 // must be a string that isn't a reserved word and isn't a filepath
-                if ([@"string" isEqualToString:data[BSGKeyType]]
-                    && ![self isReservedWord:contentValue]
-                    && !([[contentValue componentsSeparatedByString:@"/"] count] > 2)) {
-                    
-                    [msgBuffer addObject:contentValue];
-                }
+                [interestingValues addObject:contentValue];
             }
         }
-        [msgBuffer sortUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
-    }
-    
-    if (hasReservedWord && [msgBuffer count] > 0) { // needs to have a reserved word used + a message
-        return [msgBuffer componentsJoinedByString:@" | "];
-    } else {
-        return nil;
+
+        [interestingValues sortUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
+
+        NSString *message = [interestingValues componentsJoinedByString:@" | "];
+        return [[RegisterErrorData alloc] initWithClass:reservedWord
+                                                message:message];
     }
+    return nil;
 }
 
 /**
@@ -637,9 +650,24 @@ - (NSString *)enhancedErrorMessageForThread:(NSDictionary *)thread {
  *
  * For assert, "assertion failed" will be in one of the registers.
  */
-- (BOOL)isReservedWord:(NSString *)contentValue {
-    return [@"assertion failed" isEqualToString:contentValue]
-    || [@"fatal error" isEqualToString:contentValue];
++ (BOOL)isReservedWord:(NSString *)contentValue {
+    return [@"assertion failed" caseInsensitiveCompare:contentValue] == NSOrderedSame
+    || [@"fatal error" caseInsensitiveCompare:contentValue] == NSOrderedSame
+    || [@"precondition failed" caseInsensitiveCompare:contentValue] == NSOrderedSame;
+}
+
+- (instancetype)init {
+    return [self initWithClass:@"Unknown" message:@"<unset>"];
 }
 
+- (instancetype)initWithClass:(NSString *)errorClass message:(NSString *)errorMessage {
+    if (errorClass.length == 0) {
+        return nil;
+    }
+    if (self = [super init]) {
+        _errorClass = errorClass;
+        _errorMessage = errorMessage;
+    }
+    return self;
+}
 @end

cocoa/vendor/bugsnag-cocoa/Source/BugsnagFileStore.h

@@ -70,4 +70,5 @@
 + (NSString *)findReportStorePath:(NSString *)customDirectory
                        bundleName:(NSString *)bundleName;
 
-@end
+- (NSString *)fileIdFromFilename:(NSString *)filename;
+@end

cocoa/vendor/bugsnag-cocoa/Source/BugsnagNotifier.m

@@ -41,7 +41,7 @@
 #import <AppKit/AppKit.h>
 #endif
 
-NSString *const NOTIFIER_VERSION = @"5.15.0";
+NSString *const NOTIFIER_VERSION = @"5.15.3";
 NSString *const NOTIFIER_URL = @"https://github.com/bugsnag/bugsnag-cocoa";
 NSString *const BSTabCrash = @"crash";
 NSString *const BSAttributeDepth = @"depth";
@@ -410,7 +410,6 @@ - (void)willEnterBackground:(id)sender {
 
 - (void)sessionTick:(id)sender {
     [self.sessionTracker send];
-    NSLog(@"Session Tick!");
 }
 
 - (void)flushPendingReports {

cocoa/vendor/bugsnag-cocoa/Source/BugsnagSink.m

@@ -114,6 +114,7 @@ - (void)filterReports:(NSArray *)reports
 - (NSDictionary *)getBodyFromReports:(NSArray *)reports {
     NSMutableDictionary *data = [[NSMutableDictionary alloc] init];
     BSGDictSetSafeObject(data, [Bugsnag notifier].details, BSGKeyNotifier);
+    BSGDictSetSafeObject(data, [Bugsnag notifier].configuration.apiKey, BSGKeyApiKey);
 
     NSMutableArray *formatted =
             [[NSMutableArray alloc] initWithCapacity:[reports count]];

cocoa/vendor/bugsnag-cocoa/Source/KSCrash/Source/KSCrash/Recording/BSG_KSCrashDoctor.m

@@ -15,6 +15,7 @@
 typedef enum {
     BSG_CPUFamilyUnknown,
     BSG_CPUFamilyArm,
+    BSG_CPUFamilyArm64,
     BSG_CPUFamilyX86,
     BSG_CPUFamilyX86_64
 } BSG_CPUFamily;
@@ -170,15 +171,17 @@ - (NSDictionary *)errorReport:(NSDictionary *)report {
 - (BSG_CPUFamily)cpuFamily:(NSDictionary *)report {
     NSDictionary *system = [self systemReport:report];
     NSString *cpuArch = system[@BSG_KSSystemField_CPUArch];
+    if ([cpuArch isEqualToString:@"arm64"]) {
+        return BSG_CPUFamilyArm64;
+    }
     if ([cpuArch rangeOfString:@"arm"].location == 0) {
         return BSG_CPUFamilyArm;
     }
     if ([cpuArch rangeOfString:@"i"].location == 0 &&
         [cpuArch rangeOfString:@"86"].location == 2) {
         return BSG_CPUFamilyX86;
     }
-    if ([cpuArch rangeOfString:@"x86_64" options:NSCaseInsensitiveSearch]
-            .location != NSNotFound) {
+    if ([@[@"x86_64", @"x86"] containsObject:cpuArch]) {
         return BSG_CPUFamilyX86_64;
     }
     return BSG_CPUFamilyUnknown;
@@ -199,6 +202,18 @@ - (NSString *)registerNameForFamily:(BSG_CPUFamily)family
             return @"r3";
         }
     }
+    case BSG_CPUFamilyArm64: {
+        switch (index) {
+            case 0:
+                return @"x0";
+            case 1:
+                return @"x1";
+            case 2:
+                return @"x2";
+            case 3:
+                return @"x3";
+        }
+    }
     case BSG_CPUFamilyX86: {
         switch (index) {
         case 0:
@@ -367,10 +382,13 @@ - (BSG_KSCrashDoctorFunctionCall *)lastFunctionCall:(NSDictionary *)report {
     BSG_CPUFamily family = [self cpuFamily:report];
     NSDictionary *registers =
         [self basicRegistersFromThreadReport:crashedThread];
-    NSArray *regNames = @[[self registerNameForFamily:family paramIndex:0],
-            [self registerNameForFamily:family paramIndex:1],
-            [self registerNameForFamily:family paramIndex:2],
-            [self registerNameForFamily:family paramIndex:3]];
+    NSMutableArray *regNames = [NSMutableArray arrayWithCapacity:4];
+    for (int paramIndex = 0; paramIndex <= 3; paramIndex++) {
+        NSString *regName = [self registerNameForFamily:family paramIndex:paramIndex];
+        if (regName.length > 0) {
+            [regNames addObject:regName];
+        }
+    }
     NSMutableArray *params = [NSMutableArray arrayWithCapacity:4];
     for (NSString *regName in regNames) {
         BSG_KSCrashDoctorParam *param = [[BSG_KSCrashDoctorParam alloc] init];