Merge pull request #1475 from bugsnag/release-v6.22.3

Release v6.22.3

.buildkite/pipeline.full.yml

@@ -257,8 +257,6 @@ steps:
       - bundle install
       - bundle exec maze-runner
         --os=macos
-        --os-version=11.0
-        --app=macOSTestApp
         --fail-fast
         --order=random
 
@@ -279,8 +277,6 @@ steps:
       - bundle install
       - bundle exec maze-runner
         --os=macos
-        --os-version=12
-        --app=macOSTestApp
         --fail-fast
         --order=random
 
@@ -298,8 +294,6 @@ steps:
       - bundle install
       - bundle exec maze-runner
         --os=macos
-        --os-version=10.13
-        --app=macOSTestApp
         --fail-fast
         --order=random
 
@@ -317,8 +311,6 @@ steps:
       - bundle install
       - bundle exec maze-runner
         --os=macos
-        --os-version=10.14
-        --app=macOSTestApp
         --fail-fast
         --order=random
 

.buildkite/pipeline.yml

@@ -140,7 +140,7 @@ steps:
     agents:
       queue: opensource-mac-cocoa-10.13
     commands:
-      - ./scripts/run-unit-tests.sh PLATFORM=iOS OS=9.0 DEVICE=iPhone\ 5s XCODEBUILD_EXTRA_ARGS=-skip-testing:BugsnagNetworkRequestPlugin-iOSTests
+      - ./scripts/run-unit-tests.sh PLATFORM=iOS OS=9.0 DEVICE=iPhone\ 5s
     artifact_paths:
       - logs/*
 
@@ -185,7 +185,7 @@ steps:
     agents:
       queue: opensource-mac-cocoa-10.13
     commands:
-      - ./scripts/run-unit-tests.sh PLATFORM=tvOS OS=9.2 XCODEBUILD_EXTRA_ARGS=-skip-testing:BugsnagNetworkRequestPlugin-tvOSTests
+      - ./scripts/run-unit-tests.sh PLATFORM=tvOS OS=9.2
     artifact_paths:
       - logs/*
 
@@ -350,8 +350,6 @@ steps:
       - bundle exec maze-runner
         features/barebone_tests.feature
         --os=macos
-        --os-version=10.13
-        --app=macOSTestApp
         --fail-fast
         --order=random
 
@@ -369,8 +367,6 @@ steps:
       - bundle install
       - bundle exec maze-runner
         --os=macos
-        --os-version=10.15
-        --app=macOSTestApp
         --fail-fast
         --order=random
 
@@ -392,8 +388,6 @@ steps:
       - bundle exec maze-runner
         features/barebone_tests.feature
         --os=macos
-        --os-version=12
-        --app=macOSTestApp
         --fail-fast
         --order=random
 

.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.22.2/Bugsnag"
+github_file_prefix: "https://github.com/bugsnag/bugsnag-cocoa/tree/v6.22.3/Bugsnag"
 github_url: "https://github.com/bugsnag/bugsnag-cocoa"
 hide_documentation_coverage: true
 module: "Bugsnag"
-module_version: "6.22.2"
+module_version: "6.22.3"
 objc: true
 output: "docs"
 readme: "README.md"

Bugsnag.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "Bugsnag",
-  "version": "6.22.2",
+  "version": "6.22.3",
   "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.22.2"
+    "tag": "v6.22.3"
   },
   "ios": {
     "frameworks": [

Bugsnag/Client/BugsnagClient.m

@@ -214,18 +214,15 @@ - (instancetype)initWithConfiguration:(BugsnagConfiguration *)configuration {
 }
 
 - (void)start {
-    if (self.configuration.telemetry & BSGTelemetryInternalErrors) {
-        BSGInternalErrorReporter.sharedInstance = [[BSGInternalErrorReporter alloc] initWithDataSource:self];
-    } else {
-        bsg_log_debug(@"Internal error reporting was disable in config");
-    }
-
     // Called here instead of in init so that a bad config will only throw an exception
     // from the start method.
     [self.configuration validate];
 
+    // MUST be called before any code that accesses bsg_runContext
     BSGRunContextInit(BSGFileLocations.current.runContext);
+
     BSGCrashSentryInstall(self.configuration, BSSerializeDataCrashHandler);
+
     self.systemState = [[BugsnagSystemState alloc] initWithConfiguration:self.configuration];
 
     // add metadata about app/device
@@ -235,6 +232,12 @@ - (void)start {
 
     [self computeDidCrashLastLaunch];
 
+    if (self.configuration.telemetry & BSGTelemetryInternalErrors) {
+        BSGInternalErrorReporter.sharedInstance = [[BSGInternalErrorReporter alloc] initWithDataSource:self];
+    } else {
+        bsg_log_debug(@"Internal error reporting was disabled in config");
+    }
+
     NSDictionary *usage = BSGTelemetryCreateUsage(self.configuration);
     if (usage) {
         bsg_g_bugsnag_data.usageJSON = BSGCStringWithData(BSGJSONDataFromDictionary(usage, NULL));

Bugsnag/Helpers/BSGKeys.h

@@ -53,11 +53,8 @@ static BSGKey const BSGKeyGroupingHash              = @"groupingHash";
 static BSGKey const BSGKeyHandled                   = @"handled";
 static BSGKey const BSGKeyHandledCount              = @"handledCount";
 static BSGKey const BSGKeyId                        = @"id";
-static BSGKey const BSGKeyImageAddress              = @"image_addr";
-static BSGKey const BSGKeyImageVmAddress            = @"image_vmaddr";
 static BSGKey const BSGKeyIncomplete                = @"incomplete";
 static BSGKey const BSGKeyInfo                      = @"info";
-static BSGKey const BSGKeyInstructionAddress        = @"instruction_addr";
 static BSGKey const BSGKeyIsLaunching               = @"isLaunching";
 static BSGKey const BSGKeyIsLR                      = @"isLR";
 static BSGKey const BSGKeyIsPC                      = @"isPC";
@@ -80,8 +77,6 @@ static BSGKey const BSGKeyMethod                    = @"method";
 static BSGKey const BSGKeyName                      = @"name";
 static BSGKey const BSGKeyNotifier                  = @"notifier";
 static BSGKey const BSGKeyNotifyEndpoint            = @"notify";
-static BSGKey const BSGKeyObjectAddress             = @"object_addr";
-static BSGKey const BSGKeyObjectName                = @"object_name";
 static BSGKey const BSGKeyOrientation               = @"orientation";
 static BSGKey const BSGKeyOsVersion                 = @"osVersion";
 static BSGKey const BSGKeyPayloadVersion            = @"payloadVersion";
@@ -100,8 +95,6 @@ static BSGKey const BSGKeySignal                    = @"signal";
 static BSGKey const BSGKeyStacktrace                = @"stacktrace";
 static BSGKey const BSGKeyStartedAt                 = @"startedAt";
 static BSGKey const BSGKeySymbolAddr                = @"symbolAddress";
-static BSGKey const BSGKeySymbolAddress             = @"symbol_addr";
-static BSGKey const BSGKeySymbolName                = @"symbol_name";
 static BSGKey const BSGKeySystem                    = @"system";
 static BSGKey const BSGKeyThermalState              = @"thermalState";
 static BSGKey const BSGKeyThreads                   = @"threads";

Bugsnag/KSCrash/Source/KSCrash/Recording/BSG_KSSystemInfo.m

@@ -26,22 +26,23 @@
 
 #import "BSG_KSSystemInfo.h"
 
+#import "BSGDefines.h"
+#import "BSGJSONSerialization.h"
 #import "BSGKeys.h"
 #import "BSGRunContext.h"
+#import "BSGUIKit.h"
+#import "BSGUtils.h"
 #import "BSG_Jailbreak.h"
 #import "BSG_KSCrashC.h"
 #import "BSG_KSCrashReportFields.h"
 #import "BSG_KSFileUtils.h"
-#import "BSG_KSJSONCodecObjC.h"
-#import "BSG_KSLogger.h"
 #import "BSG_KSMach.h"
 #import "BSG_KSMach.h"
 #import "BSG_KSMachHeaders.h"
 #import "BSG_KSSysCtl.h"
 #import "BSG_KSSystemInfoC.h"
 #import "BugsnagCollections.h"
-#import "BSGDefines.h"
-#import "BSGUIKit.h"
+#import "BugsnagLogger.h"
 
 #import <CommonCrypto/CommonDigest.h>
 #import <mach-o/dyld.h>
@@ -481,26 +482,17 @@ + (BOOL)isRunningInAppExtension {
 @end
 
 char *bsg_kssysteminfo_toJSON(void) {
-    NSError *error;
     NSMutableDictionary *systemInfo = [[BSG_KSSystemInfo systemInfo] mutableCopy];
 
     // Make sure the jailbroken status didn't get patched out.
     systemInfo[@BSG_KSSystemField_Jailbroken] = @(is_jailbroken());
 
-    NSMutableData *jsonData =
-        (NSMutableData *)[BSG_KSJSONCodec encode:systemInfo
-                                         options:BSG_KSJSONEncodeOptionSorted
-                                           error:&error];
-    if (error != nil) {
-        bsg_log_err(@"Could not serialize system info: %@", error);
-        return NULL;
-    }
-    if (![jsonData isKindOfClass:[NSMutableData class]]) {
-        jsonData = [NSMutableData dataWithData:jsonData];
+    NSData *data = BSGJSONDataFromDictionary(systemInfo, NULL);
+    if (!data) {
+        bsg_log_err(@"Could not serialize system info. "
+                    "Crash reports will be missing vital data.");
     }
-
-    [jsonData appendBytes:"\0" length:1];
-    return strdup([jsonData bytes]);
+    return BSGCStringWithData(data);
 }
 
 char *bsg_kssysteminfo_copyProcessName(void) {