RUM-10363: Apply suggested changes

kikoveiga · kikoveiga · commit d6bd0448aef8 · 2025-12-17T12:43:05.000Z
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
@@ -457,7 +457,7 @@ internal class DatadogCore(
             executorServiceFactory ?: CoreFeature.DEFAULT_FLUSHABLE_EXECUTOR_SERVICE_FACTORY
         coreFeature = CoreFeature(
             internalLogger,
-            DefaultAppStartTimeProvider(),
+            DefaultAppStartTimeProvider(timeProviderFactory = { timeProvider }),
             flushableExecutorServiceFactory,
             CoreFeature.DEFAULT_SCHEDULED_EXECUTOR_SERVICE_FACTORY
         )
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
@@ -11,14 +11,13 @@ import android.os.Build
 import android.os.Process
 import android.os.SystemClock
 import com.datadog.android.core.internal.system.BuildSdkVersionProvider
-import com.datadog.android.internal.time.DefaultTimeProvider
 import com.datadog.android.internal.time.TimeProvider
 import com.datadog.android.rum.DdRumContentProvider
 import java.util.concurrent.TimeUnit
 import kotlin.time.Duration.Companion.seconds
 
 internal class DefaultAppStartTimeProvider(
-    private val timeProvider: TimeProvider = DefaultTimeProvider(),
+    private val timeProviderFactory: () -> TimeProvider,
     buildSdkVersionProvider: BuildSdkVersionProvider = BuildSdkVersionProvider.DEFAULT
 ) : AppStartTimeProvider {
 
@@ -27,7 +26,7 @@ internal class DefaultAppStartTimeProvider(
         when {
             buildSdkVersionProvider.version >= Build.VERSION_CODES.N -> {
                 val diffMs = SystemClock.elapsedRealtime() - Process.getStartElapsedRealtime()
-                val result = timeProvider.getDeviceElapsedTimeNs() - TimeUnit.MILLISECONDS.toNanos(diffMs)
+                val result = timeProviderFactory().getDeviceElapsedTimeNs() - TimeUnit.MILLISECONDS.toNanos(diffMs)
 
                 /**
                  * Occasionally [Process.getStartElapsedRealtime] returns buggy values. We filter them and fall back
@@ -44,7 +43,7 @@ internal class DefaultAppStartTimeProvider(
     }
 
     override val appUptimeNs: Long
-        get() = timeProvider.getDeviceElapsedTimeNs() - appStartTimeNs
+        get() = timeProviderFactory().getDeviceElapsedTimeNs() - appStartTimeNs
 
     companion object {
         internal val PROCESS_START_TO_CP_START_DIFF_THRESHOLD_NS = 10.seconds.inWholeNanoseconds
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
@@ -7,23 +7,24 @@
 package com.datadog.android.core.internal.time
 
 import com.datadog.android.api.InternalLogger
+import com.datadog.android.internal.time.BaseTimeProvider
 import com.datadog.android.internal.time.TimeProvider
 import com.lyft.kronos.Clock
 import java.util.concurrent.TimeUnit
 
 /**
  * A [TimeProvider] implementation that uses Kronos NTP for server time synchronization.
  *
- * Device timestamp and elapsed time are inherited from [TimeProvider] default implementations.
+ * Device timestamp and elapsed time are inherited from [BaseTimeProvider].
  */
 internal class KronosTimeProvider(
     private val clock: Clock,
     private val internalLogger: InternalLogger
-) : TimeProvider {
+) : BaseTimeProvider() {
 
     override fun getServerTimestamp(): Long {
         return clock.safeGetCurrentTimeMs()
-            .getOrElse { System.currentTimeMillis() }
+            .getOrElse { getDeviceTimestamp() }
     }
 
     override fun getServerOffsetMillis(): Long {
diff --git a/dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/data/upload/RotatingDnsResolverTest.kt b/dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/data/upload/RotatingDnsResolverTest.kt
@@ -60,8 +60,6 @@ internal class RotatingDnsResolverTest {
     fun `set up`(forge: Forge) {
         fakeInetAddresses = forge.aList { mock() }
 
-        whenever(mockTimeProvider.getDeviceElapsedTimeNs()) doReturn fakeElapsedTimeNs
-
         testedDns = RotatingDnsResolver(mockDelegate, TEST_TTL_MS, mockTimeProvider)
     }
 
@@ -135,14 +133,12 @@ internal class RotatingDnsResolverTest {
         fakeInetAddresses = forge.aList(size = forge.anInt(min = 1, max = 3)) { mock() }
         whenever(mockDelegate.lookup(fakeHostname)) doReturn fakeInetAddresses
 
-        val fakeExpiredTime = fakeElapsedTimeNs + TEST_TTL_MS.inWholeNanoseconds
-        whenever(mockTimeProvider.getDeviceElapsedTimeNs()).doReturn(fakeElapsedTimeNs, fakeExpiredTime)
-
         var exceptionThrown: Exception? = null
 
         // When
         List(100) {
             Thread {
+                Thread.sleep(forge.aLong(min = 0, max = 100))
                 try {
                     testedDns.lookup(fakeHostname)
                 } catch (e: Exception) {
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
@@ -50,7 +50,7 @@ class DefaultAppStartTimeProviderTest {
 
         // When
         val testedAppStartTimeProvider = DefaultAppStartTimeProvider(
-            mockTimeProvider,
+            { mockTimeProvider },
             mockBuildSdkVersionProvider
         )
         val providedStartTime = testedAppStartTimeProvider.appStartTimeNs
@@ -69,7 +69,7 @@ class DefaultAppStartTimeProviderTest {
 
         // When
         val testedAppStartTimeProvider = DefaultAppStartTimeProvider(
-            mockTimeProvider,
+            { mockTimeProvider },
             mockBuildSdkVersionProvider
         )
         val providedStartTime = testedAppStartTimeProvider.appStartTimeNs
@@ -95,7 +95,7 @@ class DefaultAppStartTimeProviderTest {
             .doReturn(fakeStartTimeNs + fakeUptimeNs)
 
         val testedProvider = DefaultAppStartTimeProvider(
-            mockTimeProvider,
+            { mockTimeProvider },
             mockBuildSdkVersionProvider
         )
 
@@ -123,7 +123,7 @@ class DefaultAppStartTimeProviderTest {
             .doReturn(fakeStartTimeNs + 200L)
 
         val testedProvider = DefaultAppStartTimeProvider(
-            mockTimeProvider,
+            { mockTimeProvider },
             mockBuildSdkVersionProvider
         )
 
diff --git a/dd-sdk-android-internal/api/apiSurface b/dd-sdk-android-internal/api/apiSurface
@@ -91,7 +91,7 @@ class com.datadog.android.internal.thread.NamedRunnable : NamedExecutionUnit, Ru
   constructor(String, Runnable)
 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
+class com.datadog.android.internal.time.DefaultTimeProvider : BaseTimeProvider
   override fun getServerTimestamp(): Long
   override fun getServerOffsetNanos(): Long
   override fun getServerOffsetMillis(): Long
@@ -101,6 +101,9 @@ interface com.datadog.android.internal.time.TimeProvider
   fun getDeviceElapsedTimeNs(): Long
   fun getServerOffsetNanos(): Long
   fun getServerOffsetMillis(): Long
+abstract class com.datadog.android.internal.time.BaseTimeProvider : TimeProvider
+  override fun getDeviceTimestamp(): Long
+  override fun getDeviceElapsedTimeNs(): Long
 fun ByteArray.toHexString(): String
 interface com.datadog.android.internal.utils.DDCoreSubscription<T: Any>
   fun addListener(T)
diff --git a/dd-sdk-android-internal/api/dd-sdk-android-internal.api b/dd-sdk-android-internal/api/dd-sdk-android-internal.api
@@ -253,10 +253,14 @@ public final class com/datadog/android/internal/thread/NamedRunnable : com/datad
 	public fun run ()V
 }
 
-public final class com/datadog/android/internal/time/DefaultTimeProvider : com/datadog/android/internal/time/TimeProvider {
+public abstract class com/datadog/android/internal/time/BaseTimeProvider : com/datadog/android/internal/time/TimeProvider {
+	public fun <init> ()V
+	public final fun getDeviceElapsedTimeNs ()J
+	public final fun getDeviceTimestamp ()J
+}
+
+public final class com/datadog/android/internal/time/DefaultTimeProvider : com/datadog/android/internal/time/BaseTimeProvider {
 	public fun <init> ()V
-	public fun getDeviceElapsedTimeNs ()J
-	public fun getDeviceTimestamp ()J
 	public fun getServerOffsetMillis ()J
 	public fun getServerOffsetNanos ()J
 	public fun getServerTimestamp ()J
@@ -270,11 +274,6 @@ 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 getDeviceElapsedTimeNs (Lcom/datadog/android/internal/time/TimeProvider;)J
-	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
@@ -10,10 +10,10 @@ package com.datadog.android.internal.time
  * A [TimeProvider] implementation that provides the current device time as both device and server time.
  * The offsets are always 0.
  *
- * Device timestamp and elapsed time are inherited from [TimeProvider] default implementations.
+ * Device timestamp and elapsed time are inherited from [BaseTimeProvider].
  */
-class DefaultTimeProvider : TimeProvider {
-    override fun getServerTimestamp(): Long = System.currentTimeMillis()
+class DefaultTimeProvider : BaseTimeProvider() {
+    override fun getServerTimestamp(): Long = getDeviceTimestamp()
 
     override fun getServerOffsetNanos(): Long = 0L
 
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
@@ -15,24 +15,20 @@ interface TimeProvider {
 
     /**
      * Returns the current device timestamp in milliseconds.
-     *
-     * Default implementation returns [System.currentTimeMillis].
-     * This should not be overridden as device time always refers to the local system clock.
+     * This is implemented in [BaseTimeProvider] as [System.currentTimeMillis].
      */
-    fun getDeviceTimestamp(): Long = System.currentTimeMillis()
+    fun getDeviceTimestamp(): Long
 
     /**
      * Returns the current server timestamp in milliseconds.
      */
     fun getServerTimestamp(): Long
 
     /**
-     * Returns the current device elapsed time in nanoseconds.
-     *
-     * Default implementation returns [System.nanoTime].
-     * This should not be overridden as device elapsed time always refers to the monotonic system clock.
+     * Returns the current device monotonic elapsed time in nanoseconds.
+     * This is implemented in [BaseTimeProvider] as [System.nanoTime].
      */
-    fun getDeviceElapsedTimeNs(): Long = System.nanoTime()
+    fun getDeviceElapsedTimeNs(): Long
 
     /**
      * Returns the offset between the device and server time references in nanoseconds.
@@ -44,3 +40,11 @@ interface TimeProvider {
      */
     fun getServerOffsetMillis(): Long
 }
+
+/**
+ * A base implementation of [TimeProvider] that provides the device time using system calls.
+ */
+abstract class BaseTimeProvider : TimeProvider {
+    final override fun getDeviceTimestamp(): Long = System.currentTimeMillis()
+    final override fun getDeviceElapsedTimeNs(): Long = System.nanoTime()
+}
diff --git a/sample/benchmark/src/main/java/com/datadog/benchmark/sample/di/app/DatadogModule.kt b/sample/benchmark/src/main/java/com/datadog/benchmark/sample/di/app/DatadogModule.kt
@@ -11,6 +11,7 @@ import android.content.Context
 import android.util.Log
 import com.datadog.android.Datadog
 import com.datadog.android.api.SdkCore
+import com.datadog.android.api.feature.FeatureSdkCore
 import com.datadog.android.core.configuration.BackPressureMitigation
 import com.datadog.android.core.configuration.BackPressureStrategy
 import com.datadog.android.core.configuration.BatchSize
@@ -54,7 +55,7 @@ internal interface DatadogModule {
 
         @Provides
         @Singleton
-        fun provideDatadogMeter(config: BenchmarkConfig): DatadogBaseMeter {
+        fun provideDatadogMeter(config: BenchmarkConfig, sdkCore: SdkCore): DatadogBaseMeter {
             val exporterConfig = DatadogExporterConfiguration.Builder(BuildConfig.BENCHMARK_API_KEY)
                 .setApplicationId(BuildConfig.APPLICATION_ID)
                 .setApplicationName(BENCHMARK_APPLICATION_NAME)
@@ -67,7 +68,10 @@ internal interface DatadogModule {
             return if (config.scenario == SyntheticsScenario.Upload) {
                 DatadogSdkMeter.create(exporterConfig)
             } else {
-                DatadogVitalsMeter.create(exporterConfig)
+                DatadogVitalsMeter.create(
+                    exporterConfig,
+                    sdkCore as FeatureSdkCore
+                )
             }
         }
 
diff --git a/tools/benchmark/src/main/java/com/datadog/benchmark/DatadogVitalsMeter.kt b/tools/benchmark/src/main/java/com/datadog/benchmark/DatadogVitalsMeter.kt
@@ -6,7 +6,6 @@
 
 package com.datadog.benchmark
 
-import com.datadog.android.Datadog
 import com.datadog.android.api.feature.FeatureSdkCore
 import com.datadog.android.internal.profiler.GlobalBenchmark
 import com.datadog.benchmark.exporter.DatadogMetricExporter
@@ -33,13 +32,14 @@ import java.util.concurrent.TimeUnit
  * It provides functionalities to start and stop monitoring these metrics, which will be uploaded to
  * Datadog metric API.
  */
-class DatadogVitalsMeter private constructor(private val meter: Meter) : DatadogBaseMeter {
+class DatadogVitalsMeter private constructor(
+    private val meter: Meter,
+    sdkCore: FeatureSdkCore
+) : DatadogBaseMeter {
 
     private val cpuVitalReader: CPUVitalReader = CPUVitalReader()
     private val memoryVitalReader: MemoryVitalReader = MemoryVitalReader()
-    private val fpsVitalReader: FpsVitalReader = FpsVitalReader(
-        (Datadog.getInstance() as FeatureSdkCore).timeProvider
-    )
+    private val fpsVitalReader: FpsVitalReader = FpsVitalReader(sdkCore.timeProvider)
 
     private val gaugesByMetricName: MutableMap<String, ObservableDoubleGauge> = mutableMapOf()
 
@@ -94,7 +94,10 @@ class DatadogVitalsMeter private constructor(private val meter: Meter) : Datadog
         /**
          * Creates an instance of [DatadogVitalsMeter] with the given configuration.
          */
-        fun create(datadogExporterConfiguration: DatadogExporterConfiguration): DatadogVitalsMeter {
+        fun create(
+            datadogExporterConfiguration: DatadogExporterConfiguration,
+            sdkCore: FeatureSdkCore
+        ): DatadogVitalsMeter {
             val datadogExporter = DatadogMetricExporter(datadogExporterConfiguration)
             val sdkMeterProvider = SdkMeterProvider.builder()
                 .registerMetricReader(
@@ -113,7 +116,7 @@ class DatadogVitalsMeter private constructor(private val meter: Meter) : Datadog
             GlobalOpenTelemetry.set(openTelemetry)
             GlobalBenchmark.register(DDBenchmarkProfiler())
             val meter = openTelemetry.getMeter(METER_INSTRUMENTATION_SCOPE_NAME)
-            return DatadogVitalsMeter(meter)
+            return DatadogVitalsMeter(meter, sdkCore)
         }
 
         private const val METER_INSTRUMENTATION_SCOPE_NAME = "datadog.open-telemetry"
diff --git a/tools/unit/src/main/kotlin/com/datadog/tools/unit/stub/StubTimeProvider.kt b/tools/unit/src/main/kotlin/com/datadog/tools/unit/stub/StubTimeProvider.kt
@@ -11,9 +11,9 @@ import com.datadog.android.internal.time.TimeProvider
 /**
  * A stub implementation of [TimeProvider] for testing purposes.
  *
- * @property elapsedTimeNs The elapsed time in nanoseconds (like `System.nanoTime`). Defaults to `0`.
- * @property deviceTimestampMs The device wall clock timestamp in milliseconds. Defaults to `0`.
- * @property serverTimestampMs The server wall clock timestamp in milliseconds. Defaults to `0`.
+ * @property elapsedTimeNs The monotonic elapsed time in nanoseconds. Defaults to `0`.
+ * @property deviceTimestampMs The device timestamp in milliseconds. Defaults to `0`.
+ * @property serverTimestampMs The server timestamp in milliseconds. Defaults to `0`.
  * @property serverOffsetNs The server time offset in nanoseconds. Defaults to `0`.
  * @property serverOffsetMs The server time offset in milliseconds. Defaults to `0`.
  */

Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,7 @@ internal class DatadogCore(`
`457`	`457`	`executorServiceFactory ?: CoreFeature.DEFAULT_FLUSHABLE_EXECUTOR_SERVICE_FACTORY`
`458`	`458`	`coreFeature = CoreFeature(`
`459`	`459`	`internalLogger,`
`460`		`- DefaultAppStartTimeProvider(),`
	`460`	`+ DefaultAppStartTimeProvider(timeProviderFactory = { timeProvider }),`
`461`	`461`	`flushableExecutorServiceFactory,`
`462`	`462`	`CoreFeature.DEFAULT_SCHEDULED_EXECUTOR_SERVICE_FACTORY`
`463`	`463`	`)`