ref: Remove v9 checks for debug image provider

.github/workflows/test-cross-platform.yml

@@ -55,7 +55,7 @@ jobs:
         with:
           repository: getsentry/sentry-react-native
           path: sentry-react-native
-          ref: itay/frames_tracker_swift
+          ref: debugImageProviderSwift
 
       - name: Enable Corepack
         working-directory: sentry-react-native

SentryTestUtils/SentryTestUtils-ObjC-BridgingHeader.h

@@ -29,7 +29,6 @@
 #import "SentryCrashCachedData.h"
 #import "SentryCrashInstallation+Private.h"
 #import "SentryCrashMonitor_MachException.h"
-#import "SentryDebugImageProvider+HybridSDKs.h"
 #import "SentryDefaultThreadInspector.h"
 #import "SentryDependencyContainer.h"
 #import "SentryFileManager+Test.h"

SentryTestUtils/TestDebugImageProvider.swift

@@ -1,19 +1,9 @@
 import _SentryPrivate
 import Foundation
-@testable import Sentry
+@_spi(Private) @testable import Sentry
 
-public class TestDebugImageProvider: SentryDebugImageProvider {
+@_spi(Private) public class TestDebugImageProvider: SentryDebugImageProvider {
     public var debugImages: [DebugMeta]?
-
-    @available(*, deprecated)
-    public override func getDebugImages() -> [DebugMeta] {
-        getDebugImagesCrashed(true)
-    }
-
-    @available(*, deprecated)
-    public override func getDebugImagesCrashed(_ isCrash: Bool) -> [DebugMeta] {
-        debugImages ?? super.getDebugImagesCrashed(isCrash)
-    }
 
     public var getDebugImagesFromCacheForFramesInvocations = Invocations<Void>()
     public override func getDebugImagesFromCacheForFrames(frames: [Frame]) -> [DebugMeta] {

Sources/Resources/Sentry.modulemap

@@ -10,7 +10,6 @@ framework module Sentry {
         header "PrivatesHeader.h"
         header "SentryAppStartMeasurement.h"
         header "SentryBreadcrumb+Private.h"
-        header "SentryDebugImageProvider+HybridSDKs.h"
         header "SentryDependencyContainer.h"
         header "SentryFormatter.h"
         header "SentryOptionsInternal.h"

Sources/Sentry/PrivateSentrySDKOnly.m

@@ -2,8 +2,6 @@
 #import "SentryAppStartMeasurement.h"
 #import "SentryBreadcrumb+Private.h"
 #import "SentryClient.h"
-#import "SentryDebugImageProvider+HybridSDKs.h"
-#import "SentryDebugImageProvider.h"
 #import "SentryHub+Private.h"
 #import "SentryInstallation.h"
 #import "SentryInternalDefines.h"
@@ -50,23 +48,6 @@ + (nullable SentryEnvelope *)envelopeWithData:(NSData *)data
     return [SentrySerializationSwift envelopeWithData:data];
 }
 
-#if !SDK_V9
-+ (NSArray<SentryDebugMeta *> *)getDebugImages
-{
-    // maintains previous behavior for the same method call by also trying to gather crash info
-    return [self getDebugImagesCrashed:YES];
-}
-
-+ (NSArray<SentryDebugMeta *> *)getDebugImagesCrashed:(BOOL)isCrash
-{
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [[SentryDependencyContainer sharedInstance].debugImageProvider
-        getDebugImagesCrashed:isCrash];
-#    pragma clang diagnostic pop
-}
-#endif // !SDK_V9
-
 + (nullable SentryAppStartMeasurement *)appStartMeasurement
 {
     return [SentrySDKInternal getAppStartMeasurement];

Sources/Sentry/Profiling/SentryProfilerSerialization.m

@@ -4,7 +4,6 @@
 
 #    import "SentryClient+Private.h"
 #    import "SentryDateUtils.h"
-#    import "SentryDebugImageProvider+HybridSDKs.h"
 #    import "SentryDependencyContainer.h"
 #    import "SentryDevice.h"
 #    import "SentryEnvelopeItemHeader.h"

Sources/Sentry/Public/Sentry.h

@@ -12,7 +12,6 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
 #    import <Sentry/SentryBreadcrumb.h>
 #    import <Sentry/SentryClient.h>
 #    import <Sentry/SentryCrashExceptionApplication.h>
-#    import <Sentry/SentryDebugImageProvider.h>
 #    import <Sentry/SentryDebugMeta.h>
 #    import <Sentry/SentryDefines.h>
 #    import <Sentry/SentryDsn.h>

Sources/Sentry/Public/SentryWithoutUIKit.h

@@ -13,7 +13,6 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
 #    import <SentryWithoutUIKit/SentryBreadcrumb.h>
 #    import <SentryWithoutUIKit/SentryClient.h>
 #    import <SentryWithoutUIKit/SentryCrashExceptionApplication.h>
-#    import <SentryWithoutUIKit/SentryDebugImageProvider.h>
 #    import <SentryWithoutUIKit/SentryDebugMeta.h>
 #    import <SentryWithoutUIKit/SentryDefines.h>
 #    import <SentryWithoutUIKit/SentryDsn.h>

Sources/Sentry/SentryANRTrackingIntegration.m

@@ -1,6 +1,5 @@
 #import "SentryANRTrackingIntegration.h"
 #import "SentryCrashMachineContext.h"
-#import "SentryDebugImageProvider+HybridSDKs.h"
 #import "SentryDependencyContainer.h"
 #import "SentryEvent.h"
 #import "SentryException.h"

Sources/Sentry/SentryClient.m

@@ -5,7 +5,6 @@
 #import "SentryCrashDefaultMachineContextWrapper.h"
 #import "SentryCrashIntegration.h"
 #import "SentryCrashStackEntryMapper.h"
-#import "SentryDebugImageProvider+HybridSDKs.h"
 #import "SentryDefaultThreadInspector.h"
 #import "SentryDependencyContainer.h"
 #import "SentryDeviceContextKeys.h"

Sources/Sentry/SentryDebugImageProvider.m → Sources/Sentry/SentryDebugImageProviderInternal.m

@@ -1,8 +1,4 @@
-#import "SentryDebugImageProvider.h"
-#import "SentryDebugImageProvider+HybridSDKs.h"
-#if !SDK_V9
-#    import "SentryCrashDefaultBinaryImageProvider.h"
-#endif // !SDK_V9
+#import "SentryDebugImageProviderInternal.h"
 #import "SentryCrashDynamicLinker.h"
 #import "SentryCrashUUIDConversion.h"
 #import "SentryDebugMeta.h"
@@ -18,46 +14,31 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface SentryDebugImageProvider ()
+@interface SentryDebugImageProviderInternal ()
 
-#if !SDK_V9
-@property (nonatomic, strong) id<SentryCrashBinaryImageProvider> binaryImageProvider;
-#endif // !SDK_V9
 @property (nonatomic, strong) SentryBinaryImageCache *binaryImageCache;
 
 @end
 
-@implementation SentryDebugImageProvider
+@implementation SentryDebugImageProviderInternal
 
 - (instancetype)init
 {
-#if SDK_V9
     self =
         [self initWithBinaryImageCache:SentryDependencyContainer.sharedInstance.binaryImageCache];
-#else
-    SentryCrashDefaultBinaryImageProvider *provider =
-        [[SentryCrashDefaultBinaryImageProvider alloc] init];
-    self = [self
-        initWithBinaryImageProvider:provider
-                   binaryImageCache:SentryDependencyContainer.sharedInstance.binaryImageCache];
-#endif // SDK_V9
 
     return self;
 }
 
 /** Internal constructor for testing */
-#if SDK_V9
-- (instancetype)initWithBinaryImageCache:(SentryBinaryImageCache *)binaryImageCache
-#else
-- (instancetype)initWithBinaryImageProvider:(id<SentryCrashBinaryImageProvider>)binaryImageProvider
-                           binaryImageCache:(SentryBinaryImageCache *)binaryImageCache
-#endif // SDK_V9
+- (instancetype)initWithBinaryImageCache:(SentryBinaryImageCache *_Nullable)binaryImageCache
 {
     if (self = [super init]) {
-#if !SDK_V9
-        self.binaryImageProvider = binaryImageProvider;
-#endif // !SDK_V9
-        self.binaryImageCache = binaryImageCache;
+        if (binaryImageCache) {
+            self.binaryImageCache = (SentryBinaryImageCache *)binaryImageCache;
+        } else {
+            self.binaryImageCache = SentryDependencyContainer.sharedInstance.binaryImageCache;
+        }
     }
     return self;
 }
@@ -72,86 +53,6 @@ - (void)extractDebugImageAddressFromFrames:(NSArray<SentryFrame *> *)frames
     }
 }
 
-#if !SDK_V9
-
-- (NSArray<SentryDebugMeta *> *)getDebugImagesForAddresses:(NSSet<NSString *> *)addresses
-                                                   isCrash:(BOOL)isCrash
-{
-    NSMutableArray<SentryDebugMeta *> *result = [NSMutableArray array];
-
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    NSArray<SentryDebugMeta *> *binaryImages = [self getDebugImagesCrashed:isCrash];
-#    pragma clang diagnostic pop
-
-    for (SentryDebugMeta *sourceImage in binaryImages) {
-        if (sourceImage.imageAddress &&
-            [addresses containsObject:SENTRY_UNWRAP_NULLABLE(NSString, sourceImage.imageAddress)]) {
-            [result addObject:sourceImage];
-        }
-    }
-
-    return result;
-}
-
-- (NSArray<SentryDebugMeta *> *)getDebugImagesForFrames:(NSArray<SentryFrame *> *)frames
-{
-    // maintains previous behavior for the same method call by also trying to gather crash info
-    return [self getDebugImagesForFrames:frames isCrash:YES];
-}
-
-- (NSArray<SentryDebugMeta *> *)getDebugImagesForFrames:(NSArray<SentryFrame *> *)frames
-                                                isCrash:(BOOL)isCrash
-{
-    NSMutableSet<NSString *> *imageAddresses = [[NSMutableSet alloc] init];
-    [self extractDebugImageAddressFromFrames:frames intoSet:imageAddresses];
-    return [self getDebugImagesForAddresses:imageAddresses isCrash:isCrash];
-}
-
-- (NSArray<SentryDebugMeta *> *)getDebugImagesForThreads:(NSArray<SentryThread *> *)threads
-{
-    // maintains previous behavior for the same method call by also trying to gather crash info
-    return [self getDebugImagesForThreads:threads isCrash:YES];
-}
-
-- (NSArray<SentryDebugMeta *> *)getDebugImagesForThreads:(NSArray<SentryThread *> *)threads
-                                                 isCrash:(BOOL)isCrash
-{
-    NSMutableSet<NSString *> *imageAddresses = [[NSMutableSet alloc] init];
-
-    for (SentryThread *thread in threads) {
-        NSArray<SentryFrame *> *_Nullable frames = thread.stacktrace.frames;
-        if (frames != nil) {
-            [self extractDebugImageAddressFromFrames:SENTRY_UNWRAP_NULLABLE(NSArray, frames)
-                                             intoSet:imageAddresses];
-        }
-    }
-
-    return [self getDebugImagesForAddresses:imageAddresses isCrash:isCrash];
-}
-
-- (NSArray<SentryDebugMeta *> *)getDebugImages
-{
-    // maintains previous behavior for the same method call by also trying to gather crash info
-    return [self getDebugImagesCrashed:YES];
-}
-
-- (NSArray<SentryDebugMeta *> *)getDebugImagesCrashed:(BOOL)isCrash
-{
-    NSMutableArray<SentryDebugMeta *> *debugMetaArray = [NSMutableArray new];
-
-    NSInteger imageCount = [self.binaryImageProvider getImageCount];
-    for (NSInteger i = 0; i < imageCount; i++) {
-        SentryCrashBinaryImage image = [self.binaryImageProvider getBinaryImage:i isCrash:isCrash];
-        SentryDebugMeta *debugMeta = [self fillDebugMetaFrom:image];
-        [debugMetaArray addObject:debugMeta];
-    }
-
-    return debugMetaArray;
-}
-
-#endif // !SDK_V9
-
 - (NSArray<SentryDebugMeta *> *)getDebugImagesForImageAddressesFromCache:
     (NSSet<NSString *> *)imageAddresses
 {

Sources/Sentry/SentryDependencyContainer.m

@@ -9,7 +9,6 @@
 #import "SentrySDK+Private.h"
 #import "SentrySwift.h"
 #import "SentrySystemWrapper.h"
-#import <SentryDebugImageProvider+HybridSDKs.h>
 #import <SentryDefaultUIViewControllerPerformanceTracker.h>
 #import <SentryDependencyContainer.h>
 #import <SentryPerformanceTracker.h>

Sources/Sentry/SentryTracer.m

@@ -1,6 +1,5 @@
 #import "PrivateSentrySDKOnly.h"
 #import "SentryClient.h"
-#import "SentryDebugImageProvider+HybridSDKs.h"
 #import "SentryDependencyContainer.h"
 #import "SentryEvent+Private.h"
 #import "SentryHub+Private.h"
@@ -171,7 +170,7 @@
 #endif // SENTRY_HAS_UIKIT
 
 #if SENTRY_TARGET_PROFILING_SUPPORTED
     _profilerReferenceID = sentry_startProfilerForTrace(configuration, hub, transactionContext);
     _isProfiling = _profilerReferenceID != nil;
 #endif // SENTRY_TARGET_PROFILING_SUPPORTED
 
@@ -581,7 +580,7 @@
 
 #if SENTRY_TARGET_PROFILING_SUPPORTED
     sentry_stopProfilerDueToFinishedTransaction(
         _hub, _dispatchQueue, transaction, _isProfiling, self.startTimestamp, _startSystemTime
 #    if SENTRY_HAS_UIKIT
         ,
         appStartMeasurement
@@ -640,7 +639,7 @@
     // Prewarming can execute code up to viewDidLoad of a UIViewController, and keep the app in the
     // background. This can lead to auto-generated transactions lasting for minutes or even hours.
     // Therefore, we drop transactions lasting longer than SENTRY_AUTO_TRANSACTION_MAX_DURATION.
     NSTimeInterval transactionDuration = [self.timestamp timeIntervalSinceDate:self.startTimestamp];
     if ([self isAutoGeneratedTransaction]
         && transactionDuration >= SENTRY_AUTO_TRANSACTION_MAX_DURATION) {
         SENTRY_LOG_INFO(@"Auto generated transaction exceeded the max duration of %f seconds. Not "
@@ -699,7 +698,7 @@
 
     @synchronized(_children) {
         for (id<SentrySpan> childSpan in _children) {
             if ([oldest compare:childSpan.timestamp] == NSOrderedAscending) {
                 oldest = childSpan.timestamp;
             }
         }
@@ -820,7 +819,7 @@
     NSDate *appStartEndTimestamp =
         [appStartTimestamp dateByAddingTimeInterval:measurement.duration];
 
     NSTimeInterval difference = [appStartEndTimestamp timeIntervalSinceDate:self.startTimestamp];
 
     // Don't attach app start measurements if too much time elapsed between the end of the app start
     // sequence and the start of the transaction. This makes transactions too long.
@@ -855,7 +854,7 @@
                 ? [NSString stringWithFormat:@"%@.prewarmed", appContextType]
                 : appContextType;
             NSMutableDictionary *context =
                 [[NSMutableDictionary alloc] initWithDictionary:[transaction context]];
             NSDictionary *appContext = @{ @"app" : @ { @"start_type" : appStartType } };
             [SentryDictionary mergeEntriesFromDictionary:appContext intoDictionary:context];
             [transaction setContext:context];