Merge pull request #1218 from bugsnag/release-v6.14.2

Release v6.14.2
bugsnag · Oct 27, 2021 · 56da57d · 56da57d
2 parents ab997b6 + 37a3fd8
commit 56da57d
Show file tree

Hide file tree

Showing 26 changed files with 53 additions and 36 deletions.
diff --git a/.jazzy.yaml b/.jazzy.yaml
@@ -2,11 +2,11 @@ author_url: "https://www.bugsnag.com"
 author: "Bugsnag Inc"
 clean: false # avoid deleting docs/.git
 framework_root: "Bugsnag"
-github_file_prefix: "https://github.com/bugsnag/bugsnag-cocoa/tree/v6.14.1/Bugsnag"
+github_file_prefix: "https://github.com/bugsnag/bugsnag-cocoa/tree/v6.14.2/Bugsnag"
 github_url: "https://github.com/bugsnag/bugsnag-cocoa"
 hide_documentation_coverage: true
 module: "Bugsnag"
-module_version: "6.14.1"
+module_version: "6.14.2"
 objc: true
 output: "docs"
 readme: "README.md"

diff --git a/Bugsnag.podspec.json b/Bugsnag.podspec.json
@@ -1,6 +1,6 @@
 {
   "name": "Bugsnag",
-  "version": "6.14.1",
+  "version": "6.14.2",
   "summary": "The Bugsnag crash reporting framework for Apple platforms.",
   "homepage": "https://bugsnag.com",
   "license": "MIT",
@@ -9,7 +9,7 @@
   },
   "source": {
     "git": "https://github.com/bugsnag/bugsnag-cocoa.git",
-    "tag": "v6.14.1"
+    "tag": "v6.14.2"
   },
   "frameworks": [
     "Foundation",

diff --git a/Bugsnag/Bugsnag+Private.h b/Bugsnag/Bugsnag+Private.h
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Bugsnag Inc. All rights reserved.
 //
 
-#import "Bugsnag.h"
+#import <Bugsnag/Bugsnag.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/Bugsnag/BugsnagSessionTracker.h b/Bugsnag/BugsnagSessionTracker.h
@@ -8,8 +8,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "BugsnagSession.h"
-#import "BugsnagConfiguration.h"
+#import <Bugsnag/BugsnagConfiguration.h>
+#import <Bugsnag/BugsnagSession.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/Bugsnag/BugsnagSessionTracker.m b/Bugsnag/BugsnagSessionTracker.m
@@ -147,6 +147,9 @@ - (BOOL)resumeSession {
     } else {
         BOOL stopped = session.isStopped;
         [session resume];
+        if (self.callback) {
+            self.callback(session);
+        }
         [self postUpdateNotice];
         return stopped;
     }

diff --git a/Bugsnag/BugsnagSystemState.h b/Bugsnag/BugsnagSystemState.h
@@ -8,7 +8,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "BugsnagConfiguration.h"
+#import <Bugsnag/BugsnagConfiguration.h>
+
 #import "BugsnagKeys.h"
 
 #define SYSTEMSTATE_KEY_APP @"app"

diff --git a/Bugsnag/Client/BugsnagClient.m b/Bugsnag/Client/BugsnagClient.m
@@ -204,10 +204,17 @@ - (instancetype)initWithConfiguration:(BugsnagConfiguration *)configuration {
     if ((self = [super init])) {
         // Take a shallow copy of the configuration
         _configuration = [configuration copy];
+
+        if (!_configuration.user.id) { // populate with an autogenerated ID if no value set
+            [_configuration setUser:[BSG_KSSystemInfo deviceAndAppHash] withEmail:_configuration.user.email andName:_configuration.user.name];
+        }
+
         _state = [[BugsnagMetadata alloc] initWithDictionary:@{
             BSGKeyApp: @{BSGKeyIsLaunching: @YES},
-            BSGKeyClient: BSGDictionaryWithKeyAndObject(BSGKeyContext, _configuration.context)
+            BSGKeyClient: BSGDictionaryWithKeyAndObject(BSGKeyContext, _configuration.context),
+            BSGKeyUser: [configuration.user toJson]
         }];
+
         _notifier = configuration.notifier ?: [[BugsnagNotifier alloc] init];
         self.systemState = [[BugsnagSystemState alloc] initWithConfiguration:configuration];
 
@@ -266,10 +273,6 @@ - (instancetype)initWithConfiguration:(BugsnagConfiguration *)configuration {
         self.pluginClient = [[BugsnagPluginClient alloc] initWithPlugins:self.configuration.plugins
                                                                   client:self];
 
-        if (self.user.id == nil) { // populate with an autogenerated ID if no value set
-            [self setUser:[BSG_KSSystemInfo deviceAndAppHash] withEmail:configuration.user.email andName:configuration.user.name];
-        }
-
         BSGInternalErrorReporter.sharedInstance = [[BSGInternalErrorReporter alloc] initWithDataSource:self];
     }
     return self;

diff --git a/Bugsnag/Metadata/BugsnagMetadata+Private.h b/Bugsnag/Metadata/BugsnagMetadata+Private.h
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Bugsnag Inc. All rights reserved.
 //
 
-#import "BugsnagMetadata.h"
+#import <Bugsnag/BugsnagMetadata.h>
 
 @class BugsnagStateEvent;
 

diff --git a/Bugsnag/Payload/BugsnagApp+Private.h b/Bugsnag/Payload/BugsnagApp+Private.h
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Bugsnag Inc. All rights reserved.
 //
 
-#import "BugsnagApp.h"
+#import <Bugsnag/BugsnagApp.h>
 
 @class BugsnagConfiguration;
 

diff --git a/Bugsnag/Payload/BugsnagAppWithState+Private.h b/Bugsnag/Payload/BugsnagAppWithState+Private.h
@@ -6,7 +6,8 @@
 //  Copyright © 2020 Bugsnag Inc. All rights reserved.
 //
 
-#import "BugsnagAppWithState.h"
+#import <Bugsnag/BugsnagAppWithState.h>
+
 #import "BugsnagApp+Private.h"
 
 @class BugsnagConfiguration;

diff --git a/Bugsnag/Payload/BugsnagBreadcrumb+Private.h b/Bugsnag/Payload/BugsnagBreadcrumb+Private.h
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Bugsnag Inc. All rights reserved.
 //
 
-#import "BugsnagBreadcrumb.h"
+#import <Bugsnag/BugsnagBreadcrumb.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/Bugsnag/Payload/BugsnagDevice+Private.h b/Bugsnag/Payload/BugsnagDevice+Private.h
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Bugsnag Inc. All rights reserved.
 //
 
-#import "BugsnagDevice.h"
+#import <Bugsnag/BugsnagDevice.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/Bugsnag/Payload/BugsnagDeviceWithState+Private.h b/Bugsnag/Payload/BugsnagDeviceWithState+Private.h
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Bugsnag Inc. All rights reserved.
 //
 
-#import "BugsnagDeviceWithState.h"
+#import <Bugsnag/BugsnagDeviceWithState.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/Bugsnag/Payload/BugsnagHandledState.h b/Bugsnag/Payload/BugsnagHandledState.h
@@ -6,9 +6,10 @@
 //  Copyright © 2017 Bugsnag. All rights reserved.
 //
 
-#import "BugsnagEvent.h"
 #import <Foundation/Foundation.h>
 
+#import <Bugsnag/BugsnagEvent.h>
+
 typedef NS_ENUM(NSUInteger, SeverityReasonType) {
     UnhandledException,
     Signal,

diff --git a/Bugsnag/Payload/BugsnagNotifier.m b/Bugsnag/Payload/BugsnagNotifier.m
@@ -23,7 +23,7 @@ - (instancetype)init {
 #else
         _name = @"Bugsnag Objective-C";
 #endif
-        _version = @"6.14.1";
+        _version = @"6.14.2";
         _url = @"https://github.com/bugsnag/bugsnag-cocoa";
         _dependencies = @[];
     }

diff --git a/Bugsnag/Payload/BugsnagSession+Private.h b/Bugsnag/Payload/BugsnagSession+Private.h
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Bugsnag Inc. All rights reserved.
 //
 
-#import "BugsnagSession.h"
+#import <Bugsnag/BugsnagSession.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/Bugsnag/Payload/BugsnagSessionTrackingPayload.h b/Bugsnag/Payload/BugsnagSessionTrackingPayload.h
@@ -7,7 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "BugsnagSession.h"
+
+#import <Bugsnag/BugsnagSession.h>
 
 @class BugsnagConfiguration;
 @class BugsnagNotifier;

diff --git a/Bugsnag/Payload/BugsnagUser+Private.h b/Bugsnag/Payload/BugsnagUser+Private.h
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Bugsnag Inc. All rights reserved.
 //
 
-#import "BugsnagUser.h"
+#import <Bugsnag/BugsnagUser.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/Bugsnag/Plugins/BugsnagPluginClient.h b/Bugsnag/Plugins/BugsnagPluginClient.h
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "BugsnagPlugin.h"
+#import <Bugsnag/BugsnagPlugin.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/Bugsnag/Storage/BugsnagSessionFileStore.h b/Bugsnag/Storage/BugsnagSessionFileStore.h
@@ -5,8 +5,9 @@
 
 #import <Foundation/Foundation.h>
 
+#import <Bugsnag/BugsnagSession.h>
+
 #import "BugsnagFileStore.h"
-#import "BugsnagSession.h"
 
 @interface BugsnagSessionFileStore : BugsnagFileStore
 + (BugsnagSessionFileStore *)storeWithPath:(NSString *)path

diff --git a/BugsnagNetworkRequestPlugin.podspec.json b/BugsnagNetworkRequestPlugin.podspec.json
@@ -1,16 +1,16 @@
 {
   "name": "BugsnagNetworkRequestPlugin",
-  "version": "6.14.1",
+  "version": "6.14.2",
   "summary": "Network request monitoring support for Bugsnag.",
   "homepage": "https://bugsnag.com",
   "license": "MIT",
   "authors": {
     "Bugsnag": "[email protected]"
   },
-  "readme": "https://raw.githubusercontent.com/bugsnag/bugsnag-cocoa/v6.14.1/BugsnagNetworkRequestPlugin/README.md",
+  "readme": "https://raw.githubusercontent.com/bugsnag/bugsnag-cocoa/v6.14.2/BugsnagNetworkRequestPlugin/README.md",
   "source": {
     "git": "https://github.com/bugsnag/bugsnag-cocoa.git",
-    "tag": "v6.14.1"
+    "tag": "v6.14.2"
   },
   "dependencies": {
     "Bugsnag": "~> 6.13"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+## 6.14.2 (2021-10-27)
+
+### Bug fixes
+
+* Fix missing `configuration.user` and manually resumed `session` info in unhandled errors.
+  [#1215](https://github.com/bugsnag/bugsnag-cocoa/pull/1215)
+
 ## 6.14.1 (2021-10-20)
 
 ### Bug fixes

diff --git a/Framework/Info.plist b/Framework/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.14.1</string>
+	<string>6.14.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/Tests/Info.plist b/Tests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.14.1</string>
+	<string>6.14.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.14.1
+6.14.2
diff --git a/features/fixtures/shared/scenarios/BareboneTestScenarios.swift b/features/fixtures/shared/scenarios/BareboneTestScenarios.swift
@@ -111,17 +111,16 @@ class BareboneTestUnhandledErrorScenario: Scenario {
             }
         } else {
             // The version of the app at crash time.
+            config.addMetadata(["group": "users"], section: "user")
             config.appVersion = "12.3"
             config.bundleVersion = "12301"
+            config.context = "Something"
+            config.setUser("barfoo", withEmail: "[email protected]", andName: "Bar Foo")
         }
         super.startBugsnag()
     }
 
     override func run() {
-        Bugsnag.setContext("Something")
-        Bugsnag.setUser("barfoo", withEmail: "[email protected]", andName: "Bar Foo")
-        Bugsnag.addMetadata(["group": "users"], section: "user")
-
         // Triggers "Fatal error: Unexpectedly found nil while implicitly unwrapping an Optional value: ..."
         print(payload.name)
     }