RUM-10363: Apply suggested changes

kikoveiga · kikoveiga · commit 5bc55e1fe2e1 · 2025-12-22T09:43:24.000Z
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
@@ -39,7 +39,7 @@ import com.datadog.tools.unit.extensions.TestConfigurationExtension
 import com.datadog.tools.unit.extensions.config.TestConfiguration
 import com.datadog.tools.unit.forge.aThrowable
 import com.datadog.tools.unit.forge.exhaustiveAttributes
-import com.datadog.tools.unit.stub.StubTimeProvider
+import com.datadog.android.internal.tests.stub.StubTimeProvider
 import com.google.gson.JsonObject
 import fr.xgouchet.elmyr.Forge
 import fr.xgouchet.elmyr.annotation.AdvancedForgery
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
@@ -132,6 +132,8 @@ internal class RotatingDnsResolverTest {
         // the real use case where we have a small number of addresses to rotate
         fakeInetAddresses = forge.aList(size = forge.anInt(min = 1, max = 3)) { mock() }
         whenever(mockDelegate.lookup(fakeHostname)) doReturn fakeInetAddresses
+        // just wait the TTL time to make sure all threads are concurrently accessing the lookup
+        Thread.sleep(TEST_TTL_MS.inWholeMilliseconds)
 
         var exceptionThrown: Exception? = null
 
diff --git a/dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/persistence/file/advanced/MoveDataMigrationOperationTest.kt b/dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/persistence/file/advanced/MoveDataMigrationOperationTest.kt
@@ -150,37 +150,39 @@ internal class MoveDataMigrationOperationTest {
     }
 
     @Test
-    fun `M not wait for real delay W run() {move fails once, time provider mocked}`() {
+    fun `M try 3 times maximum W run() {move always fails}`() {
         // Given
         whenever(mockFileMover.moveFiles(fakeFromDirectory, fakeToDirectory))
-            .doReturn(false, true)
+            .doReturn(false)
 
         // When
-        val duration = measureTimeMillis {
-            testedOperation.run()
-        }
+        testedOperation.run()
 
         // Then
-        verify(mockFileMover, times(2)).moveFiles(fakeFromDirectory, fakeToDirectory)
-        assertThat(duration).isLessThan(100L)
+        verify(mockFileMover, times(3)).moveFiles(fakeFromDirectory, fakeToDirectory)
     }
 
     @Test
-    fun `M try 3 times maximum W run() {move always fails}`() {
+    fun `M retry with 500ms delay W run() {move fails once}`() {
         // Given
+        whenever(mockTimeProvider.getDeviceElapsedTimeNs()).thenAnswer { System.nanoTime() }
         whenever(mockFileMover.moveFiles(fakeFromDirectory, fakeToDirectory))
-            .doReturn(false)
+            .doReturn(false, true)
 
         // When
-        testedOperation.run()
+        val duration = measureTimeMillis {
+            testedOperation.run()
+        }
 
         // Then
-        verify(mockFileMover, times(3)).moveFiles(fakeFromDirectory, fakeToDirectory)
+        verify(mockFileMover, times(2)).moveFiles(fakeFromDirectory, fakeToDirectory)
+        assertThat(duration).isBetween(500L, 550L)
     }
 
     @Test
-    fun `M not wait for real delay W run() {move always fails, time provider mocked}`() {
+    fun `M retry with 500ms delay W run() {move always fails}`() {
         // Given
+        whenever(mockTimeProvider.getDeviceElapsedTimeNs()).thenAnswer { System.nanoTime() }
         whenever(mockFileMover.moveFiles(fakeFromDirectory, fakeToDirectory))
             .doReturn(false)
 
@@ -191,7 +193,7 @@ internal class MoveDataMigrationOperationTest {
 
         // Then
         verify(mockFileMover, times(3)).moveFiles(fakeFromDirectory, fakeToDirectory)
-        assertThat(duration).isLessThan(100L)
+        assertThat(duration).isBetween(1000L, 1100L)
     }
 
     companion object {
diff --git a/dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/persistence/file/batch/BatchFileOrchestratorTest.kt b/dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/persistence/file/batch/BatchFileOrchestratorTest.kt
@@ -14,7 +14,7 @@ import com.datadog.android.core.internal.persistence.file.FileOrchestrator
 import com.datadog.android.core.internal.persistence.file.FilePersistenceConfig
 import com.datadog.android.utils.forge.Configurator
 import com.datadog.android.utils.verifyLog
-import com.datadog.tools.unit.stub.StubTimeProvider
+import com.datadog.android.internal.tests.stub.StubTimeProvider
 import fr.xgouchet.elmyr.Forge
 import fr.xgouchet.elmyr.annotation.IntForgery
 import fr.xgouchet.elmyr.annotation.LongForgery
diff --git a/dd-sdk-android-core/src/test/kotlin/com/datadog/android/error/internal/DatadogExceptionHandlerTest.kt b/dd-sdk-android-core/src/test/kotlin/com/datadog/android/error/internal/DatadogExceptionHandlerTest.kt
@@ -30,7 +30,7 @@ import com.datadog.tools.unit.annotations.TestConfigurationsProvider
 import com.datadog.tools.unit.extensions.TestConfigurationExtension
 import com.datadog.tools.unit.extensions.config.TestConfiguration
 import com.datadog.tools.unit.setStaticValue
-import com.datadog.tools.unit.stub.StubTimeProvider
+import com.datadog.android.internal.tests.stub.StubTimeProvider
 import fr.xgouchet.elmyr.Forge
 import fr.xgouchet.elmyr.annotation.Forgery
 import fr.xgouchet.elmyr.annotation.LongForgery
diff --git a/dd-sdk-android-internal/src/testFixtures/kotlin/com/datadog/android/internal/tests/stub/StubTimeProvider.kt b/dd-sdk-android-internal/src/testFixtures/kotlin/com/datadog/android/internal/tests/stub/StubTimeProvider.kt
@@ -4,7 +4,7 @@
  * Copyright 2016-Present Datadog, Inc.
  */
 
-package com.datadog.tools.unit.stub
+package com.datadog.android.internal.tests.stub
 
 import com.datadog.android.internal.time.TimeProvider
 
diff --git a/features/dd-sdk-android-logs/src/test/kotlin/com/datadog/android/log/internal/logger/DatadogLogHandlerTest.kt b/features/dd-sdk-android-logs/src/test/kotlin/com/datadog/android/log/internal/logger/DatadogLogHandlerTest.kt
@@ -206,7 +206,7 @@ internal class DatadogLogHandlerTest {
                 .hasThreadName(Thread.currentThread().name)
                 .hasStatus(fakeLevel.asLogStatus())
                 .hasMessage(fakeMessage)
-                .hasDateAround(fakeTimestamp)
+                .hasDate(fakeTimestamp.toIsoFormattedTimestamp())
                 .hasNetworkInfo(fakeDatadogContext.networkInfo)
                 .hasUserInfo(fakeDatadogContext.userInfo)
                 .hasBuildId(fakeDatadogContext.appBuildId)
@@ -286,7 +286,7 @@ internal class DatadogLogHandlerTest {
                 .hasThreadName(Thread.currentThread().name)
                 .hasStatus(fakeLevel.asLogStatus())
                 .hasMessage(fakeMessage)
-                .hasDateAround(fakeTimestamp)
+                .hasDate(fakeTimestamp.toIsoFormattedTimestamp())
                 .hasNetworkInfo(fakeDatadogContext.networkInfo)
                 .hasUserInfo(fakeDatadogContext.userInfo)
                 .hasAccountInfo(fakeDatadogContext.accountInfo)
@@ -350,7 +350,7 @@ internal class DatadogLogHandlerTest {
                 .hasThreadName(Thread.currentThread().name)
                 .hasStatus(fakeLevel.asLogStatus())
                 .hasMessage(fakeMessage)
-                .hasDateAround(fakeTimestamp)
+                .hasDate(fakeTimestamp.toIsoFormattedTimestamp())
                 .hasNetworkInfo(fakeDatadogContext.networkInfo)
                 .hasUserInfo(fakeDatadogContext.userInfo)
                 .hasAccountInfo(fakeDatadogContext.accountInfo)
@@ -674,7 +674,7 @@ internal class DatadogLogHandlerTest {
                 .hasThreadName(threadName)
                 .hasStatus(fakeLevel.asLogStatus())
                 .hasMessage(fakeMessage)
-                .hasDateAround(fakeTimestamp)
+                .hasDate(fakeTimestamp.toIsoFormattedTimestamp())
                 .hasNetworkInfo(fakeDatadogContext.networkInfo)
                 .hasUserInfo(fakeDatadogContext.userInfo)
                 .hasAccountInfo(fakeDatadogContext.accountInfo)
@@ -736,7 +736,7 @@ internal class DatadogLogHandlerTest {
                 .hasThreadName(Thread.currentThread().name)
                 .hasStatus(fakeLevel.asLogStatus())
                 .hasMessage(fakeMessage)
-                .hasDateAround(fakeTimestamp)
+                .hasDate(fakeTimestamp.toIsoFormattedTimestamp())
                 .doesNotHaveNetworkInfo()
                 .hasUserInfo(fakeDatadogContext.userInfo)
                 .hasAccountInfo(fakeDatadogContext.accountInfo)
@@ -803,7 +803,7 @@ internal class DatadogLogHandlerTest {
                 .hasThreadName(Thread.currentThread().name)
                 .hasStatus(fakeLevel.asLogStatus())
                 .hasMessage(fakeMessage)
-                .hasDateAround(fakeTimestamp)
+                .hasDate(fakeTimestamp.toIsoFormattedTimestamp())
                 .doesNotHaveNetworkInfo()
                 .hasUserInfo(fakeDatadogContext.userInfo)
                 .hasAccountInfo(fakeDatadogContext.accountInfo)
@@ -1110,7 +1110,7 @@ internal class DatadogLogHandlerTest {
                 .hasLoggerName(fakeLoggerName)
                 .hasStatus(fakeLevel.asLogStatus())
                 .hasMessage(fakeMessage)
-                .hasDateAround(fakeTimestamp)
+                .hasDate(fakeTimestamp.toIsoFormattedTimestamp())
                 .hasNetworkInfo(fakeDatadogContext.networkInfo)
                 .hasUserInfo(fakeDatadogContext.userInfo)
                 .hasAccountInfo(fakeDatadogContext.accountInfo)
diff --git a/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumSessionScopeTest.kt b/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumSessionScopeTest.kt
@@ -34,7 +34,7 @@ import com.datadog.android.rum.internal.vitals.VitalMonitor
 import com.datadog.android.rum.metric.interactiontonextview.LastInteractionIdentifier
 import com.datadog.android.rum.metric.networksettled.InitialResourceIdentifier
 import com.datadog.android.rum.utils.forge.Configurator
-import com.datadog.tools.unit.stub.StubTimeProvider
+import com.datadog.android.internal.tests.stub.StubTimeProvider
 import fr.xgouchet.elmyr.Forge
 import fr.xgouchet.elmyr.annotation.BoolForgery
 import fr.xgouchet.elmyr.annotation.FloatForgery
diff --git a/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/instrumentation/MainLooperLongTaskStrategyTest.kt b/features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/instrumentation/MainLooperLongTaskStrategyTest.kt
@@ -16,7 +16,7 @@ import com.datadog.tools.unit.extensions.TestConfigurationExtension
 import com.datadog.tools.unit.extensions.config.TestConfiguration
 import com.datadog.tools.unit.getStaticValue
 import com.datadog.tools.unit.setStaticValue
-import com.datadog.tools.unit.stub.StubTimeProvider
+import com.datadog.android.internal.tests.stub.StubTimeProvider
 import fr.xgouchet.elmyr.Forge
 import fr.xgouchet.elmyr.annotation.IntForgery
 import fr.xgouchet.elmyr.annotation.LongForgery
diff --git a/features/dd-sdk-android-session-replay/src/test/kotlin/com/datadog/android/sessionreplay/internal/resources/ResourceDataStoreManagerTest.kt b/features/dd-sdk-android-session-replay/src/test/kotlin/com/datadog/android/sessionreplay/internal/resources/ResourceDataStoreManagerTest.kt
@@ -73,7 +73,7 @@ internal class ResourceDataStoreManagerTest {
     @StringForgery
     lateinit var fakeHash: String
 
-    @LongForgery(min = 0L)
+    @LongForgery(min = DATASTORE_EXPIRATION_NS + 1)
     var fakeCurrentTimeNs: Long = 0L
 
     @BeforeEach
diff --git a/reliability/stub-core/build.gradle.kts b/reliability/stub-core/build.gradle.kts
@@ -44,6 +44,8 @@ dependencies {
     implementation(libs.bundles.testTools)
     implementation(libs.okHttp)
     implementation(libs.gson)
+
+    implementation(testFixtures(project(":dd-sdk-android-internal")))
 }
 
 androidLibraryConfig()
diff --git a/reliability/stub-core/src/main/kotlin/com/datadog/android/core/stub/StubSDKCore.kt b/reliability/stub-core/src/main/kotlin/com/datadog/android/core/stub/StubSDKCore.kt
@@ -21,7 +21,7 @@ import com.datadog.android.api.feature.FeatureScope
 import com.datadog.android.core.InternalSdkCore
 import com.datadog.android.core.internal.net.FirstPartyHostHeaderTypeResolver
 import com.datadog.android.internal.time.TimeProvider
-import com.datadog.tools.unit.stub.StubTimeProvider
+import com.datadog.android.internal.tests.stub.StubTimeProvider
 import fr.xgouchet.elmyr.Forge
 import org.mockito.Mockito.mock
 import org.mockito.kotlin.doReturn
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,7 +11,6 @@ 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
@@ -70,7 +69,7 @@ internal interface DatadogModule {
             } else {
                 DatadogVitalsMeter.create(
                     exporterConfig,
-                    sdkCore as FeatureSdkCore
+                    sdkCore
                 )
             }
         }
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,6 +6,7 @@
 
 package com.datadog.benchmark
 
+import com.datadog.android.api.SdkCore
 import com.datadog.android.api.feature.FeatureSdkCore
 import com.datadog.android.internal.profiler.GlobalBenchmark
 import com.datadog.benchmark.exporter.DatadogMetricExporter
@@ -34,12 +35,12 @@ import java.util.concurrent.TimeUnit
  */
 class DatadogVitalsMeter private constructor(
     private val meter: Meter,
-    sdkCore: FeatureSdkCore
+    sdkCore: SdkCore
 ) : DatadogBaseMeter {
 
     private val cpuVitalReader: CPUVitalReader = CPUVitalReader()
     private val memoryVitalReader: MemoryVitalReader = MemoryVitalReader()
-    private val fpsVitalReader: FpsVitalReader = FpsVitalReader(sdkCore.timeProvider)
+    private val fpsVitalReader: FpsVitalReader = FpsVitalReader((sdkCore as FeatureSdkCore).timeProvider)
 
     private val gaugesByMetricName: MutableMap<String, ObservableDoubleGauge> = mutableMapOf()
 
@@ -96,7 +97,7 @@ class DatadogVitalsMeter private constructor(
          */
         fun create(
             datadogExporterConfiguration: DatadogExporterConfiguration,
-            sdkCore: FeatureSdkCore
+            sdkCore: SdkCore
         ): DatadogVitalsMeter {
             val datadogExporter = DatadogMetricExporter(datadogExporterConfiguration)
             val sdkMeterProvider = SdkMeterProvider.builder()
diff --git a/tools/unit/build.gradle.kts b/tools/unit/build.gradle.kts
@@ -68,7 +68,6 @@ dependencies {
     implementation(libs.bundles.testTools)
     implementation(libs.gson)
     implementation(libs.mockitoKotlin)
-    implementation(project(":dd-sdk-android-internal"))
 
     testImplementation(libs.bundles.jUnit5)
     testImplementation(libs.bundles.testTools)
