Fix view swizzling

Author: noahsmartin

Sources/Swift/Core/Helper/SentryBinaryImageCache.swift

@@ -157,21 +157,6 @@ import Foundation
         return nil
     }
 
-    func imagePathsFor(inAppInclude: String) -> Set<String> {
-        lock.synchronized {
-            var imagePaths = Set<String>()
-            
-            guard let cache = self.cache else { return imagePaths }
-            
-            for info in cache {
-                if SentryInAppLogic.isImageNameInApp(info.name, inAppInclude: inAppInclude) {
-                    imagePaths.insert(info.name)
-                }
-            }
-            return imagePaths
-        }
-    }
-    
     func getAllBinaryImages() -> [SentryBinaryImageInfo] {
         lock.synchronized {
             return cache ?? []

Sources/Swift/Core/Integrations/Performance/SentryUIViewControllerSwizzling.swift

@@ -1,4 +1,5 @@
 @_implementationOnly import _SentryPrivate
+import MachO
 
 #if (os(iOS) || os(tvOS) || os(visionOS)) && !SENTRY_NO_UI_FRAMEWORK
 import UIKit
@@ -19,7 +20,6 @@ class SentryUIViewControllerSwizzling {
     private let subClassFinder: SentrySubClassFinder
     private let imagesActedOnSubclassesOfUIViewControllers: NSMutableSet
     private let processInfoWrapper: SentryProcessInfoSource
-    private let binaryImageCache: SentryBinaryImageCache
     private let performanceTracker: SentryUIViewControllerPerformanceTracker
 
     init(
@@ -28,7 +28,6 @@ class SentryUIViewControllerSwizzling {
         objcRuntimeWrapper: SentryObjCRuntimeWrapper,
         subClassFinder: SentrySubClassFinder,
         processInfoWrapper: SentryProcessInfoSource,
-        binaryImageCache: SentryBinaryImageCache,
         performanceTracker: SentryUIViewControllerPerformanceTracker
     ) {
         self.options = options
@@ -38,19 +37,23 @@ class SentryUIViewControllerSwizzling {
         self.subClassFinder = subClassFinder
         self.imagesActedOnSubclassesOfUIViewControllers = NSMutableSet()
         self.processInfoWrapper = processInfoWrapper
-        self.binaryImageCache = binaryImageCache
         self.performanceTracker = performanceTracker
     }
 
     func start() {
-        for inAppInclude in inAppLogic.inAppIncludes {
-            let imagePathsToInAppInclude = binaryImageCache.imagePathsFor(inAppInclude: inAppInclude)
+        let imageNames = (0..<_dyld_image_count()).compactMap { i in
+            _dyld_get_image_name(i).map { String(cString: $0) }
+        }
 
-            if !imagePathsToInAppInclude.isEmpty {
-                for imagePath in imagePathsToInAppInclude {
-                    swizzleUIViewControllers(ofImage: imagePath)
+        for inAppInclude in inAppLogic.inAppIncludes {
+            var found = false
+            for imageName in imageNames {
+                if SentryInAppLogic.isImageNameInApp(imageName, inAppInclude: inAppInclude) {
+                    found = true
+                    swizzleUIViewControllers(ofImage: imageName)
                 }
-            } else {
+            }
+            if !found {
                 SentrySDKLog.warning(
                     "Failed to find the binary image(s) for inAppInclude <\(inAppInclude)> and, therefore can't instrument UIViewControllers in these binaries."
                 )

Sources/Swift/SentryDependencyContainer.swift

@@ -234,7 +234,6 @@ extension SentryFileManager: SentryFileManagerProtocol { }
             objcRuntimeWrapper: objcRuntimeWrapper,
             subClassFinder: subClassFinder,
             processInfoWrapper: processInfoWrapper,
-            binaryImageCache: binaryImageCache,
             performanceTracker: uiViewControllerPerformanceTracker
         )
 

Tests/SentryTests/Integrations/Performance/UIViewController/SentryUIViewControllerSwizzlingTests.swift

@@ -12,13 +12,11 @@ class SentryUIViewControllerSwizzlingTests: XCTestCase {
         let objcRuntimeWrapper = SentryTestObjCRuntimeWrapper()
         let subClassFinder: TestSubClassFinder
         let processInfoWrapper = MockSentryProcessInfo()
-        let binaryImageCache: SentryBinaryImageCache
         let performanceTracker = SentryUIViewControllerPerformanceTracker()
         var options: Options
 
         init() {
             subClassFinder = TestSubClassFinder(dispatchQueue: dispatchQueue, objcRuntimeWrapper: objcRuntimeWrapper, swizzleClassNameExcludes: [])
-            binaryImageCache = SentryDependencyContainer.sharedInstance().binaryImageCache
 
             options = Options.noIntegrations()
 
@@ -29,15 +27,15 @@ class SentryUIViewControllerSwizzlingTests: XCTestCase {
         }
 
         var sut: SentryUIViewControllerSwizzling {
-            return SentryUIViewControllerSwizzling(options: options, dispatchQueue: dispatchQueue, objcRuntimeWrapper: objcRuntimeWrapper, subClassFinder: subClassFinder, processInfoWrapper: processInfoWrapper, binaryImageCache: binaryImageCache, performanceTracker: performanceTracker)
+            return SentryUIViewControllerSwizzling(options: options, dispatchQueue: dispatchQueue, objcRuntimeWrapper: objcRuntimeWrapper, subClassFinder: subClassFinder, processInfoWrapper: processInfoWrapper, performanceTracker: performanceTracker)
         }
 
         var sutWithDefaultObjCRuntimeWrapper: SentryUIViewControllerSwizzling {
-            return SentryUIViewControllerSwizzling(options: options, dispatchQueue: dispatchQueue, objcRuntimeWrapper: SentryDependencyContainer.sharedInstance().objcRuntimeWrapper, subClassFinder: subClassFinder, processInfoWrapper: processInfoWrapper, binaryImageCache: binaryImageCache, performanceTracker: performanceTracker)
+            return SentryUIViewControllerSwizzling(options: options, dispatchQueue: dispatchQueue, objcRuntimeWrapper: SentryDependencyContainer.sharedInstance().objcRuntimeWrapper, subClassFinder: subClassFinder, processInfoWrapper: processInfoWrapper, performanceTracker: performanceTracker)
         }
 
         var testableSut: TestSentryUIViewControllerSwizzling {
-            return TestSentryUIViewControllerSwizzling(options: options, dispatchQueue: dispatchQueue, objcRuntimeWrapper: objcRuntimeWrapper, subClassFinder: subClassFinder, processInfoWrapper: processInfoWrapper, binaryImageCache: binaryImageCache, performanceTracker: performanceTracker)
+            return TestSentryUIViewControllerSwizzling(options: options, dispatchQueue: dispatchQueue, objcRuntimeWrapper: objcRuntimeWrapper, subClassFinder: subClassFinder, processInfoWrapper: processInfoWrapper, performanceTracker: performanceTracker)
         }
 
         var delegate: MockApplication.MockApplicationDelegate {
@@ -187,30 +185,6 @@ class SentryUIViewControllerSwizzlingTests: XCTestCase {
         XCTAssertNotNil(SentrySDK.span)
     }
 
-    /// Xcode 16 introduces a new flag ENABLE_DEBUG_DYLIB (https://developer.apple.com/documentation/xcode/build-settings-reference#Enable-Debug-Dylib-Support)
-    /// If this flag is enabled, debug builds of app and app extension targets on supported platforms and SDKs
-    /// will be built with the main binary code in a separate “NAME.debug.dylib”.
-    /// This test adds this debug.dylib and checks if it gets swizzled.
-    func testSwizzle_DebugDylib_GetsSwizzled() {
-        let imageName = String(
-            cString: class_getImageName(SentryUIViewControllerSwizzlingTests.self)!,
-            encoding: .utf8)! as NSString
-        
-        let debugDylib = "\(imageName).debug.dylib"
-        
-        let image = createCrashBinaryImage(0, name: debugDylib)
-        SentryDependencyContainer.sharedInstance().binaryImageCache.start(false)
-        SentryDependencyContainer.sharedInstance().binaryImageCache.binaryImageAdded(image: image)
-        
-        let sut = fixture.sut
-        sut.start()
-        
-        let subClassFinderInvocations = fixture.subClassFinder.invocations
-        let result = subClassFinderInvocations.invocations.filter { $0.imageName == debugDylib }
-            
-        XCTAssertEqual(1, result.count)
-    }
-    
     func testSwizzle_fromScene_invalidNotification_NoObject() {
         let swizzler = fixture.testableSut
 

Tests/SentryTests/SentryBinaryImageCacheTests.swift

@@ -121,25 +121,6 @@ class SentryBinaryImageCacheTests: XCTestCase {
         XCTAssertNil(sut.imageByAddress(399))
     }
 
-    func testImagePathByName() {
-        let binaryImage = createCrashBinaryImage(0)
-        let binaryImage2 = createCrashBinaryImage(1)
-        addBinaryImageToSut(binaryImage)
-        addBinaryImageToSut(binaryImage2)
-        
-        let paths = sut.imagePathsFor(inAppInclude: "Expected Name at 0")
-        XCTAssertEqual(paths.first, "Expected Name at 0")
-        
-        let paths2 = sut.imagePathsFor(inAppInclude: "Expected Name at 1")
-        XCTAssertEqual(paths2.first, "Expected Name at 1")
-        
-        let bothPaths = sut.imagePathsFor(inAppInclude: "Expected")
-        XCTAssertEqual(bothPaths, ["Expected Name at 0", "Expected Name at 1"])
-        
-        let didNotFind = sut.imagePathsFor(inAppInclude: "Name at 0")
-        XCTAssertTrue(didNotFind.isEmpty)
-    }
-    
     func testBinaryImageWithNULLName_DoesNotAddImage() {
         let address = UInt64(100)
 

Tests/SentryTests/SentryCrash/SentryCrashBinaryImageCacheTests.m

@@ -310,7 +310,11 @@ - (void)assertBinaryImageCacheLength:(int)expected
 {
     int counter = 0;
     sentrycrashbic_iterateOverImages(countNumberOfImagesInCache, &counter);
-    XCTAssertEqual(counter, expected);
+    NSMutableArray<NSString *> *paths = [NSMutableArray new];
+    [SentryDependencyContainer.sharedInstance.binaryImageCache.cache enumerateObjectsUsingBlock:^(SentryBinaryImageInfo * _Nonnull obj, NSUInteger __unused idx, BOOL * _Nonnull __unused stop) {
+        [paths addObject:obj.name];
+    }];
+    XCTAssertEqual(counter, expected, @"Cache should have %d images but contained %@", expected, paths);
 }
 
 - (void)assertCachedBinaryImages