ref: Convert SentryANRTracker to class

Sources/Sentry/Profiling/SentryContinuousProfiler.mm

@@ -2,7 +2,7 @@
 
 #if SENTRY_TARGET_PROFILING_SUPPORTED
 
-#    import "SentryDependencyContainer.h"
+#    import "SentryDependencyContainerSwiftHelper.h"
 #    import "SentryInternalDefines.h"
 #    import "SentryLogC.h"
 #    import "SentryMetricProfiler.h"
@@ -83,7 +83,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 +199,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/SentryProfilerState.mm

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

Sources/Sentry/Profiling/SentryTraceProfiler.mm

@@ -2,8 +2,7 @@
 
 #if SENTRY_TARGET_PROFILING_SUPPORTED
 
-#    import "SentryDependencyContainer.h"
-
+#    import "SentryDependencyContainerSwiftHelper.h"
 #    import "SentryInternalDefines.h"
 #    import "SentryLogC.h"
 #    import "SentryMetricProfiler.h"
@@ -85,7 +84,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/SentryANRTrackerV1.m

@@ -13,7 +13,7 @@ typedef NS_ENUM(NSInteger, SentryANRTrackerState) {
     kSentryANRTrackerStopping
 };
 
-@interface SentryANRTrackerV1 () <SentryANRTracker>
+@interface SentryANRTrackerV1 ()
 
 @property (nonatomic, strong) SentryCrashWrapper *crashWrapper;
 @property (nonatomic, strong) SentryDispatchQueueWrapper *dispatchQueueWrapper;
@@ -28,6 +28,15 @@ @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
@@ -45,11 +54,6 @@ - (instancetype)initWithTimeoutInterval:(NSTimeInterval)timeoutInterval
     return self;
 }
 
-- (id<SentryANRTracker>)asProtocol
-{
-    return self;
-}
-
 - (void)detectANRs
 {
     NSUUID *threadID = [NSUUID UUID];

Sources/Sentry/SentryANRTrackerV2.m

@@ -17,7 +17,7 @@ typedef NS_ENUM(NSInteger, SentryANRTrackerState) {
     kSentryANRTrackerStopping
 };
 
-@interface SentryANRTrackerV2 () <SentryANRTracker>
+@interface SentryANRTrackerV2 ()
 
 @property (nonatomic, strong) SentryCrashWrapper *crashWrapper;
 @property (nonatomic, strong) SentryDispatchQueueWrapper *dispatchQueueWrapper;
@@ -33,6 +33,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 +62,6 @@ - (instancetype)initWithTimeoutInterval:(NSTimeInterval)timeoutInterval
     return self;
 }
 
