ref: Add ANRTracker protocol

Add a protocol for the ANRTracker in preparation for switching between
V1 and V2. Furthermore, remove the ANRTrackerV2 integration as it would
contain mostly duplicated code from ANTTrackerV1.

Sources/Sentry/SentryANRTracker.m → Sources/Sentry/SentryANRTrackerV1.m

@@ -1,4 +1,4 @@
-#import "SentryANRTracker.h"
+#import "SentryANRTrackerV1.h"
 #import "SentryCrashWrapper.h"
 #import "SentryDependencyContainer.h"
 #import "SentryDispatchQueueWrapper.h"
@@ -16,7 +16,7 @@ typedef NS_ENUM(NSInteger, SentryANRTrackerState) {
     kSentryANRTrackerStopping
 };
 
-@interface SentryANRTracker ()
+@interface SentryANRTrackerV1 ()
 
 @property (nonatomic, strong) SentryCrashWrapper *crashWrapper;
 @property (nonatomic, strong) SentryDispatchQueueWrapper *dispatchQueueWrapper;
@@ -26,7 +26,7 @@ @interface SentryANRTracker ()
 
 @end
 
-@implementation SentryANRTracker {
+@implementation SentryANRTrackerV1 {
     NSObject *threadLock;
     SentryANRTrackerState state;
 }

Sources/Sentry/SentryANRTrackingIntegration.m

@@ -1,5 +1,4 @@
 #import "SentryANRTrackingIntegration.h"
-#import "SentryANRTracker.h"
 #import "SentryClient+Private.h"
 #import "SentryCrashMachineContext.h"
 #import "SentryCrashWrapper.h"
@@ -12,6 +11,7 @@
 #import "SentryMechanism.h"
 #import "SentrySDK+Private.h"
 #import "SentryStacktrace.h"
+#import "SentrySwift.h"
 #import "SentryThread.h"
 #import "SentryThreadInspector.h"
 #import "SentryThreadWrapper.h"
@@ -26,7 +26,7 @@
 
 @interface SentryANRTrackingIntegration ()
 
-@property (nonatomic, strong) SentryANRTracker *tracker;
+@property (nonatomic, strong) id<SentryANRTracker> tracker;
 @property (nonatomic, strong) SentryOptions *options;
 @property (atomic, assign) BOOL reportAppHangs;
 
@@ -41,7 +41,7 @@ - (BOOL)installWithOptions:(SentryOptions *)options
     }
 
     self.tracker =
-        [SentryDependencyContainer.sharedInstance getANRTracker:options.appHangTimeoutInterval];
+        [SentryDependencyContainer.sharedInstance getANRTrackerV1:options.appHangTimeoutInterval];
 
     [self.tracker addListener:self];
     self.options = options;

Sources/Sentry/SentryDependencyContainer.m

@@ -1,4 +1,4 @@
-#import "SentryANRTracker.h"
+#import "SentryANRTrackerV1.h"
 #import "SentryANRTrackerV2.h"
 #import "SentryBinaryImageCache.h"
 #import "SentryDispatchFactory.h"
@@ -348,22 +348,22 @@ - (SentrySwizzleWrapper *)swizzleWrapper SENTRY_DISABLE_THREAD_SANITIZER(
 }
 #endif // SENTRY_UIKIT_AVAILABLE
 
