pass end view to app launch vital

Author: aleksandr-gringauz

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/Time.kt

@@ -13,6 +13,9 @@ internal data class Time(
     val nanoTime: Long = System.nanoTime()
 )
 
+/**
+ * Convert a value obtained from [System.currentTimeMillis] to [Time].
+ */
 internal fun Long.asTime(): Time {
     // Because nanoTime only measures the nanoseconds since the beginning
     // of the current JVM lifetime, we need to approximate the nanotime we want.
@@ -22,3 +25,12 @@ internal fun Long.asTime(): Time {
     val offset = this - now.timestamp
     return Time(this, TimeUnit.MILLISECONDS.toNanos(offset) + now.nanoTime)
 }
+
+/**
+ * Convert a value obtained from [System.nanoTime] to [Time].
+ */
+internal fun Long.asTimeNs(): Time {
+    val now = Time()
+    val offset = this - now.nanoTime
+    return Time(TimeUnit.NANOSECONDS.toMillis(offset) + now.timestamp, this)
+}

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumSessionScope.kt

@@ -162,7 +162,8 @@ internal class RumSessionScope(
                         writeScope = writeScope,
                         writer = actualWriter,
                         rumContext = getRumContext(),
-                        customAttributes = getCustomAttributes()
+                        customAttributes = getCustomAttributes(),
+                        activeView = activeView
                     )
                 }
             }
@@ -179,7 +180,8 @@ internal class RumSessionScope(
                         writeScope = writeScope,
                         writer = actualWriter,
                         rumContext = getRumContext(),
-                        customAttributes = getCustomAttributes()
+                        customAttributes = getCustomAttributes(),
+                        activeView = activeView
                     )
                 }
             }

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumVitalAppLaunchEventHelper.kt

