Merge 8d5a5ce into 01a28a9

armcknight · web-flow · commit bf1c527408bb · 2023-08-19T05:45:14.000Z
diff --git a/SentryTestUtils/ClearTestState.swift b/SentryTestUtils/ClearTestState.swift
@@ -47,5 +47,7 @@ class TestCleanup: NSObject {
         PrivateSentrySDKOnly.onAppStartMeasurementAvailable = nil
         SentrySDK.setAppStartMeasurement(nil)
         #endif // os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
+
+        sentrycrash_scopesync_reset()
     }
 }
diff --git a/SentryTestUtils/SentryTestUtils-ObjC-BridgingHeader.h b/SentryTestUtils/SentryTestUtils-ObjC-BridgingHeader.h
@@ -35,6 +35,7 @@
 #import "SentryRandom.h"
 #import "SentrySDK+Private.h"
 #import "SentrySDK+Tests.h"
+#import "SentryScopeSyncC.h"
 #import "SentrySession.h"
 #import "SentrySwizzleWrapper.h"
 #import "SentrySystemWrapper.h"
diff --git a/Sources/Sentry/SentryCrashIntegration.m b/Sources/Sentry/SentryCrashIntegration.m
@@ -185,7 +185,7 @@ - (void)configureScope
         userInfo[@"release"] = self.options.releaseName;
         userInfo[@"dist"] = self.options.dist;
 
-        [SentryCrash.sharedInstance setUserInfo:userInfo];
+        [SentryDependencyContainer.sharedInstance.crashReporter setUserInfo:userInfo];
 
         [outerScope addObserver:self.scopeObserver];
     }];
diff --git a/Sources/Sentry/SentryCrashWrapper.m b/Sources/Sentry/SentryCrashWrapper.m
@@ -7,6 +7,7 @@
 #import <SentryCrashCachedData.h>
 #import <SentryCrashDebug.h>
 #import <SentryCrashMonitor_System.h>
+#import <SentryDependencyContainer.h>
 #include <mach/mach.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -23,7 +24,7 @@ + (instancetype)sharedInstance
 
 - (BOOL)crashedLastLaunch
 {
-    return SentryCrash.sharedInstance.crashedLastLaunch;
+    return SentryDependencyContainer.sharedInstance.crashReporter.crashedLastLaunch;
 }
 
 - (NSTimeInterval)durationFromCrashStateInitToLastCrash
@@ -33,7 +34,7 @@ - (NSTimeInterval)durationFromCrashStateInitToLastCrash
 
 - (NSTimeInterval)activeDurationSinceLastCrash
 {
-    return SentryCrash.sharedInstance.activeDurationSinceLastCrash;
+    return SentryDependencyContainer.sharedInstance.crashReporter.activeDurationSinceLastCrash;
 }
 
 - (BOOL)isBeingTraced
@@ -55,7 +56,8 @@ - (NSDictionary *)systemInfo
 {
     static NSDictionary *sharedInfo = nil;
     static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{ sharedInfo = SentryCrash.sharedInstance.systemInfo; });
+    dispatch_once(&onceToken,
+        ^{ sharedInfo = SentryDependencyContainer.sharedInstance.crashReporter.systemInfo; });
     return sharedInfo;
 }
 
diff --git a/Sources/Sentry/SentryDependencyContainer.m b/Sources/Sentry/SentryDependencyContainer.m
@@ -10,6 +10,7 @@
 #import "SentryUIApplication.h"
 #import <SentryAppStateManager.h>
 #import <SentryClient+Private.h>
+#import <SentryCrash.h>
 #import <SentryCrashWrapper.h>
 #import <SentryDebugImageProvider.h>
 #import <SentryDependencyContainer.h>
@@ -95,6 +96,18 @@ - (SentryCrashWrapper *)crashWrapper
     return _crashWrapper;
 }
 
