ref: Dependency container in Swift

Author: noahsmartin

Sentry.xcodeproj/project.pbxproj

@@ -18,7 +18,13 @@ @interface SentryWatchdogTerminationBreadcrumbProcessor ()
 @implementation SentryWatchdogTerminationBreadcrumbProcessor
 
 - (instancetype)initWithMaxBreadcrumbs:(NSInteger)maxBreadcrumbs
-                           fileManager:(SentryFileManager *_Nullable)fileManager
+{
+    return [self initWithMaxBreadcrumbs:maxBreadcrumbs
+                            fileManager:SentryDependencyContainer.sharedInstance.fileManager];
+}
+
+- (instancetype)initWithMaxBreadcrumbs:(NSInteger)maxBreadcrumbs
+                           fileManager:(nullable SentryFileManager *)fileManager
 {
     if (self = [super init]) {
         self.fileManager = fileManager;

Sources/Sentry/Processors/SentryWatchdogTerminationBreadcrumbProcessor.m

@@ -3,6 +3,7 @@
 #if SENTRY_TARGET_PROFILING_SUPPORTED
 
 #    import "SentryDependencyContainer.h"
+#    import "SentryDependencyContainerSwiftHelper.h"
 #    import "SentryInternalDefines.h"
 #    import "SentryLogC.h"
 #    import "SentryMetricProfiler.h"
@@ -83,7 +84,7 @@
 
     // Move the serialization work to a background queue to avoid potentially
     // blocking the main thread. The serialization can take several milliseconds.
-    sentry_dispatchAsync(SentryDependencyContainer.sharedInstance.dispatchQueueWrapper, ^{
+    sentry_dispatchAsync(SentryDependencyContainerSwiftHelper.dispatchQueueWrapper, ^{
         NSDictionary *_Nonnull serializedMetrics
             = serializeContinuousProfileMetrics(metricProfilerState);
         SentryEnvelope *_Nullable envelope
@@ -199,7 +200,7 @@ + (nullable SentryId *)currentProfilerID
 + (void)scheduleTimer
 {
     sentry_dispatchAsyncOnMainIfNotMainThread(
-        SentryDependencyContainer.sharedInstance.dispatchQueueWrapper, ^{
+        SentryDependencyContainerSwiftHelper.dispatchQueueWrapper, ^{
             std::lock_guard<std::mutex> l(_threadUnsafe_gContinuousProfilerLock);
             if (_chunkTimer != nil) {
                 SENTRY_LOG_WARN(

Sources/Sentry/Profiling/SentryContinuousProfiler.mm

@@ -3,6 +3,7 @@
 #    import "SentryAsyncSafeLog.h"
 #    import "SentryBacktrace.hpp"
 #    import "SentryDependencyContainer.h"
+#    import "SentryDependencyContainerSwiftHelper.h"
 #    import "SentryFormatter.h"
 #    import "SentryInternalDefines.h"
 #    import "SentryProfileTimeseries.h"
@@ -73,7 +74,7 @@ - (instancetype)init
         _mutableState = [[SentryProfilerMutableState alloc] init];
         _mainThreadID = 0;
         sentry_dispatchAsyncOnMainIfNotMainThread(
-            SentryDependencyContainer.sharedInstance.dispatchQueueWrapper,
+            SentryDependencyContainerSwiftHelper.dispatchQueueWrapper,
             ^{ [self cacheMainThreadID]; });
     }
     return self;

Sources/Sentry/Profiling/SentryProfilerState.mm

@@ -4,6 +4,7 @@
 
 #    import "SentryDependencyContainer.h"
 
+#    import "SentryDependencyContainerSwiftHelper.h"
 #    import "SentryInternalDefines.h"
 #    import "SentryLogC.h"
 #    import "SentryMetricProfiler.h"
@@ -85,7 +86,7 @@ + (void)recordMetrics
 + (void)scheduleTimeoutTimer
 {
     sentry_dispatchAsyncOnMainIfNotMainThread(
-        SentryDependencyContainer.sharedInstance.dispatchQueueWrapper, ^{
+        SentryDependencyContainerSwiftHelper.dispatchQueueWrapper, ^{
             std::lock_guard<std::mutex> l(_threadUnsafe_gTraceProfilerLock);
             if (_sentry_threadUnsafe_traceProfileTimeoutTimer != nil) {
                 return;

Sources/Sentry/Profiling/SentryTraceProfiler.mm

@@ -0,0 +1,12 @@
+#import <Foundation/Foundation.h>
+
+@interface SentryANRStoppedResultInternal : NSObject
+
+@property (nonatomic, readonly) NSTimeInterval minDuration;
+
+@property (nonatomic, readonly) NSTimeInterval maxDuration;
+
+- (instancetype)initWithMinDuration:(NSTimeInterval)minDuration
+                        maxDuration:(NSTimeInterval)maxDuration;
+
+@end

Sources/Sentry/SentryANRStoppedResultInternal.h

@@ -0,0 +1,16 @@
+#import "SentryANRStoppedResultInternal.h"
+
+@implementation SentryANRStoppedResultInternal
+
+- (instancetype)initWithMinDuration:(NSTimeInterval)minDuration
+                        maxDuration:(NSTimeInterval)maxDuration
+{
+    if (self = [super init]) {
+        _minDuration = minDuration;
+        _maxDuration = maxDuration;
+        return self;
+    }
+    return nil;
+}
+
+@end

Sources/Sentry/SentryANRStoppedResultInternal.m

@@ -0,0 +1,23 @@
+#import <Foundation/Foundation.h>
+
+@class SentryANRStoppedResultInternal;
+
+typedef NS_ENUM(NSInteger, SentryANRTypeInternal) {
+    kSentryANRTypeFatalFullyBlocking,
+    kSentryANRTypeFatalNonFullyBlocking,
+    kSentryANRTypeFullyBlocking,
+    kSentryANRTypeNonFullyBlocking,
+    kSentryANRTypeUnknown
+};
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol SentryANRTrackerInternalDelegate <NSObject>
+
+- (void)anrDetected:(SentryANRTypeInternal)type;
+
+- (void)anrStopped:(nullable SentryANRStoppedResultInternal *)result;
+
+@end
+
+NS_ASSUME_NONNULL_END

Sources/Sentry/SentryANRTrackerInternalDelegate.h

@@ -1,4 +1,5 @@
 #import "SentryANRTrackerV1.h"
+#import "SentryANRTrackerInternalDelegate.h"
 #import "SentryDependencyContainer.h"
 #import "SentryLogC.h"
 #import "SentrySwift.h"
@@ -13,12 +14,12 @@ typedef NS_ENUM(NSInteger, SentryANRTrackerState) {
     kSentryANRTrackerStopping
 };
 
-@interface SentryANRTrackerV1 () <SentryANRTracker>
+@interface SentryANRTrackerV1 ()
 
 @property (nonatomic, strong) SentryCrashWrapper *crashWrapper;
 @property (nonatomic, strong) SentryDispatchQueueWrapper *dispatchQueueWrapper;
 @property (nonatomic, strong) SentryThreadWrapper *threadWrapper;
-@property (nonatomic, strong) NSHashTable<id<SentryANRTrackerDelegate>> *listeners;
+@property (nonatomic, strong) NSHashTable<id<SentryANRTrackerInternalDelegate>> *listeners;
 @property (nonatomic, assign) NSTimeInterval timeoutInterval;
 
 @end
@@ -28,28 +29,32 @@ @implementation SentryANRTrackerV1 {
     SentryANRTrackerState state;
 }
 
+- (instancetype)initWithTimeoutInterval:(NSTimeInterval)timeoutInterval
+{
+    return
+        [self initWithTimeoutInterval:timeoutInterval
+                         crashWrapper:SentryDependencyContainer.sharedInstance.crashWrapper
+                 dispatchQueueWrapper:SentryDependencyContainer.sharedInstance.dispatchQueueWrapper
+                        threadWrapper:SentryDependencyContainer.sharedInstance.threadWrapper];
+}
+
 - (instancetype)initWithTimeoutInterval:(NSTimeInterval)timeoutInterval
                            crashWrapper:(SentryCrashWrapper *)crashWrapper
                    dispatchQueueWrapper:(SentryDispatchQueueWrapper *)dispatchQueueWrapper
                           threadWrapper:(SentryThreadWrapper *)threadWrapper
 {
     if (self = [super init]) {
         self.timeoutInterval = timeoutInterval;
-        self.crashWrapper = crashWrapper;
-        self.dispatchQueueWrapper = dispatchQueueWrapper;
-        self.threadWrapper = threadWrapper;
+        self.crashWrapper = SentryDependencyContainer.sharedInstance.crashWrapper;
+        self.dispatchQueueWrapper = SentryDependencyContainer.sharedInstance.dispatchQueueWrapper;
+        self.threadWrapper = SentryDependencyContainer.sharedInstance.threadWrapper;
         self.listeners = [NSHashTable weakObjectsHashTable];
         threadLock = [[NSObject alloc] init];
         state = kSentryANRTrackerNotRunning;
     }
     return self;
 }
 
-- (id<SentryANRTracker>)asProtocol
-{
-    return self;
-}
-
 - (void)detectANRs
 {
     NSUUID *threadID = [NSUUID UUID];
@@ -149,8 +154,8 @@ - (void)ANRDetected
         localListeners = [self.listeners allObjects];
     }
 
-    for (id<SentryANRTrackerDelegate> target in localListeners) {
-        [target anrDetectedWithType:SentryANRTypeUnknown];
+    for (id<SentryANRTrackerInternalDelegate> target in localListeners) {
+        [target anrDetected:kSentryANRTypeUnknown];
     }
 }
 
@@ -161,14 +166,14 @@ - (void)ANRStopped
         targets = [self.listeners allObjects];
     }
 
-    for (id<SentryANRTrackerDelegate> target in targets) {
+    for (id<SentryANRTrackerInternalDelegate> target in targets) {
         // We intentionally don't measure the ANR duration, because V2 will replace V1, so it's not
         // worth the effort.
-        [target anrStoppedWithResult:nil];
+        [target anrStopped:nil];
     }
 }
 
-- (void)addListener:(id<SentryANRTrackerDelegate>)listener
+- (void)addListener:(id<SentryANRTrackerInternalDelegate>)listener
 {
     @synchronized(self.listeners) {
         [self.listeners addObject:listener];
@@ -186,7 +191,7 @@ - (void)addListener:(id<SentryANRTrackerDelegate>)listener
     }
 }
 
-- (void)removeListener:(id<SentryANRTrackerDelegate>)listener
+- (void)removeListener:(id<SentryANRTrackerInternalDelegate>)listener
 {
     @synchronized(self.listeners) {
         [self.listeners removeObject:listener];

Sources/Sentry/SentryANRTrackerV1.m

@@ -2,6 +2,8 @@
 
 #if SENTRY_HAS_UIKIT
 
+#    import "SentryANRStoppedResultInternal.h"
+#    import "SentryANRTrackerInternalDelegate.h"
 #    import "SentryDependencyContainer.h"
 #    import "SentryLogC.h"
 #    import "SentrySwift.h"
@@ -17,12 +19,12 @@ typedef NS_ENUM(NSInteger, SentryANRTrackerState) {
     kSentryANRTrackerStopping
 };
 
-@interface SentryANRTrackerV2 () <SentryANRTracker>
+@interface SentryANRTrackerV2 ()
 
 @property (nonatomic, strong) SentryCrashWrapper *crashWrapper;
 @property (nonatomic, strong) SentryDispatchQueueWrapper *dispatchQueueWrapper;
 @property (nonatomic, strong) SentryThreadWrapper *threadWrapper;
-@property (nonatomic, strong) NSHashTable<id<SentryANRTrackerDelegate>> *listeners;
+@property (nonatomic, strong) NSHashTable<id<SentryANRTrackerInternalDelegate>> *listeners;
 @property (nonatomic, strong) SentryFramesTracker *framesTracker;
 @property (nonatomic, assign) NSTimeInterval timeoutInterval;
 
@@ -33,6 +35,16 @@ @implementation SentryANRTrackerV2 {
     SentryANRTrackerState state;
 }
 
+- (instancetype)initWithTimeoutInterval:(NSTimeInterval)timeoutInterval
+{
+    return
+        [self initWithTimeoutInterval:timeoutInterval
+                         crashWrapper:SentryDependencyContainer.sharedInstance.crashWrapper
+                 dispatchQueueWrapper:SentryDependencyContainer.sharedInstance.dispatchQueueWrapper
+                        threadWrapper:SentryDependencyContainer.sharedInstance.threadWrapper
+                        framesTracker:SentryDependencyContainer.sharedInstance.framesTracker];
+}
+
 - (instancetype)initWithTimeoutInterval:(NSTimeInterval)timeoutInterval
                            crashWrapper:(SentryCrashWrapper *)crashWrapper
                    dispatchQueueWrapper:(SentryDispatchQueueWrapper *)dispatchQueueWrapper
@@ -52,11 +64,6 @@ - (instancetype)initWithTimeoutInterval:(NSTimeInterval)timeoutInterval
     return self;
 }
 
-- (id<SentryANRTracker>)asProtocol
-{
-    return self;
-}
-
 - (void)detectANRs
 {
     NSUUID *threadID = [NSUUID UUID];
@@ -125,9 +132,9 @@ - (void)detectANRs
 
             uint64_t framesDelayStartSystemTime = nowSystemTime - appHangStoppedInterval;
 
-            SentryFramesDelayResult *framesDelay =
-                [self.framesTracker getFramesDelay:framesDelayStartSystemTime
-                                endSystemTimestamp:nowSystemTime];
+            SentryFramesDelayResultSPI *framesDelay =
+                [self.framesTracker getFramesDelaySPI:framesDelayStartSystemTime
+                                   endSystemTimestamp:nowSystemTime];
 
             if (framesDelay.delayDuration == -1) {
                 continue;
@@ -171,9 +178,9 @@ - (void)detectANRs
 
         uint64_t frameDelayStartSystemTime = nowSystemTime - timeoutIntervalInNanos;
 
-        SentryFramesDelayResult *framesDelayForTimeInterval =
-            [self.framesTracker getFramesDelay:frameDelayStartSystemTime
-                            endSystemTimestamp:nowSystemTime];
+        SentryFramesDelayResultSPI *framesDelayForTimeInterval =
+            [self.framesTracker getFramesDelaySPI:frameDelayStartSystemTime
+                               endSystemTimestamp:nowSystemTime];
 
         if (framesDelayForTimeInterval.delayDuration == -1) {
             continue;
@@ -189,7 +196,7 @@ - (void)detectANRs
 
             reported = YES;
             lastAppHangStartedSystemTime = dateProvider.systemTime;
-            [self ANRDetected:SentryANRTypeFullyBlocking];
+            [self ANRDetected:kSentryANRTypeFullyBlocking];
         }
 
         NSTimeInterval nonFullyBlockingFramesDelayThreshold = self.timeoutInterval * 0.99;
@@ -200,7 +207,7 @@ - (void)detectANRs
 
             reported = YES;
             lastAppHangStartedSystemTime = dateProvider.systemTime;
-            [self ANRDetected:SentryANRTypeNonFullyBlocking];
+            [self ANRDetected:kSentryANRTypeNonFullyBlocking];
         }
     }
 
@@ -210,15 +217,15 @@ - (void)detectANRs
     }
 }
 
-- (void)ANRDetected:(enum SentryANRType)type
+- (void)ANRDetected:(SentryANRTypeInternal)type
 {
     NSArray *localListeners;
     @synchronized(self.listeners) {
         localListeners = [self.listeners allObjects];
     }
 
-    for (id<SentryANRTrackerDelegate> target in localListeners) {
-        [target anrDetectedWithType:type];
+    for (id<SentryANRTrackerInternalDelegate> target in localListeners) {
+        [target anrDetected:type];
     }
 }
 
@@ -229,15 +236,15 @@ - (void)ANRStopped:(NSTimeInterval)hangDurationMinimum to:(NSTimeInterval)hangDu
         targets = [self.listeners allObjects];
     }
 
-    SentryANRStoppedResult *result =
-        [[SentryANRStoppedResult alloc] initWithMinDuration:hangDurationMinimum
-                                                maxDuration:hangDurationMaximum];
-    for (id<SentryANRTrackerDelegate> target in targets) {
-        [target anrStoppedWithResult:result];
+    SentryANRStoppedResultInternal *result =
+        [[SentryANRStoppedResultInternal alloc] initWithMinDuration:hangDurationMinimum
+                                                        maxDuration:hangDurationMaximum];
+    for (id<SentryANRTrackerInternalDelegate> target in targets) {
+        [target anrStopped:result];
     }
 }
 
-- (void)addListener:(id<SentryANRTrackerDelegate>)listener
+- (void)addListener:(id<SentryANRTrackerInternalDelegate>)listener
 {
     @synchronized(self.listeners) {
         [self.listeners addObject:listener];
@@ -255,7 +262,7 @@ - (void)addListener:(id<SentryANRTrackerDelegate>)listener
     }
 }
 
-- (void)removeListener:(id<SentryANRTrackerDelegate>)listener
+- (void)removeListener:(id<SentryANRTrackerInternalDelegate>)listener
 {
     @synchronized(self.listeners) {
         [self.listeners removeObject:listener];