-- (SentryANRTracker *)getANRTracker:(NSTimeInterval)timeout
+- (SentryANRTrackerV1 *)getANRTrackerV1:(NSTimeInterval)timeout
     SENTRY_DISABLE_THREAD_SANITIZER("double-checked lock produce false alarms")
 {
-    if (_anrTracker == nil) {
+    if (_anrTrackerV1 == nil) {
         @synchronized(sentryDependencyContainerLock) {
-            if (_anrTracker == nil) {
-                _anrTracker =
-                    [[SentryANRTracker alloc] initWithTimeoutInterval:timeout
-                                                         crashWrapper:self.crashWrapper
-                                                 dispatchQueueWrapper:self.dispatchQueueWrapper
-                                                        threadWrapper:self.threadWrapper];
+            if (_anrTrackerV1 == nil) {
+                _anrTrackerV1 =
+                    [[SentryANRTrackerV1 alloc] initWithTimeoutInterval:timeout
+                                                           crashWrapper:self.crashWrapper
+                                                   dispatchQueueWrapper:self.dispatchQueueWrapper
+                                                          threadWrapper:self.threadWrapper];
             }
         }
     }
 
-    return _anrTracker;
+    return _anrTrackerV1;
 }
 
 - (SentryNSProcessInfoWrapper *)processInfoWrapper SENTRY_DISABLE_THREAD_SANITIZER(

Sources/Sentry/SentryOptions.m

@@ -1,4 +1,3 @@
-#import "SentryANRTracker.h"
 #import "SentryANRTrackingIntegration.h"
 #import "SentryAutoBreadcrumbTrackingIntegration.h"
 #import "SentryAutoSessionTrackingIntegration.h"

Sources/Sentry/SentryWatchdogTerminationTrackingIntegration.m

@@ -3,6 +3,7 @@
 #if SENTRY_HAS_UIKIT
 
 #    import "SentryScope+Private.h"
+#    import <SentryANRTrackerV1.h>
 #    import <SentryAppState.h>
 #    import <SentryAppStateManager.h>
 #    import <SentryClient+Private.h>
@@ -12,6 +13,7 @@
 #    import <SentryHub.h>
 #    import <SentryOptions+Private.h>
 #    import <SentrySDK+Private.h>
+#    import <SentrySwift.h>
 #    import <SentryWatchdogTerminationLogic.h>
 #    import <SentryWatchdogTerminationScopeObserver.h>
 #    import <SentryWatchdogTerminationTracker.h>
@@ -21,7 +23,7 @@
 @interface SentryWatchdogTerminationTrackingIntegration ()
 
 @property (nonatomic, strong) SentryWatchdogTerminationTracker *tracker;
-@property (nonatomic, strong) SentryANRTracker *anrTracker;
+@property (nonatomic, strong) id<SentryANRTracker> anrTracker;
 @property (nullable, nonatomic, copy) NSString *testConfigurationFilePath;
 @property (nonatomic, strong) SentryAppStateManager *appStateManager;
 
@@ -72,7 +74,7 @@ - (BOOL)installWithOptions:(SentryOptions *)options
     [self.tracker start];
 
     self.anrTracker =
-        [SentryDependencyContainer.sharedInstance getANRTracker:options.appHangTimeoutInterval];
+        [SentryDependencyContainer.sharedInstance getANRTrackerV1:options.appHangTimeoutInterval];
     [self.anrTracker addListener:self];
 
     self.appStateManager = appStateManager;

Sources/Sentry/include/HybridPublic/SentryDependencyContainer.h

@@ -1,6 +1,6 @@
 #import "SentryDefines.h"
 
-@class SentryANRTracker;
+@class SentryANRTrackerV1;
 @class SentryANRTrackerV2;
 @class SentryAppStateManager;
 @class SentryBinaryImageCache;
@@ -63,7 +63,7 @@ SENTRY_NO_INIT
 @property (nonatomic, strong) SentryDispatchQueueWrapper *dispatchQueueWrapper;
 @property (nonatomic, strong) SentryNSNotificationCenterWrapper *notificationCenterWrapper;
 @property (nonatomic, strong) SentryDebugImageProvider *debugImageProvider;
-@property (nonatomic, strong) SentryANRTracker *anrTracker;
+@property (nonatomic, strong) SentryANRTrackerV1 *anrTrackerV1;
 @property (nonatomic, strong) SentryANRTrackerV2 *anrTrackerV2;
 @property (nonatomic, strong) SentryNSProcessInfoWrapper *processInfoWrapper;
 @property (nonatomic, strong) SentrySystemWrapper *systemWrapper;
@@ -90,7 +90,7 @@ SENTRY_NO_INIT
 @property (nonatomic, strong) SentryReachability *reachability;
 #endif // !TARGET_OS_WATCH
 
-- (SentryANRTracker *)getANRTracker:(NSTimeInterval)timeout;
+- (SentryANRTrackerV1 *)getANRTrackerV1:(NSTimeInterval)timeout;
 #if SENTRY_UIKIT_AVAILABLE
 - (SentryANRTrackerV2 *)getANRTrackerV2:(NSTimeInterval)timeout;
 #endif // SENTRY_UIKIT_AVAILABLE

Sources/Sentry/include/SentryANRTracker.h → Sources/Sentry/include/SentryANRTrackerV1.h

@@ -21,21 +21,14 @@ NS_ASSUME_NONNULL_BEGIN
  * seconds, and it executes all events in time. Instead, what matters is how long the main thread
  * needs to execute a newly added event to the run loop.
  */
-@interface SentryANRTracker : NSObject
+@interface SentryANRTrackerV1 : NSObject <SentryANRTracker>
 SENTRY_NO_INIT
 
 - (instancetype)initWithTimeoutInterval:(NSTimeInterval)timeoutInterval
                            crashWrapper:(SentryCrashWrapper *)crashWrapper
                    dispatchQueueWrapper:(SentryDispatchQueueWrapper *)dispatchQueueWrapper
                           threadWrapper:(SentryThreadWrapper *)threadWrapper;
 
-- (void)addListener:(id<SentryANRTrackerDelegate>)listener;
-
-- (void)removeListener:(id<SentryANRTrackerDelegate>)listener;
-
-// Function used for tests
-- (void)clear;
-
 @end
 
 NS_ASSUME_NONNULL_END

Sources/Sentry/include/SentryANRTrackerV2.h

@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
  * seconds, it can still respond to user input to navigate to a different screen, for example. In
  * that scenario, the frame delay is around 97%.
  */
-@interface SentryANRTrackerV2 : NSObject
+@interface SentryANRTrackerV2 : NSObject <SentryANRTracker>
 SENTRY_NO_INIT
 
 - (instancetype)initWithTimeoutInterval:(NSTimeInterval)timeoutInterval
@@ -29,13 +29,6 @@ SENTRY_NO_INIT
                           threadWrapper:(SentryThreadWrapper *)threadWrapper
                           framesTracker:(SentryFramesTracker *)framesTracker;
 
-- (void)addListener:(id<SentryANRTrackerDelegate>)listener;
-
-- (void)removeListener:(id<SentryANRTrackerDelegate>)listener;
-
-// Function used for tests
-- (void)clear;
-
 @end
 
 NS_ASSUME_NONNULL_END

Sources/Sentry/include/SentryANRTrackingIntegration.h

@@ -1,4 +1,4 @@
-#import "SentryANRTracker.h"
+#import "SentryANRTrackerV1.h"
 #import "SentryBaseIntegration.h"
 #import "SentrySwift.h"
 #import <Foundation/Foundation.h>

Sources/Sentry/include/SentryWatchdogTerminationTrackingIntegration.h

@@ -1,8 +1,6 @@
 #import "SentryDefines.h"
 
 #if SENTRY_HAS_UIKIT
-
-#    import "SentryANRTracker.h"
 #    import "SentryBaseIntegration.h"
 #    import "SentrySwift.h"
 #    import <Foundation/Foundation.h>

Sources/Swift/Integrations/ANR/SentryANRTracker.swift

@@ -0,0 +1,12 @@
+import Foundation
+
+@objc
+protocol SentryANRTracker {
+    @objc(addListener:)
+    func add(listener: SentryANRTrackerDelegate)
+    @objc(removeListener:)
+    func remove(listener: SentryANRTrackerDelegate)
+
+    /// Only used for tests.
+    func clear()
+}