ref: Convert SentryObjCRuntimeWrapper and SentryDefaultObjCRuntimeWrapper to Swift (#6023)

itaybre · web-flow · commit 75b23cd84892 · 2025-09-02T16:37:51.000-03:00
* ref: Convert `SentryObjCRuntimeWrapper` and `SentryDefaultObjCRuntimeWrapper` to Swift

* ref: Enhance `LoadValidator` to include `objcRuntimeWrapper` parameter for SDK duplication checks
diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj
@@ -593,9 +593,6 @@
 		7BF9EF762722B34700B5BBEF /* SentrySubClassFinder.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BF9EF752722B34700B5BBEF /* SentrySubClassFinder.h */; };
 		7BF9EF782722B35D00B5BBEF /* SentrySubClassFinder.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BF9EF772722B35D00B5BBEF /* SentrySubClassFinder.m */; };
 		7BF9EF7A2722B58900B5BBEF /* SentrySubClassFinderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BF9EF792722B58900B5BBEF /* SentrySubClassFinderTests.swift */; };
-		7BF9EF7C2722B90E00B5BBEF /* SentryDefaultObjCRuntimeWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BF9EF7B2722B90E00B5BBEF /* SentryDefaultObjCRuntimeWrapper.h */; };
-		7BF9EF7E2722B91F00B5BBEF /* SentryDefaultObjCRuntimeWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BF9EF7D2722B91F00B5BBEF /* SentryDefaultObjCRuntimeWrapper.m */; };
-		7BF9EF842722D07B00B5BBEF /* SentryObjCRuntimeWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BF9EF832722D07B00B5BBEF /* SentryObjCRuntimeWrapper.h */; };
 		7BF9EF862722D10600B5BBEF /* SentryTestObjCRuntimeWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BF9EF852722D10600B5BBEF /* SentryTestObjCRuntimeWrapper.h */; };
 		7BF9EF882722D13000B5BBEF /* SentryTestObjCRuntimeWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BF9EF872722D13000B5BBEF /* SentryTestObjCRuntimeWrapper.m */; };
 		7BF9EF8B2722D58700B5BBEF /* SentryInitializeForGettingSubclassesNotCalled.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BF9EF8A2722D58700B5BBEF /* SentryInitializeForGettingSubclassesNotCalled.m */; };
@@ -1048,6 +1045,8 @@
 		F4DCC9DD2E4AA9D0008ECE45 /* SentrySDKSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4DCC9DC2E4AA9D0008ECE45 /* SentrySDKSettingsTests.swift */; };
 		F4DCC9E52E4AACE0008ECE45 /* SentrySDKSettings+Equality.m in Sources */ = {isa = PBXBuildFile; fileRef = F4DCC9E42E4AACE0008ECE45 /* SentrySDKSettings+Equality.m */; };
 		F4E3DCCB2E1579240093CB80 /* SentryScopePersistentStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4E3DCCA2E1579240093CB80 /* SentryScopePersistentStore.swift */; };
+		F4FE9DFD2E622CD70014FED5 /* SentryDefaultObjCRuntimeWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FE9DFB2E622CD70014FED5 /* SentryDefaultObjCRuntimeWrapper.swift */; };
+		F4FE9DFE2E622CD70014FED5 /* SentryObjCRuntimeWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FE9DFC2E622CD70014FED5 /* SentryObjCRuntimeWrapper.swift */; };
 		F4FE9DBD2E621F100014FED5 /* SentryRandom.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FE9DBC2E621F100014FED5 /* SentryRandom.swift */; };
 		FA034AC82DD3DB4900FE3107 /* SentryIntegrationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = FA034AC72DD3DB4900FE3107 /* SentryIntegrationProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FA21F0B42E4A2A80008B4E5A /* SentryAppState.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA4C32972DF7513F001D7B01 /* SentryAppState.swift */; };
