Fix flaky unit test exit

noahsmartin · noahsmartin · commit 6a68958c53c7 · 2025-06-30T11:54:13.000-04:00
diff --git a/Sources/Sentry/SentryHub.m b/Sources/Sentry/SentryHub.m
@@ -36,7 +36,7 @@
 
 @interface SentryHub ()
 
-@property (nullable, nonatomic, strong) SentryClient *client;
+@property (nullable, atomic, strong) SentryClient *client;
 @property (nullable, nonatomic, strong) SentryScope *scope;
 @property (nonatomic) SentryDispatchQueueWrapper *dispatchQueue;
 @property (nonatomic, strong) SentryCrashWrapper *crashWrapper;
@@ -90,7 +90,7 @@ - (void)startSession
 {
     SentrySession *lastSession = nil;
     SentryScope *scope = self.scope;
-    SentryOptions *options = [_client options];
+    SentryOptions *options = [self.client options];
     if (options == nil) {
         SENTRY_LOG_ERROR(@"Options of the client are nil. Not starting a session.");
         return;
@@ -158,17 +158,17 @@ - (void)endSessionWithTimestamp:(NSDate *)timestamp
 
 - (void)storeCurrentSession:(SentrySession *)session
 {
-    [[_client fileManager] storeCurrentSession:session];
+    [[self.client fileManager] storeCurrentSession:session];
 }
 
 - (void)deleteCurrentSession
 {
-    [[_client fileManager] deleteCurrentSession];
+    [[self.client fileManager] deleteCurrentSession];
 }
 
 - (void)closeCachedSessionWithTimestamp:(nullable NSDate *)timestamp
 {
-    SentryFileManager *fileManager = [_client fileManager];
+    SentryFileManager *fileManager = [self.client fileManager];
     SentrySession *session = [fileManager readCurrentSession];
     if (session == nil) {
         SENTRY_LOG_DEBUG(@"No cached session to close.");
@@ -177,7 +177,7 @@ - (void)closeCachedSessionWithTimestamp:(nullable NSDate *)timestamp
     SENTRY_LOG_DEBUG(@"A cached session was found.");
 
     // Make sure there's a client bound.
-    SentryClient *client = _client;
+    SentryClient *client = self.client;
     if (client == nil) {
         SENTRY_LOG_DEBUG(@"No client bound.");
         return;
@@ -204,7 +204,7 @@ - (void)closeCachedSessionWithTimestamp:(nullable NSDate *)timestamp
 - (void)captureSession:(nullable SentrySession *)session
 {
     if (session != nil) {
-        SentryClient *client = _client;
+        SentryClient *client = self.client;
 
         if (client.options.diagnosticLevel == kSentryLevelDebug) {
             SENTRY_LOG_DEBUG(
@@ -243,7 +243,7 @@ - (void)captureFatalEvent:(SentryEvent *)event withScope:(SentryScope *)scope
 {
     event.isFatalEvent = YES;
 
-    SentryClient *client = _client;
+    SentryClient *client = self.client;
     if (client == nil) {
         return;
     }
@@ -337,7 +337,7 @@ - (void)saveCrashTransaction:(SentryTransaction *)transaction
         return;
     }
 
-    SentryClient *client = _client;
+    SentryClient *client = self.client;
     if (client != nil) {
         [client saveCrashTransaction:transaction withScope:self.scope];
     }
@@ -357,7 +357,7 @@ - (SentryId *)captureEvent:(SentryEvent *)event
                   withScope:(SentryScope *)scope
     additionalEnvelopeItems:(NSArray<SentryEnvelopeItem *> *)additionalEnvelopeItems
 {
-    SentryClient *client = _client;
+    SentryClient *client = self.client;
     if (client != nil) {
         return [client captureEvent:event
                           withScope:scope
@@ -370,10 +370,10 @@ - (void)captureReplayEvent:(SentryReplayEvent *)replayEvent
            replayRecording:(SentryReplayRecording *)replayRecording
                      video:(NSURL *)videoURL
 {
-    [_client captureReplayEvent:replayEvent
-                replayRecording:replayRecording
-                          video:videoURL
-                      withScope:self.scope];
+    [self.client captureReplayEvent:replayEvent
+                    replayRecording:replayRecording
+                              video:videoURL
+                          withScope:self.scope];
 }
 
 - (id<SentrySpan>)startTransactionWithName:(NSString *)name operation:(NSString *)operation
@@ -489,7 +489,7 @@ - (SentryId *)captureMessage:(NSString *)message
 
 - (SentryId *)captureMessage:(NSString *)message withScope:(SentryScope *)scope
 {
-    SentryClient *client = _client;
+    SentryClient *client = self.client;
     if (client != nil) {
         return [client captureMessage:message withScope:scope];
     }
@@ -504,7 +504,7 @@ - (SentryId *)captureError:(NSError *)error
 - (SentryId *)captureError:(NSError *)error withScope:(SentryScope *)scope
 {
     SentrySession *currentSession = _session;
-    SentryClient *client = _client;
+    SentryClient *client = self.client;
     if (client != nil) {
         if (currentSession != nil) {
             return [client captureError:error
@@ -526,7 +526,7 @@ - (SentryId *)captureException:(NSException *)exception
 - (SentryId *)captureException:(NSException *)exception withScope:(SentryScope *)scope
 {
     SentrySession *currentSession = _session;
-    SentryClient *client = _client;
+    SentryClient *client = self.client;
     if (client != nil) {
         if (currentSession != nil) {
             return [client captureException:exception
@@ -542,15 +542,15 @@ - (SentryId *)captureException:(NSException *)exception withScope:(SentryScope *
 
 - (void)captureUserFeedback:(SentryUserFeedback *)userFeedback
 {
-    SentryClient *client = _client;
+    SentryClient *client = self.client;
     if (client != nil) {
         [client captureUserFeedback:userFeedback];
     }
 }
 
 - (void)captureFeedback:(SentryFeedback *)feedback
 {
-    SentryClient *client = _client;
+    SentryClient *client = self.client;
     if (client != nil) {
         [client captureFeedback:feedback withScope:self.scope];
     }
@@ -575,7 +575,7 @@ - (void)addBreadcrumb:(SentryBreadcrumb *)crumb
 
 - (nullable SentryClient *)getClient
 {
-    return _client;
+    return self.client;
 }
 
 - (void)bindClient:(nullable SentryClient *)client
@@ -587,7 +587,7 @@ - (SentryScope *)scope
 {
     @synchronized(self) {
         if (_scope == nil) {
-            SentryClient *client = _client;
+            SentryClient *client = self.client;
             if (client != nil) {
                 _scope = [[SentryScope alloc] initWithMaxBreadcrumbs:client.options.maxBreadcrumbs];
             } else {
@@ -695,7 +695,7 @@ - (void)setUser:(nullable SentryUser *)user
  */
 - (void)storeEnvelope:(SentryEnvelope *)envelope
 {
-    SentryClient *client = _client;
+    SentryClient *client = self.client;
     if (client == nil) {
         return;
     }
@@ -707,7 +707,7 @@ - (void)storeEnvelope:(SentryEnvelope *)envelope
 
 - (void)captureEnvelope:(SentryEnvelope *)envelope
 {
-    SentryClient *client = _client;
+    SentryClient *client = self.client;
     if (client == nil) {
         return;
     }
@@ -732,7 +732,7 @@ - (SentryEnvelope *)updateSessionState:(SentryEnvelope *)envelope
                 [currentSession
                     endSessionCrashedWithTimestamp:[SentryDependencyContainer.sharedInstance
                                                            .dateProvider date]];
-                if (_client.options.diagnosticLevel == kSentryLevelDebug) {
+                if (self.client.options.diagnosticLevel == kSentryLevelDebug) {
                     SENTRY_LOG_DEBUG(@"Ending session with status: %@",
                         [self createSessionDebugString:currentSession]);
                 }
@@ -811,15 +811,15 @@ - (NSString *)createSessionDebugString:(SentrySession *)session
 
 - (void)flush:(NSTimeInterval)timeout
 {
-    SentryClient *client = _client;
+    SentryClient *client = self.client;
     if (client != nil) {
         [client flush:timeout];
     }
 }
 
 - (void)close
 {
-    [_client close];
+    [self.client close];
     SENTRY_LOG_DEBUG(@"Closed the Hub.");
 }
 
diff --git a/Sources/Sentry/SentryViewHierarchyIntegration.m b/Sources/Sentry/SentryViewHierarchyIntegration.m
@@ -44,7 +44,7 @@ - (BOOL)installWithOptions:(nonnull SentryOptions *)options
 
     self.options = options;
 
-    SentryClient *client = [SentrySDK.currentHub getClient];
+    SentryClient *client = [SentrySDK.currentHub client];
     [client addAttachmentProcessor:self];
 
     sentrycrash_setSaveViewHierarchy(&saveViewHierarchy);
@@ -63,7 +63,7 @@ - (void)uninstall
 {
     sentrycrash_setSaveViewHierarchy(NULL);
 
-    SentryClient *client = [SentrySDK.currentHub getClient];
+    SentryClient *client = [SentrySDK.currentHub client];
     [client removeAttachmentProcessor:self];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`
`37`	`37`	`@interface SentryHub ()`
`38`	`38`
`39`		`-@property (nullable, nonatomic, strong) SentryClient *client;`
	`39`	`+@property (nullable, atomic, strong) SentryClient *client;`
`40`	`40`	`@property (nullable, nonatomic, strong) SentryScope *scope;`
`41`	`41`	`@property (nonatomic) SentryDispatchQueueWrapper *dispatchQueue;`
`42`	`42`	`@property (nonatomic, strong) SentryCrashWrapper *crashWrapper;`
`@@ -90,7 +90,7 @@ - (void)startSession`
`90`	`90`	`{`
`91`	`91`	`SentrySession *lastSession = nil;`
`92`	`92`	`SentryScope *scope = self.scope;`
`93`		`- SentryOptions *options = [_client options];`
	`93`	`+ SentryOptions *options = [self.client options];`
`94`	`94`	`if (options == nil) {`
`95`	`95`	`SENTRY_LOG_ERROR(@"Options of the client are nil. Not starting a session.");`
`96`	`96`	`return;`
`@@ -158,17 +158,17 @@ - (void)endSessionWithTimestamp:(NSDate *)timestamp`
`158`	`158`
`159`	`159`	`- (void)storeCurrentSession:(SentrySession *)session`
`160`	`160`	`{`
`161`		`- [[_client fileManager] storeCurrentSession:session];`
	`161`	`+ [[self.client fileManager] storeCurrentSession:session];`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`- (void)deleteCurrentSession`
`165`	`165`	`{`
`166`		`- [[_client fileManager] deleteCurrentSession];`
	`166`	`+ [[self.client fileManager] deleteCurrentSession];`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`- (void)closeCachedSessionWithTimestamp:(nullable NSDate *)timestamp`
`170`	`170`	`{`
`171`		`- SentryFileManager *fileManager = [_client fileManager];`
	`171`	`+ SentryFileManager *fileManager = [self.client fileManager];`
`172`	`172`	`SentrySession *session = [fileManager readCurrentSession];`
`173`	`173`	`if (session == nil) {`
`174`	`174`	`SENTRY_LOG_DEBUG(@"No cached session to close.");`
`@@ -177,7 +177,7 @@ - (void)closeCachedSessionWithTimestamp:(nullable NSDate *)timestamp`
`177`	`177`	`SENTRY_LOG_DEBUG(@"A cached session was found.");`
`178`	`178`
`179`	`179`	`// Make sure there's a client bound.`
`180`		`- SentryClient *client = _client;`
	`180`	`+ SentryClient *client = self.client;`
`181`	`181`	`if (client == nil) {`
`182`	`182`	`SENTRY_LOG_DEBUG(@"No client bound.");`
`183`	`183`	`return;`
`@@ -204,7 +204,7 @@ - (void)closeCachedSessionWithTimestamp:(nullable NSDate *)timestamp`
`204`	`204`	`- (void)captureSession:(nullable SentrySession *)session`
`205`	`205`	`{`
`206`	`206`	`if (session != nil) {`
`207`		`- SentryClient *client = _client;`
	`207`	`+ SentryClient *client = self.client;`
`208`	`208`
`209`	`209`	`if (client.options.diagnosticLevel == kSentryLevelDebug) {`
`210`	`210`	`SENTRY_LOG_DEBUG(`
`@@ -243,7 +243,7 @@ - (void)captureFatalEvent:(SentryEvent )event withScope:(SentryScope )scope`
`243`	`243`	`{`
`244`	`244`	`event.isFatalEvent = YES;`
`245`	`245`
`246`		`- SentryClient *client = _client;`
	`246`	`+ SentryClient *client = self.client;`
`247`	`247`	`if (client == nil) {`
`248`	`248`	`return;`
`249`	`249`	`}`
`@@ -337,7 +337,7 @@ - (void)saveCrashTransaction:(SentryTransaction *)transaction`
`337`	`337`	`return;`
`338`	`338`	`}`
`339`	`339`
`340`		`- SentryClient *client = _client;`
	`340`	`+ SentryClient *client = self.client;`
`341`	`341`	`if (client != nil) {`
`342`	`342`	`[client saveCrashTransaction:transaction withScope:self.scope];`
`343`	`343`	`}`
`@@ -357,7 +357,7 @@ - (SentryId )captureEvent:(SentryEvent )event`
`357`	`357`	`withScope:(SentryScope *)scope`
`358`	`358`	`additionalEnvelopeItems:(NSArray<SentryEnvelopeItem > )additionalEnvelopeItems`
`359`	`359`	`{`
`360`		`- SentryClient *client = _client;`
	`360`	`+ SentryClient *client = self.client;`
`361`	`361`	`if (client != nil) {`
`362`	`362`	`return [client captureEvent:event`
`363`	`363`	`withScope:scope`
`@@ -370,10 +370,10 @@ - (void)captureReplayEvent:(SentryReplayEvent *)replayEvent`
`370`	`370`	`replayRecording:(SentryReplayRecording *)replayRecording`
`371`	`371`	`video:(NSURL *)videoURL`
`372`	`372`	`{`
`373`		`- [_client captureReplayEvent:replayEvent`
`374`		`- replayRecording:replayRecording`
`375`		`- video:videoURL`
`376`		`- withScope:self.scope];`
	`373`	`+ [self.client captureReplayEvent:replayEvent`
	`374`	`+ replayRecording:replayRecording`
	`375`	`+ video:videoURL`
	`376`	`+ withScope:self.scope];`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`- (id<SentrySpan>)startTransactionWithName:(NSString )name operation:(NSString )operation`
`@@ -489,7 +489,7 @@ - (SentryId )captureMessage:(NSString )message`
`489`	`489`
`490`	`490`	`- (SentryId )captureMessage:(NSString )message withScope:(SentryScope *)scope`
`491`	`491`	`{`
`492`		`- SentryClient *client = _client;`
	`492`	`+ SentryClient *client = self.client;`
`493`	`493`	`if (client != nil) {`
`494`	`494`	`return [client captureMessage:message withScope:scope];`
`495`	`495`	`}`
`@@ -504,7 +504,7 @@ - (SentryId )captureError:(NSError )error`
`504`	`504`	`- (SentryId )captureError:(NSError )error withScope:(SentryScope *)scope`
`505`	`505`	`{`
`506`	`506`	`SentrySession *currentSession = _session;`
`507`		`- SentryClient *client = _client;`
	`507`	`+ SentryClient *client = self.client;`
`508`	`508`	`if (client != nil) {`
`509`	`509`	`if (currentSession != nil) {`
`510`	`510`	`return [client captureError:error`
`@@ -526,7 +526,7 @@ - (SentryId )captureException:(NSException )exception`
`526`	`526`	`- (SentryId )captureException:(NSException )exception withScope:(SentryScope *)scope`
`527`	`527`	`{`
`528`	`528`	`SentrySession *currentSession = _session;`
`529`		`- SentryClient *client = _client;`
	`529`	`+ SentryClient *client = self.client;`
`530`	`530`	`if (client != nil) {`
`531`	`531`	`if (currentSession != nil) {`
`532`	`532`	`return [client captureException:exception`
`@@ -542,15 +542,15 @@ - (SentryId )captureException:(NSException )exception withScope:(SentryScope *`
`542`	`542`
`543`	`543`	`- (void)captureUserFeedback:(SentryUserFeedback *)userFeedback`
`544`	`544`	`{`
`545`		`- SentryClient *client = _client;`
	`545`	`+ SentryClient *client = self.client;`
`546`	`546`	`if (client != nil) {`
`547`	`547`	`[client captureUserFeedback:userFeedback];`
`548`	`548`	`}`
`549`	`549`	`}`
`550`	`550`
`551`	`551`	`- (void)captureFeedback:(SentryFeedback *)feedback`
`552`	`552`	`{`
`553`		`- SentryClient *client = _client;`
	`553`	`+ SentryClient *client = self.client;`
`554`	`554`	`if (client != nil) {`
`555`	`555`	`[client captureFeedback:feedback withScope:self.scope];`
`556`	`556`	`}`
`@@ -575,7 +575,7 @@ - (void)addBreadcrumb:(SentryBreadcrumb *)crumb`
`575`	`575`
`576`	`576`	`- (nullable SentryClient *)getClient`
`577`	`577`	`{`
`578`		`- return _client;`
	`578`	`+ return self.client;`
`579`	`579`	`}`
`580`	`580`
`581`	`581`	`- (void)bindClient:(nullable SentryClient *)client`
`@@ -587,7 +587,7 @@ - (SentryScope *)scope`
`587`	`587`	`{`
`588`	`588`	`@synchronized(self) {`
`589`	`589`	`if (_scope == nil) {`
`590`		`- SentryClient *client = _client;`
	`590`	`+ SentryClient *client = self.client;`
`591`	`591`	`if (client != nil) {`
`592`	`592`	`_scope = [[SentryScope alloc] initWithMaxBreadcrumbs:client.options.maxBreadcrumbs];`
`593`	`593`	`} else {`
`@@ -695,7 +695,7 @@ - (void)setUser:(nullable SentryUser *)user`
`695`	`695`	`*/`
`696`	`696`	`- (void)storeEnvelope:(SentryEnvelope *)envelope`
`697`	`697`	`{`
`698`		`- SentryClient *client = _client;`
	`698`	`+ SentryClient *client = self.client;`
`699`	`699`	`if (client == nil) {`
`700`	`700`	`return;`
`701`	`701`	`}`
`@@ -707,7 +707,7 @@ - (void)storeEnvelope:(SentryEnvelope *)envelope`
`707`	`707`
`708`	`708`	`- (void)captureEnvelope:(SentryEnvelope *)envelope`
`709`	`709`	`{`
`710`		`- SentryClient *client = _client;`
	`710`	`+ SentryClient *client = self.client;`
`711`	`711`	`if (client == nil) {`
`712`	`712`	`return;`
`713`	`713`	`}`
`@@ -732,7 +732,7 @@ - (SentryEnvelope )updateSessionState:(SentryEnvelope )envelope`
`732`	`732`	`[currentSession`
`733`	`733`	`endSessionCrashedWithTimestamp:[SentryDependencyContainer.sharedInstance`
`734`	`734`	`.dateProvider date]];`
`735`		`- if (_client.options.diagnosticLevel == kSentryLevelDebug) {`
	`735`	`+ if (self.client.options.diagnosticLevel == kSentryLevelDebug) {`
`736`	`736`	`SENTRY_LOG_DEBUG(@"Ending session with status: %@",`
`737`	`737`	`[self createSessionDebugString:currentSession]);`
`738`	`738`	`}`
`@@ -811,15 +811,15 @@ - (NSString )createSessionDebugString:(SentrySession )session`
`811`	`811`
`812`	`812`	`- (void)flush:(NSTimeInterval)timeout`
`813`	`813`	`{`
`814`		`- SentryClient *client = _client;`
	`814`	`+ SentryClient *client = self.client;`
`815`	`815`	`if (client != nil) {`
`816`	`816`	`[client flush:timeout];`
`817`	`817`	`}`
`818`	`818`	`}`
`819`	`819`
`820`	`820`	`- (void)close`
`821`	`821`	`{`
`822`		`- [_client close];`
	`822`	`+ [self.client close];`
`823`	`823`	`SENTRY_LOG_DEBUG(@"Closed the Hub.");`
`824`	`824`	`}`
`825`	`825`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ - (BOOL)installWithOptions:(nonnull SentryOptions *)options`
`44`	`44`
`45`	`45`	`self.options = options;`
`46`	`46`
`47`		`- SentryClient *client = [SentrySDK.currentHub getClient];`
	`47`	`+ SentryClient *client = [SentrySDK.currentHub client];`
`48`	`48`	`[client addAttachmentProcessor:self];`
`49`	`49`
`50`	`50`	`sentrycrash_setSaveViewHierarchy(&saveViewHierarchy);`
`@@ -63,7 +63,7 @@ - (void)uninstall`
`63`	`63`	`{`
`64`	`64`	`sentrycrash_setSaveViewHierarchy(NULL);`
`65`	`65`
`66`		`- SentryClient *client = [SentrySDK.currentHub getClient];`
	`66`	`+ SentryClient *client = [SentrySDK.currentHub client];`
`67`	`67`	`[client removeAttachmentProcessor:self];`
`68`	`68`	`}`
`69`	`69`