Merge pull request #254 from bugsnag/next

fractalwrench · web-flow · commit 333c9714b7c7 · 2018-07-03T16:06:08.000+01:00
Next release
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,14 @@ jobs:
          - android-26
          - extra-google-m2repository
          - extra-android-m2repository
+      before_cache:
+        - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+        - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+      cache:
+        directories:
+          - $HOME/.gradle/caches/
+          - $HOME/.gradle/wrapper/
+          - $HOME/.android/build-cache
       env:
         - ANDROID_TARGET=android-26 ANDROID_ABI=armeabi-v7a
         - ADB-INSTALL_TIMEOUT=5
@@ -42,6 +50,9 @@ jobs:
       language: objective-c
       os: osx
       osx_image: xcode9.3
+      cache:
+        - bundler
+        - cocoapods
       xcode_project: ./cocoa/BugsnagReactNative.xcodeproj
       xcode_scheme: BugsnagReactNative
       install:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,34 @@
 Changelog
 =========
 
+## 2.10.0 (2018-07-03)
 
-## TBD
+This release alters the behaviour of the notifier to track sessions automatically.
+A session will be automatically captured on each app launch and sent to [https://sessions.bugsnag.com](https://sessions.bugsnag.com).
+
+If you use Bugsnag On-Premise, it is recommended that you set your notify and session endpoints
+via `config.setEndpoints(String notify, String sessions)` on Android, and `config.setEndpoints(notify:sessions:)` on iOS. You should also initialise the Android/iOS components by passing a `config` parameter:
+
+```java
+Configuration config = new Configuration("your-api-key-here");
+config.setEndpoints("https://notify.example.com", "https://sessions.example.com");
+BugsnagReactNative.start(this, config);
+```
+
+```objc
+BugsnagConfiguration *config = [BugsnagConfiguration new];
+[config setEndpointsForNotify:@"http://notify.example.com"
+                     sessions:@"http://sessions.example.com"];
+[BugsnagReactNative startWithConfiguration:config];
+```
+
+* Upgrade bugsnag-android to v4.5.0:
+  * Enable automatic session tracking by default [#314](https://github.com/bugsnag/bugsnag-android/pull/314)
+  * Trim long stacktraces to max limit of 200 [#324](https://github.com/bugsnag/bugsnag-android/pull/324)
+
+* Upgrade bugsnag-cocoa to v5.16.0:
+  * Enable automatic session tracking by default [#286](https://github.com/bugsnag/bugsnag-cocoa/pull/286)
+  * Handle potential nil content value in RegisterErrorData class [#289](https://github.com/bugsnag/bugsnag-cocoa/pull/289)
 
 ### Bug fixes
 
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Bugsnag exception reporter for React Native
-[![Documentation](https://img.shields.io/badge/documentation-2.9.5-blue.svg)](http://docs.bugsnag.com/platforms/react-native/)
+[![Documentation](https://img.shields.io/badge/documentation-2.10.0-blue.svg)](http://docs.bugsnag.com/platforms/react-native/)
 
 Automatic [React Native crash reporting](https://www.bugsnag.com/platforms/react-native-error-reporting/) with Bugsnag helps you detect both native OS and JavaScript errors in your React Native apps.
 
diff --git a/android/build.gradle b/android/build.gradle
@@ -8,11 +8,11 @@ android {
         minSdkVersion 16
         targetSdkVersion 23
         versionCode 4
-        versionName '2.9.5'
+        versionName '2.10.0'
     }
 }
 
 dependencies {
-    compile 'com.bugsnag:bugsnag-android:4.4.1'
+    compile 'com.bugsnag:bugsnag-android:4.5.0'
     compile 'com.facebook.react:react-native:+'
 }
diff --git a/android/src/main/java/com/bugsnag/BugsnagReactNative.java b/android/src/main/java/com/bugsnag/BugsnagReactNative.java
@@ -207,18 +207,23 @@ private void configureRuntimeOptions(Client client, ReadableMap options) {
               client.setAppVersion(version);
       }
 
+      String notify = null;
+      String sessions = null;
+
       if (options.hasKey("endpoint")) {
-          String endpoint = options.getString("endpoint");
-          if (endpoint != null && endpoint.length() > 0)
-              client.setEndpoint(endpoint);
+          notify = options.getString("endpoint");
       }
-
       if (options.hasKey("sessionsEndpoint")) {
-          String endpoint = options.getString("sessionsEndpoint");
-          if (endpoint != null && endpoint.length() > 0)
-              config.setSessionEndpoint(endpoint);
+          sessions = options.getString("sessionsEndpoint");
       }
 
+      if (notify != null && notify.length() > 0) {
+          config.setEndpoints(notify, sessions);
+      } else if (sessions != null && sessions.length() > 0) {
+          logger.warning("The session tracking endpoint should not be set without the error reporting endpoint.");
+      }
+
+
       if (options.hasKey("releaseStage")) {
           String releaseStage = options.getString("releaseStage");
           if (releaseStage != null && releaseStage.length() > 0)
diff --git a/cocoa/BugsnagReactNative.m b/cocoa/BugsnagReactNative.m
@@ -247,16 +247,12 @@ + (void)startWithConfiguration:(BugsnagConfiguration *)config {
         return !([report.errorClass hasPrefix:@"RCTFatalException"]
                  && [report.errorMessage hasPrefix:@"Unhandled JS Exception"]);
     }];
-    if (sessionURLPath.length > 0) {
-        NSURL *sessionURL = [NSURL URLWithString:sessionURLPath];
-        if (sessionURL)
-            config.sessionURL = sessionURL;
-    }
+
     if (notifyURLPath.length > 0) {
-        NSURL *notifyURL = [NSURL URLWithString:notifyURLPath];
-        if (notifyURL)
-            config.notifyURL = notifyURL;
+        [config setEndpointsForNotify:notifyURLPath
+                             sessions:sessionURLPath];
     }
+
     if (appVersion.length > 0) {
         config.appVersion = appVersion;
     }
diff --git a/cocoa/vendor/bugsnag-cocoa/Source/BugsnagApiClient.m b/cocoa/vendor/bugsnag-cocoa/Source/BugsnagApiClient.m
@@ -59,7 +59,7 @@ - (void)sendData:(id)data
         NSError *error = nil;
         NSData *jsonData =
                 [NSJSONSerialization dataWithJSONObject:payload
-                                                options:NSJSONWritingPrettyPrinted
+                                                options:0
                                                   error:&error];
 
         if (jsonData == nil) {
diff --git a/cocoa/vendor/bugsnag-cocoa/Source/BugsnagConfiguration.h b/cocoa/vendor/bugsnag-cocoa/Source/BugsnagConfiguration.h
@@ -42,7 +42,10 @@
 typedef void (^BugsnagNotifyBlock)(BugsnagCrashReport *_Nonnull report);
 
 /**
- *  A handler for modifying data before sending it to Bugsnag
+ *  A handler for modifying data before sending it to Bugsnag.
+ *
+ * beforeSendBlocks will be invoked on a dedicated
+ * background queue, which will be different from the queue where the block was originally added.
  *
  *  @param rawEventData The raw event data written at crash time. This
  *                      includes data added in onCrashHandler.
@@ -70,10 +73,6 @@ typedef NSDictionary *_Nullable (^BugsnagBeforeNotifyHook)(
  *  The API key of a Bugsnag project
  */
 @property(readwrite, retain, nullable) NSString *apiKey;
-/**
- *  The URL used to notify Bugsnag
- */
-@property(readwrite, retain, nullable) NSURL *notifyURL;
 /**
  *  The release stage of the application, such as production, development, beta
  *  et cetera
@@ -100,7 +99,7 @@ typedef NSDictionary *_Nullable (^BugsnagBeforeNotifyHook)(
 /**
  * The current user
  */
-@property(nullable) BugsnagUser *currentUser;
+@property(retain, nullable) BugsnagUser *currentUser;
 
 /**
  *  Additional information about the state of the app or environment at the
@@ -139,15 +138,45 @@ BugsnagBreadcrumbs *breadcrumbs;
 @property BOOL autoNotify;
 
 /**
- * Determines whether app sessions should be tracked automatically. By default this value is false.
+ * Determines whether app sessions should be tracked automatically. By default this value is true.
  */
 @property BOOL shouldAutoCaptureSessions;
 
 /**
- * Set the endpoint to which tracked sessions reports are sent. This defaults to https://sessions.bugsnag.com,
- * but should be overridden if you are using Bugsnag On-premise, to point to your own Bugsnag endpoint.
+ * Retrieves the endpoint used to notify Bugsnag of errors
+ *
+ * NOTE: If you want to set this value, you should do so via setEndpointsForNotify:sessions: instead.
+ *
+ * @see setEndpointsForNotify:sessions:
+ */
+@property(readonly, retain, nullable) NSURL *notifyURL;
+
+/**
+ * Retrieves the endpoint used to send tracked sessions to Bugsnag
+ *
+ * NOTE: If you want to set this value, you should do so via setEndpointsForNotify:sessions: instead.
+ *
+ * @see setEndpointsForNotify:sessions:
  */
-@property(readwrite, retain, nullable) NSURL *sessionURL;
+@property(readonly, retain, nullable) NSURL *sessionURL;
+
+/**
+ * Set the endpoints to send data to. By default we'll send error reports to
+ * https://notify.bugsnag.com, and sessions to https://sessions.bugsnag.com, but you can
+ * override this if you are using Bugsnag Enterprise to point to your own Bugsnag endpoint.
+ *
+ * Please note that it is recommended that you set both endpoints. If the notify endpoint is
+ * missing, an assertion will be thrown. If the session endpoint is missing, a warning will be
+ * logged and sessions will not be sent automatically.
+ *
+ * @param notify the notify endpoint
+ * @param sessions the sessions endpoint
+ *
+ * @throws an assertion if the notify endpoint is not a valid URL
+ */
+
+- (void)setEndpointsForNotify:(NSString *_Nonnull)notify
+                     sessions:(NSString *_Nonnull)sessions NS_SWIFT_NAME(setEndpoints(notify:sessions:));
 
 /**
  *  Set user metadata
@@ -191,8 +220,8 @@ BugsnagBreadcrumbs *breadcrumbs;
 - (NSDictionary *_Nonnull)errorApiHeaders;
 - (NSDictionary *_Nonnull)sessionApiHeaders;
 
-@property(nullable) NSString *codeBundleId;
-@property(nullable) NSString *notifierType;
+@property(retain, nullable) NSString *codeBundleId;
+@property(retain, nullable) NSString *notifierType;
 
 - (BOOL)hasValidApiKey;
 
diff --git a/cocoa/vendor/bugsnag-cocoa/Source/BugsnagConfiguration.m b/cocoa/vendor/bugsnag-cocoa/Source/BugsnagConfiguration.m
@@ -65,6 +65,8 @@ - (id)init {
         _notifyReleaseStages = nil;
         _breadcrumbs = [BugsnagBreadcrumbs new];
         _automaticallyCollectBreadcrumbs = YES;
+        _shouldAutoCaptureSessions = YES;
+
         if ([NSURLSession class]) {
             _session = [NSURLSession
                 sessionWithConfiguration:[NSURLSessionConfiguration
@@ -87,7 +89,7 @@ - (BOOL)shouldSendReports {
 - (void)setUser:(NSString *)userId
        withName:(NSString *)userName
        andEmail:(NSString *)userEmail {
-    
+
     self.currentUser = [[BugsnagUser alloc] initWithUserId:userId name:userName emailAddress:userEmail];
 
     [self.metaData addAttribute:BSGKeyId withValue:userId toTabWithName:BSGKeyUser];
@@ -225,7 +227,7 @@ - (BOOL)shouldAutoCaptureSessions {
 - (void)setShouldAutoCaptureSessions:(BOOL)shouldAutoCaptureSessions {
     @synchronized (self) {
         _shouldAutoCaptureSessions = shouldAutoCaptureSessions;
-        
+
         if (shouldAutoCaptureSessions) { // track any existing sessions
             BugsnagSessionTracker *sessionTracker = [Bugsnag notifier].sessionTracker;
             [sessionTracker onAutoCaptureEnabled];
@@ -249,6 +251,22 @@ - (NSDictionary *)sessionApiHeaders {
              };
 }
 
+- (void)setEndpointsForNotify:(NSString *_Nonnull)notify sessions:(NSString *_Nonnull)sessions {
+    _notifyURL = [NSURL URLWithString:notify];
+    _sessionURL = [NSURL URLWithString:sessions];
+
+    NSAssert([self isValidUrl:_notifyURL], @"Invalid URL supplied for notify endpoint");
+
+    if (![self isValidUrl:_sessionURL]) {
+        _sessionURL = nil;
+    }
+}
+
+- (BOOL)isValidUrl:(NSURL *)url {
+    return url != nil && url.scheme != nil && url.host != nil;
+}
+
+
 - (BOOL)hasValidApiKey {
     return [_apiKey length] > 0;
 }
diff --git a/cocoa/vendor/bugsnag-cocoa/Source/BugsnagCrashReport.m b/cocoa/vendor/bugsnag-cocoa/Source/BugsnagCrashReport.m
@@ -630,9 +630,16 @@ + (instancetype)errorDataFromThreads:(NSArray *)threads {
             }
             NSString *contentValue = data[@"value"];
 
+#pragma clang diagnostic push
+#pragma ide diagnostic ignored "OCDFAInspection"
+            if (contentValue == nil || ![contentValue isKindOfClass:[NSString class]]) {
+                continue;
+            }
+#pragma clang diagnostic pop
+
             if ([self isReservedWord:contentValue]) {
                 reservedWord = contentValue;
-            } else if (!([[contentValue componentsSeparatedByString:@"/"] count] > 2)) {
+            } else if ([[contentValue componentsSeparatedByString:@"/"] count] <= 2) {
                 // must be a string that isn't a reserved word and isn't a filepath
                 [interestingValues addObject:contentValue];
             }
diff --git a/cocoa/vendor/bugsnag-cocoa/Source/BugsnagNotifier.m b/cocoa/vendor/bugsnag-cocoa/Source/BugsnagNotifier.m
@@ -42,7 +42,7 @@
 #import <AppKit/AppKit.h>
 #endif
 
-NSString *const NOTIFIER_VERSION = @"5.15.6";
+NSString *const NOTIFIER_VERSION = @"5.16.0";
 NSString *const NOTIFIER_URL = @"https://github.com/bugsnag/bugsnag-cocoa";
 NSString *const BSTabCrash = @"crash";
 NSString *const BSAttributeDepth = @"depth";
@@ -216,9 +216,6 @@ - (id)initWithConfiguration:(BugsnagConfiguration *)initConfiguration {
                                                                        hasRecordedSessions = true;
                                                                    }];
 
-        
-        [self.sessionTracker startNewSession:[NSDate date] withUser:nil autoCaptured:YES];
-
         [self metaDataChanged:self.configuration.metaData];
         [self metaDataChanged:self.configuration.config];
         [self metaDataChanged:self.state];
@@ -356,9 +353,10 @@ - (void)start {
                  object:nil];
 #endif
 
+    _started = YES;
+
     // notification not received in time on initial startup, so trigger manually
     [self willEnterForeground:self];
-    _started = YES;
 }
 
 - (void)watchLifecycleEvents:(NSNotificationCenter *)center {
diff --git a/cocoa/vendor/bugsnag-cocoa/Source/BugsnagSessionTracker.m b/cocoa/vendor/bugsnag-cocoa/Source/BugsnagSessionTracker.m
diff --git a/cocoa/vendor/bugsnag-cocoa/Source/BugsnagUser.m b/cocoa/vendor/bugsnag-cocoa/Source/BugsnagUser.m
diff --git a/cocoa/vendor/bugsnag-cocoa/iOS/Bugsnag.xcodeproj/project.pbxproj b/cocoa/vendor/bugsnag-cocoa/iOS/Bugsnag.xcodeproj/project.pbxproj
diff --git a/package.json b/package.json
diff --git a/src/Bugsnag.js b/src/Bugsnag.js

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@ android {`
`8`	`8`	`minSdkVersion 16`
`9`	`9`	`targetSdkVersion 23`
`10`	`10`	`versionCode 4`
`11`		`- versionName '2.9.5'`
	`11`	`+ versionName '2.10.0'`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`
`16`		`- compile 'com.bugsnag:bugsnag-android:4.4.1'`
	`16`	`+ compile 'com.bugsnag:bugsnag-android:4.5.0'`
`17`	`17`	`compile 'com.facebook.react:react-native:+'`
`18`	`18`	`}`