RUM-8415 - Address Simao's comments

Author: mariedm

DatadogRUM/Sources/Instrumentation/Views/SwiftUI/SwiftUIControllerType.swift

@@ -6,10 +6,10 @@
 
 /// Controller type enum to identify different SwiftUI hosting controllers
 internal enum ControllerType {
+    case tabItem
     case hostingController
     case navigationController
     case modal
-    case tabItem
     case unknown
 
     /// Determines the controller type from the class name

DatadogRUM/Sources/Instrumentation/Views/SwiftUI/SwiftUIViewNameExtractor.swift

@@ -16,7 +16,7 @@ internal protocol SwiftUIViewNameExtractor {
 // MARK: - SwiftUIReflectionBasedViewNameExtractor
 /// Default implementation that extracts SwiftUI view names using reflection and string parsing
 internal struct SwiftUIReflectionBasedViewNameExtractor: SwiftUIViewNameExtractor {
-    internal let createReflector: (Any) -> TopLevelReflector
+    private let createReflector: (Any) -> TopLevelReflector
 
     init(
         reflectorFactory: @escaping (Any) -> TopLevelReflector = { subject in
@@ -34,10 +34,6 @@ internal struct SwiftUIReflectionBasedViewNameExtractor: SwiftUIViewNameExtracto
     /// - Parameter viewController: The `UIViewController` potentially hosting a SwiftUI view
     /// - Returns: The extracted view name or nil if extraction failed
     func extractName(from viewController: UIViewController) -> String? {
-        return extractViewNameFrom(from: viewController)
-    }
-
-    private func extractViewNameFrom(from viewController: UIViewController) -> String? {
         // Skip known container controllers that shouldn't be tracked
         if shouldSkipViewController(viewController: viewController) {
             return nil
@@ -52,7 +48,7 @@ internal struct SwiftUIReflectionBasedViewNameExtractor: SwiftUIViewNameExtracto
         )
     }
 
-    internal func extractViewName(
+    private func extractViewName(
         from viewController: UIViewController,
         withReflector reflector: TopLevelReflector
     ) -> String? {
@@ -61,7 +57,7 @@ internal struct SwiftUIReflectionBasedViewNameExtractor: SwiftUIViewNameExtracto
 
         switch controllerType {
         case .tabItem:
-            return extractTabViewName(viewController: viewController)
+            return extractTabViewName(from: viewController)
 
         case .hostingController:
             if let output = SwiftUIViewPath.hostingController.traverse(with: reflector) {
@@ -123,7 +119,7 @@ internal struct SwiftUIReflectionBasedViewNameExtractor: SwiftUIViewNameExtracto
         return input
     }
 
-    internal func extractTabViewName(viewController: UIViewController) -> String? {
+    private func extractTabViewName(from viewController: UIViewController) -> String? {
         // We fetch the parent, which corresponds to the TabBarController
         guard let parent = viewController.parent as? UITabBarController,
               let container = parent.parent else {

DatadogRUM/Sources/Instrumentation/Views/SwiftUI/SwiftUIViewPath.swift

@@ -7,10 +7,20 @@
 import DatadogInternal
 
 /// Common path components for SwiftUI view traversal
-internal enum RootPath {
-    static let hostingBase = ["host", "_rootView"]
-    static let navigationBase = ["host", "_rootView", "storage", "view", "content", "content", "content"]
-    static let sheetBase = ["host", "_rootView", "storage", "view", "content"]
+internal enum ViewNode: String {
+    case host
+    case rootView = "_rootView"
+    case root
+    case storage
+    case view
+    case content
+    case list
+    case item
+    case type
+
+    static let hostingBase: [ViewNode] = [.host, .rootView]
+    static let navigationBase: [ViewNode] = [.host, .rootView, .storage, .view, .content, .content, .content]
+    static let sheetBase: [ViewNode] = [.host, .rootView, .storage, .view, .content]
 }
 
 /// Defines the various traversal paths for different SwiftUI view structures
@@ -25,18 +35,18 @@ internal enum SwiftUIViewPath {
     case sheetContent
 
     /// The sequence of property names to traverse for this view type
-    var pathComponents: [String] {
+    var pathComponents: [ViewNode] {
         switch self {
         case .hostingController:
-            return RootPath.hostingBase + ["content", "storage", "view"]
+            return ViewNode.hostingBase + [.content, .storage, .view]
         case .navigationStack:
-            return RootPath.navigationBase
+            return ViewNode.navigationBase
         case .navigationStackDetail:
-            return RootPath.navigationBase + ["content", "list", "item", "type"]
+            return ViewNode.navigationBase + [.content, .list, .item, .type]
         case .navigationStackContainer:
-            return RootPath.navigationBase + ["root"]
+            return ViewNode.navigationBase + [.root]
         case .sheetContent:
-            return RootPath.sheetBase
+            return ViewNode.sheetBase
         }
     }
 
@@ -46,7 +56,7 @@ internal enum SwiftUIViewPath {
     /// - Returns: The object found at the end of the path, or nil if not found
     func traverse(with reflector: TopLevelReflector) -> Any? {
         // Convert string components to path objects
-        let paths = pathComponents.map { ReflectionMirror.Path.key($0) }
+        let paths = pathComponents.map { ReflectionMirror.Path.key($0.rawValue) }
 
         // Use descendant directly
         return reflector.descendant(paths)

DatadogRUM/Tests/Instrumentation/Views/SwiftUIViewNameExtractorTests.swift

@@ -45,23 +45,23 @@ class SwiftUIViewNameExtractorTests: XCTestCase {
     func testSwiftUIViewPathComponents() {
         XCTAssertEqual(
             SwiftUIViewPath.hostingController.pathComponents,
-            ["host", "_rootView", "content", "storage", "view"]
+            [.host, .rootView, .content, .storage, .view]
         )
         XCTAssertEqual(
             SwiftUIViewPath.navigationStack.pathComponents,
-            ["host", "_rootView", "storage", "view", "content", "content", "content"]
+            [.host, .rootView, .storage, .view, .content, .content, .content]
         )
         XCTAssertEqual(
             SwiftUIViewPath.navigationStackDetail.pathComponents,
-            ["host", "_rootView", "storage", "view", "content", "content", "content", "content", "list", "item", "type"]
+            [.host, .rootView, .storage, .view, .content, .content, .content, .content, .list, .item, .type]
         )
         XCTAssertEqual(
             SwiftUIViewPath.navigationStackContainer.pathComponents,
-            ["host", "_rootView", "storage", "view", "content", "content", "content", "root"]
+            [.host, .rootView, .storage, .view, .content, .content, .content, .root]
         )
         XCTAssertEqual(
             SwiftUIViewPath.sheetContent.pathComponents,
-            ["host", "_rootView", "storage", "view", "content"]
+            [.host, .rootView, .storage, .view, .content]
         )
     }