chore: Remove more deprecated APIs in V9 (#6346)

Author: noahsmartin

CHANGELOG-v9.md

@@ -2,9 +2,6 @@
 
 ### Breaking Changes
 
-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)

CHANGELOG.md

@@ -7,6 +7,9 @@
 - Moves `SentryEventDecoder` to SPI (#6365)
 - Makes `PreviewRedactOptions`, `SentryProfileOptions`, `SentryRedactViewHelper`, `SentryViewScreenshotOptions`, `SentryReplayOptions`, `SentryUserFeedbackConfiguration`, `SentryUserFeedbackFormConfiguration`, `SentryUserFeedbackThemeConfiguration`, `SentryUserFeedbackWidgetConfiguration`, `SentryFeedback`, and `SentryExperimentalOptions` `final` (#6365)
 - Removes Decodable conformances from the public API of model classes (#5691)
+- Removes unused SentryLogLevel (#5591)
+- Removes deprecated getStoreEndpoint (#5591)
+- Removes deprecated useSpan function (#5591)
 - Removes deprecated user feedback API, this is replaced with the new feedback API (#5591)
 - Removes `enablePerformanceV2` option and makes this the default. The app start duration will now finish when the first frame is drawn instead of when the OS posts the UIWindowDidBecomeVisibleNotification. (#6008)
 

Sources/Sentry/Public/SentryDefines.h

@@ -146,25 +146,6 @@ typedef BOOL (^SentryShouldQueueEvent)(
 typedef NSNumber *_Nullable (^SentryTracesSamplerCallback)(
     SentrySamplingContext *_Nonnull samplingContext);
 
-#if !SDK_V9
-/**
- * Function pointer for span manipulation.
- * @param span The span to be used.
- */
-typedef void (^SentrySpanCallback)(id<SentrySpan> _Nullable span DEPRECATED_MSG_ATTRIBUTE(
-    "See `SentryScope.useSpan` for reasoning of deprecation."));
-
-/**
- * Log level.
- */
-typedef NS_ENUM(NSInteger, SentryLogLevel) {
-    kSentryLogLevelNone = 1,
-    kSentryLogLevelError,
-    kSentryLogLevelDebug,
-    kSentryLogLevelVerbose
-};
-#endif // !SDK_V9
-
 /**
  * Sentry level.
  */

Sources/Sentry/Public/SentryDsn.h

@@ -11,9 +11,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSString *)getHash;
 
-#if !SDK_V9
-- (NSURL *)getStoreEndpoint DEPRECATED_MSG_ATTRIBUTE("This endpoint is no longer used");
-#endif // !SDK_V9
 - (NSURL *)getEnvelopeEndpoint;
 
 @end

Sources/Sentry/Public/SentryScope.h

@@ -165,18 +165,6 @@ NS_SWIFT_NAME(Scope)
  */
 - (void)clear;
 
-#if !SDK_V9
-/**
- * Mutates the current transaction atomically.
- * @param callback the SentrySpanCallback.
- */
-- (void)useSpan:(SentrySpanCallback)callback
-    DEPRECATED_MSG_ATTRIBUTE(
-        "This method was used to create an atomic block that could be used to mutate the current "
-        "span. It is not atomic anymore and due to issues with memory safety in `NSBlock` it is "
-        "now considered unsafe and deprecated. Use `span` instead.");
-#endif // !SDK_V9
-
 @end
 
 NS_ASSUME_NONNULL_END

Sources/Sentry/SentryDsn.m

@@ -11,7 +11,6 @@ @interface SentryDsn ()
 @end
 
 @implementation SentryDsn {
-    NSURL *_storeEndpoint;
     NSURL *_envelopeEndpoint;
 }
 
@@ -41,20 +40,6 @@ - (NSString *)getHash
     return output;
 }
 
-#if !SDK_V9
-- (NSURL *)getStoreEndpoint
-{
-    if (nil == _storeEndpoint) {
-        @synchronized(self) {
-            if (nil == _storeEndpoint) {
-                _storeEndpoint = [[self getBaseEndpoint] URLByAppendingPathComponent:@"store/"];
-            }
-        }
-    }
-    return _storeEndpoint;
-}
-#endif // !SDK_V9
-
 - (NSURL *)getEnvelopeEndpoint
 {
     if (nil == _envelopeEndpoint) {

Sources/Sentry/SentryScope.m

@@ -153,14 +153,6 @@ - (void)setPropagationContext:(SentryPropagationContext *)propagationContext
     }
 }
 
-#if !SDK_V9
-- (void)useSpan:(SentrySpanCallback)callback
-{
-    id<SentrySpan> localSpan = [self span];
-    callback(localSpan);
-}
-#endif // !SDK_V9
-
 - (void)clear
 {
     // As we need to synchronize the accesses of the arrays and dictionaries and we use the

Tests/SentryTests/Networking/SentryDsnTests.m

@@ -47,28 +47,6 @@ - (void)testUnsupportedProtocol
     XCTAssertNil(options);
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-- (void)testDsnUrl
-{
-    NSError *error = nil;
-    SentryDsn *dsn = [[SentryDsn alloc] initWithString:@"https://username:password@getsentry.net/1"
-                                      didFailWithError:&error];
-
-    XCTAssertEqualObjects(
-        [[dsn getStoreEndpoint] absoluteString], @"https://getsentry.net/api/1/store/");
-    XCTAssertNil(error);
-
-    SentryDsn *dsn2 =
-        [[SentryDsn alloc] initWithString:@"https://username:password@sentry.io/foo/bar/baz/1"
-                         didFailWithError:&error];
-
-    XCTAssertEqualObjects(
-        [[dsn2 getStoreEndpoint] absoluteString], @"https://sentry.io/foo/bar/baz/api/1/store/");
-    XCTAssertNil(error);
-}
-#pragma clang diagnostic pop
-
 - (void)testGetEnvelopeUrl
 {
     NSError *error = nil;
@@ -88,19 +66,6 @@ - (void)testGetEnvelopeUrl
     XCTAssertNil(error);
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-- (void)testGetStoreDsnCachesResult
-{
-    SentryDsn *dsn = [[SentryDsn alloc] initWithString:@"https://username:password@getsentry.net/1"
-                                      didFailWithError:nil];
-
-    XCTAssertNotNil([dsn getStoreEndpoint]);
-    // Assert same reference
-    XCTAssertTrue([dsn getStoreEndpoint] == [dsn getStoreEndpoint]);
-}
-#pragma clang diagnostic pop
-
 - (void)testInitWithInvalidString
 {
     SentryDsn *dsn = [[SentryDsn alloc] initWithString:@"This is invalid DSN" didFailWithError:nil];

Tests/SentryTests/SentryScopeSwiftTests.swift

@@ -271,74 +271,14 @@ class SentryScopeSwiftTests: XCTestCase {
         XCTAssertNil(actual?.tags)
         XCTAssertNil(actual?.extra)
     }
-
-    @available(*, deprecated, message: "The test is marked as deprecated to silence the deprecation warning of useSpan")
-    func testUseSpan() {
-        fixture.scope.span = fixture.transaction
-        fixture.scope.useSpan { (span) in
-            XCTAssert(span === self.fixture.transaction)
-        }
-    }
-    
-    @available(*, deprecated, message: "The test is marked as deprecated to silence the deprecation warning of useSpan")
-    func testUseSpanLock_DoesNotBlock_WithBlockingCallback() {
-        let scope = fixture.scope
-        scope.span = fixture.transaction
-        let queue = DispatchQueue(label: "test-queue", attributes: [.initiallyInactive, .concurrent])
-        let expect = expectation(description: "useSpan callback is non-blocking")
-        
-        let condition = NSCondition()
-        var useSpanCalled = false
-        
-        queue.async {
-            scope.useSpan { _ in
-                condition.lock()
-                while !useSpanCalled {
-                    condition.wait()
-                }
-                condition.unlock()
-            }
-        }
-        
-        queue.async {
-            scope.useSpan { _ in
-                useSpanCalled = true
-                condition.broadcast()
-                expect.fulfill()
-            }
-        }
-        
-        queue.activate()
-        
-        wait(for: [expect], timeout: 0.1)
-    }
 
-    @available(*, deprecated, message: "The test is marked as deprecated to silence the deprecation warning of useSpan")
-    func testUseSpanLock_IsReentrant() {
-        let expect = expectation(description: "finish on time")
-        let scope = fixture.scope
-        scope.span = fixture.transaction
-        scope.useSpan { _ in
-            scope.useSpan { _ in
-                expect.fulfill()
-            }
-
-        }
-        wait(for: [expect], timeout: 0.1)
-    }
-    
-    @available(*, deprecated, message: "The test is marked as deprecated to silence the deprecation warning of useSpan")
     func testSpan_FromMultipleThreads() {
         let scope = fixture.scope
 
         testConcurrentModifications(asyncWorkItems: 20, writeLoopCount: 10, writeWork: { _ in
 
             scope.span = SentryTracer(transactionContext: TransactionContext(name: self.fixture.transactionName, operation: self.fixture.transactionOperation), hub: nil)
 
-            scope.useSpan { span in
-                XCTAssertNotNil(span)
-            }
-            
         }, readWork: {
             XCTAssertNotNil(scope.span)
         })
@@ -362,15 +302,6 @@ class SentryScopeSwiftTests: XCTestCase {
         XCTAssertNil(serialized["breadcrumbs"])
     }
 
-    @available(*, deprecated, message: "The test is marked as deprecated to silence the deprecation warning of useSpan")
-    func testUseSpanForClear() {
-        fixture.scope.span = fixture.transaction
-        fixture.scope.useSpan { (_) in
-            self.fixture.scope.span = nil
-        }
-        XCTAssertNil(fixture.scope.span)
-    }
-    
     func testApplyToEvent_EventWithContext() {
         let context = NSMutableDictionary(dictionary: ["my": ["extra": "context"],
                                                        "trace": fixture.scope.propagationContext.traceForEvent() ])