@@ -33,7 +33,7 @@ internal class RumVitalAppLaunchEventHelper(
         datadogContext: DatadogContext,
         eventAttributes: Map<String, Any?>,
         customAttributes: Map<String, Any?>,
-        view: RumVitalAppLaunchEvent.RumVitalAppLaunchEventView?,
+        view: RumViewScope?,
         hasReplay: Boolean?,
         rumContext: RumContext,
         durationNs: Long,
@@ -85,7 +85,14 @@ internal class RumVitalAppLaunchEventHelper(
                 type = sessionType,
                 hasReplay = hasReplay
             ),
-            view = view,
+            view = view?.let {
+                RumVitalAppLaunchEvent.RumVitalAppLaunchEventView(
+                    id = it.viewId,
+                    referrer = null,
+                    url = it.url,
+                    name = it.key.name
+                )
+            },
             source = RumVitalAppLaunchEvent.RumVitalAppLaunchEventSource.tryFromSource(
                 source = datadogContext.source,
                 internalLogger = internalLogger

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/startup/RumAppStartupDetector.kt

@@ -11,7 +11,7 @@ import com.datadog.android.core.InternalSdkCore
 import com.datadog.android.core.internal.system.BuildSdkVersionProvider
 import com.datadog.android.rum.DdRumContentProvider
 import com.datadog.android.rum.internal.domain.Time
-import com.datadog.android.rum.internal.domain.asTime
+import com.datadog.android.rum.internal.domain.asTimeNs
 
 internal interface RumAppStartupDetector {
     interface Listener {
@@ -29,7 +29,7 @@ internal interface RumAppStartupDetector {
             return RumAppStartupDetectorImpl(
                 application = application,
                 buildSdkVersionProvider = BuildSdkVersionProvider.DEFAULT,
-                appStartupTimeProvider = { sdkCore.appStartTimeNs.asTime() },
+                appStartupTimeProvider = { sdkCore.appStartTimeNs.asTimeNs() },
                 processImportanceProvider = { DdRumContentProvider.processImportance },
                 timeProvider = { Time() },
                 listener

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/startup/RumSessionScopeStartupManager.kt

@@ -13,6 +13,7 @@ import com.datadog.android.api.storage.DataWriter
 import com.datadog.android.core.InternalSdkCore
 import com.datadog.android.rum.internal.domain.RumContext
 import com.datadog.android.rum.internal.domain.scope.RumRawEvent
+import com.datadog.android.rum.internal.domain.scope.RumViewScope
 import com.datadog.android.rum.internal.domain.scope.RumVitalAppLaunchEventHelper
 import com.datadog.android.rum.internal.utils.newRumEventWriteOperation
 import com.datadog.android.rum.model.RumVitalAppLaunchEvent
@@ -26,7 +27,8 @@ internal interface RumSessionScopeStartupManager {
         writeScope: EventWriteScope,
         writer: DataWriter<Any>,
         rumContext: RumContext,
-        customAttributes: Map<String, Any?>
+        customAttributes: Map<String, Any?>,
+        activeView: RumViewScope?
     )
 
     fun onTTFDEvent(
@@ -35,7 +37,8 @@ internal interface RumSessionScopeStartupManager {
         writeScope: EventWriteScope,
         writer: DataWriter<Any>,
         rumContext: RumContext,
-        customAttributes: Map<String, Any?>
+        customAttributes: Map<String, Any?>,
+        activeView: RumViewScope?
     )
 
     companion object {
@@ -84,7 +87,8 @@ internal class RumSessionScopeStartupManagerImpl(
         writeScope: EventWriteScope,
         writer: DataWriter<Any>,
         rumContext: RumContext,
-        customAttributes: Map<String, Any?>
+        customAttributes: Map<String, Any?>,
+        activeView: RumViewScope?
     ) {
         ttidReportedForScenario = true
 
@@ -105,7 +109,7 @@ internal class RumSessionScopeStartupManagerImpl(
                 datadogContext = datadogContext,
                 eventAttributes = emptyMap(),
                 customAttributes = customAttributes,
-                view = null,
+                view = activeView,
                 hasReplay = null,
                 rumContext = rumContext,
                 durationNs = event.info.durationNs,
@@ -126,7 +130,8 @@ internal class RumSessionScopeStartupManagerImpl(
                 rumContext = rumContext,
                 customAttributes = customAttributes,
                 durationNs = event.info.durationNs,
-                scenario = event.info.scenario
+                scenario = event.info.scenario,
+                activeView = activeView
             )
         }
     }
@@ -138,7 +143,8 @@ internal class RumSessionScopeStartupManagerImpl(
         writeScope: EventWriteScope,
         writer: DataWriter<Any>,
         rumContext: RumContext,
-        customAttributes: Map<String, Any?>
+        customAttributes: Map<String, Any?>,
+        activeView: RumViewScope?
     ) {
         if (ttfdReportedForSession) {
             return
@@ -185,7 +191,8 @@ internal class RumSessionScopeStartupManagerImpl(
             rumContext = rumContext,
             customAttributes = customAttributes,
             durationNs = event.eventTime.nanoTime - scenario.initialTime.nanoTime,
-            scenario = scenario
+            scenario = scenario,
+            activeView = activeView
         )
     }
 
@@ -196,15 +203,16 @@ internal class RumSessionScopeStartupManagerImpl(
         rumContext: RumContext,
         customAttributes: Map<String, Any?>,
         durationNs: Long,
-        scenario: RumStartupScenario
+        scenario: RumStartupScenario,
+        activeView: RumViewScope?
     ) {
         sdkCore.newRumEventWriteOperation(datadogContext, writeScope, writer) {
             rumVitalAppLaunchEventHelper.newVitalAppLaunchEvent(
                 timestampMs = scenario.initialTime.timestamp + sdkCore.time.serverTimeOffsetMs,
                 datadogContext = datadogContext,
                 eventAttributes = emptyMap(),
                 customAttributes = customAttributes,
-                view = null,
+                view = activeView,
                 hasReplay = null,
                 rumContext = rumContext,
                 durationNs = durationNs,

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/domain/TimeTest.kt

@@ -52,4 +52,23 @@ internal class TimeTest {
             offset(2L)
         )
     }
+
+    @Test
+    fun `M convert nanoTime to Time W asTimeNs()`(
+        @LongForgery(1000000000000, 2000000000000) nanoTime: Long
+    ) {
+        val startMs = System.currentTimeMillis()
+        val startNs = System.nanoTime()
+        val time = nanoTime.asTimeNs()
+        val endNs = System.nanoTime()
+        val endMs = System.currentTimeMillis()
+
+        assertThat(time.nanoTime).isEqualTo(nanoTime)
+        val nanoOffset = time.nanoTime - ((startNs + endNs) / 2)
+        val milliOffset = time.timestamp - ((startMs + endMs) / 2)
+        assertThat(TimeUnit.NANOSECONDS.toMillis(nanoOffset)).isCloseTo(
+            milliOffset,
+            offset(2L)
+        )
+    }
 }

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumSessionScopeTest.kt

@@ -1543,7 +1543,8 @@ internal class RumSessionScopeTest {
             writeScope = mockEventWriteScope,
             writer = mockWriter,
             rumContext = rumContext,
-            customAttributes = fakeParentAttributes
+            customAttributes = fakeParentAttributes,
+            activeView = testedScope.activeView
         )
 
         verifyNoMoreInteractions(mockRumSessionScopeStartupManager)
@@ -1578,7 +1579,8 @@ internal class RumSessionScopeTest {
             writeScope = mockEventWriteScope,
             writer = mockWriter,
             rumContext = rumContext,
-            customAttributes = fakeParentAttributes
+            customAttributes = fakeParentAttributes,
+            activeView = testedScope.activeView
         )
 
         verifyNoMoreInteractions(mockRumSessionScopeStartupManager)