RUM-10907: Supporting process uptime for telemetry debug attribute

satween · satween · commit 2633d21f5a60 · 2025-11-19T15:45:30.000Z
diff --git a/dd-sdk-android-core/api/apiSurface b/dd-sdk-android-core/api/apiSurface
@@ -201,6 +201,7 @@ interface com.datadog.android.core.InternalSdkCore : com.datadog.android.api.fea
   val lastViewEvent: com.google.gson.JsonObject?
   val lastFatalAnrSent: Long?
   val appStartTimeNs: Long
+  val appUptimeNs: Long
   fun writeLastViewEvent(ByteArray)
   fun deleteLastViewEvent()
   fun writeLastFatalAnrSent(Long)
diff --git a/dd-sdk-android-core/api/dd-sdk-android-core.api b/dd-sdk-android-core/api/dd-sdk-android-core.api
@@ -594,6 +594,7 @@ public abstract interface class com/datadog/android/core/InternalSdkCore : com/d
 	public abstract fun deleteLastViewEvent ()V
 	public abstract fun getAllFeatures ()Ljava/util/List;
 	public abstract fun getAppStartTimeNs ()J
+	public abstract fun getAppUptimeNs ()J
 	public abstract fun getDatadogContext (Ljava/util/Set;)Lcom/datadog/android/api/context/DatadogContext;
 	public abstract fun getFirstPartyHostResolver ()Lcom/datadog/android/core/internal/net/FirstPartyHostHeaderTypeResolver;
 	public abstract fun getLastFatalAnrSent ()Ljava/lang/Long;