-- (id<SentryANRTracker>)asProtocol
-{
-    return self;
-}
-
 - (void)detectANRs
 {
     NSUUID *threadID = [NSUUID UUID];

Sources/Sentry/SentryANRTrackingIntegration.m

@@ -24,7 +24,7 @@
 
 @interface SentryANRTrackingIntegration () <SentryANRTrackerDelegate>
 
-@property (nonatomic, strong) id<SentryANRTracker> tracker;
+@property (nonatomic, strong) SentryANRTracker *tracker;
 @property (nonatomic, strong) SentryOptions *options;
 @property (nonatomic, strong) SentryFileManager *fileManager;
 @property (nonatomic, strong) SentryDispatchQueueWrapper *dispatchQueueWrapper;

Sources/Sentry/SentryAutoBreadcrumbTrackingIntegration.m

@@ -4,6 +4,7 @@
 #import "SentryLogC.h"
 #import "SentryOptions.h"
 #import "SentrySDKInternal.h"
+#import "SentrySwift.h"
 #import "SentrySystemEventBreadcrumbs.h"
 
 NS_ASSUME_NONNULL_BEGIN

Sources/Sentry/SentryCoreDataTrackingIntegration.m

@@ -6,6 +6,7 @@
 #import "SentryLogC.h"
 #import "SentryNSDataSwizzling.h"
 #import "SentryOptions.h"
+#import "SentrySwift.h"
 
 @interface SentryCoreDataTrackingIntegration ()
 

Sources/Sentry/SentryDelayedFramesTracker.m

@@ -3,6 +3,7 @@
 #if SENTRY_HAS_UIKIT
 
 #    import "SentryDelayedFrame.h"
+#    import "SentryDependencyContainer.h"
 #    import "SentryInternalCDefines.h"
 #    import "SentryLogC.h"
 #    import "SentrySwift.h"
@@ -22,6 +23,13 @@ @interface SentryDelayedFramesTracker ()
 
 @implementation SentryDelayedFramesTracker
 
+- (instancetype)initWithKeepDelayedFramesDuration:(CFTimeInterval)keepDelayedFramesDuration
+{
+    return [self
+        initWithKeepDelayedFramesDuration:keepDelayedFramesDuration
+                             dateProvider:SentryDependencyContainer.sharedInstance.dateProvider];
+}
+
 - (instancetype)initWithKeepDelayedFramesDuration:(CFTimeInterval)keepDelayedFramesDuration
                                      dateProvider:(id<SentryCurrentDateProvider>)dateProvider
 {

Sources/Sentry/SentryDependencyContainer.m

@@ -53,6 +53,9 @@
     return nil;
 };
 
+@interface SentryANRTrackerV1 () <SentryANRTrackerProtocol>
+@end
+
 @interface SentryFileManager () <SentryFileManagerProtocol>
 @end
 
@@ -62,11 +65,14 @@ @interface SentryWatchdogTerminationScopeObserver () <SentryScopeObserver>
 
 @interface SentryDelayedFramesTracker () <SentryDelayedFramesTrackerWrapper>
 @end
+
+@interface SentryANRTrackerV2 () <SentryANRTrackerProtocol>
+@end
 #endif
 
 @interface SentryDependencyContainer ()
 
-@property (nonatomic, strong) id<SentryANRTracker> anrTracker;
+@property (nonatomic, strong) SentryANRTracker *anrTracker;
 
 @end
 
@@ -236,27 +242,31 @@ - (SentryCrashSwift *)crashReporter SENTRY_THREAD_SANITIZER_DOUBLE_CHECKED_LOCK
         [[SentryCrashSwift alloc] initWith:SentrySDKInternal.options.cacheDirectoryPath]);
 }
 
-- (id<SentryANRTracker>)getANRTracker:(NSTimeInterval)timeout
+- (SentryANRTracker *)getANRTracker:(NSTimeInterval)timeout
     SENTRY_THREAD_SANITIZER_DOUBLE_CHECKED_LOCK
 {
     SENTRY_LAZY_INIT(_anrTracker,
-        [[[SentryANRTrackerV1 alloc] initWithTimeoutInterval:timeout
-                                                crashWrapper:self.crashWrapper
-                                        dispatchQueueWrapper:self.dispatchQueueWrapper
-                                               threadWrapper:self.threadWrapper] asProtocol]);
+        [[SentryANRTracker alloc]
+            initWithHelper:[[SentryANRTrackerV1 alloc]
+                               initWithTimeoutInterval:timeout
+                                          crashWrapper:self.crashWrapper
+                                  dispatchQueueWrapper:self.dispatchQueueWrapper
+                                         threadWrapper:self.threadWrapper]]);
 }
 
 #if SENTRY_HAS_UIKIT
