Merge pull request #1001 from DataDog/release/1.12.0

Merge `release/1.12.0` to `develop`

CHANGELOG.md

@@ -1,21 +1,10 @@
 # Unreleased
 
-# 1.12.0-beta3 / 30-08-2022
-
-### Changes
+# 1.12.0 / 16-09-2022
 
+- [BUGFIX] Fix manual User Action dropped if a new view start. See [#997][]
 - [IMPROVEMENT] Enable cross-platform SDKs to change app `version`. See [#973][]
-
-# 1.12.0-beta2 / 10-08-2022
-
-### Changes
-
 - [IMPROVEMENT] Add internal APIs for cross-platform SDKs. See [#964][]
-
-# 1.12.0-beta1 / 02-08-2022
-
-### Changes
-
 - [IMPROVEMENT] Add mobile vitals frequency configuration. See [#876][]
 - [IMPROVEMENT] Include the exact model information in RUM `device.model`. See [#888][]
 - [FEATURE] Allow filtering outgoing logs with a status threshold. See [#867][]
@@ -43,25 +32,10 @@
 - [IMPROVEMENT] Add tracing sampling rate. See [#851][]
 - [IMPROVEMENT] Crash Reporting: Filter out unrecognized trailing `???` stack frame in `error.stack`. See [#794][]
 - [IMPROVEMENT] Reduce the number of intermediate view events sent in RUM payloads. See [#815][]
-
-# 1.11.0-rc1 / 18-05-2022
-
-### Changes
-
 - [IMPROVEMENT] Allow manually tracked resources in RUM Sessions to detect first party hosts. See [#837][]
 - [IMPROVEMENT] Add tracing sampling rate. See [#851][]
-
-# 1.11.0-beta2 / 05-04-2022
-
-### Changes
-
 - [BUGFIX] Fix rare problem with bringing up the "Local Network Permission" alert. See [#830][]
 - [BUGFIX] Fix RUM event `source`. See [#832][]
-
-# 1.11.0-beta1 / 04-26-2022
-
-### Changes
-
 - [FEATURE] Integration with CI Visibility Tests. See[#761][]
 - [FEATURE] Add tvOS Support. See [#793][]
 - [FEATURE] Add data encryption interface on-disk data storage. See [#797][]
@@ -417,6 +391,7 @@
 [#950]: https://github.com/DataDog/dd-sdk-ios/issues/950
 [#964]: https://github.com/DataDog/dd-sdk-ios/issues/964
 [#973]: https://github.com/DataDog/dd-sdk-ios/issues/973
+[#997]: https://github.com/DataDog/dd-sdk-ios/issues/997
 [@00fa9a]: https://github.com/00FA9A
 [@britton-earnin]: https://github.com/Britton-Earnin
 [@hengyu]: https://github.com/Hengyu

DatadogSDK.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogSDK"
   s.module_name  = "Datadog"
-  s.version      = "1.12.0-beta3"
+  s.version      = "1.12.0"
   s.summary      = "Official Datadog Swift SDK for iOS."
 
   s.homepage     = "https://www.datadoghq.com"

DatadogSDKAlamofireExtension.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogSDKAlamofireExtension"
   s.module_name  = "DatadogAlamofireExtension"
-  s.version      = "1.12.0-beta3"
+  s.version      = "1.12.0"
   s.summary      = "An Official Extensions of Datadog Swift SDK for Alamofire."
 
   s.homepage     = "https://www.datadoghq.com"

DatadogSDKCrashReporting.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogSDKCrashReporting"
   s.module_name  = "DatadogCrashReporting"
-  s.version      = "1.12.0-beta3"
+  s.version      = "1.12.0"
   s.summary      = "Official Datadog Crash Reporting SDK for iOS."
 
   s.homepage     = "https://www.datadoghq.com"
@@ -22,6 +22,6 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.source_files = "Sources/DatadogCrashReporting/**/*.swift"
-  s.dependency 'DatadogSDK', '1.12.0-beta3'
+  s.dependency 'DatadogSDK', '1.12.0'
   s.dependency 'PLCrashReporter', '~> 1.10.1'
 end

DatadogSDKObjc.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "DatadogSDKObjc"
   s.module_name  = "DatadogObjc"
-  s.version      = "1.12.0-beta3"
+  s.version      = "1.12.0"
   s.summary      = "Official Datadog Objective-C SDK for iOS."
 
   s.homepage     = "https://www.datadoghq.com"
@@ -21,5 +21,5 @@ Pod::Spec.new do |s|
   s.source = { :git => 'https://github.com/DataDog/dd-sdk-ios.git', :tag => s.version.to_s }
 
   s.source_files = "Sources/DatadogObjc/**/*.swift"
-  s.dependency 'DatadogSDK', '1.12.0-beta3'
+  s.dependency 'DatadogSDK', '1.12.0'
 end

Sources/Datadog/RUM/RUMMonitor/Scopes/RUMUserActionScope.swift

@@ -100,7 +100,7 @@ internal class RUMUserActionScope: RUMScope, RUMContextProvider {
 
         lastActivityTime = command.time
         switch command {
-        case is RUMStopViewCommand:
+        case is RUMStartViewCommand, is RUMStopViewCommand:
             sendActionEvent(completionTime: command.time, on: command, context: context, writer: writer)
             return false
         case let command as RUMStopUserActionCommand:

Sources/Datadog/Versioning.swift

@@ -1,3 +1,3 @@
 // GENERATED FILE: Do not edit directly
 
-internal let __sdkVersion = "1.12.0-beta3"
+internal let __sdkVersion = "1.12.0"

Tests/DatadogTests/Datadog/RUM/RUMMonitor/Scopes/RUMUserActionScopeTests.swift

@@ -87,6 +87,48 @@ class RUMUserActionScopeTests: XCTestCase {
         XCTAssertEqual(recordedAction.os?.name, "device-os")
     }
 
+    func testGivenActiveUserAction_whenNewViewStart_itSendsUserActionEvent() throws {
+        let scope = RUMViewScope.mockWith(
+            parent: parent,
+            dependencies: .mockAny(),
+            identity: mockView,
+            attributes: [:],
+            startTime: Date()
+        )
+        XCTAssertTrue(
+            scope.process(
+                command: RUMStartViewCommand.mockWith(identity: mockView),
+                context: context,
+                writer: writer
+            )
+        )
+        let mockUserActionCmd = RUMAddUserActionCommand.mockAny()
+        XCTAssertTrue(
+            scope.process(
+                command: mockUserActionCmd,
+                context: context,
+                writer: writer
+            )
+        )
+        XCTAssertFalse(
+            scope.process(
+                command: RUMStartViewCommand.mockAny(),
+                context: context,
+                writer: writer
+            )
+        )
+
+        let recordedActionEvents = writer.events(ofType: RUMActionEvent.self)
+        XCTAssertEqual(recordedActionEvents.count, 1)
+        let recordedAction = try XCTUnwrap(recordedActionEvents.last)
+        XCTAssertEqual(recordedAction.action.type.rawValue, String(describing: mockUserActionCmd.actionType))
+        XCTAssertEqual(recordedAction.dd.session?.plan, .plan1, "All RUM events should use RUM Lite plan")
+        XCTAssertEqual(recordedAction.source, .ios)
+        XCTAssertEqual(recordedAction.service, "test-service")
+        XCTAssertEqual(recordedAction.device?.name, "device-name")
+        XCTAssertEqual(recordedAction.os?.name, "device-os")
+    }
+
     func testGivenCustomSource_whenActionIsSent_itSendsCustomSource() throws {
         let source = String.mockAnySource()
         let customContext: DatadogV1Context = .mockWith(configuration: .mockWith(source: source))