ref: Remove deprecated integrations option (#6492)

noahsmartin · web-flow · commit 5ff1b04b3142 · 2025-10-29T14:06:04.000-04:00
* ref: Remove deprecated integrations option

* Remove deprecation tags

* PR feedback
diff --git a/SentryTestUtils/TestOptions.swift b/SentryTestUtils/TestOptions.swift
@@ -2,19 +2,27 @@ import Foundation
 import Sentry
 
 public extension Options {
-    @available(*, deprecated)
-    func setIntegrations(_ integrations: [AnyClass]) {
-        self.integrations = integrations.map {
-            NSStringFromClass($0)
-        }
-    }
     
-    @available(*, deprecated)
     func removeAllIntegrations() {
-        self.integrations = []
+        enableAutoSessionTracking = false
+        enableWatchdogTerminationTracking = false
+        enableAutoPerformanceTracing = false
+        enableCrashHandler = false
+        swiftAsyncStacktraces = false
+        enableAppHangTracking = false
+        enableNetworkTracking = false
+        enableNetworkBreadcrumbs = false
+        enableCaptureFailedRequests = false
+        enableAutoBreadcrumbTracking = false
+        enableCoreDataTracing = false
+        enableFileIOTracing = false
+        #if (os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT
+        enableUserInteractionTracing = false
+        attachViewHierarchy = false
+        enableUIViewControllerTracing = false
+        #endif
     }
-    
-    @available(*, deprecated)
+
     static func noIntegrations() -> Options {
         let options = Options()
         options.removeAllIntegrations()
diff --git a/Sources/Sentry/Public/SentryOptions.h b/Sources/Sentry/Public/SentryOptions.h
@@ -207,15 +207,6 @@ NS_SWIFT_NAME(Options)
 @property (nullable, nonatomic, copy)
     SentryOnCrashedLastRunCallback onCrashedLastRun NS_SWIFT_SENDABLE;
 
-#if !SDK_V9
-/**
- * Array of integrations to install.
- */
-@property (nullable, nonatomic, copy) NSArray<NSString *> *integrations DEPRECATED_MSG_ATTRIBUTE(
-    "Setting `SentryOptions.integrations` is deprecated. Integrations should be enabled or "
-    "disabled using their respective `SentryOptions.enable*` property.");
-#endif // !SDK_V9
-
 /**
  * Array of default integrations. Will be used if @c integrations is @c nil .
  */
diff --git a/Sources/Sentry/SentryOptions.m b/Sources/Sentry/SentryOptions.m
@@ -73,9 +73,6 @@ - (instancetype)init
         self.debug = NO;
         self.maxBreadcrumbs = defaultMaxBreadcrumbs;
         self.maxCacheItems = 30;
-#if !SDK_V9
-        _integrations = [SentryOptions defaultIntegrations];
-#endif // !SDK_V9
         self.sampleRate = SENTRY_DEFAULT_SAMPLE_RATE;
         self.enableAutoSessionTracking = YES;
         self.enableGraphQLOperationTracking = NO;
@@ -213,13 +210,6 @@ - (void)setFailedRequestTargets:(NSArray *)failedRequestTargets
     _failedRequestTargets = failedRequestTargets;
 }
 
-#if !SDK_V9
-- (void)setIntegrations:(NSArray<NSString *> *)integrations
-{
-    _integrations = integrations.mutableCopy;
-}
-#endif // !SDK_V9
-
 - (void)setDsn:(NSString *)dsn
 {
     NSError *error = nil;
diff --git a/Sources/Sentry/SentrySDKInternal.m b/Sources/Sentry/SentrySDKInternal.m
@@ -559,15 +559,7 @@ + (void)installIntegrations
         return;
     }
     SentryOptions *options = [SentrySDKInternal.currentHub getClient].options;
-#if SDK_V9
     NSMutableArray<NSString *> *integrationNames = [SentryOptions defaultIntegrations].mutableCopy;
-#else
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    NSMutableArray<NSString *> *integrationNames =
-        [SentrySDKInternal.currentHub getClient].options.integrations.mutableCopy;
-#    pragma clang diagnostic pop
-#endif // SDK_V9
 
     NSArray<Class> *defaultIntegrations = SentryOptionsInternal.defaultIntegrationClasses;
 
diff --git a/Sources/Sentry/SentyOptionsInternal.m b/Sources/Sentry/SentyOptionsInternal.m
@@ -200,16 +200,6 @@ + (BOOL)validateOptions:(NSDictionary<NSString *, id> *)options
         sentryOptions.onCrashedLastRun = options[@"onCrashedLastRun"];
     }
 
-#if !SDK_V9
-    if ([options[@"integrations"] isKindOfClass:[NSArray class]]) {
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        sentryOptions.integrations =
-            [[options[@"integrations"] filteredArrayUsingPredicate:isNSString] mutableCopy];
-#    pragma clang diagnstic pop
-    }
-#endif // !SDK_V9
-
     if ([options[@"sampleRate"] isKindOfClass:[NSNumber class]]) {
         sentryOptions.sampleRate = options[@"sampleRate"];
     }
diff --git a/Tests/SentryProfilerTests/SentryProfilingPublicAPITests.swift b/Tests/SentryProfilerTests/SentryProfilingPublicAPITests.swift
@@ -7,7 +7,6 @@ import XCTest
 // swiftlint:disable file_length
 class SentryProfilingPublicAPITests: XCTestCase {
     private class Fixture {
-        @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
         let options: Options = {
             let options = Options.noIntegrations()
             options.dsn = TestConstants.dsnAsString(username: "SentrySDKTests")
@@ -36,9 +35,7 @@ class SentryProfilingPublicAPITests: XCTestCase {
 
         let currentDate = TestCurrentDateProvider()
         lazy var timerFactory = TestSentryNSTimerFactory(currentDateProvider: currentDate)
-        @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
         lazy var client = TestClient(options: options)!
-        @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
         lazy var hub = SentryHub(client: client, andScope: scope)
     }
 
@@ -55,7 +52,6 @@ class SentryProfilingPublicAPITests: XCTestCase {
         SentryDependencyContainer.sharedInstance().dateProvider = fixture.currentDate
     }
 
-    @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
     override func tearDown() {
         super.tearDown()
 
@@ -72,7 +68,6 @@ class SentryProfilingPublicAPITests: XCTestCase {
 }
 
 // MARK: continuous profiling v2
-@available(*, deprecated, message: "This is only deprecated because profilesSampleRate is deprecated. Once that is removed this attribute can be removed.")
 extension SentryProfilingPublicAPITests {
     func testSentryOptionsReportsContinuousProfilingV2Enabled() {
         // Arrange
@@ -481,14 +476,12 @@ extension SentryProfilingPublicAPITests {
 }
 
 private extension SentryProfilingPublicAPITests {
-    @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
     func givenSdkWithHub() {
         SentrySDKInternal.setCurrentHub(fixture.hub)
         SentrySDKInternal.setStart(with: fixture.options)
         sentry_sdkInitProfilerTasks(fixture.options, fixture.hub)
     }
 
-    @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
     func givenSdkWithHubButNoClient() {
         SentrySDKInternal.setCurrentHub(SentryHub(client: nil, andScope: nil))
         SentrySDKInternal.setStart(with: fixture.options)
diff --git a/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackingIntegrationTest.swift b/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackingIntegrationTest.swift
@@ -13,9 +13,11 @@ class SentryCoreDataTrackingIntegrationTests: XCTestCase {
         init(testName: String) {
             coreDataStack = TestCoreDataStack(databaseFilename: "db-\(testName.hashValue).sqlite")
             options = Options()
+            options.removeAllIntegrations()
+            options.enableAutoPerformanceTracing = true
+            options.enableSwizzling = true
             options.enableCoreDataTracing = true
             options.tracesSampleRate = 1
-            options.setIntegrations([SentryCoreDataTrackingIntegration.self])
         }
         
         func getSut() -> SentryCoreDataTrackingIntegration {
diff --git a/Tests/SentryTests/Integrations/Performance/IO/DataSentryTracingIntegrationTests.swift b/Tests/SentryTests/Integrations/Performance/IO/DataSentryTracingIntegrationTests.swift
@@ -38,7 +38,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
                     // Configure options required by File I/O tracking integration
                     options.enableAutoPerformanceTracing = true
                     options.enableFileIOTracing = isEnabled
-                    options.setIntegrations(isEnabled ? [SentryFileIOTrackingIntegration.self] : [])
 
                     // Configure the tracing sample rate to record all traces
                     options.tracesSampleRate = 1.0
diff --git a/Tests/SentryTests/Integrations/Performance/IO/FileManagerTracingIntegrationTests.swift b/Tests/SentryTests/Integrations/Performance/IO/FileManagerTracingIntegrationTests.swift
@@ -41,7 +41,6 @@ class FileManagerSentryTracingIntegrationTests: XCTestCase {
                 // Configure options required by File I/O tracking integration
                 options.enableAutoPerformanceTracing = true
                 options.enableFileIOTracing = isEnabled
-                options.setIntegrations(isEnabled ? [SentryFileIOTrackingIntegration.self] : [])
 
                 // Configure the tracing sample rate to record all traces
                 options.tracesSampleRate = 1.0
diff --git a/Tests/SentryTests/Integrations/Performance/IO/SentryFileIOTrackingIntegrationTests.swift b/Tests/SentryTests/Integrations/Performance/IO/SentryFileIOTrackingIntegrationTests.swift
@@ -14,13 +14,13 @@ class SentryFileIOTrackingIntegrationTests: XCTestCase {
         @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
         func getOptions(enableAutoPerformanceTracing: Bool = true, enableFileIOTracing: Bool = true, enableSwizzling: Bool = true, enableDataSwizzling: Bool = true, enableFileManagerSwizzling: Bool = true, tracesSampleRate: NSNumber = 1) -> Options {
             let result = Options()
+            result.removeAllIntegrations()
             result.enableAutoPerformanceTracing = enableAutoPerformanceTracing
             result.enableFileIOTracing = enableFileIOTracing
             result.enableSwizzling = enableSwizzling
             result.tracesSampleRate = tracesSampleRate
             result.experimental.enableDataSwizzling = enableDataSwizzling
             result.experimental.enableFileManagerSwizzling = enableFileManagerSwizzling
-            result.setIntegrations([SentryFileIOTrackingIntegration.self])
             return result
         }
         
diff --git a/Tests/SentryTests/Integrations/Performance/Network/SentryNetworkTrackerIntegrationTests.swift b/Tests/SentryTests/Integrations/Performance/Network/SentryNetworkTrackerIntegrationTests.swift
@@ -20,7 +20,10 @@ class SentryNetworkTrackerIntegrationTests: XCTestCase {
             options = Options()
             options.dsn = SentryNetworkTrackerIntegrationTests.dsnAsString
             options.tracesSampleRate = 1.0
-            options.setIntegrations([SentryNetworkTrackingIntegration.self])
+            options.removeAllIntegrations()
+            options.enableNetworkTracking = true
+            options.enableNetworkBreadcrumbs = true
+            options.enableCaptureFailedRequests = true
         }
     }
     
diff --git a/Tests/SentryTests/Integrations/Screenshot/SentryScreenshotIntegrationTests.swift b/Tests/SentryTests/Integrations/Screenshot/SentryScreenshotIntegrationTests.swift
@@ -44,8 +44,8 @@ class SentryScreenshotIntegrationTests: XCTestCase {
     @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
     func test_attachScreenshot_disabled() {
         SentrySDK.start {
+            $0.removeAllIntegrations()
             $0.attachScreenshot = false
-            $0.setIntegrations([SentryScreenshotIntegration.self])
         }
         XCTAssertEqual(SentrySDKInternal.currentHub().getClient()?.attachmentProcessors.count, 0)
         XCTAssertFalse(sentrycrash_hasSaveScreenshotCallback())
@@ -54,8 +54,8 @@ class SentryScreenshotIntegrationTests: XCTestCase {
     @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
     func test_attachScreenshot_enabled() {
         SentrySDK.start {
+            $0.removeAllIntegrations()
             $0.attachScreenshot = true
-            $0.setIntegrations([SentryScreenshotIntegration.self])
         }
         XCTAssertEqual(SentrySDKInternal.currentHub().getClient()?.attachmentProcessors.count, 1)
         XCTAssertTrue(sentrycrash_hasSaveScreenshotCallback())
@@ -64,8 +64,8 @@ class SentryScreenshotIntegrationTests: XCTestCase {
     @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
     func test_uninstall() {
         SentrySDK.start {
+            $0.removeAllIntegrations()
             $0.attachScreenshot = true
-            $0.setIntegrations([SentryScreenshotIntegration.self])
         }
         SentrySDK.close()
         
diff --git a/Tests/SentryTests/Integrations/SentryCrash/SentryCrashIntegrationTests.swift b/Tests/SentryTests/Integrations/SentryCrash/SentryCrashIntegrationTests.swift
@@ -100,7 +100,8 @@ class SentryCrashIntegrationTests: NotificationCenterTestCase {
             options.dsn = SentryCrashIntegrationTests.dsnAsString
             options.releaseName = releaseName
             options.dist = dist
-            options.setIntegrations([SentryCrashIntegration.self])
+            options.removeAllIntegrations()
+            options.enableCrashHandler = true
         }
         
         // To test this properly we need SentryCrash and SentryCrashIntegration installed and registered on the current hub of the SDK.
@@ -114,7 +115,8 @@ class SentryCrashIntegrationTests: NotificationCenterTestCase {
     func testContext_IsPassedToSentryCrash() throws {
         SentrySDK.start { options in
             options.dsn = SentryCrashIntegrationTests.dsnAsString
-            options.setIntegrations([SentryCrashIntegration.self])
+            options.removeAllIntegrations()
+            options.enableCrashHandler = true
         }
         
         let userInfo = try XCTUnwrap(SentryDependencyContainer.sharedInstance().crashReporter.userInfo)
diff --git a/Tests/SentryTests/Integrations/Session/SentrySessionGeneratorTests.swift b/Tests/SentryTests/Integrations/Session/SentrySessionGeneratorTests.swift
@@ -26,7 +26,7 @@ class SentrySessionGeneratorTests: NotificationCenterTestCase {
     override func setUp() {
         super.setUp()
         
-        options = Options.noIntegrations()
+        options = Options()
         options.dsn = TestConstants.realDSN
         
         options.releaseName = "Release Health"
@@ -35,9 +35,7 @@ class SentrySessionGeneratorTests: NotificationCenterTestCase {
         options.sessionTrackingIntervalMillis = 1
         
         // We want to start and stop the SentryAutoSessionTrackingIntegration ourselves so we can send crashed and abnormal sessions.
-        options.integrations = Options.defaultIntegrations().filter { (name) -> Bool in
-            return name != "SentryAutoSessionTrackingIntegration"
-        }
+        options.enableAutoSessionTracking = false
 
         fileManager = try! SentryFileManager(
             options: options,
diff --git a/Tests/SentryTests/Integrations/SessionReplay/SentrySessionReplayIntegrationTests.swift b/Tests/SentryTests/Integrations/SessionReplay/SentrySessionReplayIntegrationTests.swift
@@ -5,7 +5,6 @@ import XCTest
 
 #if os(iOS) || os(tvOS)
 
-@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
 class SentrySessionReplayIntegrationTests: XCTestCase {
 
     private var uiApplication: TestSentryUIApplication!
@@ -54,8 +53,10 @@ class SentrySessionReplayIntegrationTests: XCTestCase {
     private func startSDK(sessionSampleRate: Float, errorSampleRate: Float, enableSwizzling: Bool = true, noIntegrations: Bool = false, configure: ((Options) -> Void)? = nil) {
         SentrySDK.start {
             $0.dsn = "https://user@test.com/test"
-            $0.sessionReplay = SentryReplayOptions(sessionSampleRate: sessionSampleRate, onErrorSampleRate: errorSampleRate)
-            $0.setIntegrations(noIntegrations ? [] : [SentrySessionReplayIntegration.self])
+            $0.removeAllIntegrations()
+            if !noIntegrations {
+                $0.sessionReplay = SentryReplayOptions(sessionSampleRate: sessionSampleRate, onErrorSampleRate: errorSampleRate)
+            }
             $0.enableSwizzling = enableSwizzling
             $0.cacheDirectoryPath = FileManager.default.temporaryDirectory.path
             configure?($0)
@@ -115,7 +116,6 @@ class SentrySessionReplayIntegrationTests: XCTestCase {
     
     func testInstallErrorReplay() {
         startSDK(sessionSampleRate: 0, errorSampleRate: 0.1)
-        
         XCTAssertEqual(SentrySDKInternal.currentHub().trimmedInstalledIntegrationNames().count, 1)
         XCTAssertEqual(globalEventProcessor.processors.count, 1)
     }
diff --git a/Tests/SentryTests/Integrations/ViewHierarchy/SentryViewHierarchyIntegrationTests.swift b/Tests/SentryTests/Integrations/ViewHierarchy/SentryViewHierarchyIntegrationTests.swift
@@ -36,42 +36,38 @@ class SentryViewHierarchyIntegrationTests: XCTestCase {
         clearTestState()
     }
 
-    @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
     func test_attachViewHierarchy() {
         SentrySDK.start {
+            $0.removeAllIntegrations()
             $0.attachViewHierarchy = false
-            $0.setIntegrations([SentryViewHierarchyIntegration.self])
         }
         XCTAssertEqual(SentrySDKInternal.currentHub().getClient()?.attachmentProcessors.count, 0)
         XCTAssertFalse(sentrycrash_hasSaveViewHierarchyCallback())
     }
 
-    @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
     func test_attachViewHierarchy_enabled() {
         SentrySDK.start {
+            $0.removeAllIntegrations()
             $0.attachViewHierarchy = true
-            $0.setIntegrations([SentryViewHierarchyIntegration.self])
         }
         XCTAssertEqual(SentrySDKInternal.currentHub().getClient()?.attachmentProcessors.count, 1)
         XCTAssertTrue(sentrycrash_hasSaveViewHierarchyCallback())
     }
 
-    @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
     func test_uninstall() {
         SentrySDK.start {
+            $0.removeAllIntegrations()
             $0.attachViewHierarchy = true
-            $0.setIntegrations([SentryViewHierarchyIntegration.self])
         }
         SentrySDK.close()
         XCTAssertNil(SentrySDKInternal.currentHub().getClient()?.attachmentProcessors)
         XCTAssertFalse(sentrycrash_hasSaveViewHierarchyCallback())
     }
 
-    @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
     func test_integrationAddFileName() {
         SentrySDK.start {
+            $0.removeAllIntegrations()
             $0.attachViewHierarchy = true
-            $0.setIntegrations([SentryViewHierarchyIntegration.self])
         }
         saveViewHierarchy("/test/path")
         XCTAssertEqual("/test/path/view-hierarchy.json", fixture.viewHierarchyProvider.saveFilePathUsed)
@@ -173,21 +169,19 @@ class SentryViewHierarchyIntegrationTests: XCTestCase {
         wait(for: [ex], timeout: 1)
     }
     
-    @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
     func testReportAccessibilityIdentifierTrue() {
         SentrySDK.start {
+            $0.removeAllIntegrations()
             $0.attachViewHierarchy = true
-            $0.setIntegrations([SentryViewHierarchyIntegration.self])
         }
         XCTAssertTrue(SentryDependencyContainer.sharedInstance().viewHierarchyProvider.reportAccessibilityIdentifier)
     }
     
-    @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
     func testReportAccessibilityIdentifierFalse() {
         SentrySDK.start {
+            $0.removeAllIntegrations()
             $0.attachViewHierarchy = true
             $0.reportAccessibilityIdentifier = false
-            $0.setIntegrations([SentryViewHierarchyIntegration.self])
         }
         XCTAssertFalse(SentryDependencyContainer.sharedInstance().viewHierarchyProvider.reportAccessibilityIdentifier)
     }
diff --git a/Tests/SentryTests/PrivateSentrySDKOnlyTests.swift b/Tests/SentryTests/PrivateSentrySDKOnlyTests.swift
diff --git a/Tests/SentryTests/SentryClientTests.swift b/Tests/SentryTests/SentryClientTests.swift
diff --git a/Tests/SentryTests/SentryCrash/SentryCrashInstallationReporterTests.swift b/Tests/SentryTests/SentryCrash/SentryCrashInstallationReporterTests.swift
diff --git a/Tests/SentryTests/SentryCrash/SentryStacktraceBuilderTests.swift b/Tests/SentryTests/SentryCrash/SentryStacktraceBuilderTests.swift
diff --git a/Tests/SentryTests/SentryOptionsTest.m b/Tests/SentryTests/SentryOptionsTest.m
diff --git a/Tests/SentryTests/SentrySDKInternalTests.swift b/Tests/SentryTests/SentrySDKInternalTests.swift
diff --git a/Tests/SentryTests/SentrySDKTests.swift b/Tests/SentryTests/SentrySDKTests.swift