@@ -1872,9 +1871,6 @@
 		7BF9EF752722B34700B5BBEF /* SentrySubClassFinder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentrySubClassFinder.h; path = include/SentrySubClassFinder.h; sourceTree = "<group>"; };
 		7BF9EF772722B35D00B5BBEF /* SentrySubClassFinder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySubClassFinder.m; sourceTree = "<group>"; };
 		7BF9EF792722B58900B5BBEF /* SentrySubClassFinderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySubClassFinderTests.swift; sourceTree = "<group>"; };
-		7BF9EF7B2722B90E00B5BBEF /* SentryDefaultObjCRuntimeWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryDefaultObjCRuntimeWrapper.h; path = include/SentryDefaultObjCRuntimeWrapper.h; sourceTree = "<group>"; };
-		7BF9EF7D2722B91F00B5BBEF /* SentryDefaultObjCRuntimeWrapper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryDefaultObjCRuntimeWrapper.m; sourceTree = "<group>"; };
-		7BF9EF832722D07B00B5BBEF /* SentryObjCRuntimeWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryObjCRuntimeWrapper.h; path = include/SentryObjCRuntimeWrapper.h; sourceTree = "<group>"; };
 		7BF9EF852722D10600B5BBEF /* SentryTestObjCRuntimeWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SentryTestObjCRuntimeWrapper.h; sourceTree = "<group>"; };
 		7BF9EF872722D13000B5BBEF /* SentryTestObjCRuntimeWrapper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryTestObjCRuntimeWrapper.m; sourceTree = "<group>"; };
 		7BF9EF892722D57100B5BBEF /* SentryInitializeForGettingSubclassesNotCalled.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SentryInitializeForGettingSubclassesNotCalled.h; sourceTree = "<group>"; };
@@ -2393,6 +2389,8 @@
 		F4DCC9E32E4AACE0008ECE45 /* SentrySDKSettings+Equality.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SentrySDKSettings+Equality.h"; sourceTree = "<group>"; };
 		F4DCC9E42E4AACE0008ECE45 /* SentrySDKSettings+Equality.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "SentrySDKSettings+Equality.m"; sourceTree = "<group>"; };
 		F4E3DCCA2E1579240093CB80 /* SentryScopePersistentStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryScopePersistentStore.swift; sourceTree = "<group>"; };
+		F4FE9DFB2E622CD70014FED5 /* SentryDefaultObjCRuntimeWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryDefaultObjCRuntimeWrapper.swift; sourceTree = "<group>"; };
+		F4FE9DFC2E622CD70014FED5 /* SentryObjCRuntimeWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryObjCRuntimeWrapper.swift; sourceTree = "<group>"; };
 		F4FE9DBC2E621F100014FED5 /* SentryRandom.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryRandom.swift; sourceTree = "<group>"; };
 		FA034AC72DD3DB4900FE3107 /* SentryIntegrationProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryIntegrationProtocol.h; path = Public/SentryIntegrationProtocol.h; sourceTree = "<group>"; };
 		FA3734812E0EEA670091EF24 /* SentryScreenshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryScreenshot.swift; sourceTree = "<group>"; };
@@ -2607,6 +2605,8 @@
 				FA8E58F02E0AD4220049F69D /* SentryDispatchQueueWrapper.swift */,
 				84B0E0062CD963F9007FB332 /* SentryIconography.swift */,
 				621F61F02BEA073A005E654F /* SentryEnabledFeaturesBuilder.swift */,
+				F4FE9DFB2E622CD70014FED5 /* SentryDefaultObjCRuntimeWrapper.swift */,
+				F4FE9DFC2E622CD70014FED5 /* SentryObjCRuntimeWrapper.swift */,
 			);
 			path = Helper;
 			sourceTree = "<group>";
@@ -2929,9 +2929,6 @@
 				7B8ECBFB26498958005FE2EF /* SentryAppStateManager.m */,
 				7BD86EC4264A63F6005439DB /* SentrySysctl.h */,
 				7BD86EC6264A641D005439DB /* SentrySysctl.m */,
