RUM-8415 - Use type description + enums + regex + other CR suggestions

Author: mariedm

Datadog/Datadog.xcodeproj/project.pbxproj

@@ -59,6 +59,7 @@ internal final class RUMInstrumentation: RUMCommandPublisher {
         watchdogTermination: WatchdogTerminationMonitor?,
         memoryWarningMonitor: MemoryWarningMonitor
     ) {
+        // MARK: TODO: RUM-8416 - Remove after we add SwiftUI view instrumentation option
         // Always create views handler (we can't know if it will be used by SwiftUI instrumentation)
         // and only swizzle `UIViewController` if UIKit instrumentation is configured:
         let viewsHandler = RUMViewsHandler(
@@ -70,6 +71,7 @@ internal final class RUMInstrumentation: RUMCommandPublisher {
         )
         let viewControllerSwizzler: UIViewControllerSwizzler? = {
             do {
+                // MARK: TODO: RUM-8416 - Check both predicates after we add SwiftUI view instrumentation option
                 if uiKitRUMViewsPredicate != nil {
                     return try UIViewControllerSwizzler(handler: viewsHandler)
                 }
@@ -82,11 +84,13 @@ internal final class RUMInstrumentation: RUMCommandPublisher {
             return nil
         }()
 
+        // MARK: TODO: RUM-8420 - Remove after we add SwiftUI action instrumentation option
         // Always create actions handler (we can't know if it will be used by SwiftUI instrumentation)
         // and only swizzle `UIApplicationSwizzler` if UIKit instrumentation is configured:
         let actionsHandler = RUMActionsHandler(dateProvider: dateProvider, predicate: uiKitRUMActionsPredicate)
         let uiApplicationSwizzler: UIApplicationSwizzler? = {
             do {
+                // MARK: TODO: RUM-8420 - Check both predicates after we add SwiftUI action instrumentation option
                 if uiKitRUMActionsPredicate != nil {
                     return try UIApplicationSwizzler(handler: actionsHandler)
                 }

DatadogInternal/Sources/Utils/Dumper.swift

@@ -239,7 +239,7 @@ extension RUMViewsHandler: UIViewControllerHandler {
                     path: rumView.path ?? viewController.canonicalClassName,
                     isUntrackedModal: rumView.isUntrackedModal,
                     attributes: rumView.attributes,
-                    instrumentationType: .uikit
+                    instrumentationType: .swiftui
                 )
             )
         } else if #available(iOS 13, tvOS 13, *), viewController.isModalInPresentation {

DatadogRUM/Sources/Instrumentation/RUMInstrumentation.swift

@@ -0,0 +1,29 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+/// Controller type enum to identify different SwiftUI hosting controllers
+internal enum ControllerType {
+    case hostingController
+    case navigationController
+    case modal
+    case tabItem
+    case unknown
+
+    /// Determines the controller type from the class name
+    init(className: String) {
+        if className.contains("_TtGC7SwiftUI19UIHostingControllerVVS_7TabItem8RootView_") {
+            self = .tabItem
+        } else if className.contains("TtGC7SwiftUI19UIHostingController") {
+            self = .hostingController
+        } else if className.contains("Navigation") {
+            self = .navigationController
+        } else if className.contains("_TtGC7SwiftUI29PresentationHostingController") {
+            self = .modal
+        } else {
+            self = .unknown
+        }
+    }
+}