diff --git a/dd-sdk-android-core/src/main/kotlin/com/datadog/android/api/context/TimeInfo.kt b/dd-sdk-android-core/src/main/kotlin/com/datadog/android/api/context/TimeInfo.kt
@@ -20,4 +20,8 @@ data class TimeInfo(
     val serverTimeNs: Long,
     val serverTimeOffsetNs: Long,
     val serverTimeOffsetMs: Long
-)
+) {
+    internal companion object {
+        internal val EMPTY = TimeInfo(0, 0, 0, 0)
+    }
+}
diff --git a/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/InternalSdkCore.kt b/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/InternalSdkCore.kt
@@ -78,6 +78,15 @@ interface InternalSdkCore : FeatureSdkCore {
     @InternalApi
     val appStartTimeNs: Long
 
+    /**
+     * Provide the time since the application started in nanoseconds from device boot, or our best guess
+     * if the actual start time is not available. Note: since the implementation may rely on [System.nanoTime],
+     * this property can only be used to measure elapsed time and is not related to any other notion of system
+     * or wall-clock time. The value is the time since VM start.
+     */
+    @InternalApi
+    val appUptimeNs: Long
+
     /**
      * Writes current RUM view event to the dedicated file for the needs of NDK crash reporting.
      *
diff --git a/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/CoreFeature.kt b/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/CoreFeature.kt
@@ -209,6 +209,9 @@ internal class CoreFeature(
     internal val appStartTimeNs: Long
         get() = appStartTimeProvider.appStartTimeNs
 
+    internal val appUptimeNs: Long
+        get() = appStartTimeProvider.appUptimeNs
+
     // lazy here on purpose: we need to read it only once, even if it is used in different features
     @get:WorkerThread
     internal val lastViewEvent: JsonObject? by lazy {
diff --git a/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/DatadogContextProvider.kt b/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/DatadogContextProvider.kt
@@ -10,8 +10,7 @@ import com.datadog.android.api.context.DatadogContext
 import com.datadog.android.api.context.DeviceInfo
 import com.datadog.android.api.context.LocaleInfo
 import com.datadog.android.api.context.ProcessInfo
-import com.datadog.android.api.context.TimeInfo
-import java.util.concurrent.TimeUnit
+import com.datadog.android.core.internal.time.composeTimeInfo
 
 internal class DatadogContextProvider(
     private val coreFeature: CoreFeature,
@@ -30,17 +29,7 @@ internal class DatadogContextProvider(
             variant = coreFeature.variant,
             sdkVersion = coreFeature.sdkVersion,
             source = coreFeature.sourceName,
-            time = with(coreFeature.timeProvider) {
-                val deviceTimeMs = getDeviceTimestamp()
-                val serverTimeMs = getServerTimestamp()
-                TimeInfo(
-                    deviceTimeNs = TimeUnit.MILLISECONDS.toNanos(deviceTimeMs),
-                    serverTimeNs = TimeUnit.MILLISECONDS.toNanos(serverTimeMs),
-                    serverTimeOffsetNs = TimeUnit.MILLISECONDS
-                        .toNanos(serverTimeMs - deviceTimeMs),
-                    serverTimeOffsetMs = serverTimeMs - deviceTimeMs
-                )
-            },
+            time = coreFeature.timeProvider.composeTimeInfo(),
             processInfo = ProcessInfo(
                 isMainProcess = coreFeature.isMainProcess
             ),
diff --git a/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/DatadogCore.kt b/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/DatadogCore.kt
@@ -34,6 +34,7 @@ import com.datadog.android.core.internal.logger.SdkInternalLogger
 import com.datadog.android.core.internal.net.FirstPartyHostHeaderTypeResolver
 import com.datadog.android.core.internal.system.BuildSdkVersionProvider
 import com.datadog.android.core.internal.time.DefaultAppStartTimeProvider
+import com.datadog.android.core.internal.time.composeTimeInfo
 import com.datadog.android.core.internal.utils.executeSafe
 import com.datadog.android.core.internal.utils.getSafe
 import com.datadog.android.core.internal.utils.scheduleSafe
@@ -100,17 +101,7 @@ internal class DatadogCore(
     /** @inheritDoc */
     override val time: TimeInfo
         get() {
-            return with(coreFeature.timeProvider) {
-                val deviceTimeMs = getDeviceTimestamp()
-                val serverTimeMs = getServerTimestamp()
-                TimeInfo(
-                    deviceTimeNs = TimeUnit.MILLISECONDS.toNanos(deviceTimeMs),
-                    serverTimeNs = TimeUnit.MILLISECONDS.toNanos(serverTimeMs),
-                    serverTimeOffsetNs = TimeUnit.MILLISECONDS
-                        .toNanos(serverTimeMs - deviceTimeMs),
-                    serverTimeOffsetMs = serverTimeMs - deviceTimeMs
-                )
-            }
+            return coreFeature.timeProvider.composeTimeInfo()
         }
 
     /** @inheritDoc */
@@ -387,6 +378,9 @@ internal class DatadogCore(
     override val appStartTimeNs: Long
         get() = coreFeature.appStartTimeNs
 
+    override val appUptimeNs: Long
+        get() = coreFeature.appUptimeNs
+
     @WorkerThread
     override fun writeLastViewEvent(data: ByteArray) {
         // we need to write it only if we are going to read ApplicationExitInfo (available on
diff --git a/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/NoOpContextProvider.kt b/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/NoOpContextProvider.kt
@@ -28,12 +28,7 @@ internal class NoOpContextProvider : ContextProvider {
         variant = "",
         source = "",
         sdkVersion = "",
-        time = TimeInfo(
-            deviceTimeNs = 0L,
-            serverTimeNs = 0L,
-            serverTimeOffsetMs = 0L,
-            serverTimeOffsetNs = 0L
-        ),
+        time = TimeInfo.EMPTY,
         processInfo = ProcessInfo(isMainProcess = true),
         networkInfo = NetworkInfo(
             connectivity = NetworkInfo.Connectivity.NETWORK_OTHER,
diff --git a/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/NoOpInternalSdkCore.kt b/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/NoOpInternalSdkCore.kt
@@ -41,16 +41,15 @@ import java.util.concurrent.TimeUnit
 /**
  * A no-op implementation of [SdkCore].
  */
+@Suppress("TooManyFunctions")
 internal object NoOpInternalSdkCore : InternalSdkCore {
 
     override val name: String = "no-op"
 
     override val time: TimeInfo = with(System.currentTimeMillis()) {
-        TimeInfo(
+        TimeInfo.EMPTY.copy(
             deviceTimeNs = TimeUnit.MILLISECONDS.toNanos(this),
-            serverTimeNs = TimeUnit.MILLISECONDS.toNanos(this),
-            serverTimeOffsetNs = 0L,
-            serverTimeOffsetMs = 0L
+            serverTimeNs = TimeUnit.MILLISECONDS.toNanos(this)
         )
     }
 
@@ -78,6 +77,8 @@ internal object NoOpInternalSdkCore : InternalSdkCore {
         get() = null
     override val appStartTimeNs: Long
         get() = 0
+    override val appUptimeNs: Long
+        get() = 0
 
     // endregion
 
diff --git a/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/time/AppStartTimeProvider.kt b/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/time/AppStartTimeProvider.kt
@@ -12,4 +12,10 @@ internal interface AppStartTimeProvider {
      * if the actual start time is not available.
      */
     val appStartTimeNs: Long
+
+    /**
+     * Provide the time since the application started in nanoseconds from device boot, or our best guess
+     * if the actual start time is not available.
+     */
+    val appUptimeNs: Long
 }
diff --git a/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/time/DefaultAppStartTimeProvider.kt b/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/time/DefaultAppStartTimeProvider.kt
@@ -28,4 +28,7 @@ internal class DefaultAppStartTimeProvider(
             else -> DdRumContentProvider.createTimeNs
         }
     }
+
+    override val appUptimeNs: Long
+        get() = System.nanoTime() - appStartTimeNs
 }
diff --git a/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/time/KronosTimeProvider.kt b/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/time/KronosTimeProvider.kt
@@ -14,10 +14,6 @@ internal class KronosTimeProvider(
     private val clock: Clock
 ) : TimeProvider {
 
-    override fun getDeviceTimestamp(): Long {
-        return System.currentTimeMillis()
-    }
-
     override fun getServerTimestamp(): Long {
         return clock.getCurrentTimeMs()
     }
diff --git a/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/time/TimeProviderExt.kt b/dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/time/TimeProviderExt.kt
@@ -0,0 +1,21 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2016-Present Datadog, Inc.
+ */
+package com.datadog.android.core.internal.time
+
+import com.datadog.android.api.context.TimeInfo
+import com.datadog.android.internal.time.TimeProvider
+import java.util.concurrent.TimeUnit
+
+internal fun TimeProvider.composeTimeInfo(): TimeInfo {
+    val deviceTimeMs = getDeviceTimestamp()
+    val serverTimeMs = getServerTimestamp()
+    return TimeInfo(
+        deviceTimeNs = TimeUnit.MILLISECONDS.toNanos(deviceTimeMs),
+        serverTimeNs = TimeUnit.MILLISECONDS.toNanos(serverTimeMs),
+        serverTimeOffsetNs = TimeUnit.MILLISECONDS.toNanos(serverTimeMs - deviceTimeMs),
+        serverTimeOffsetMs = serverTimeMs - deviceTimeMs
+    )
+}
diff --git a/dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/DatadogCoreTest.kt b/dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/DatadogCoreTest.kt
@@ -1124,6 +1124,21 @@ internal class DatadogCoreTest {
         assertThat(appStartTimeNs).isEqualTo(fakeAppStartTimeNs)
     }
 
+    @Test
+    fun `M provide app uptime W appUptimeNs()`(
+        @LongForgery(min = 0L) fakeAppUptimeNs: Long
+    ) {
+        // Given
+        testedCore.coreFeature = mock()
+        whenever(testedCore.coreFeature.appUptimeNs) doReturn fakeAppUptimeNs
+
+        // When
+        val appStartTimeNs = testedCore.appUptimeNs
+
+        // Then
+        assertThat(appStartTimeNs).isEqualTo(fakeAppUptimeNs)
+    }
+
     @Test
     fun `M return tracking consent W trackingConsent()`(
         @Forgery fakeTrackingConsent: TrackingConsent
diff --git a/dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/time/DefaultAppStartTimeProviderTest.kt b/dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/time/DefaultAppStartTimeProviderTest.kt
@@ -36,10 +36,10 @@ class DefaultAppStartTimeProviderTest {
         whenever(mockBuildSdkVersionProvider.version) doReturn apiVersion
         val diffMs = SystemClock.elapsedRealtime() - Process.getStartElapsedRealtime()
         val startTimeNs = System.nanoTime() - TimeUnit.MILLISECONDS.toNanos(diffMs)
+        val testedProvider = DefaultAppStartTimeProvider(mockBuildSdkVersionProvider)
 
         // WHEN
-        val timeProvider = DefaultAppStartTimeProvider(mockBuildSdkVersionProvider)
-        val providedStartTime = timeProvider.appStartTimeNs
+        val providedStartTime = testedProvider.appStartTimeNs
 
         // THEN
         assertThat(providedStartTime)
@@ -54,12 +54,54 @@ class DefaultAppStartTimeProviderTest {
         val mockBuildSdkVersionProvider: BuildSdkVersionProvider = mock()
         whenever(mockBuildSdkVersionProvider.version) doReturn apiVersion
         val startTimeNs = DdRumContentProvider.createTimeNs
+        val testedProvider = DefaultAppStartTimeProvider(mockBuildSdkVersionProvider)
 
         // WHEN
-        val timeProvider = DefaultAppStartTimeProvider(mockBuildSdkVersionProvider)
-        val providedStartTime = timeProvider.appStartTimeNs
+        val providedStartTime = testedProvider.appStartTimeNs
 
         // THEN
         assertThat(providedStartTime).isEqualTo(startTimeNs)
     }
+
+    @Test
+    fun `M return app uptime W appUptimeNs`(
+        @IntForgery(min = Build.VERSION_CODES.M) apiVersion: Int
+    ) {
+        // GIVEN
+        val mockBuildSdkVersionProvider: BuildSdkVersionProvider = mock {
+            on { version } doReturn apiVersion
+        }
+        val testedProvider = DefaultAppStartTimeProvider(mockBuildSdkVersionProvider)
+
+        // WHEN
+        val beforeNs = System.nanoTime()
+        val appStartTimeNs = testedProvider.appStartTimeNs
+        val uptime = testedProvider.appUptimeNs
+        val afterNs = System.nanoTime()
+
+        // THEN
+        val expectedUptime = beforeNs - appStartTimeNs
+        assertThat(uptime)
+            .isGreaterThan(0)
+            .isCloseTo(expectedUptime, Offset.offset(TimeUnit.MILLISECONDS.toNanos(100)))
+            .isLessThanOrEqualTo(afterNs - appStartTimeNs)
+    }
+
+    @Test
+    fun `M return increasing uptime W appUptimeNs called multiple times`(
+        @IntForgery(min = Build.VERSION_CODES.M) apiVersion: Int
+    ) {
+        // GIVEN
+        val mockBuildSdkVersionProvider: BuildSdkVersionProvider = mock()
+        whenever(mockBuildSdkVersionProvider.version) doReturn apiVersion
+        val testedProvider = DefaultAppStartTimeProvider(mockBuildSdkVersionProvider)
+
+        // WHEN
+        val uptime1 = testedProvider.appUptimeNs
+        Thread.sleep(10)
+        val uptime2 = testedProvider.appUptimeNs
+
+        // THEN
+        assertThat(uptime2).isGreaterThan(uptime1)
+    }
 }
diff --git a/dd-sdk-android-internal/api/apiSurface b/dd-sdk-android-internal/api/apiSurface
@@ -92,7 +92,6 @@ class com.datadog.android.internal.thread.NamedRunnable : NamedExecutionUnit, Ru
 class com.datadog.android.internal.thread.NamedCallable<V> : NamedExecutionUnit, java.util.concurrent.Callable<V>
   constructor(String, java.util.concurrent.Callable<V>)
 class com.datadog.android.internal.time.DefaultTimeProvider : TimeProvider
-  override fun getDeviceTimestamp(): Long
   override fun getServerTimestamp(): Long
   override fun getServerOffsetNanos(): Long
   override fun getServerOffsetMillis(): Long
diff --git a/dd-sdk-android-internal/api/dd-sdk-android-internal.api b/dd-sdk-android-internal/api/dd-sdk-android-internal.api
@@ -268,6 +268,10 @@ public abstract interface class com/datadog/android/internal/time/TimeProvider {
 	public abstract fun getServerTimestamp ()J
 }
 
+public final class com/datadog/android/internal/time/TimeProvider$DefaultImpls {
+	public static fun getDeviceTimestamp (Lcom/datadog/android/internal/time/TimeProvider;)J
+}
+
 public final class com/datadog/android/internal/utils/ByteArrayExtKt {
 	public static final fun toHexString ([B)Ljava/lang/String;
 }
diff --git a/dd-sdk-android-internal/src/main/java/com/datadog/android/internal/time/DefaultTimeProvider.kt b/dd-sdk-android-internal/src/main/java/com/datadog/android/internal/time/DefaultTimeProvider.kt
@@ -11,7 +11,6 @@ package com.datadog.android.internal.time
  * The offsets are always 0.
  */
 class DefaultTimeProvider : TimeProvider {
-    override fun getDeviceTimestamp(): Long = System.currentTimeMillis()
 
     override fun getServerTimestamp(): Long = System.currentTimeMillis()
 
diff --git a/dd-sdk-android-internal/src/main/java/com/datadog/android/internal/time/TimeProvider.kt b/dd-sdk-android-internal/src/main/java/com/datadog/android/internal/time/TimeProvider.kt
@@ -16,7 +16,7 @@ interface TimeProvider {
     /**
      * Returns the current device timestamp in milliseconds.
      */
-    fun getDeviceTimestamp(): Long
+    fun getDeviceTimestamp(): Long = System.currentTimeMillis()
 
     /**
      * Returns the current server timestamp in milliseconds.
diff --git a/detekt_custom_safe_calls.yml b/detekt_custom_safe_calls.yml
@@ -56,9 +56,11 @@ datadog:
       - "android.os.Looper.getMainLooper()"
       - "android.os.Looper.setMessageLogging(android.util.Printer?)"
       - "android.os.Process.getStartElapsedRealtime()"
+      - "android.os.Process.getStartUptimeMillis()"
       - "android.os.Process.myPid()"
       - "android.os.SystemClock.elapsedRealtime()"
       - "android.os.SystemClock.elapsedRealtimeNanos()"
+      - "android.os.SystemClock.uptimeMillis()"
       - "android.os.StrictMode.allowThreadDiskReads()"
       - "android.os.StrictMode.allowThreadDiskWrites()"
       - "android.os.StrictMode.setThreadPolicy(android.os.StrictMode.ThreadPolicy?)"
diff --git a/features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandler.kt b/features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandler.kt
diff --git a/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/telemetry/assertj/TelemetryDebugEventAssert.kt b/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/telemetry/assertj/TelemetryDebugEventAssert.kt
diff --git a/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandlerTest.kt b/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandlerTest.kt