-				7BF9EF832722D07B00B5BBEF /* SentryObjCRuntimeWrapper.h */,
-				7BF9EF7B2722B90E00B5BBEF /* SentryDefaultObjCRuntimeWrapper.h */,
-				7BF9EF7D2722B91F00B5BBEF /* SentryDefaultObjCRuntimeWrapper.m */,
 				D8479327278873A100BE8E99 /* SentryByteCountFormatter.h */,
 				D84793242788737D00BE8E99 /* SentryByteCountFormatter.m */,
 				7B2A70DA27D607CF008B0D15 /* SentryThreadWrapper.h */,
@@ -5021,7 +5018,6 @@
 				33EB2A922C341300004FED3D /* Sentry.h in Headers */,
 				7B3398632459C14000BD9C96 /* SentryEnvelopeRateLimit.h in Headers */,
 				6304360A1EC0595B00C4D3FA /* SentryNSDataUtils.h in Headers */,
-				7BF9EF7C2722B90E00B5BBEF /* SentryDefaultObjCRuntimeWrapper.h in Headers */,
 				FA6555142E30181B009917BC /* SentrySDKInternal.h in Headers */,
 				63FE718720DA4C1100CDBAE8 /* SentryCrashReportVersion.h in Headers */,
 				0A56DA5F28ABA01B00C400D5 /* SentryTransactionContext+Private.h in Headers */,
@@ -5079,7 +5075,6 @@
 				7BF9EF762722B34700B5BBEF /* SentrySubClassFinder.h in Headers */,
 				7BC852332458802C005A70F0 /* SentryDataCategoryMapper.h in Headers */,
 				7BDB03B7251364F800BAE198 /* _SentryDispatchQueueWrapperInternal.h in Headers */,
-				7BF9EF842722D07B00B5BBEF /* SentryObjCRuntimeWrapper.h in Headers */,
 				621AE74B2C626C230012E730 /* SentryANRTrackerV2.h in Headers */,
 				639889B71EDECFA800EA7442 /* SentryBreadcrumbTracker.h in Headers */,
 				632331F9240506DF008D91D6 /* SentryScope+Private.h in Headers */,
@@ -5829,13 +5824,14 @@
 				620467AC2D3FFD230025F06C /* SentryNSErrorCodable.swift in Sources */,
 				639FCFA51EBC809A00778193 /* SentryStacktrace.m in Sources */,
 				D84D2CC32C29AD120011AF8A /* SentrySessionReplay.swift in Sources */,
+				F4FE9DFD2E622CD70014FED5 /* SentryDefaultObjCRuntimeWrapper.swift in Sources */,
+				F4FE9DFE2E622CD70014FED5 /* SentryObjCRuntimeWrapper.swift in Sources */,
 				84A898542E163072009A551E /* SentryProfileConfiguration.m in Sources */,
 				849B8F9B2C6E906900148E1F /* SentryUserFeedbackIntegrationDriver.swift in Sources */,
 				FA3734862E0F09320091EF24 /* SentryDependencyContainerSwiftHelper.m in Sources */,
 				63FE70DF20DA4C1000CDBAE8 /* SentryCrashMonitorType.c in Sources */,
 				D468C0622D3669A200964230 /* SentryFileIOTracker+SwiftHelpers.swift in Sources */,
 				F49236EB2E5E4B2F00663673 /* SentryBinaryImageCache.swift in Sources */,
-				7BF9EF7E2722B91F00B5BBEF /* SentryDefaultObjCRuntimeWrapper.m in Sources */,
 				7BC3936E25B1AB72004F03D3 /* SentryLevelMapper.m in Sources */,
 				6304360B1EC0595B00C4D3FA /* SentryNSDataUtils.m in Sources */,
 				D81988C52BEC18CA0020E36C /* SentryRRWebCustomEvent.swift in Sources */,
diff --git a/Sources/Sentry/SentryDefaultObjCRuntimeWrapper.m b/Sources/Sentry/SentryDefaultObjCRuntimeWrapper.m
diff --git a/Sources/Sentry/SentryDependencyContainer.m b/Sources/Sentry/SentryDependencyContainer.m
@@ -1,7 +1,6 @@
 #import "SentryANRTrackerV1.h"
 
 #import "SentryApplication.h"
-#import "SentryDefaultObjCRuntimeWrapper.h"
 #import "SentryDispatchFactory.h"
 #import "SentryDisplayLinkWrapper.h"
 #import "SentryExtraContextProvider.h"
