feat(v9): Remove app hang v2 option from SDK v9 (getsentry#5615)

Author: noahsmartin

CHANGELOG-v9.md

@@ -13,3 +13,4 @@ Removes unused SentryLogLevel (#5591)
 Removes deprecated getStoreEndpoint (#5591)
 Removes deprecated useSpan function (#5591)
 Removes deprecated SentryDebugImageProvider class (#5598)
+Makes app hang tracking V2 the default and removes the option to enable/disable it (#5615)

Sources/Sentry/Public/SentryOptions.h

@@ -639,6 +639,7 @@ typedef void (^SentryProfilingConfigurationBlock)(SentryProfileOptions *_Nonnull
 
 #if SENTRY_UIKIT_AVAILABLE
 
+#    if !SDK_V9
 /**
  * AppHangTrackingV2 can differentiate between fully-blocking and non-fully blocking app hangs.
  * fully-blocking app hang is when the main thread is stuck completely, and the app can't render a
@@ -658,6 +659,8 @@ typedef void (^SentryProfilingConfigurationBlock)(SentryProfileOptions *_Nonnull
  */
 @property (nonatomic, assign) BOOL enableAppHangTrackingV2;
 
+#    endif // !SDK_V9
+
 /**
  * When enabled the SDK reports non-fully-blocking app hangs. A non-fully-blocking app hang is when
  * the app appears stuck to the user but can still render a few frames. For more information see @c

Sources/Sentry/SentryANRTrackingIntegration.m

@@ -51,9 +51,14 @@ - (BOOL)installWithOptions:(SentryOptions *)options
     }
 
 #if SENTRY_HAS_UIKIT
+#    if SDK_V9
+    BOOL isV2Enabled = YES;
+#    else
+    BOOL isV2Enabled = options.enableAppHangTrackingV2;
+#    endif // SDK_V9
     self.tracker =
         [SentryDependencyContainer.sharedInstance getANRTracker:options.appHangTimeoutInterval
-                                                    isV2Enabled:options.enableAppHangTrackingV2];
+                                                    isV2Enabled:isV2Enabled];
 #else
     self.tracker =
         [SentryDependencyContainer.sharedInstance getANRTracker:options.appHangTimeoutInterval];
@@ -157,9 +162,15 @@ - (void)anrDetectedWithType:(enum SentryANRType)type
     event.debugMeta = [self.debugImageProvider getDebugImagesFromCacheForThreads:event.threads];
 
 #if SENTRY_HAS_UIKIT
+#    if SDK_V9
+    BOOL isV2Enabled = YES;
+#    else
+    BOOL isV2Enabled = self.options.enableAppHangTrackingV2;
+#    endif // SDK_V9
+
     // We only measure app hang duration for V2.
     // For V1, we directly capture the app hang event.
-    if (self.options.enableAppHangTrackingV2) {
+    if (isV2Enabled) {
         // We only temporarily store the app hang duration info, so we can change the error message
         // when either sending a normal or fatal app hang event. Otherwise, we would have to rely on
         // string parsing to retrieve the app hang duration info from the error message.
@@ -187,9 +198,11 @@ - (void)anrStoppedWithResult:(SentryANRStoppedResult *_Nullable)result
 {
 #if SENTRY_HAS_UIKIT
     // We only measure app hang duration for V2, and therefore ignore V1.
+#    if !SDK_V9
     if (!self.options.enableAppHangTrackingV2) {
         return;
     }
+#    endif // !SDK_V9
 
     if (result == nil) {
         SENTRY_LOG_WARN(@"ANR stopped for V2 but result was nil.")

Sources/Sentry/SentryBaseIntegration.m

@@ -78,10 +78,17 @@ - (BOOL)shouldBeEnabledWithOptions:(SentryOptions *)options
 
     if (integrationOptions & kIntegrationOptionEnableAppHangTracking) {
 #if SENTRY_HAS_UIKIT
+#    if SDK_V9
+        if (!options.enableAppHangTracking) {
+            [self logWithOptionName:@"enableAppHangTracking"];
+            return NO;
+        }
+#    else
         if (!options.enableAppHangTracking && !options.enableAppHangTrackingV2) {
             [self logWithOptionName:@"enableAppHangTracking && enableAppHangTrackingV2"];
             return NO;
         }
+#    endif
 #else
         if (!options.enableAppHangTracking) {
             [self logWithOptionName:@"enableAppHangTracking"];

Sources/Sentry/SentryOptions.m

@@ -136,7 +136,9 @@ - (instancetype)init
         self.enableUserInteractionTracing = YES;
         self.idleTimeout = SentryTracerDefaultTimeout;
         self.enablePreWarmedAppStartTracing = NO;
+#    if !SDK_V9
         self.enableAppHangTrackingV2 = NO;
+#    endif // !SDK_V9
         self.enableReportNonFullyBlockingAppHangs = YES;
 #endif // SENTRY_HAS_UIKIT
 
@@ -468,8 +470,10 @@ - (BOOL)validateOptions:(NSDictionary<NSString *, id> *)options
     [self setBool:options[@"enablePreWarmedAppStartTracing"]
             block:^(BOOL value) { self->_enablePreWarmedAppStartTracing = value; }];
 
+#    if !SDK_V9
     [self setBool:options[@"enableAppHangTrackingV2"]
             block:^(BOOL value) { self->_enableAppHangTrackingV2 = value; }];
+#    endif // !SDK_V9
 
     [self setBool:options[@"enableReportNonFullyBlockingAppHangs"]
             block:^(BOOL value) { self->_enableReportNonFullyBlockingAppHangs = value; }];
@@ -843,7 +847,12 @@ - (void)setEnableSpotlight:(BOOL)value
 #if SENTRY_HAS_UIKIT
 - (BOOL)isAppHangTrackingV2Disabled
 {
-    return !self.enableAppHangTrackingV2 || self.appHangTimeoutInterval <= 0;
+#    if SDK_V9
+    BOOL isV2Enabled = self.enableAppHangTracking;
+#    else
+    BOOL isV2Enabled = self.enableAppHangTrackingV2;
+#    endif // SDK_V9
+    return !isV2Enabled || self.appHangTimeoutInterval <= 0;
 }
 #endif // SENTRY_HAS_UIKIT
 

Sources/Sentry/SentryWatchdogTerminationTrackingIntegration.m

@@ -79,9 +79,15 @@ - (BOOL)installWithOptions:(SentryOptions *)options
 
     [self.tracker start];
 
+#    if SDK_V9
+    BOOL isV2Enabled = YES;
+#    else
+    BOOL isV2Enabled = options.enableAppHangTrackingV2;
+#    endif // SDK_V9
+
     self.anrTracker =
         [SentryDependencyContainer.sharedInstance getANRTracker:options.appHangTimeoutInterval
-                                                    isV2Enabled:options.enableAppHangTrackingV2];
+                                                    isV2Enabled:isV2Enabled];
     [self.anrTracker addListener:self];
 
     self.appStateManager = appStateManager;

Sources/Swift/Helper/SentryEnabledFeaturesBuilder.swift

@@ -41,9 +41,11 @@ import Foundation
         }
 
 #if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
+        #if !SDK_V9
         if options.enableAppHangTrackingV2 {
             features.append("appHangTrackingV2")
         }
+        #endif // !SDK_V9
 #endif //os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
 
         if options.enablePersistingTracesWhenCrashing {