RUM-9035 Address Simao CR comments

Author: mariedm

Datadog/Datadog.xcodeproj/xcshareddata/xcschemes/DatadogRUM iOS.xcscheme

@@ -212,12 +212,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <CommandLineArguments>
-         <CommandLineArgument
-            argument = "DD_DEBUG"
-            isEnabled = "NO">
-         </CommandLineArgument>
-      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

DatadogCore/Tests/DatadogObjc/DDRUMConfigurationTests.swift

@@ -131,7 +131,7 @@ class DDRUMConfigurationTests: XCTestCase {
     func testEventMappers() {
         let swiftViewEvent: RUMViewEvent = .mockRandom()
         let swiftResourceEvent: RUMResourceEvent = .mockRandom()
-        let swiftActionEvent: RUMActionEvent = .mockRandom()
+        let swiftActionEvent: RUMActionEvent = .mockAny()
         let swiftErrorEvent: RUMErrorEvent = .mockRandom()
         let swiftLongTaskEvent: RUMLongTaskEvent = .mockRandom()
 

DatadogCore/Tests/DatadogObjc/RUM/RUMDataModels+objcTests.swift

@@ -57,7 +57,7 @@ class RUMDataModels_objcTests: XCTestCase {
         let expectedUserInfoAttributes: [String: Any] = mockRandomAttributes()
 
         // Given
-        var swiftAction: RUMActionEvent = .mockRandom()
+        var swiftAction: RUMActionEvent = .mockAny()
         swiftAction.context?.contextInfo = expectedContextAttributes.dd.swiftAttributes
         swiftAction.usr?.usrInfo = expectedUserInfoAttributes.dd.swiftAttributes
 

DatadogRUM/Sources/RUMMonitor/Scopes/RUMUserActionScope.swift

@@ -203,6 +203,14 @@ internal class RUMUserActionScope: RUMScope, RUMContextProvider {
 
         if let event = dependencies.eventBuilder.build(from: actionEvent) {
             writer.write(value: event)
+
+            // Track action in session ended metric
+            dependencies.sessionEndedMetric.track(
+                action: event,
+                instrumentationType: instrumentation,
+                in: self.context.sessionID
+            )
+
             onActionEventSent(event)
 
             if let activeViewID = self.context.activeViewID {

DatadogRUM/Sources/RUMMonitor/Scopes/RUMViewScope.swift

@@ -414,15 +414,6 @@ internal class RUMViewScope: RUMScope, RUMContextProvider {
         actionsCount += 1
         frustrationCount += event.action.frustration?.type.count.toInt64 ?? 0
         needsViewUpdate = true
-
-        // Track action in session ended metric
-        if let userActionScope = userActionScope {
-            dependencies.sessionEndedMetric.track(
-                action: event,
-                instrumentationType: userActionScope.instrumentation,
-                in: self.context.sessionID
-            )
-        }
     }
 
     private func addDiscreteUserAction(on command: RUMAddUserActionCommand) {

DatadogRUM/Sources/SDKMetrics/SessionEndedMetric.swift

@@ -174,34 +174,24 @@ internal class SessionEndedMetric {
     /// - Parameters:
     ///   - action: the action event to track
     ///   - instrumentationType: the type of instrumentation used to start this action
-    func track(action: RUMActionEvent, instrumentationType: InstrumentationType?) {
+    func track(action: RUMActionEvent, instrumentationType: InstrumentationType) {
         guard action.session.id == sessionID.toRUMDataFormat else {
             return
         }
 
-        if let instrumentationType = instrumentationType {
-            trackedActions[instrumentationType.metricKey] = (trackedActions[instrumentationType.metricKey] ?? 0) + 1
-        }
+        trackedActions[instrumentationType.metricKey, default: 0] += 1
     }
 
     /// Tracks the kind of SDK error that occurred during the session.
     /// - Parameter sdkErrorKind: the kind of SDK error
     func track(sdkErrorKind: String) {
-        if let count = trackedSDKErrors[sdkErrorKind] {
-            trackedSDKErrors[sdkErrorKind] = count + 1
-        } else {
-            trackedSDKErrors[sdkErrorKind] = 1
-        }
+        trackedSDKErrors[sdkErrorKind, default: 0] += 1
     }
 
     /// Tracks an event missed due to absence of an active view.
     /// - Parameter missedEventType: the type of an event that was missed
     func track(missedEventType: MissedEventType) {
-        if let count = missedEvents[missedEventType] {
-            missedEvents[missedEventType] = count + 1
-        } else {
-            missedEvents[missedEventType] = 1
-        }
+        missedEvents[missedEventType, default: 0] += 1
     }
 
     /// Signals that the session was stopped with `stopSession()` API.
@@ -410,7 +400,7 @@ internal class SessionEndedMetric {
         var byInstrumentationViewsCount: [String: Int] = [:]
         trackedViews.values.forEach {
             if let instrumentationType = $0.instrumentationType {
-                byInstrumentationViewsCount[instrumentationType.metricKey] = (byInstrumentationViewsCount[instrumentationType.metricKey] ?? 0) + 1
+                byInstrumentationViewsCount[instrumentationType.metricKey, default: 0] += 1
             }
         }
         let totalActionsCount = trackedActions.values.reduce(0, +)

DatadogRUM/Sources/SDKMetrics/SessionEndedMetricController.swift

@@ -72,7 +72,7 @@ internal final class SessionEndedMetricController {
     ///   - sessionID: session ID to track this action in (pass `nil` to track it for the last started session)
     func track(
         action: RUMActionEvent,
-        instrumentationType: InstrumentationType?,
+        instrumentationType: InstrumentationType,
         in sessionID: RUMUUID?
     ) {
         updateMetric(for: sessionID) { $0?.track(action: action, instrumentationType: instrumentationType) }

DatadogRUM/Tests/RUMEvent/RUMEventSanitizerTests.swift

@@ -11,7 +11,7 @@ import DatadogInternal
 class RUMEventSanitizerTests: XCTestCase {
     private let viewEvent: RUMViewEvent = .mockRandom()
     private let resourceEvent: RUMResourceEvent = .mockRandom()
-    private let actionEvent: RUMActionEvent = .mockRandom()
+    private let actionEvent: RUMActionEvent = .mockAny()
     private let errorEvent: RUMErrorEvent = .mockRandom()
     private let longTaskEvent: RUMLongTaskEvent = .mockRandom()
 

DatadogRUM/Tests/SDKMetrics/SessionEndedMetricTests.swift

@@ -419,7 +419,7 @@ class SessionEndedMetricTests: XCTestCase {
         // When
         (0..<actionCount).forEach { _ in
             metric.track(
-                action: .mockRandomWith(sessionID: sessionID.rawValue),
+                action: .mockWith(sessionID: sessionID.rawValue),
                 instrumentationType: .manual
             )
         }
@@ -442,25 +442,25 @@ class SessionEndedMetricTests: XCTestCase {
         // When
         (0..<manualActionsCount).forEach { _ in
             metric.track(
-                action: .mockRandomWith(sessionID: sessionID.rawValue),
+                action: .mockWith(sessionID: sessionID.rawValue),
                 instrumentationType: .manual
             )
         }
         (0..<swiftuiActionsCount).forEach { _ in
             metric.track(
-                action: .mockRandomWith(sessionID: sessionID.rawValue),
+                action: .mockWith(sessionID: sessionID.rawValue),
                 instrumentationType: .swiftui
             )
         }
         (0..<uikitPredicateActionsCount).forEach { _ in
             metric.track(
-                action: .mockRandomWith(sessionID: sessionID.rawValue),
+                action: .mockWith(sessionID: sessionID.rawValue),
                 instrumentationType: .uikit
             )
         }
         (0..<swiftuiAutomaticPredicateActionsCount).forEach { _ in
             metric.track(
-                action: .mockRandomWith(sessionID: sessionID.rawValue),
+                action: .mockWith(sessionID: sessionID.rawValue),
                 instrumentationType: .swiftuiAutomatic
             )
         }
@@ -488,8 +488,8 @@ class SessionEndedMetricTests: XCTestCase {
         let metric = SessionEndedMetric.with(sessionID: sessionID)
 
         // When
-        metric.track(action: .mockRandom(), instrumentationType: .manual)
-        metric.track(action: .mockRandom(), instrumentationType: .manual)
+        metric.track(action: .mockAny(), instrumentationType: .manual)
+        metric.track(action: .mockAny(), instrumentationType: .manual)
         let attributes = metric.asMetricAttributes()
 
         // Then

DatadogRUM/Tests/Scrubbing/RUMEventsMapperTests.swift

@@ -20,8 +20,8 @@ class RUMEventsMapperTests: XCTestCase {
         let originalResourceEvent: RUMResourceEvent = .mockRandom()
         let modifiedResourceEvent: RUMResourceEvent = .mockRandom()
 
-        let originalActionEvent: RUMActionEvent = .mockRandom()
-        let modifiedActionEvent: RUMActionEvent = .mockRandom()
+        let originalActionEvent: RUMActionEvent = .mockAny()
+        let modifiedActionEvent: RUMActionEvent = .mockAny()
 
         let originalLongTaskEvent: RUMLongTaskEvent = .mockRandom()
         let modifiedLongTaskEvent: RUMLongTaskEvent = .mockRandom()
@@ -68,7 +68,7 @@ class RUMEventsMapperTests: XCTestCase {
     func testGivenMappersEnabled_whenDroppingEvents_itReturnsNil() {
         let originalErrorEvent: RUMErrorEvent = .mockRandom()
         let originalResourceEvent: RUMResourceEvent = .mockRandom()
-        let originalActionEvent: RUMActionEvent = .mockRandom()
+        let originalActionEvent: RUMActionEvent = .mockAny()
         let originalLongTaskEvent: RUMLongTaskEvent = .mockRandom()
 
         // Given
@@ -108,7 +108,7 @@ class RUMEventsMapperTests: XCTestCase {
         let originalViewEvent: RUMViewEvent = .mockRandom()
         let originalErrorEvent: RUMErrorEvent = .mockRandom()
         let originalResourceEvent: RUMResourceEvent = .mockRandom()
-        let originalActionEvent: RUMActionEvent = .mockRandom()
+        let originalActionEvent: RUMActionEvent = .mockAny()
         let originalLongTaskEvent: RUMLongTaskEvent = .mockRandom()
 
         // Given

TestUtilities/Sources/Mocks/DatadogInternal/RUMDataModelMocks.swift

@@ -41,7 +41,7 @@ public func randomRUMEvent() -> RUMDataModel {
     // swiftlint:disable opening_brace
     return oneOf([
         { RUMViewEvent.mockRandom() },
-        { RUMActionEvent.mockRandom() },
+        { RUMActionEvent.mockAny() },
         { RUMResourceEvent.mockRandom() },
         { RUMErrorEvent.mockRandom() },
         { RUMLongTaskEvent.mockRandom() },
@@ -369,12 +369,12 @@ extension RUMActionEvent.DD.Configuration: RandomMockable {
     }
 }
 
-extension RUMActionEvent: RandomMockable {
-    public static func mockRandom() -> RUMActionEvent {
-        return mockRandomWith()
+extension RUMActionEvent: AnyMockable {
+    public static func mockAny() -> RUMActionEvent {
+        .mockWith()
     }
 
-    public static func mockRandomWith(
+    public static func mockWith(
         sessionID: UUID = .mockRandom()
     ) -> RUMActionEvent {
         return RUMActionEvent(