diff --git a/Sources/Sentry/SentrySubClassFinder.m b/Sources/Sentry/SentrySubClassFinder.m
@@ -1,6 +1,6 @@
 #import "SentrySubClassFinder.h"
+#import "SentryInternalDefines.h"
 #import "SentryLogC.h"
-#import "SentryObjCRuntimeWrapper.h"
 #import "SentrySwift.h"
 #import <objc/runtime.h>
 #import <string.h>
@@ -43,9 +43,14 @@ - (void)actOnSubclassesOfViewControllerInImage:(NSString *)imageName block:(void
             return;
         }
 
+        const char *_Nullable cImageName = [imageName cStringUsingEncoding:NSUTF8StringEncoding];
+        if (cImageName == nil) {
+            return;
+        }
+
         unsigned int count = 0;
         const char **classes = [self.objcRuntimeWrapper
-            copyClassNamesForImage:[imageName cStringUsingEncoding:NSUTF8StringEncoding]
+            copyClassNamesForImage:SENTRY_UNWRAP_NULLABLE(const char, cImageName)
                             amount:&count];
 
         SENTRY_LOG_DEBUG(@"Found %u number of classes in image: %@.", count, imageName);
diff --git a/Sources/Sentry/SentryUIViewControllerSwizzling.m b/Sources/Sentry/SentryUIViewControllerSwizzling.m
@@ -2,7 +2,6 @@
 
 #if SENTRY_HAS_UIKIT
 
-#    import "SentryDefaultObjCRuntimeWrapper.h"
 #    import "SentryDefines.h"
 #    import "SentryDependencyContainer.h"
 #    import "SentryLogC.h"
diff --git a/Sources/Sentry/include/SentryDefaultObjCRuntimeWrapper.h b/Sources/Sentry/include/SentryDefaultObjCRuntimeWrapper.h
diff --git a/Sources/Sentry/include/SentryObjCRuntimeWrapper.h b/Sources/Sentry/include/SentryObjCRuntimeWrapper.h
diff --git a/Sources/Sentry/include/SentryPrivate.h b/Sources/Sentry/include/SentryPrivate.h
@@ -8,7 +8,6 @@
 #import "SentryCrashUUIDConversion.h"
 #import "SentryEventSwiftHelper.h"
 #import "SentryNSDataUtils.h"
-#import "SentryObjCRuntimeWrapper.h"
 #import "SentryTime.h"
 #import "SentryUserAccess.h"
 #import "_SentryDispatchQueueWrapperInternal.h"
diff --git a/Sources/Sentry/include/SentrySubClassFinder.h b/Sources/Sentry/include/SentrySubClassFinder.h
@@ -1,8 +1,9 @@
 #import "SentryDefines.h"
-#import "SentryObjCRuntimeWrapper.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
+@protocol SentryObjCRuntimeWrapper;
+
 @class SentryDefaultObjCRuntimeWrapper;
 @class SentryDispatchQueueWrapper;
 
diff --git a/Sources/Sentry/include/SentryUIViewControllerSwizzling.h b/Sources/Sentry/include/SentryUIViewControllerSwizzling.h
@@ -2,11 +2,12 @@
 
 #if SENTRY_HAS_UIKIT
 
-#    import "SentryObjCRuntimeWrapper.h"
 #    import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
+@protocol SentryObjCRuntimeWrapper;
+
 @class SentryBinaryImageCache;
 @class SentryDispatchQueueWrapper;
 @class SentryNSProcessInfoWrapper;
diff --git a/Sources/Swift/Core/Helper/SentryBinaryImageCache.swift b/Sources/Swift/Core/Helper/SentryBinaryImageCache.swift
@@ -98,6 +98,7 @@ import Foundation
             LoadValidator.checkForDuplicatedSDK(imageName: nameString,
                                                 imageAddress: NSNumber(value: newImage.address),
                                                 imageSize: NSNumber(value: newImage.size),
+                                                objcRuntimeWrapper: Dependencies.objcRuntimeWrapper,
                                                 dispatchQueueWrapper: Dependencies.dispatchQueueWrapper)
         }
     }
