chore: Remove v2 perf option from v9 sdk

noahsmartin · noahsmartin · commit 7de2e2d02cbc · 2025-10-02T16:56:50.000-04:00
diff --git a/Samples/SentrySampleShared/SentrySampleShared/SentrySDKOverrides.swift b/Samples/SentrySampleShared/SentrySampleShared/SentrySDKOverrides.swift
@@ -83,7 +83,6 @@ public enum SentrySDKOverrides: String, CaseIterable {
 
     public enum Performance: String, SentrySDKOverride {
         case disableTimeToFullDisplayTracing    = "--io.sentry.performance.disable-time-to-full-display-tracing"
-        case disablePerformanceV2               = "--io.sentry.performance.disable-performance-v2"
         case disableAppHangTrackingV2           = "--io.sentry.performance.disable-app-hang-tracking-v2"
         case disableSessionTracking             = "--io.sentry.performance.disable-automatic-session-tracking"
         case disableFileIOTracing               = "--io.sentry.performance.disable-file-io-tracing"
@@ -315,7 +314,7 @@ extension SentrySDKOverrides.Other {
 extension SentrySDKOverrides.Performance {
     public var overrideType: OverrideType {
         switch self {
-        case .disableTimeToFullDisplayTracing, .disablePerformanceV2, .disableAppHangTrackingV2, .disableSessionTracking, .disableFileIOTracing, .disableUIVCTracing, .disableCoreDataTracing, .disableANRTracking, .disableWatchdogTracking, .disableUITracing, .disablePrewarmedAppStartTracing, .disablePerformanceTracing: return .boolean
+        case .disableTimeToFullDisplayTracing, .disableAppHangTrackingV2, .disableSessionTracking, .disableFileIOTracing, .disableUIVCTracing, .disableCoreDataTracing, .disableANRTracking, .disableWatchdogTracking, .disableUITracing, .disablePrewarmedAppStartTracing, .disablePerformanceTracing: return .boolean
         case .sessionTrackingIntervalMillis: return .string
         }
     }
@@ -402,7 +401,7 @@ extension SentrySDKOverrides.Other {
 extension SentrySDKOverrides.Performance {
     public var ignoresDisableEverything: Bool {
         switch self {
-        case .disableTimeToFullDisplayTracing, .disablePerformanceV2, .disableAppHangTrackingV2, .disableSessionTracking, .disableFileIOTracing, .disableUIVCTracing, .disableCoreDataTracing, .disableANRTracking, .disableWatchdogTracking, .disableUITracing, .disablePrewarmedAppStartTracing, .disablePerformanceTracing: return false
+        case .disableTimeToFullDisplayTracing, .disableAppHangTrackingV2, .disableSessionTracking, .disableFileIOTracing, .disableUIVCTracing, .disableCoreDataTracing, .disableANRTracking, .disableWatchdogTracking, .disableUITracing, .disablePrewarmedAppStartTracing, .disablePerformanceTracing: return false
         case .sessionTrackingIntervalMillis: return true
         }
     }
diff --git a/Samples/SentrySampleShared/SentrySampleShared/SentrySDKWrapper.swift b/Samples/SentrySampleShared/SentrySampleShared/SentrySDKWrapper.swift
@@ -135,9 +135,6 @@ public struct SentrySDKWrapper {
         options.enableCrashHandler = !SentrySDKOverrides.Other.disableCrashHandling.boolValue
         options.enablePersistingTracesWhenCrashing = true
         options.enableTimeToFullDisplayTracing = !SentrySDKOverrides.Performance.disableTimeToFullDisplayTracing.boolValue
-      #if !SDK_V9
-        options.enablePerformanceV2 = !SentrySDKOverrides.Performance.disablePerformanceV2.boolValue
-      #endif
         options.failedRequestStatusCodes = [ HttpStatusCodeRange(min: 400, max: 599) ]
 
     #if targetEnvironment(simulator)
diff --git a/Sources/Sentry/Public/SentryOptions.h b/Sources/Sentry/Public/SentryOptions.h
@@ -288,17 +288,6 @@ NS_SWIFT_NAME(Options)
  */
 @property (nonatomic, assign) BOOL enableAutoPerformanceTracing;
 
-#if !SDK_V9
-/**
- * We're working to update our Performance product offering in order to be able to provide better
- * insights and highlight specific actions you can take to improve your mobile app's overall
- * performance. The performanceV2 option changes the following behavior: The app start duration will
- * now finish when the first frame is drawn instead of when the OS posts the
- * UIWindowDidBecomeVisibleNotification. This change will be the default in the next major version.
- */
-@property (nonatomic, assign) BOOL enablePerformanceV2;
-#endif // !SDK_V9
-
 /**
  * @warning This is an experimental feature and may still have bugs.
  *
diff --git a/Sources/Sentry/SentryAppStartTracker.m b/Sources/Sentry/SentryAppStartTracker.m
@@ -33,7 +33,6 @@ @interface SentryAppStartTracker () <SentryFramesTrackerListener>
 @property (nonatomic, assign) BOOL wasInBackground;
 @property (nonatomic, strong) NSDate *didFinishLaunchingTimestamp;
 @property (nonatomic, assign) BOOL enablePreWarmedAppStartTracing;
-@property (nonatomic, assign) BOOL enablePerformanceV2;
 
 @end
 
@@ -55,16 +54,12 @@ - (instancetype)initWithDispatchQueueWrapper:(SentryDispatchQueueWrapper *)dispa
                              appStateManager:(id<SentryAppStateManager>)appStateManager
                                framesTracker:(SentryFramesTracker *)framesTracker
               enablePreWarmedAppStartTracing:(BOOL)enablePreWarmedAppStartTracing
-                         enablePerformanceV2:(BOOL)enablePerformanceV2
 {
     if (self = [super init]) {
         self.dispatchQueue = dispatchQueueWrapper;
         self.appStateManager = appStateManager;
-        _enablePerformanceV2 = enablePerformanceV2;
-        if (_enablePerformanceV2) {
-            self.framesTracker = framesTracker;
-            [framesTracker addListener:self];
-        }
+        self.framesTracker = framesTracker;
+        [framesTracker addListener:self];
 
         self.previousAppState = [self.appStateManager loadPreviousAppState];
         self.wasInBackground = NO;
@@ -104,11 +99,6 @@ - (void)start
                                                name:UIApplicationDidFinishLaunchingNotification
                                              object:nil];
 
-    [NSNotificationCenter.defaultCenter addObserver:self
-                                           selector:@selector(didBecomeVisible)
-                                               name:UIWindowDidBecomeVisibleNotification
-                                             object:nil];
-
     [NSNotificationCenter.defaultCenter addObserver:self
                                            selector:@selector(didEnterBackground)
                                                name:UIApplicationDidEnterBackgroundNotification
@@ -229,19 +219,6 @@ - (void)buildAppStartMeasurement:(NSDate *)appStartEnd
 #    endif // defined(SENTRY_TEST) || defined(SENTRY_TEST_CI) || defined(DEBUG)
 }
 
-/**
- * This is when the window becomes visible, which is not when the first frame of the app is drawn.
- * When this is posted, the app screen is usually white. The correct time when the first frame is
- * drawn is called in framesTrackerHasNewFrame only when `enablePerformanceV2` is enabled.
- */
-- (void)didBecomeVisible
-{
-    if (!_enablePerformanceV2) {
-        [self
-            buildAppStartMeasurement:[SentryDependencyContainer.sharedInstance.dateProvider date]];
-    }
-}
-
 /**
  * This is when the first frame is drawn.
  */
@@ -303,10 +280,6 @@ - (void)stop
                                                   name:UIApplicationDidFinishLaunchingNotification
                                                 object:nil];
 
-    [NSNotificationCenter.defaultCenter removeObserver:self
-                                                  name:UIWindowDidBecomeVisibleNotification
-                                                object:nil];
-
     [NSNotificationCenter.defaultCenter removeObserver:self
                                                   name:UIApplicationDidEnterBackgroundNotification
                                                 object:nil];
diff --git a/Sources/Sentry/SentryAppStartTrackingIntegration.m b/Sources/Sentry/SentryAppStartTrackingIntegration.m
@@ -27,17 +27,11 @@ - (BOOL)installWithOptions:(SentryOptions *)options
     id<SentryAppStateManager> appStateManager =
         [SentryDependencyContainer sharedInstance].appStateManager;
 
-#    if SDK_V9
-    BOOL usePerformanceV2 = YES;
-#    else
-    BOOL usePerformanceV2 = options.enablePerformanceV2;
-#    endif // SDK_V9
     self.tracker = [[SentryAppStartTracker alloc]
           initWithDispatchQueueWrapper:[[SentryDispatchQueueWrapper alloc] init]
                        appStateManager:appStateManager
                          framesTracker:SentryDependencyContainer.sharedInstance.framesTracker
-        enablePreWarmedAppStartTracing:options.enablePreWarmedAppStartTracing
-                   enablePerformanceV2:usePerformanceV2];
+        enablePreWarmedAppStartTracing:options.enablePreWarmedAppStartTracing];
     [self.tracker start];
 
     return YES;
diff --git a/Sources/Sentry/SentryOptions.m b/Sources/Sentry/SentryOptions.m
@@ -88,9 +88,6 @@ - (instancetype)init
         self.maxAttachmentSize = 20 * 1024 * 1024;
         self.sendDefaultPii = NO;
         self.enableAutoPerformanceTracing = YES;
-#if !SDK_V9
-        self.enablePerformanceV2 = NO;
-#endif // !SDK_V9
         self.enablePersistingTracesWhenCrashing = NO;
         self.enableCaptureFailedRequests = YES;
         self.environment = kSentryDefaultEnvironment;
diff --git a/Sources/Sentry/SentyOptionsInternal.m b/Sources/Sentry/SentyOptionsInternal.m
@@ -240,11 +240,6 @@ + (BOOL)validateOptions:(NSDictionary<NSString *, id> *)options
     [self setBool:options[@"enableAutoPerformanceTracing"]
             block:^(BOOL value) { sentryOptions.enableAutoPerformanceTracing = value; }];
 
-#if !SDK_V9
-    [self setBool:options[@"enablePerformanceV2"]
-            block:^(BOOL value) { sentryOptions.enablePerformanceV2 = value; }];
-#endif // !SDK_V9
-
     [self setBool:options[@"enablePersistingTracesWhenCrashing"]
             block:^(BOOL value) { sentryOptions.enablePersistingTracesWhenCrashing = value; }];
 
diff --git a/Sources/Sentry/include/SentryAppStartTracker.h b/Sources/Sentry/include/SentryAppStartTracker.h
@@ -22,8 +22,7 @@ SENTRY_NO_INIT
 - (instancetype)initWithDispatchQueueWrapper:(SentryDispatchQueueWrapper *)dispatchQueueWrapper
                              appStateManager:(id<SentryAppStateManager>)appStateManager
                                framesTracker:(SentryFramesTracker *)framesTracker
-              enablePreWarmedAppStartTracing:(BOOL)enablePreWarmedAppStartTracing
-                         enablePerformanceV2:(BOOL)enablePerformanceV2;
+              enablePreWarmedAppStartTracing:(BOOL)enablePreWarmedAppStartTracing;
 
 - (void)start;
 - (void)stop;
diff --git a/Sources/Swift/Helper/SentryEnabledFeaturesBuilder.swift b/Sources/Swift/Helper/SentryEnabledFeaturesBuilder.swift
@@ -15,12 +15,6 @@ import Foundation
             features.append("captureFailedRequests")
         }
         
-        #if !SDK_V9
-        if options.enablePerformanceV2 {
-            features.append("performanceV2")
-        }
-        #endif // !SDK_V9
-        
         if options.enableTimeToFullDisplayTracing {
             features.append("timeToFullDisplayTracing")
         }
diff --git a/Tests/SentryTests/Helper/SentryEnabledFeaturesBuilderTests.swift b/Tests/SentryTests/Helper/SentryEnabledFeaturesBuilderTests.swift
@@ -22,7 +22,6 @@ final class SentryEnabledFeaturesBuilderTests: XCTestCase {
     func testEnableAllFeatures() throws {
         // -- Arrange --
         let options = Options()
-        options.enablePerformanceV2 = true
         options.enableTimeToFullDisplayTracing = true
         options.swiftAsyncStacktraces = true
 
diff --git a/Tests/SentryTests/Integrations/Performance/AppStartTracking/SentryAppStartTrackerTests.swift b/Tests/SentryTests/Integrations/Performance/AppStartTracking/SentryAppStartTrackerTests.swift
@@ -19,7 +19,6 @@ class SentryAppStartTrackerTests: NotificationCenterTestCase {
         private let framesTracker: SentryFramesTracker
         let dispatchQueue = TestSentryDispatchQueueWrapper()
         var enablePreWarmedAppStartTracing = true
-        var enablePerformanceV2 = false
 
         let appStartDuration: TimeInterval = 0.4
         var runtimeInitTimestamp: Date
@@ -68,7 +67,6 @@ class SentryAppStartTrackerTests: NotificationCenterTestCase {
                 appStateManager: appStateManager,
                 framesTracker: framesTracker,
                 enablePreWarmedAppStartTracing: enablePreWarmedAppStartTracing,
-                enablePerformanceV2: enablePerformanceV2
             )
             return sut
         }
@@ -99,16 +97,12 @@ class SentryAppStartTrackerTests: NotificationCenterTestCase {
     }
     
     func testPerformanceV2_UsesRenderedFrameAsEndTimeStamp() {
-        fixture.enablePerformanceV2 = true
-        
         startApp(callDisplayLink: true)
         
         assertValidStart(type: .cold, expectedDuration: 0.45)
     }
     
     func testPerformanceV2_RemovesFramesTrackerListener() {
-        fixture.enablePerformanceV2 = true
-        
         startApp(callDisplayLink: true)
         
         advanceTime(bySeconds: 0.05)
@@ -122,7 +116,7 @@ class SentryAppStartTrackerTests: NotificationCenterTestCase {
         let appState = SentryAppState(releaseName: TestData.appState.releaseName, osVersion: UIDevice.current.systemVersion, vendorId: TestData.someUUID, isDebugging: false, systemBootTimestamp: previousBootTime)
         store(appState: appState)
         
-        startApp()
+        startApp(callDisplayLink: true)
         
         assertValidStart(type: .cold)
     }
@@ -131,7 +125,7 @@ class SentryAppStartTrackerTests: NotificationCenterTestCase {
         givenSystemNotRebooted()
 
         fixture.fileManager.moveAppStateToPreviousAppState()
-        startApp()
+        startApp(callDisplayLink: true)
         
         assertValidStart(type: .warm)
     }
@@ -143,19 +137,19 @@ class SentryAppStartTrackerTests: NotificationCenterTestCase {
         fixture.options.enableWatchdogTerminationTracking = false
 
         fixture.fileManager.moveAppStateToPreviousAppState()
-        startApp()
+        startApp(callDisplayLink: true)
         assertValidStart(type: .warm)
 
         fixture.fileManager.moveAppStateToPreviousAppState()
-        startApp()
+        startApp(callDisplayLink: true)
         assertValidStart(type: .warm)
     }
     
     func testAppUpgrade_IsColdStart() {
         let appState = SentryAppState(releaseName: "0.9.0", osVersion: UIDevice.current.systemVersion, vendorId: TestData.someUUID, isDebugging: false, systemBootTimestamp: SentryDependencyContainer.sharedInstance().dateProvider.date())
         store(appState: appState)
         
-        startApp()
+        startApp(callDisplayLink: true)
         
         assertValidStart(type: .cold)
     }
@@ -182,7 +176,7 @@ class SentryAppStartTrackerTests: NotificationCenterTestCase {
         store(appState: appState)
 
         fixture.fileManager.moveAppStateToPreviousAppState()
-        startApp()
+        startApp(callDisplayLink: true)
         
         assertValidStart(type: .warm)
     }
@@ -206,7 +200,7 @@ class SentryAppStartTrackerTests: NotificationCenterTestCase {
         givenSystemNotRebooted()
 
         fixture.fileManager.moveAppStateToPreviousAppState()
-        startApp(processStartTimeStamp: SentryDependencyContainer.sharedInstance().dateProvider.date().addingTimeInterval(-60 * 60 * 4))
+        startApp(processStartTimeStamp: SentryDependencyContainer.sharedInstance().dateProvider.date().addingTimeInterval(-60 * 60 * 4), callDisplayLink: true)
 #if os(iOS)
         if #available(iOS 14.0, *) {
             assertValidStart(type: .warm, expectedDuration: 0.3, preWarmed: true)
@@ -260,7 +254,7 @@ class SentryAppStartTrackerTests: NotificationCenterTestCase {
         givenSystemNotRebooted()
 
         fixture.fileManager.moveAppStateToPreviousAppState()
-        startApp()
+        startApp(callDisplayLink: true)
         
         assertValidStart(type: .warm)
     }
@@ -274,7 +268,7 @@ class SentryAppStartTrackerTests: NotificationCenterTestCase {
     
     func testAppLaunches_OSAlmostPrewarmedProcess_AppStartUp() {
         let processStartTime = SentryDependencyContainer.sharedInstance().dateProvider.date().addingTimeInterval(-179)
-        startApp(processStartTimeStamp: processStartTime)
+        startApp(processStartTimeStamp: processStartTime, callDisplayLink: true)
         
         assertValidStart(type: .cold, expectedDuration: 179.4)
     }
diff --git a/Tests/SentryTests/Integrations/Performance/AppStartTracking/SentryAppStartTrackingIntegrationTests.swift b/Tests/SentryTests/Integrations/Performance/AppStartTracking/SentryAppStartTrackingIntegrationTests.swift
@@ -117,21 +117,9 @@ class SentryAppStartTrackingIntegrationTests: NotificationCenterTestCase {
         
         XCTAssertFalse(result)
     }
-    
-    func test_PerformanceV2Enabled() {
-        let options = fixture.options
-        options.enablePerformanceV2 = true
-        
-        XCTAssertEqual(self.sut.install(with: options), true)
-        
-        let tracker = Dynamic(sut).tracker.asAnyObject as? SentryAppStartTracker
-        XCTAssertEqual(Dynamic(tracker).enablePerformanceV2.asBool, true)
-    }
 
     func assertTrackerSetupAndRunning(_ tracker: SentryAppStartTracker) throws {
         _ = try XCTUnwrap(Dynamic(tracker).dispatchQueue.asAnyObject as? SentryDispatchQueueWrapper, "Tracker does not have a dispatch queue.")
-        
-        XCTAssertFalse(try XCTUnwrap(Dynamic(tracker).enablePerformanceV2.asBool))
 
         let appStateManager = Dynamic(tracker).appStateManager.asObject as? SentryAppStateManager
 
diff --git a/Tests/SentryTests/SentryClientTests.swift b/Tests/SentryTests/SentryClientTests.swift
@@ -1725,15 +1725,12 @@ class SentryClientTests: XCTestCase {
     }
     
     func testSetSDKFeatures() throws {
-        let sut = fixture.getSut {
-            $0.enablePerformanceV2 = true
-        }
+        let sut = fixture.getSut()
         
         sut.capture(message: "message")
         
         let actual = try lastSentEvent()
         let features = try XCTUnwrap(actual.sdk?["features"] as? [String])
-        XCTAssert(features.contains("performanceV2"))
         XCTAssert(features.contains("captureFailedRequests"))
     }
 
diff --git a/Tests/SentryTests/SentryOptionsTest.m b/Tests/SentryTests/SentryOptionsTest.m
@@ -834,11 +834,6 @@ - (void)testEnableAutoPerformanceTracing
     [self testBooleanField:@"enableAutoPerformanceTracing"];
 }
 
-- (void)testEnablePerformanceV2
-{
-    [self testBooleanField:@"enablePerformanceV2" defaultValue:NO];
-}
-
 - (void)testEnablePersistingTracesWhenCrashing
 {
     [self testBooleanField:@"enablePersistingTracesWhenCrashing" defaultValue:NO];

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,6 @@ public enum SentrySDKOverrides: String, CaseIterable {`
`83`	`83`
`84`	`84`	`public enum Performance: String, SentrySDKOverride {`
`85`	`85`	`case disableTimeToFullDisplayTracing = "--io.sentry.performance.disable-time-to-full-display-tracing"`
`86`		`- case disablePerformanceV2 = "--io.sentry.performance.disable-performance-v2"`
`87`	`86`	`case disableAppHangTrackingV2 = "--io.sentry.performance.disable-app-hang-tracking-v2"`
`88`	`87`	`case disableSessionTracking = "--io.sentry.performance.disable-automatic-session-tracking"`
`89`	`88`	`case disableFileIOTracing = "--io.sentry.performance.disable-file-io-tracing"`
`@@ -315,7 +314,7 @@ extension SentrySDKOverrides.Other {`
`315`	`314`	`extension SentrySDKOverrides.Performance {`
`316`	`315`	`public var overrideType: OverrideType {`
`317`	`316`	`switch self {`
`318`		`- case .disableTimeToFullDisplayTracing, .disablePerformanceV2, .disableAppHangTrackingV2, .disableSessionTracking, .disableFileIOTracing, .disableUIVCTracing, .disableCoreDataTracing, .disableANRTracking, .disableWatchdogTracking, .disableUITracing, .disablePrewarmedAppStartTracing, .disablePerformanceTracing: return .boolean`
	`317`	`+ case .disableTimeToFullDisplayTracing, .disableAppHangTrackingV2, .disableSessionTracking, .disableFileIOTracing, .disableUIVCTracing, .disableCoreDataTracing, .disableANRTracking, .disableWatchdogTracking, .disableUITracing, .disablePrewarmedAppStartTracing, .disablePerformanceTracing: return .boolean`
`319`	`318`	`case .sessionTrackingIntervalMillis: return .string`
`320`	`319`	`}`
`321`	`320`	`}`
`@@ -402,7 +401,7 @@ extension SentrySDKOverrides.Other {`
`402`	`401`	`extension SentrySDKOverrides.Performance {`
`403`	`402`	`public var ignoresDisableEverything: Bool {`
`404`	`403`	`switch self {`
`405`		`- case .disableTimeToFullDisplayTracing, .disablePerformanceV2, .disableAppHangTrackingV2, .disableSessionTracking, .disableFileIOTracing, .disableUIVCTracing, .disableCoreDataTracing, .disableANRTracking, .disableWatchdogTracking, .disableUITracing, .disablePrewarmedAppStartTracing, .disablePerformanceTracing: return false`
	`404`	`+ case .disableTimeToFullDisplayTracing, .disableAppHangTrackingV2, .disableSessionTracking, .disableFileIOTracing, .disableUIVCTracing, .disableCoreDataTracing, .disableANRTracking, .disableWatchdogTracking, .disableUITracing, .disablePrewarmedAppStartTracing, .disablePerformanceTracing: return false`
`406`	`405`	`case .sessionTrackingIntervalMillis: return true`
`407`	`406`	`}`
`408`	`407`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,6 @@ import Foundation`
`15`	`15`	`features.append("captureFailedRequests")`
`16`	`16`	`}`
`17`	`17`
`18`		`- #if !SDK_V9`
`19`		`- if options.enablePerformanceV2 {`
`20`		`- features.append("performanceV2")`
`21`		`- }`
`22`		`- #endif // !SDK_V9`
`23`		`-`
`24`	`18`	`if options.enableTimeToFullDisplayTracing {`
`25`	`19`	`features.append("timeToFullDisplayTracing")`
`26`	`20`	`}`