-- (id<SentryANRTracker>)getANRTracker:(NSTimeInterval)timeout
-                          isV2Enabled:(BOOL)isV2Enabled SENTRY_THREAD_SANITIZER_DOUBLE_CHECKED_LOCK
+- (SentryANRTracker *)getANRTracker:(NSTimeInterval)timeout
+                        isV2Enabled:(BOOL)isV2Enabled SENTRY_THREAD_SANITIZER_DOUBLE_CHECKED_LOCK
 {
     if (isV2Enabled) {
         SENTRY_LAZY_INIT(_anrTracker,
-            [[[SentryANRTrackerV2 alloc] initWithTimeoutInterval:timeout
-                                                    crashWrapper:self.crashWrapper
-                                            dispatchQueueWrapper:self.dispatchQueueWrapper
-                                                   threadWrapper:self.threadWrapper
-                                                   framesTracker:self.framesTracker] asProtocol]);
+            [[SentryANRTracker alloc]
+                initWithHelper:[[SentryANRTrackerV2 alloc]
+                                   initWithTimeoutInterval:timeout
+                                              crashWrapper:self.crashWrapper
+                                      dispatchQueueWrapper:self.dispatchQueueWrapper
+                                             threadWrapper:self.threadWrapper
+                                             framesTracker:self.framesTracker]]);
     } else {
         return [self getANRTracker:timeout];
     }

Sources/Sentry/SentryDependencyContainerSwiftHelper.m

@@ -17,6 +17,11 @@ @implementation SentryDependencyContainerSwiftHelper
 
 #endif // SENTRY_HAS_UIKIT
 
