ref: Remove deprecated integrations option

noahsmartin · noahsmartin · commit d59b99e3a5ed · 2025-10-28T13:41:02.000-04:00
diff --git a/SentryTestUtils/TestOptions.swift b/SentryTestUtils/TestOptions.swift
@@ -2,19 +2,24 @@ 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
+        attachViewHierarchy = false
+        enableNetworkTracking = false
+        enableNetworkBreadcrumbs = false
+        enableCaptureFailedRequests = false
+        enableAutoBreadcrumbTracking = false
+        #if (os(iOS) || os(tvOS) || (swift(>=5.9) && os(visionOS))) && !SENTRY_NO_UIKIT
+        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;
@@ -211,13 +208,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
@@ -9,7 +9,7 @@ class SentryProfilingPublicAPITests: XCTestCase {
     private class Fixture {
         @available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
         let options: Options = {
-            let options = Options.noIntegrations()
+            let options = Options()
             options.dsn = TestConstants.dsnAsString(username: "SentrySDKTests")
             options.releaseName = "1.0.0"
             return options
diff --git a/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackingIntegrationTest.swift b/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackingIntegrationTest.swift
@@ -15,7 +15,6 @@ class SentryCoreDataTrackingIntegrationTests: XCTestCase {
             options = Options()
             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
@@ -35,10 +35,10 @@ class DataSentryTracingIntegrationTests: XCTestCase {
                     options.dsn = TestConstants.dsnAsString(username: testName)
                     options.removeAllIntegrations()
 
+                    options.removeAllIntegrations()
                     // 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
@@ -38,10 +38,10 @@ class FileManagerSentryTracingIntegrationTests: XCTestCase {
                 options.dsn = TestConstants.dsnAsString(username: "FileManagerSentryTracingIntegrationTests")
                 options.removeAllIntegrations()
 
+                options.removeAllIntegrations()
                 // 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,8 @@ class SentryNetworkTrackerIntegrationTests: XCTestCase {
             options = Options()
             options.dsn = SentryNetworkTrackerIntegrationTests.dsnAsString
             options.tracesSampleRate = 1.0
-            options.setIntegrations([SentryNetworkTrackingIntegration.self])
+            options.removeAllIntegrations()
+            options.enableNetworkTracking = 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
@@ -55,7 +55,6 @@ class SentrySessionReplayIntegrationTests: XCTestCase {
         SentrySDK.start {
             $0.dsn = "https://user@test.com/test"
             $0.sessionReplay = SentryReplayOptions(sessionSampleRate: sessionSampleRate, onErrorSampleRate: errorSampleRate)
-            $0.setIntegrations(noIntegrations ? [] : [SentrySessionReplayIntegration.self])
             $0.enableSwizzling = enableSwizzling
             $0.cacheDirectoryPath = FileManager.default.temporaryDirectory.path
             configure?($0)
diff --git a/Tests/SentryTests/Integrations/ViewHierarchy/SentryViewHierarchyIntegrationTests.swift b/Tests/SentryTests/Integrations/ViewHierarchy/SentryViewHierarchyIntegrationTests.swift
@@ -39,8 +39,8 @@ class SentryViewHierarchyIntegrationTests: XCTestCase {
     @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())
@@ -49,8 +49,8 @@ class SentryViewHierarchyIntegrationTests: XCTestCase {
     @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())
@@ -59,8 +59,8 @@ class SentryViewHierarchyIntegrationTests: XCTestCase {
     @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)
@@ -70,8 +70,8 @@ class SentryViewHierarchyIntegrationTests: XCTestCase {
     @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)
@@ -176,18 +176,18 @@ class SentryViewHierarchyIntegrationTests: XCTestCase {
     @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/SentryClientTests.swift b/Tests/SentryTests/SentryClientTests.swift
@@ -1737,18 +1737,6 @@ class SentryClientTests: XCTestCase {
         XCTAssert(features.contains("captureFailedRequests"))
     }
     
-    func testSetSDKIntegrations_NoIntegrations() throws {
-        let expected: [String] = []
-        
-        let eventId = fixture.getSut(configureOptions: { options in
-            options.integrations = expected
-        }).capture(message: fixture.messageAsString)
-
-        eventId.assertIsNotEmpty()
-        let actual = try lastSentEvent()
-        assertArrayEquals(expected: expected, actual: actual.sdk?["integrations"] as? [String])
-    }
-
     func testFileManagerCantBeInit() throws {
         try SentryFileManager.prepareInitError()
         defer {
diff --git a/Tests/SentryTests/SentryCrash/SentryCrashInstallationReporterTests.swift b/Tests/SentryTests/SentryCrash/SentryCrashInstallationReporterTests.swift
@@ -86,7 +86,6 @@ class SentryCrashInstallationReporterTests: XCTestCase {
     private func givenSutWithStartedSDK() {
         let options = Options()
         options.dsn = TestConstants.dsnAsString(username: "SentryCrashInstallationReporterTests")
-        options.setIntegrations([SentryCrashIntegration.self])
         SentrySDK.start(options: options)
         
         testClient = TestClient(options: options)
diff --git a/Tests/SentryTests/SentryCrash/SentryStacktraceBuilderTests.swift b/Tests/SentryTests/SentryCrash/SentryStacktraceBuilderTests.swift
@@ -86,7 +86,9 @@ class SentryStacktraceBuilderTests: XCTestCase {
             options.dsn = TestConstants.dsnAsString(username: "SentryStacktraceBuilderTests")
             options.swiftAsyncStacktraces = true
             options.debug = true
-            options.setIntegrations([SentryCrashIntegration.self, SentrySwiftAsyncIntegration.self])
+            options.removeAllIntegrations()
+            options.swiftAsyncStacktraces = true
+            options.enableCrashHandler = true
         }
 
         let waitForAsyncToRun = expectation(description: "Wait async functions")
@@ -110,7 +112,9 @@ class SentryStacktraceBuilderTests: XCTestCase {
             options.dsn = TestConstants.dsnAsString(username: "SentryStacktraceBuilderTests")
             options.swiftAsyncStacktraces = false
             options.debug = true
-            options.setIntegrations([SentryCrashIntegration.self, SentrySwiftAsyncIntegration.self])
+            options.removeAllIntegrations()
+            options.swiftAsyncStacktraces = true
+            options.enableCrashHandler = true
         }
 
         let waitForAsyncToRun = expectation(description: "Wait async functions")
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

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ class SentryCoreDataTrackingIntegrationTests: XCTestCase {`
`15`	`15`	`options = Options()`
`16`	`16`	`options.enableCoreDataTracing = true`
`17`	`17`	`options.tracesSampleRate = 1`
`18`		`- options.setIntegrations([SentryCoreDataTrackingIntegration.self])`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`func getSut() -> SentryCoreDataTrackingIntegration {`