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

This reverts commit 04ff3ec.

Author: philipsawyerdd

CHANGELOG-v9.md

@@ -7,15 +7,3 @@ 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)
-Removes segment property on SentryUser, SentryBaggage, and SentryTraceContext (#5638)
-Removes public SentrySerializable conformance from many public models (#5636)
-Removes Decodable conformances from the public API of model classes (#5691)
-Removes enableTracing property from SentryOptions (#5694)
-Removes `integrations` property from `SentryOptions` (#5749)
-
-### Fixes
-
-Fixes warnings about minimum OS version being lower than Xcode supported version (#5591)
-
-### Improvements

Sources/Sentry/Public/SentryOptions.h

@@ -663,7 +663,6 @@ 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
@@ -683,8 +682,6 @@ 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,14 +51,9 @@ - (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:isV2Enabled];
+                                                    isV2Enabled:options.enableAppHangTrackingV2];
 #else
     self.tracker =
         [SentryDependencyContainer.sharedInstance getANRTracker:options.appHangTimeoutInterval];
@@ -162,15 +157,9 @@ - (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 (isV2Enabled) {
+    if (self.options.enableAppHangTrackingV2) {
         // 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.
@@ -198,11 +187,9 @@ - (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,17 +78,10 @@ - (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

@@ -109,9 +109,7 @@ - (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
 
@@ -810,12 +808,7 @@ - (void)setEnableSpotlight:(BOOL)value
 #if SENTRY_HAS_UIKIT
 - (BOOL)isAppHangTrackingV2Disabled
 {
-#    if SDK_V9
-    BOOL isV2Enabled = self.enableAppHangTracking;
-#    else
-    BOOL isV2Enabled = self.enableAppHangTrackingV2;
-#    endif // SDK_V9
-    return !isV2Enabled || self.appHangTimeoutInterval <= 0;
+    return !self.enableAppHangTrackingV2 || self.appHangTimeoutInterval <= 0;
 }
 #endif // SENTRY_HAS_UIKIT
 

Sources/Swift/Helper/SentryEnabledFeaturesBuilder.swift

@@ -43,11 +43,9 @@ 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 {