++ (SentryDispatchQueueWrapper *)dispatchQueueWrapper
+{
+    return SentryDependencyContainer.sharedInstance.dispatchQueueWrapper;
+}
+
 + (void)dispatchSyncOnMainQueue:(void (^)(void))block
 {
     [SentryDependencyContainer.sharedInstance.dispatchQueueWrapper dispatchSyncOnMainQueue:block];

Sources/Sentry/SentryProfiler.mm

@@ -3,7 +3,7 @@
 #if SENTRY_TARGET_PROFILING_SUPPORTED
 #    import "SentryClient+Private.h"
 #    import "SentryContinuousProfiler.h"
-#    import "SentryDependencyContainer.h"
+#    import "SentryDependencyContainerSwiftHelper.h"
 #    import "SentryFileManagerHelper.h"
 #    import "SentryHub+Private.h"
 #    import "SentryInternalDefines.h"
@@ -121,7 +121,7 @@
 
     sentry_configureContinuousProfiling(options);
 
-    sentry_dispatchAsync(SentryDependencyContainer.sharedInstance.dispatchQueueWrapper, ^{
+    sentry_dispatchAsync(SentryDependencyContainerSwiftHelper.dispatchQueueWrapper, ^{
         if (configurationFromLaunch.isProfilingThisLaunch) {
             BOOL shouldStopAndTransmitLaunchProfile = YES;
 

Sources/Sentry/SentryWatchdogTerminationTrackingIntegration.m

@@ -13,14 +13,13 @@
 #    import <SentrySwift.h>
 #    import <SentryWatchdogTerminationBreadcrumbProcessor.h>
 #    import <SentryWatchdogTerminationLogic.h>
-#    import <SentryWatchdogTerminationScopeObserver.h>
 #    import <SentryWatchdogTerminationTracker.h>
 NS_ASSUME_NONNULL_BEGIN
 
 @interface SentryWatchdogTerminationTrackingIntegration () <SentryANRTrackerDelegate>
 
 @property (nonatomic, strong) SentryWatchdogTerminationTracker *tracker;
-@property (nonatomic, strong) id<SentryANRTracker> anrTracker;
+@property (nonatomic, strong) SentryANRTracker *anrTracker;
 @property (nullable, nonatomic, copy) NSString *testConfigurationFilePath;
 @property (nonatomic, strong) SentryAppStateManager *appStateManager;
 

Sources/Sentry/include/HybridPublic/SentryDependencyContainer.h

@@ -24,9 +24,9 @@
 @class SentrySessionTracker;
 @class SentryGlobalEventProcessor;
 @class SentryThreadInspector;
+@class SentryANRTracker;
 @class SentryReachability;
 
-@protocol SentryANRTracker;
 @protocol SentryRandomProtocol;
 @protocol SentryCurrentDateProvider;
 @protocol SentryRateLimits;
@@ -106,9 +106,9 @@ SENTRY_NO_INIT
 @property (nonatomic, strong, nullable) SentryScopePersistentStore *scopePersistentStore;
 @property (nonatomic, strong) SentryDebugImageProvider *debugImageProvider;
 
-- (id<SentryANRTracker>)getANRTracker:(NSTimeInterval)timeout;
+- (SentryANRTracker *)getANRTracker:(NSTimeInterval)timeout;
 #if SENTRY_HAS_UIKIT
-- (id<SentryANRTracker>)getANRTracker:(NSTimeInterval)timeout isV2Enabled:(BOOL)isV2Enabled;
+- (SentryANRTracker *)getANRTracker:(NSTimeInterval)timeout isV2Enabled:(BOOL)isV2Enabled;
 #endif // SENTRY_HAS_UIKIT
 
 - (nullable id<SentryApplication>)application;

Sources/Sentry/include/SentryANRTrackerV1.h

@@ -4,7 +4,7 @@
 @class SentryCrashWrapper;
 @class SentryDispatchQueueWrapper;
 @class SentryThreadWrapper;
-@protocol SentryANRTracker;
+@protocol SentryANRTrackerDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -24,12 +24,16 @@ NS_ASSUME_NONNULL_BEGIN
 @interface SentryANRTrackerV1 : NSObject
 SENTRY_NO_INIT
 
+- (instancetype)initWithTimeoutInterval:(NSTimeInterval)timeoutInterval;
+
 - (instancetype)initWithTimeoutInterval:(NSTimeInterval)timeoutInterval
                            crashWrapper:(SentryCrashWrapper *)crashWrapper
                    dispatchQueueWrapper:(SentryDispatchQueueWrapper *)dispatchQueueWrapper
                           threadWrapper:(SentryThreadWrapper *)threadWrapper;
 
-- (id<SentryANRTracker>)asProtocol;
+- (void)addListener:(id<SentryANRTrackerDelegate>)listener;
+- (void)removeListener:(id<SentryANRTrackerDelegate>)listener;
+- (void)clear;
 
 @end
 

Sources/Sentry/include/SentryANRTrackerV2.h

@@ -6,7 +6,7 @@
 @class SentryDispatchQueueWrapper;
 @class SentryThreadWrapper;
 @class SentryFramesTracker;
-@protocol SentryANRTracker;
+@protocol SentryANRTrackerDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -23,13 +23,17 @@ NS_ASSUME_NONNULL_BEGIN
 @interface SentryANRTrackerV2 : NSObject
 SENTRY_NO_INIT
 
+- (instancetype)initWithTimeoutInterval:(NSTimeInterval)timeoutInterval;
+
 - (instancetype)initWithTimeoutInterval:(NSTimeInterval)timeoutInterval
                            crashWrapper:(SentryCrashWrapper *)crashWrapper
                    dispatchQueueWrapper:(SentryDispatchQueueWrapper *)dispatchQueueWrapper
                           threadWrapper:(SentryThreadWrapper *)threadWrapper
                           framesTracker:(SentryFramesTracker *)framesTracker;
 
-- (id<SentryANRTracker>)asProtocol;
+- (void)addListener:(id<SentryANRTrackerDelegate>)listener;
+- (void)removeListener:(id<SentryANRTrackerDelegate>)listener;
+- (void)clear;
 
 @end
 

Sources/Sentry/include/SentryDelayedFramesTracker.h

@@ -10,6 +10,15 @@ NS_ASSUME_NONNULL_BEGIN
 @interface SentryDelayedFramesTracker : NSObject
 SENTRY_NO_INIT
 
+/**
+ * Initializes a @c SentryDelayedFramesTracker. This class keeps track of information on delayed
+ * frames. Whenever a new delayed frame is recorded, it removes recorded delayed frames older than
+ * the current time minus the @c keepDelayedFramesDuration.
+ *
+ * @param keepDelayedFramesDuration The maximum duration to keep delayed frames records in memory.
+ */
+- (instancetype)initWithKeepDelayedFramesDuration:(CFTimeInterval)keepDelayedFramesDuration;
+
 /**
  * Initializes a @c SentryDelayedFramesTracker. This class keeps track of information on delayed
  * frames. Whenever a new delayed frame is recorded, it removes recorded delayed frames older than