Merge pull request #2475 from DataDog/mariedm/fo-fix-command-properties-and-inject-s8s-id

Feature Operations - set `canStartBackgroundView` to `true`

Co-authored-by: mariedm <marie.denis@datadoghq.com>

Author: dd-mergequeue[bot]

DatadogRUM/Sources/RUMMonitor/RUMCommand.swift

@@ -720,7 +720,7 @@ internal struct RUMOperationStepVitalCommand: RUMCommand {
     var time: Date
     var globalAttributes: [AttributeKey: AttributeValue] = [:]
     var attributes: [AttributeKey: AttributeValue]
-    let canStartBackgroundView = false
+    let canStartBackgroundView = true
     let isUserInteraction = false
     let missedEventType: SessionEndedMetric.MissedEventType? = nil
     let canStartApplicationLaunchView = true

DatadogRUM/Sources/RUMMonitor/RUMFeatureOperationManager.swift

@@ -96,14 +96,29 @@ internal class RUMFeatureOperationManager {
 
         let vitalEvent = RUMVitalEvent(
             dd: .init(),
+            account: .init(context: context),
             application: .init(id: parent.context.rumApplicationID),
+            buildId: context.buildId,
+            buildVersion: context.buildNumber,
+            ciTest: dependencies.ciTest,
+            connectivity: .init(context: context),
+            container: nil,
             context: .init(contextInfo: mergedAttributes),
             date: command.time.addingTimeInterval(context.serverTimeOffset).timeIntervalSince1970.toInt64Milliseconds,
+            ddtags: context.ddTags,
+            device: context.normalizedDevice(),
+            display: nil,
+            os: context.os,
+            service: context.service,
             session: .init(
                 hasReplay: context.hasReplay,
                 id: parent.context.sessionID.toRUMDataFormat,
                 type: dependencies.sessionType
             ),
+            source: .init(rawValue: context.source) ?? .ios,
+            synthetics: dependencies.syntheticsTest,
+            usr: .init(context: context),
+            version: context.version,
             view: .init(
                 id: (activeView?.viewUUID).orNull.toRUMDataFormat,
                 url: activeView?.viewPath ?? ""

DatadogRUM/Tests/RUMMonitor/RUMFeatureOperationManagerTests.swift

@@ -59,6 +59,7 @@ class RUMFeatureOperationManagerTests: XCTestCase {
 
         let event = try XCTUnwrap(vitalEvents.first)
         XCTAssertNotNil(event)
+        // Operation Step specific properties
         XCTAssertEqual(event.vital.type, .operationStep)
         XCTAssertEqual(event.vital.id, command.vitalId)
         XCTAssertEqual(event.vital.name, command.name)
@@ -69,6 +70,23 @@ class RUMFeatureOperationManagerTests: XCTestCase {
         XCTAssertEqual(event.view.url, view.viewPath)
         XCTAssertNil(event.vital.vitalDescription)
         XCTAssertNil(event.vital.duration)
+        // Common properties
+        XCTAssertNil(event.account)
+        XCTAssertNil(event.buildId)
+        XCTAssertNotNil(event.buildVersion)
+        XCTAssertNil(event.ciTest)
+        XCTAssertNotNil(event.connectivity)
+        XCTAssertNil(event.container)
+        XCTAssertNotNil(event.context)
+        XCTAssertNotNil(event.ddtags)
+        XCTAssertNotNil(event.device)
+        XCTAssertNil(event.display)
+        XCTAssertNotNil(event.os)
+        XCTAssertNotNil(event.service)
+        XCTAssertEqual(event.source, .ios)
+        XCTAssertNil(event.synthetics)
+        XCTAssertNil(event.usr)
+        XCTAssertNotNil(event.version)
     }
 
     func testProcess_MultipleOperations_CreatesCorrectNumberOfEvents() {
@@ -212,4 +230,43 @@ class RUMFeatureOperationManagerTests: XCTestCase {
         // Then
         XCTAssertNil(dd.logger.warnLog)
     }
+
+    // MARK: - Synthetics Test ID Tests
+
+    func testProcess_WithSyntheticsTestId_IncludesSyntheticsInVitalEvent() throws {
+        // Given
+        let fakeSyntheticsTestId: String = .mockRandom()
+        let fakeSyntheticsResultId: String = .mockRandom()
+        let syntheticsTest = RUMSyntheticsTest(
+            injected: nil,
+            resultId: fakeSyntheticsResultId,
+            testId: fakeSyntheticsTestId
+        )
+
+        mockDependencies = RUMScopeDependencies.mockWith(syntheticsTest: syntheticsTest)
+        manager = RUMFeatureOperationManager(
+            parent: mockParent,
+            dependencies: mockDependencies
+        )
+
+        let command = RUMOperationStepVitalCommand.mockRandom()
+        let view: RUMViewScope = .mockAny()
+
+        // When
+        manager.process(
+            command,
+            context: mockContext,
+            writer: mockWriter,
+            activeView: view
+        )
+
+        // Then
+        let vitalEvents = mockWriter.events(ofType: RUMVitalEvent.self)
+        XCTAssertEqual(vitalEvents.count, 1)
+
+        let event = try XCTUnwrap(vitalEvents.first)
+        XCTAssertEqual(event.synthetics?.testId, fakeSyntheticsTestId)
+        XCTAssertEqual(event.synthetics?.resultId, fakeSyntheticsResultId)
+        XCTAssertEqual(event.synthetics?.injected, nil)
+    }
 }