Merge pull request #1718 from DataDog/xgouchet/RUM-2127/5_read_synthe…

…tics_info (5/9) RUM-2127 Add synthetics info to RUM Actions
DataDog · Nov 16, 2023 · 436fad3 · 436fad3
2 parents 4a9ae58 + 69f9cfd
commit 436fad3
Show file tree

Hide file tree

Showing 6 changed files with 522 additions and 4 deletions.
diff --git a/...droid-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumActionScope.kt b/...droid-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumActionScope.kt
@@ -204,6 +204,23 @@ internal class RumActionScope(
         val eventLongTaskCount = longTaskCount
         val eventResourceCount = resourceCount
 
+        val syntheticsAttribute = if (
+            rumContext.syntheticsTestId.isNullOrBlank() ||
+            rumContext.syntheticsResultId.isNullOrBlank()
+        ) {
+            null
+        } else {
+            ActionEvent.Synthetics(
+                testId = rumContext.syntheticsTestId,
+                resultId = rumContext.syntheticsResultId
+            )
+        }
+        val sessionType = if (syntheticsAttribute == null) {
+            ActionEvent.ActionEventSessionType.USER
+        } else {
+            ActionEvent.ActionEventSessionType.SYNTHETICS
+        }
+
         sdkCore.getFeature(Feature.RUM_FEATURE_NAME)
             ?.withWriteContext { datadogContext, eventBatchWriter ->
                 val user = datadogContext.userInfo
@@ -241,9 +258,10 @@ internal class RumActionScope(
                     application = ActionEvent.Application(rumContext.applicationId),
                     session = ActionEvent.ActionEventSession(
                         id = rumContext.sessionId,
-                        type = ActionEvent.ActionEventSessionType.USER,
+                        type = sessionType,
                         hasReplay = hasReplay
                     ),
+                    synthetics = syntheticsAttribute,
                     source = ActionEvent.Source.tryFromSource(
                         datadogContext.source,
                         sdkCore.internalLogger

diff --git a/...android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScope.kt b/...android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScope.kt
@@ -848,6 +848,22 @@ internal open class RumViewScope(
         sdkCore.getFeature(Feature.RUM_FEATURE_NAME)
             ?.withWriteContext { datadogContext, eventBatchWriter ->
                 val user = datadogContext.userInfo
+                val syntheticsAttribute = if (
+                    rumContext.syntheticsTestId.isNullOrBlank() ||
+                    rumContext.syntheticsResultId.isNullOrBlank()
+                ) {
+                    null
+                } else {
+                    ActionEvent.Synthetics(
+                        testId = rumContext.syntheticsTestId,
+                        resultId = rumContext.syntheticsResultId
+                    )
+                }
+                val sessionType = if (syntheticsAttribute == null) {
+                    ActionEvent.ActionEventSessionType.USER
+                } else {
+                    ActionEvent.ActionEventSessionType.SYNTHETICS
+                }
 
                 val actionEvent = ActionEvent(
                     date = eventTimestamp,
@@ -878,9 +894,10 @@ internal open class RumViewScope(
                     application = ActionEvent.Application(rumContext.applicationId),
                     session = ActionEvent.ActionEventSession(
                         id = rumContext.sessionId,
-                        type = ActionEvent.ActionEventSessionType.USER,
+                        type = sessionType,
                         hasReplay = false
                     ),
+                    synthetics = syntheticsAttribute,
                     source = ActionEvent.Source.tryFromSource(
                         datadogContext.source,
                         sdkCore.internalLogger

diff --git a/...s/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/assertj/ActionEventAssert.kt b/...s/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/assertj/ActionEventAssert.kt
@@ -237,7 +237,7 @@ internal class ActionEventAssert(actual: ActionEvent) :
     fun hasApplicationId(expected: String): ActionEventAssert {
         assertThat(actual.application.id)
             .overridingErrorMessage(
-                "Expected context to have application.id $expected but was ${actual.application.id}"
+                "Expected event to have application.id $expected but was ${actual.application.id}"
             )
             .isEqualTo(expected)
         return this
@@ -246,12 +246,52 @@ internal class ActionEventAssert(actual: ActionEvent) :
     fun hasSessionId(expected: String): ActionEventAssert {
         assertThat(actual.session.id)
             .overridingErrorMessage(
-                "Expected context to have session.id $expected but was ${actual.session.id}"
+                "Expected event to have session.id $expected but was ${actual.session.id}"
             )
             .isEqualTo(expected)
         return this
     }
 
+    fun hasUserSession(): ActionEventAssert {
+        assertThat(actual.session.type)
+            .overridingErrorMessage(
+                "Expected event to have session.type:user but was ${actual.session.type}"
+            ).isEqualTo(ActionEvent.ActionEventSessionType.USER)
+        return this
+    }
+
+    fun hasSyntheticsSession(): ActionEventAssert {
+        assertThat(actual.session.type)
+            .overridingErrorMessage(
+                "Expected event to have session.type:synthetics but was ${actual.session.type}"
+            ).isEqualTo(ActionEvent.ActionEventSessionType.SYNTHETICS)
+        return this
+    }
+
+    fun hasNoSyntheticsTest(): ActionEventAssert {
+        assertThat(actual.synthetics?.testId)
+            .overridingErrorMessage(
+                "Expected event to have no synthetics.testId but was ${actual.synthetics?.testId}"
+            ).isNull()
+        assertThat(actual.synthetics?.resultId)
+            .overridingErrorMessage(
+                "Expected event to have no synthetics.resultId but was ${actual.synthetics?.resultId}"
+            ).isNull()
+        return this
+    }
+
+    fun hasSyntheticsTest(testId: String, resultId: String): ActionEventAssert {
+        assertThat(actual.synthetics?.testId)
+            .overridingErrorMessage(
+                "Expected event to have synthetics.testId $testId but was ${actual.synthetics?.testId}"
+            ).isEqualTo(testId)
+        assertThat(actual.synthetics?.resultId)
+            .overridingErrorMessage(
+                "Expected event to have synthetics.resultId $resultId but was ${actual.synthetics?.resultId}"
+            ).isEqualTo(resultId)
+        return this
+    }
+
     fun hasDuration(expected: Long): ActionEventAssert {
         assertThat(actual.action.loadingTime)
             .overridingErrorMessage(