Merge pull request #1039 from bugsnag/integration/app-hangs

bugsnag · Mar 18, 2021 · f33859d · f33859d
2 parents 5287d5c + 74e89d3
commit f33859d
Show file tree

Hide file tree

Showing 87 changed files with 2,465 additions and 1,739 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -138,6 +138,7 @@ steps:
       docker-compose#v3.3.0:
         run: cocoa-maze-runner
         command:
+          - "features/app_hangs.feature"
           - "features/barebone_tests.feature"
           - "--app=/app/build/iOSTestApp.ipa"
           - "--farm=bs"
@@ -164,6 +165,7 @@ steps:
       docker-compose#v3.3.0:
         run: cocoa-maze-runner
         command:
+          - "features/app_hangs.feature"
           - "features/barebone_tests.feature"
           - "--app=/app/build/iOSTestApp.ipa"
           - "--farm=bs"
@@ -190,6 +192,7 @@ steps:
     commands:
       - bundle install
       - bundle exec maze-runner
+        features/app_hangs.feature
         features/barebone_tests.feature
         --farm=local
         --os=macos
@@ -198,5 +201,20 @@ steps:
         --tags='not @skip_macos'
         --fail-fast
 
+  - label: 'macOS 10.15 stress test'
+    timeout_in_minutes: 3
+    agents:
+      queue: opensource-mac-cocoa
+    env:
+      STRESS_TEST: "true"
+    commands:
+      - bundle install
+      - bundle exec maze-runner
+        features/stress_test.feature
+        --no-log-requests
+    artifact_paths:
+      - features/fixtures/macos-stress-test/BugsnagStressTest.stdout.log
+      - features/fixtures/macos-stress-test/BugsnagStressTest.stderr.log
+
   - label: 'Conditionally trigger full set of tests'
     command: sh -c .buildkite/pipeline_trigger.sh
diff --git a/Bugsnag.xcodeproj/project.pbxproj b/Bugsnag.xcodeproj/project.pbxproj
diff --git a/Bugsnag/BugsnagCrashSentry.h b/Bugsnag/BugsnagCrashSentry.h
@@ -11,14 +11,12 @@
 #import "BSG_KSCrashReportWriter.h"
 #import "BSG_KSCrashType.h"
 #import "BugsnagConfiguration.h"
-#import "BugsnagErrorReportApiClient.h"
 
 @class BugsnagNotifier;
 
 @interface BugsnagCrashSentry : NSObject
 
 - (void)install:(BugsnagConfiguration *)config
-      apiClient:(BugsnagErrorReportApiClient *)apiClient
        notifier:(BugsnagNotifier *)notifier
         onCrash:(BSGReportCallback)onCrash;
 

diff --git a/Bugsnag/BugsnagCrashSentry.m b/Bugsnag/BugsnagCrashSentry.m
@@ -9,24 +9,21 @@
 
 #import "BugsnagCrashSentry.h"
 
+#import "BSGFileLocations.h"
 #import "BSG_KSCrashAdvanced.h"
 #import "BSG_KSCrashC.h"
 #import "Bugsnag.h"
 #import "BugsnagConfiguration.h"
-#import "BugsnagErrorReportSink.h"
 #import "BugsnagErrorTypes.h"
 #import "BugsnagLogger.h"
 
 @implementation BugsnagCrashSentry
 
 - (void)install:(BugsnagConfiguration *)config
-      apiClient:(BugsnagErrorReportApiClient *)apiClient
        notifier:(BugsnagNotifier *)notifier
         onCrash:(BSGReportCallback)onCrash
 {
-    BugsnagErrorReportSink *sink = [[BugsnagErrorReportSink alloc] initWithApiClient:apiClient configuration:config notifier:notifier];
     BSG_KSCrash *ksCrash = [BSG_KSCrash sharedInstance];
-    ksCrash.sink = sink;
     ksCrash.introspectMemory = NO;
     ksCrash.onCrash = onCrash;
     ksCrash.maxStoredReports = (int)config.maxPersistedEvents;
@@ -47,11 +44,9 @@ - (void)install:(BugsnagConfiguration *)config
 
     bsg_kscrash_setHandlingCrashTypes(crashTypes);
 
-    if ((![ksCrash install])) {
+    if ((![ksCrash install:[BSGFileLocations current].kscrashReports])) {
         bsg_log_err(@"Failed to install crash handler. No exceptions will be reported!");
     }
-
-    [sink.apiClient flushPendingData];
 }
 
 /**

diff --git a/Bugsnag/BugsnagErrorReportSink+Private.h b/Bugsnag/BugsnagErrorReportSink+Private.h
diff --git a/Bugsnag/BugsnagErrorReportSink.h b/Bugsnag/BugsnagErrorReportSink.h
diff --git a/Bugsnag/BugsnagErrorReportSink.m b/Bugsnag/BugsnagErrorReportSink.m
diff --git a/Bugsnag/Client/BugsnagClient+AppHangs.h b/Bugsnag/Client/BugsnagClient+AppHangs.h
@@ -0,0 +1,23 @@
+//
+//  BugsnagClient+AppHangs.h
+//  Bugsnag
+//
+//  Created by Nick Dowell on 08/03/2021.
+//  Copyright © 2021 Bugsnag Inc. All rights reserved.
+//
+
+#import "BugsnagClient+Private.h"
+
+#import "BSGAppHangDetector.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BugsnagClient (AppHangs) <BSGAppHangDetectorDelegate>
+
+- (BOOL)lastRunEndedWithAppHang;
+
+- (void)startAppHangDetector;
+
+@end
+
+NS_ASSUME_NONNULL_END