diff --git a/Sources/Swift/Helper/Dependencies.swift b/Sources/Swift/Helper/Dependencies.swift
@@ -1,4 +1,5 @@
 @objc(SentryDependencies) @_spi(Private) public final class Dependencies: NSObject {
     @objc public static let dispatchQueueWrapper = SentryDispatchQueueWrapper()
     @objc public static let dateProvider = SentryDefaultCurrentDateProvider()
+    public static let objcRuntimeWrapper = SentryDefaultObjCRuntimeWrapper()
 }
diff --git a/Sources/Swift/Helper/SentryDefaultObjCRuntimeWrapper.swift b/Sources/Swift/Helper/SentryDefaultObjCRuntimeWrapper.swift
@@ -0,0 +1,15 @@
+import Foundation
+import ObjectiveC.runtime
+
+@objc @_spi(Private)
+public final class SentryDefaultObjCRuntimeWrapper: NSObject, SentryObjCRuntimeWrapper {
+    @_spi(Private)
+    public func copyClassNamesForImage(_ image: UnsafePointer<CChar>, _ outCount: UnsafeMutablePointer<UInt32>?) -> UnsafeMutablePointer<UnsafePointer<CChar>>? {
+        return objc_copyClassNamesForImage(image, outCount)
+    }
+    
+    @_spi(Private)
+    public func classGetImageName(_ cls: AnyClass) -> UnsafePointer<CChar>? {
+        return class_getImageName(cls)
+    }
+}
diff --git a/Sources/Swift/Helper/SentryObjCRuntimeWrapper.swift b/Sources/Swift/Helper/SentryObjCRuntimeWrapper.swift
@@ -0,0 +1,9 @@
+import Foundation
+
+@objc @_spi(Private)
+public protocol SentryObjCRuntimeWrapper {
+    @objc(copyClassNamesForImage:amount:)
+    func copyClassNamesForImage(_ image: UnsafePointer<CChar>, _ outCount: UnsafeMutablePointer<UInt32>?) -> UnsafeMutablePointer<UnsafePointer<CChar>>?
+    @objc(class_getImageName:)
+    func classGetImageName(_ cls: AnyClass) -> UnsafePointer<CChar>?
+}
diff --git a/Sources/Swift/Tools/LoadValidator.swift b/Sources/Swift/Tools/LoadValidator.swift
@@ -11,9 +11,13 @@ import MachO
     // This function is used to check for duplicated SDKs in the binary.
     // Since `SentryBinaryImageInfo` is not public and only available through the Hybrid SDK, we use the expanded parameters.
     @objc
