Skip to content

Commit 54bf850

Browse files
authored
chore: Remove deprecation flags that are not needed (#6597)
1 parent 78c87e8 commit 54bf850

20 files changed

+0
-71
lines changed

Tests/SentryProfilerTests/SentryAppLaunchProfilingTests.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import XCTest
33

44
#if os(iOS) || os(macOS) || targetEnvironment(macCatalyst)
5-
@available(*, deprecated, message: "App launch profiling is deprecated in favor of continuous profiling.")
65
final class SentryAppLaunchProfilingTests: XCTestCase {
76
private var fixture: SentryProfileTestFixture!
87

@@ -18,7 +17,6 @@ final class SentryAppLaunchProfilingTests: XCTestCase {
1817
}
1918

2019
// MARK: continuous profiling v2
21-
@available(*, deprecated, message: "This is only deprecated because SentryAppLaunchProfilingTests is deprecated. Once trace based and continuous profiling v1 is removed this deprecation can be removed.")
2220
extension SentryAppLaunchProfilingTests {
2321
func testContinuousLaunchProfileV2TraceLifecycleConfiguration() throws {
2422
// Arrange
@@ -86,7 +84,6 @@ extension SentryAppLaunchProfilingTests {
8684

8785
// MARK: continuous profiling v2 (iOS-only)
8886
#if !os(macOS)
89-
@available(*, deprecated, message: "This is only deprecated because SentryAppLaunchProfilingTests is deprecated. Once trace based and continuous profiling v1 is removed this deprecation can be removed.")
9087
extension SentryAppLaunchProfilingTests {
9188
func testLaunchContinuousProfileV2TraceLifecycleNotStoppedOnFullyDisplayed() throws {
9289
// Arrange

Tests/SentryProfilerTests/SentryAppStartProfilingConfigurationChangeTests.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import XCTest
55

66
#if os(iOS) || os(macOS) || targetEnvironment(macCatalyst)
77
/// Validate stopping behavior of launch profiles that run with one set of configured options, where the SDK is started on that launch with a different set of options, to validate that the configured options persisted to disk from the previous launch are the ones used to determine how/when to stop the profiler, and not the new options currently in memory
8-
@available(*, deprecated, message: "This is only marked as deprecated because it must still test some deprecated profiling APIs, but the deprecation warnings are converted to errors in our test targets. Once the deprecated API are removed, this can also be removed.")
98
final class SentryAppStartProfilingConfigurationChangeTests: XCTestCase {
109
private var fixture: SentryProfileTestFixture!
1110

@@ -22,7 +21,6 @@ final class SentryAppStartProfilingConfigurationChangeTests: XCTestCase {
2221

2322
#if !os(macOS)
2423
// MARK: configuring launch profiling with TTFD disabled, then launching with it enabled (iOS-only)
25-
@available(*, deprecated, message: "This is only marked as deprecated because it must still test some deprecated profiling APIs, but the deprecation warnings are converted to errors in our test targets. Once the deprecated API are removed, this can also be removed.")
2624
extension SentryAppStartProfilingConfigurationChangeTests {
2725
func test_lastLaunch_continuousV2_manualLifecycle_noTTFD_currentLaunch_continuousV2_traceLifecycle_withTTFD() throws {
2826
// Arrange
@@ -191,7 +189,6 @@ extension SentryAppStartProfilingConfigurationChangeTests {
191189
}
192190

193191
// MARK: configuring launch profiling with TTFD enabled, then launching with it disabled (iOS-only)
194-
@available(*, deprecated, message: "This is only marked as deprecated because it must still test some deprecated profiling APIs, but the deprecation warnings are converted to errors in our test targets. Once the deprecated API are removed, this can also be removed.")
195192
extension SentryAppStartProfilingConfigurationChangeTests {
196193
// MARK: starting with continuous v2 manual lifecycle with TTFD
197194
func test_lastLaunch_continuousV2_manualLifecycle_withTTFD_currentLaunch_continuousV2_traceLifecycle_noTTFD() throws {

Tests/SentryProfilerTests/SentryContinuousProfilerTests.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import XCTest
55

66
#if os(iOS) || os(macOS) || targetEnvironment(macCatalyst)
77

8-
@available(*, deprecated, message: "This is only marked as deprecated because profilesSampleRate is marked as deprecated. Once that is removed this can be removed.")
98
final class SentryContinuousProfilerTests: XCTestCase {
109
private var fixture: SentryProfileTestFixture!
1110

@@ -243,7 +242,6 @@ final class SentryContinuousProfilerTests: XCTestCase {
243242
}
244243
}
245244

246-
@available(*, deprecated, message: "This is only marked as deprecated because profilesSampleRate is marked as deprecated. Once that is removed this can be removed.")
247245
private extension SentryContinuousProfilerTests {
248246
func addMockSamples(mockAddresses: [NSNumber]) throws {
249247
let mockThreadMetadata = SentryProfileTestFixture.ThreadMetadata(id: 1, priority: 2, name: "main")

Tests/SentryProfilerTests/SentryProfileTestFixture.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ class SentryProfileTestFixture {
4343
lazy var framesTracker = TestFramesTracker(displayLinkWrapper: displayLinkWrapper, dateProvider: currentDateProvider, dispatchQueueWrapper: dispatchQueueWrapper, notificationCenter: notificationCenter, delayedFramesTracker: TestDelayedWrapper(keepDelayedFramesDuration: 0, dateProvider: currentDateProvider))
4444
#endif // !os(macOS)
4545

46-
@available(*, deprecated, message: "This is only marked as deprecated because profilesSampleRate is marked as deprecated. Once that is removed this can be removed.")
4746
init() {
4847
SentryDependencyContainer.sharedInstance().dispatchQueueWrapper = dispatchQueueWrapper
4948
SentryDependencyContainer.sharedInstance().dateProvider = currentDateProvider

Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackingIntegrationTest.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ class SentryCoreDataTrackingIntegrationTests: XCTestCase {
99
let options: Options
1010
let coreDataStack: TestCoreDataStack
1111

12-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
1312
init(testName: String) {
1413
coreDataStack = TestCoreDataStack(databaseFilename: "db-\(testName.hashValue).sqlite")
1514
options = Options()
@@ -27,7 +26,6 @@ class SentryCoreDataTrackingIntegrationTests: XCTestCase {
2726

2827
private var fixture: Fixture!
2928

30-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
3129
override func setUp() {
3230
super.setUp()
3331
fixture = Fixture(testName: self.name)

Tests/SentryTests/Integrations/Performance/IO/DataSentryTracingIntegrationTests.swift

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
2020

2121
init() {}
2222

23-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
2423
func getSut(testName: String, isSDKEnabled: Bool = true, isEnabled: Bool = true) throws -> Data {
2524
let fileManager = FileManager.default
2625
let tempDirUrl = URL(fileURLWithPath: NSTemporaryDirectory())
@@ -132,7 +131,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
132131

133132
// MARK: - Data.init(contentsOfWithSentryTracing:)
134133

135-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
136134
func testInitContentsOfWithSentryTracing_shouldTraceManually() throws {
137135
// -- Arrange --
138136
let expectedData = try fixture.getSut(testName: self.name)
@@ -162,7 +160,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
162160
XCTAssertGreaterThan(endTimestamp.timeIntervalSince1970, startTimestamp.timeIntervalSince1970)
163161
}
164162

165-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
166163
func testInitContentsOfWithSentryTracingWithOptions_shouldPassOptionsToSystemImplementation() throws {
167164
// -- Arrange --
168165
let expectedData = try fixture.getSut(testName: self.name)
@@ -190,7 +187,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
190187
XCTAssertEqual(mappedSentryData, expectedData)
191188
}
192189

193-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
194190
func testInitContentsOfWithSentryTracing_throwsError_shouldTraceManuallyWithErrorRethrow() throws {
195191
// -- Arrange --
196192
let _ = try fixture.getSut(testName: self.name)
@@ -217,7 +213,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
217213
XCTAssertGreaterThan(endTimestamp.timeIntervalSince1970, startTimestamp.timeIntervalSince1970)
218214
}
219215

220-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
221216
func testInitContentsOfWithSentryTracing_nonFileUrl_shouldNotTraceManually() throws {
222217
// -- Arrange --
223218
let _ = try fixture.getSut(testName: self.name)
@@ -231,7 +226,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
231226
XCTAssertEqual(parentTransaction.children.count, 0)
232227
}
233228

234-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
235229
func testInitContentsOfWithSentryTracing_trackerIsNotEnabled_shouldNotTraceManually() throws {
236230
// -- Arrange --
237231
let _ = try fixture.getSut(testName: self.name, isEnabled: false)
@@ -245,7 +239,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
245239
XCTAssertEqual(parentTransaction.children.count, 0)
246240
}
247241

248-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
249242
func testInitContentsOfWithSentryTracing_fileIsIgnored_shouldNotTraceManually() throws {
250243
// -- Arrange --
251244
let _ = try fixture.getSut(testName: self.name)
@@ -259,7 +252,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
259252
XCTAssertEqual(parentTransaction.children.count, 0)
260253
}
261254

262-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
263255
func testInitContentsOfWithSentryTracing_SDKIsNotStarted_shouldReadData() throws {
264256
// -- Arrange --
265257
let _ = try fixture.getSut(testName: self.name, isSDKEnabled: false)
@@ -272,7 +264,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
272264
XCTAssertEqual(data, fixture.data)
273265
}
274266

275-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
276267
func testInitContentsOfWithSentryTracing_SDKIsClosed_shouldReadData() throws {
277268
// -- Arrange --
278269
let _ = try fixture.getSut(testName: self.name)
@@ -288,7 +279,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
288279

289280
// MARK: - Data.writeWithSentryTracing(to:)
290281

291-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
292282
func testWriteWithSentryTracing_shouldTraceManuallyWithErrorRethrow() throws {
293283
// -- Arrange --
294284
let sut: Data = try fixture.getSut(testName: self.name)
@@ -324,7 +314,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
324314
XCTAssertGreaterThan(endTimestamp.timeIntervalSince1970, startTimestamp.timeIntervalSince1970)
325315
}
326316

327-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
328317
func testWriteWithSentryTracingWithOptions_shouldPassOptionsToSystemImplementation() throws {
329318
// -- Arrange --
330319
let sut: Data = try fixture.getSut(testName: self.name)
@@ -356,7 +345,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
356345
XCTAssertEqual(writtenData, sut)
357346
}
358347

359-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
360348
func testWriteWithSentryTracing_throwsError_shouldTraceManuallyWithErrorRethrow() throws {
361349
// -- Arrange --
362350
let sut: Data = try fixture.getSut(testName: self.name)
@@ -383,7 +371,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
383371
XCTAssertGreaterThan(endTimestamp.timeIntervalSince1970, startTimestamp.timeIntervalSince1970)
384372
}
385373

386-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
387374
func testWriteWithSentryTracing_nonFileUrl_shouldNotTraceManually() throws {
388375
// -- Arrange --
389376
let sut: Data = try fixture.getSut(testName: self.name)
@@ -396,7 +383,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
396383
XCTAssertEqual(parentTransaction.children.count, 0)
397384
}
398385

399-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
400386
func testWriteWithSentryTracing_trackerIsNotEnabled_shouldNotTraceManually() throws {
401387
// -- Arrange --
402388
let sut: Data = try fixture.getSut(testName: self.name, isEnabled: false)
@@ -409,7 +395,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
409395
XCTAssertEqual(parentTransaction.children.count, 0)
410396
}
411397

412-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
413398
func testWriteWithSentryTracing_fileIsIgnored_shouldNotTraceManually() throws {
414399
// -- Arrange --
415400
let sut: Data = try fixture.getSut(testName: self.name)
@@ -429,7 +414,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
429414
XCTAssertEqual(parentTransaction.children.count, 0)
430415
}
431416

432-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
433417
func testWriteWithSentryTracing_SDKIsNotStarted_shouldWriteFile() throws {
434418
// -- Arrange --
435419
let sut: Data = try fixture.getSut(testName: self.name, isSDKEnabled: false)
@@ -448,7 +432,6 @@ class DataSentryTracingIntegrationTests: XCTestCase {
448432
XCTAssertEqual(writtenData, fixture.data)
449433
}
450434

451-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
452435
func testWriteWithSentryTracing_SDKIsClosed_shouldWriteFile() throws {
453436
// -- Arrange --
454437
let sut: Data = try fixture.getSut(testName: self.name)

Tests/SentryTests/Integrations/Performance/IO/FileManagerTracingIntegrationTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
@_spi(Private) import SentryTestUtils
44
import XCTest
55

6-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
76
class FileManagerSentryTracingIntegrationTests: XCTestCase {
87
private class Fixture {
98
let mockDateProvider: TestCurrentDateProvider = {

Tests/SentryTests/Integrations/Performance/IO/SentryFileIOTrackerSwiftHelpersTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ class SentryFileIOTrackerSwiftHelpersTests: XCTestCase {
2020
private let destPath = "/path/to/dest"
2121
private let testError = NSError(domain: "Test", code: 1, userInfo: nil)
2222

23-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
2423
override func setUp() {
2524
mockedDateProvider = TestCurrentDateProvider()
2625
SentryDependencyContainer.sharedInstance().dateProvider = mockedDateProvider

Tests/SentryTests/Integrations/Performance/IO/SentryFileIOTrackerTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ class SentryFileIOTrackerTests: XCTestCase {
4747

4848
private var fixture: Fixture!
4949

50-
@available(*, deprecated, message: "This is deprecated because SentryOptions integrations is deprecated")
5150
override func setUpWithError() throws {
5251
try super.setUpWithError()
5352
fixture = try Fixture()

0 commit comments

Comments
 (0)