+- (SentryCrash *)crashReporter
+{
+    if (_crashReporter == nil) {
+        @synchronized(sentryDependencyContainerLock) {
+            if (_crashReporter == nil) {
+                _crashReporter = [[SentryCrash alloc] init];
+            }
+        }
+    }
+    return _crashReporter;
+}
+
 - (SentryThreadWrapper *)threadWrapper
 {
     if (_threadWrapper == nil) {
diff --git a/Sources/Sentry/SentrySDK.m b/Sources/Sentry/SentrySDK.m
@@ -322,7 +322,7 @@ + (void)setUser:(SentryUser *_Nullable)user
 
 + (BOOL)crashedLastRun
 {
-    return SentryCrash.sharedInstance.crashedLastLaunch;
+    return SentryDependencyContainer.sharedInstance.crashReporter.crashedLastLaunch;
 }
 
 + (void)startSession
diff --git a/Sources/Sentry/include/HybridPublic/SentryDependencyContainer.h b/Sources/Sentry/include/HybridPublic/SentryDependencyContainer.h
@@ -2,6 +2,7 @@
 
 @class SentryANRTracker;
 @class SentryAppStateManager;
+@class SentryCrash;
 @class SentryCrashWrapper;
 @class SentryCurrentDateProvider;
 @class SentryDebugImageProvider;
@@ -42,6 +43,7 @@ SENTRY_NO_INIT
 @property (nonatomic, strong) SentryFileManager *fileManager;
 @property (nonatomic, strong) SentryAppStateManager *appStateManager;
 @property (nonatomic, strong) SentryCrashWrapper *crashWrapper;
+@property (nonatomic, strong) SentryCrash *crashReporter;
 @property (nonatomic, strong) SentryThreadWrapper *threadWrapper;
 @property (nonatomic, strong) id<SentryRandom> random;
 @property (nonatomic, strong) SentrySwizzleWrapper *swizzleWrapper;
diff --git a/Sources/SentryCrash/Installations/SentryCrashInstallation.m b/Sources/SentryCrash/Installations/SentryCrashInstallation.m
@@ -33,6 +33,7 @@
 #import "SentryCrashJSONCodecObjC.h"
 #import "SentryCrashLogger.h"
 #import "SentryCrashReportFilterBasic.h"
+#import "SentryDependencyContainer.h"
 #import <objc/runtime.h>
 
 /** Max number of properties that can be defined for writing to the report */
@@ -175,7 +176,7 @@ - (id)initWithRequiredProperties:(NSArray *)requiredProperties
 
 - (void)dealloc
 {
-    SentryCrash *handler = [SentryCrash sharedInstance];
+    SentryCrash *handler = SentryDependencyContainer.sharedInstance.crashReporter;
     @synchronized(handler) {
         if (g_crashHandlerData == self.crashHandlerData) {
             g_crashHandlerData = NULL;
@@ -260,7 +261,7 @@ - (void)setOnCrash:(SentryCrashReportWriteCallback)onCrash
 
 - (void)install
 {
-    SentryCrash *handler = [SentryCrash sharedInstance];
+    SentryCrash *handler = SentryDependencyContainer.sharedInstance.crashReporter;
     @synchronized(handler) {
         g_crashHandlerData = self.crashHandlerData;
         handler.onCrash = crashCallback;
@@ -270,7 +271,7 @@ - (void)install
 
 - (void)uninstall
 {
-    SentryCrash *handler = [SentryCrash sharedInstance];
+    SentryCrash *handler = SentryDependencyContainer.sharedInstance.crashReporter;
     @synchronized(handler) {
         if (g_crashHandlerData == self.crashHandlerData) {
             g_crashHandlerData = NULL;
@@ -302,7 +303,7 @@ - (void)sendAllReportsWithCompletion:(SentryCrashReportFilterCompletion)onComple
 
     sink = [SentryCrashReportFilterPipeline filterWithFilters:self.prependedFilters, sink, nil];
 
-    SentryCrash *handler = [SentryCrash sharedInstance];
+    SentryCrash *handler = SentryDependencyContainer.sharedInstance.crashReporter;
     handler.sink = sink;
     [handler sendAllReportsWithCompletion:onCompletion];
 }
diff --git a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_NSException.m b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_NSException.m
@@ -31,6 +31,7 @@
 #include "SentryCrashMonitorContext.h"
 #import "SentryCrashStackCursor_Backtrace.h"
 #include "SentryCrashThread.h"
+#import "SentryDependencyContainer.h"
 
 // #define SentryCrashLogger_LocalLevel TRACE
 #import "SentryCrashLogger.h"
@@ -128,7 +129,8 @@
 
             SentryCrashLOG_DEBUG(@"Setting new handler.");
             NSSetUncaughtExceptionHandler(&handleUncaughtException);
-            SentryCrash.sharedInstance.uncaughtExceptionHandler = &handleUncaughtException;
+            SentryDependencyContainer.sharedInstance.crashReporter.uncaughtExceptionHandler
+                = &handleUncaughtException;
         } else {
             SentryCrashLOG_DEBUG(@"Restoring original handler.");
             NSSetUncaughtExceptionHandler(g_previousUncaughtExceptionHandler);
diff --git a/Sources/SentryCrash/Recording/SentryCrash.h b/Sources/SentryCrash/Recording/SentryCrash.h
@@ -182,10 +182,6 @@ static NSString *const SENTRYCRASH_REPORT_ATTACHMENTS_ITEM = @"attachments";
 
 #pragma mark - API -
 
-/** Get the singleton instance of the crash reporter.
- */
-+ (SentryCrash *)sharedInstance;
-
 /** Install the crash reporter.
  * The reporter will record crashes, but will not send any crash reports unless
  * sink is set.
diff --git a/Sources/SentryCrash/Recording/SentryCrash.m b/Sources/SentryCrash/Recording/SentryCrash.m
@@ -87,15 +87,6 @@ @implementation SentryCrash
 #pragma mark - Lifecycle -
 // ============================================================================
 
-+ (instancetype)sharedInstance
-{
-    static SentryCrash *sharedInstance = nil;
-    static dispatch_once_t onceToken;
-
-    dispatch_once(&onceToken, ^{ sharedInstance = [[SentryCrash alloc] init]; });
-    return sharedInstance;
-}
-
 - (id)init
 {
     return [self initWithBasePath:[self getBasePath]];
diff --git a/Tests/SentryTests/Integrations/SentryCrash/SentryCrashIntegrationTests.swift b/Tests/SentryTests/Integrations/SentryCrash/SentryCrashIntegrationTests.swift
@@ -68,7 +68,7 @@ class SentryCrashIntegrationTests: NotificationCenterTestCase {
     }
     
     // Test for GH-581
-    func testReleaseNamePassedToSentryCrash() {
+    func testReleaseNamePassedToSentryCrash() throws {
         let releaseName = "1.0.0"
         let dist = "14G60"
         // The start of the SDK installs all integrations
@@ -79,20 +79,18 @@ class SentryCrashIntegrationTests: NotificationCenterTestCase {
         }
         
         // To test this properly we need SentryCrash and SentryCrashIntegration installed and registered on the current hub of the SDK.
-        
-        let instance = SentryCrash.sharedInstance()
-        let userInfo = (instance?.userInfo ?? ["": ""]) as Dictionary
+
+        let userInfo = try XCTUnwrap(SentryDependencyContainer.sharedInstance().crashReporter.userInfo)
         assertUserInfoField(userInfo: userInfo, key: "release", expected: releaseName)
         assertUserInfoField(userInfo: userInfo, key: "dist", expected: dist)
     }
     
-    func testContext_IsPassedToSentryCrash() {
+    func testContext_IsPassedToSentryCrash() throws {
         SentrySDK.start { options in
             options.dsn = SentryCrashIntegrationTests.dsnAsString
         }
         
-        let instance = SentryCrash.sharedInstance()
-        let userInfo = (instance?.userInfo ?? ["": ""]) as Dictionary
+        let userInfo = try XCTUnwrap(SentryDependencyContainer.sharedInstance().crashReporter.userInfo)
         let context = userInfo["context"] as? [String: Any]
         
         assertContext(context: context)
diff --git a/Tests/SentryTests/Integrations/SentryCrash/SentryCrashReportTests.swift b/Tests/SentryTests/Integrations/SentryCrash/SentryCrashReportTests.swift
@@ -76,7 +76,7 @@ class SentryCrashReportTests: XCTestCase {
      * UserInfo is picked up by the crash report when writing a new report.
      */
     private func serializeToCrashReport(scope: Scope) {
-        SentryCrash.sharedInstance().userInfo = scope.serialize()
+        SentryDependencyContainer.sharedInstance().crashReporter.userInfo = scope.serialize()
     }
     
     private func deleteTestDir() {
diff --git a/Tests/SentryTests/Integrations/SentryCrash/SentryCrashScopeObserverTests.swift b/Tests/SentryTests/Integrations/SentryCrash/SentryCrashScopeObserverTests.swift
@@ -1,3 +1,4 @@
+import SentryTestUtils
 import XCTest
 
 class SentryCrashScopeObserverTests: XCTestCase {
@@ -17,16 +18,9 @@ class SentryCrashScopeObserverTests: XCTestCase {
     
     private let fixture = Fixture()
     
-    override func setUp() {
-        super.setUp()
-        sentrycrash_scopesync_reset()
-        SentryCrash.sharedInstance().userInfo = nil
-    }
-    
     override func tearDown() {
         super.tearDown()
-        sentrycrash_scopesync_reset()
-        SentryCrash.sharedInstance().userInfo = nil
+        clearTestState()
     }
 
     func testUser() {
diff --git a/Tests/SentryTests/SentryCrash/SentryCrashInstallationTests.m b/Tests/SentryTests/SentryCrash/SentryCrashInstallationTests.m
@@ -38,7 +38,8 @@ - (SentryCrashTestInstallation *)getSut
     SentryCrashTestInstallation *installation =
         [[SentryCrashTestInstallation alloc] initForTesting];
     self.notificationCenter = [[TestNSNotificationCenterWrapper alloc] init];
-    [[SentryCrash sharedInstance] setSentryNSNotificationCenterWrapper:self.notificationCenter];
+    [SentryDependencyContainer.sharedInstance.crashReporter
+        setSentryNSNotificationCenterWrapper:self.notificationCenter];
     return installation;
 }
 
@@ -48,7 +49,8 @@ - (void)testUninstall
 
     [installation install];
 
-    SentryCrashMonitorType monitorsAfterInstall = [SentryCrash sharedInstance].monitoring;
+    SentryCrashMonitorType monitorsAfterInstall
+        = SentryDependencyContainer.sharedInstance.crashReporter.monitoring;
 
     [installation uninstall];
 
@@ -73,8 +75,8 @@ - (void)testUninstall_Install
 
     [installation install];
 
-    SentryCrash *sentryCrash = [SentryCrash sharedInstance];
-    SentryCrashMonitorType monitorsAfterInstall = sentryCrash.monitoring;
+    SentryCrashMonitorType monitorsAfterInstall
+        = SentryDependencyContainer.sharedInstance.crashReporter.monitoring;
     CrashHandlerData *crashHandlerDataAfterInstall = [installation g_crashHandlerData];
 
     // To ensure multiple calls in a row work
@@ -104,7 +106,7 @@ - (void)assertReinstalled:(SentryCrashTestInstallation *)installation
             monitorsAfterInstall:(SentryCrashMonitorType)monitorsAfterInstall
     crashHandlerDataAfterInstall:(CrashHandlerData *)crashHandlerDataAfterInstall
 {
-    SentryCrash *sentryCrash = [SentryCrash sharedInstance];
+    SentryCrash *sentryCrash = SentryDependencyContainer.sharedInstance.crashReporter;
     XCTAssertNotEqual(NULL, [installation g_crashHandlerData]);
     XCTAssertEqual(monitorsAfterInstall, sentryCrash.monitoring);
     XCTAssertEqual(monitorsAfterInstall, sentrycrashcm_getActiveMonitors());
@@ -119,7 +121,7 @@ - (void)assertReinstalled:(SentryCrashTestInstallation *)installation
 - (void)assertUninstalled:(SentryCrashTestInstallation *)installation
      monitorsAfterInstall:(SentryCrashMonitorType)monitorsAfterInstall
 {
-    SentryCrash *sentryCrash = [SentryCrash sharedInstance];
+    SentryCrash *sentryCrash = SentryDependencyContainer.sharedInstance.crashReporter;
     XCTAssertEqual(NULL, [installation g_crashHandlerData]);
     XCTAssertEqual(SentryCrashMonitorTypeNone, sentryCrash.monitoring);
     XCTAssertEqual(SentryCrashMonitorTypeNone, sentrycrashcm_getActiveMonitors());
diff --git a/Tests/SentryTests/SentrySDKTests.swift b/Tests/SentryTests/SentrySDKTests.swift
@@ -187,7 +187,7 @@ class SentrySDKTests: XCTestCase {
     }
     
     func testCrashedLastRun() {
-        XCTAssertEqual(SentryCrash.sharedInstance().crashedLastLaunch, SentrySDK.crashedLastRun) 
+        XCTAssertEqual(SentryDependencyContainer.sharedInstance().crashReporter.crashedLastLaunch, SentrySDK.crashedLastRun) 
     }
     
     func testCaptureCrashEvent() {

Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,7 @@ class TestCleanup: NSObject {`
`47`	`47`	`PrivateSentrySDKOnly.onAppStartMeasurementAvailable = nil`
`48`	`48`	`SentrySDK.setAppStartMeasurement(nil)`
`49`	`49`	`#endif // os(iOS) \|\| os(tvOS) \|\| targetEnvironment(macCatalyst)`
	`50`	`+`
	`51`	`+ sentrycrash_scopesync_reset()`
`50`	`52`	`}`
`51`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`#import <SentryCrashCachedData.h>`
`8`	`8`	`#import <SentryCrashDebug.h>`
`9`	`9`	`#import <SentryCrashMonitor_System.h>`
	`10`	`+#import <SentryDependencyContainer.h>`
`10`	`11`	`#include <mach/mach.h>`
`11`	`12`
`12`	`13`	`NS_ASSUME_NONNULL_BEGIN`
`@@ -23,7 +24,7 @@ + (instancetype)sharedInstance`
`23`	`24`
`24`	`25`	`- (BOOL)crashedLastLaunch`
`25`	`26`	`{`
`26`		`- return SentryCrash.sharedInstance.crashedLastLaunch;`
	`27`	`+ return SentryDependencyContainer.sharedInstance.crashReporter.crashedLastLaunch;`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`- (NSTimeInterval)durationFromCrashStateInitToLastCrash`
`@@ -33,7 +34,7 @@ - (NSTimeInterval)durationFromCrashStateInitToLastCrash`
`33`	`34`
`34`	`35`	`- (NSTimeInterval)activeDurationSinceLastCrash`
`35`	`36`	`{`
`36`		`- return SentryCrash.sharedInstance.activeDurationSinceLastCrash;`
	`37`	`+ return SentryDependencyContainer.sharedInstance.crashReporter.activeDurationSinceLastCrash;`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`- (BOOL)isBeingTraced`
`@@ -55,7 +56,8 @@ - (NSDictionary *)systemInfo`
`55`	`56`	`{`
`56`	`57`	`static NSDictionary *sharedInfo = nil;`
`57`	`58`	`static dispatch_once_t onceToken;`
`58`		`- dispatch_once(&onceToken, ^{ sharedInfo = SentryCrash.sharedInstance.systemInfo; });`
	`59`	`+ dispatch_once(&onceToken,`
	`60`	`+ ^{ sharedInfo = SentryDependencyContainer.sharedInstance.crashReporter.systemInfo; });`
`59`	`61`	`return sharedInfo;`
`60`	`62`	`}`
`61`	`63`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ + (void)setUser:(SentryUser *_Nullable)user`
`322`	`322`
`323`	`323`	`+ (BOOL)crashedLastRun`
`324`	`324`	`{`
`325`		`- return SentryCrash.sharedInstance.crashedLastLaunch;`
	`325`	`+ return SentryDependencyContainer.sharedInstance.crashReporter.crashedLastLaunch;`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`+ (void)startSession`