-    @_spi(Private) public class func checkForDuplicatedSDK(imageName: String, imageAddress: NSNumber, imageSize: NSNumber, dispatchQueueWrapper: SentryDispatchQueueWrapper) {
+    @_spi(Private) public class func checkForDuplicatedSDK(imageName: String,
+                                                           imageAddress: NSNumber,
+                                                           imageSize: NSNumber,
+                                                           objcRuntimeWrapper: SentryObjCRuntimeWrapper,
+                                                           dispatchQueueWrapper: SentryDispatchQueueWrapper) {
         internalCheckForDuplicatedSDK(imageName, imageAddress.uint64Value, imageSize.uint64Value,
-                                      objcRuntimeWrapper: SentryDependencyContainerSwiftHelper.objcRuntimeWrapper(),
+                                      objcRuntimeWrapper: objcRuntimeWrapper,
                                       dispatchQueueWrapper: dispatchQueueWrapper)
     }
     
@@ -41,14 +45,12 @@ import MachO
 
             var classCount: UInt32 = 0
             imageName.withCString { cImageName in
-                if let classNames = objcRuntimeWrapper.copyClassNames(forImage: cImageName, amount: &classCount) {
+                if let classNames = objcRuntimeWrapper.copyClassNamesForImage(cImageName, &classCount) {
                     defer {
                         free(classNames)
                     }
                     for j in 0..<Int(classCount) {
-                        guard let className = classNames[j] else {
-                            continue
-                        }
+                        let className = classNames[j]
                         // Since we are iterating over all classes in the image, we need to be extra careful not to do unnecesarry work
                         // or calling `NSClassFromString` since that can lead to issues (see `SentrySubClassFinder` for more details).
                         let name = String(cString: UnsafeRawPointer(className).assumingMemoryBound(to: UInt8.self))
diff --git a/Tests/SentryTests/Helper/SentryTestObjCRuntimeWrapper.h b/Tests/SentryTests/Helper/SentryTestObjCRuntimeWrapper.h
@@ -1,5 +1,5 @@
 #import "SentryDefines.h"
-#import "SentryObjCRuntimeWrapper.h"
+@import Sentry;
 
 /**
  * Written in ObjC, because dealing with the pointers in Swift is super complicated.
diff --git a/Tests/SentryTests/Helper/SentryTestObjCRuntimeWrapper.m b/Tests/SentryTests/Helper/SentryTestObjCRuntimeWrapper.m
@@ -1,8 +1,11 @@
 #import "SentryTestObjCRuntimeWrapper.h"
 #import "SentryDependencyContainer.h"
-#import "SentryObjCRuntimeWrapper.h"
+#import "SentryInternalDefines.h"
+#import "SentrySwift.h"
 #import <objc/runtime.h>
 
+@protocol SentryObjCRuntimeWrapper;
+
 @interface SentryTestObjCRuntimeWrapper ()
 
 @property (nonatomic, strong) id<SentryObjCRuntimeWrapper> objcRuntimeWrapper;
@@ -25,7 +28,14 @@ - (const char **)copyClassNamesForImage:(const char *)image amount:(unsigned int
     if (self.beforeGetClassList != nil) {
         self.beforeGetClassList();
     }
-    const char **result = [self.objcRuntimeWrapper copyClassNamesForImage:image amount:outCount];
+
+    if (image == nil) {
+        return nil;
+    }
+
+    const char **result =
+        [self.objcRuntimeWrapper copyClassNamesForImage:SENTRY_UNWRAP_NULLABLE(const char, image)
+                                                 amount:outCount];
 
     if (self.classesNames != nil) {
         NSMutableArray *names = [NSMutableArray new];
diff --git a/Tests/SentryTests/SentryTests-Bridging-Header.h b/Tests/SentryTests/SentryTests-Bridging-Header.h
@@ -104,7 +104,6 @@
 #import "SentryDebugImageProvider+HybridSDKs.h"
 #import "SentryDebugImageProvider+TestInit.h"
 #import "SentryDebugMeta.h"
-#import "SentryDefaultObjCRuntimeWrapper.h"
 #import "SentryDefaultRateLimits.h"
 #import "SentryDependencyContainer.h"
 #import "SentryDiscardReason.h"
@@ -157,7 +156,6 @@
 #import "SentryNetworkTracker.h"
 #import "SentryNetworkTrackingIntegration.h"
 #import "SentryNoOpSpan.h"
-#import "SentryObjCRuntimeWrapper.h"
 #import "SentryOptions+Private.h"
 #import "SentryOptionsInternal.h"
 #import "SentryPerformanceTracker+Testing.h"
diff --git a/sdk_api.json b/sdk_api.json
@@ -42915,6 +42915,13 @@
         "declKind": "Import",
         "moduleName": "Sentry"
       },
+      {
+        "kind": "Import",
+        "name": "ObjectiveC.runtime",
+        "printedName": "ObjectiveC.runtime",
+        "declKind": "Import",
+        "moduleName": "Sentry"
+      },
       {
         "kind": "TypeDecl",
         "name": "SentryFeedback",
diff --git a/sdk_api_V9.json b/sdk_api_V9.json
@@ -40084,6 +40084,13 @@
         "declKind": "Import",
         "moduleName": "Sentry"
       },
+      {
+        "kind": "Import",
+        "name": "ObjectiveC.runtime",
+        "printedName": "ObjectiveC.runtime",
+        "declKind": "Import",
+        "moduleName": "Sentry"
+      },
       {
         "kind": "TypeDecl",
         "name": "SentryFeedback",
