chore: Accept frameTimeSeconds as double, not nanos as long

Author: awforsythe

features/dd-sdk-android-rum/api/apiSurface

@@ -162,6 +162,7 @@ interface com.datadog.android.rum.RumSessionListener
 class com.datadog.android.rum._RumInternalProxy
   fun addLongTask(Long, String)
   fun updatePerformanceMetric(RumPerformanceMetric, Double)
+  fun updateExternalRefreshRate(Double)
   fun setInternalViewAttribute(String, Any?)
   fun setSyntheticsAttribute(String?, String?)
   fun enableJankStatsTracking(android.app.Activity)

features/dd-sdk-android-rum/api/dd-sdk-android-rum.api

@@ -241,6 +241,7 @@ public final class com/datadog/android/rum/_RumInternalProxy {
 	public final fun enableJankStatsTracking (Landroid/app/Activity;)V
 	public final fun setInternalViewAttribute (Ljava/lang/String;Ljava/lang/Object;)V
 	public final fun setSyntheticsAttribute (Ljava/lang/String;Ljava/lang/String;)V
+	public final fun updateExternalRefreshRate (D)V
 	public final fun updatePerformanceMetric (Lcom/datadog/android/rum/RumPerformanceMetric;D)V
 }
 

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/_RumInternalProxy.kt

@@ -45,8 +45,8 @@ class _RumInternalProxy internal constructor(private val rumMonitor: AdvancedRum
         rumMonitor.updatePerformanceMetric(metric, value)
     }
 
-    fun updateExternalRefreshRate(frameTimeNanos: Long) {
-        rumMonitor.updateExternalRefreshRate(frameTimeNanos)
+    fun updateExternalRefreshRate(frameTimeSeconds: Double) {
+        rumMonitor.updateExternalRefreshRate(frameTimeSeconds)
     }
 
     fun setInternalViewAttribute(key: String, value: Any?) {

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

@@ -218,7 +218,7 @@ internal sealed class RumRawEvent {
     ) : RumRawEvent()
 
     internal data class UpdateExternalRefreshRate(
-        val frameTimeNanos: Long,
+        val frameTimeSeconds: Double,
         override val eventTime: Time = Time()
     ) : RumRawEvent()
 

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

@@ -643,9 +643,9 @@ internal open class RumViewScope(
     ) {
         if (stopped) return
 
-        // Convert frame time (nanoseconds) to refresh rate (Hz)
-        val refreshRateHz = if (event.frameTimeNanos > 0) {
-            1_000_000_000.0 / event.frameTimeNanos.toDouble()
+        // Convert frame time (seconds) to refresh rate (Hz)
+        val refreshRateHz = if (event.frameTimeSeconds > 0) {
+            1.0 / event.frameTimeSeconds
         } else {
             return // Invalid frame time
         }

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/monitor/AdvancedRumMonitor.kt

@@ -49,7 +49,7 @@ internal interface AdvancedRumMonitor : RumMonitor, AdvancedNetworkRumMonitor {
 
     fun updatePerformanceMetric(metric: RumPerformanceMetric, value: Double)
 
-    fun updateExternalRefreshRate(frameTimeNanos: Long)
+    fun updateExternalRefreshRate(frameTimeSeconds: Double)
 
     fun setInternalViewAttribute(key: String, value: Any?)
 

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/monitor/DatadogRumMonitor.kt

@@ -631,8 +631,8 @@ internal class DatadogRumMonitor(
         handleEvent(RumRawEvent.UpdatePerformanceMetric(metric, value))
     }
 
-    override fun updateExternalRefreshRate(frameTimeNanos: Long) {
-        handleEvent(RumRawEvent.UpdateExternalRefreshRate(frameTimeNanos))
+    override fun updateExternalRefreshRate(frameTimeSeconds: Double) {
+        handleEvent(RumRawEvent.UpdateExternalRefreshRate(frameTimeSeconds))
     }
 
     override fun setInternalViewAttribute(key: String, value: Any?) {

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/RumInternalProxyTest.kt

@@ -10,6 +10,7 @@ import android.app.Activity
 import com.datadog.android.rum.internal.monitor.AdvancedRumMonitor
 import com.datadog.android.rum.utils.forge.Configurator
 import fr.xgouchet.elmyr.Forge
+import fr.xgouchet.elmyr.annotation.DoubleForgery
 import fr.xgouchet.elmyr.annotation.LongForgery
 import fr.xgouchet.elmyr.annotation.StringForgery
 import fr.xgouchet.elmyr.junit5.ForgeConfiguration
@@ -66,17 +67,17 @@ internal class RumInternalProxyTest {
 
     @Test
     fun `M proxy updateExternalRefreshRate to RumMonitor W updateExternalRefreshRate()`(
-        @LongForgery frameTimeNanos: Long
+        @DoubleForgery(min = 0.001, max = 1.0) frameTimeSeconds: Double
     ) {
         // Given
         val mockRumMonitor = mock(AdvancedRumMonitor::class.java)
         val proxy = _RumInternalProxy(mockRumMonitor)
 
         // When
-        proxy.updateExternalRefreshRate(frameTimeNanos)
+        proxy.updateExternalRefreshRate(frameTimeSeconds)
 
         // Then
-        verify(mockRumMonitor).updateExternalRefreshRate(frameTimeNanos)
+        verify(mockRumMonitor).updateExternalRefreshRate(frameTimeSeconds)
     }
 
     @Test

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

@@ -7870,12 +7870,12 @@ internal class RumViewScopeTest {
         forge: Forge
     ) {
         // GIVEN
-        val frameTimeNanos = forge.aLong(min = 1_000_000L, max = 50_000_000L) // 1ms to 50ms
-        val expectedRefreshRate = 1_000_000_000.0 / frameTimeNanos.toDouble()
+        val frameTimeSeconds = forge.aDouble(min = 0.001, max = 0.05) // 1ms to 50ms
+        val expectedRefreshRate = 1.0 / frameTimeSeconds
 
         // WHEN
         testedScope.handleEvent(
-            RumRawEvent.UpdateExternalRefreshRate(frameTimeNanos),
+            RumRawEvent.UpdateExternalRefreshRate(frameTimeSeconds),
             mockWriter
         )
         val result = testedScope.handleEvent(
@@ -7898,8 +7898,8 @@ internal class RumViewScopeTest {
         forge: Forge
     ) {
         // GIVEN
-        val frameTimesNanos = forge.aList(size = 5) {
-            aLong(min = 8_000_000L, max = 20_000_000L) // ~50-125 FPS range
+        val frameTimesSeconds = forge.aList(size = 5) {
+            aDouble(min = 0.008, max = 0.02) // ~50-125 FPS range
         }
 
         var sum = 0.0
@@ -7908,8 +7908,8 @@ internal class RumViewScopeTest {
         val refreshRates = mutableListOf<Double>()
 
         // WHEN
-        frameTimesNanos.forEach { frameTime ->
-            val refreshRate = 1_000_000_000.0 / frameTime.toDouble()
+        frameTimesSeconds.forEach { frameTime ->
+            val refreshRate = 1.0 / frameTime
             refreshRates.add(refreshRate)
             sum += refreshRate
             min = kotlin.math.min(min, refreshRate)
@@ -7941,7 +7941,7 @@ internal class RumViewScopeTest {
     fun `M ignore invalid frame time W handleEvent(UpdateExternalRefreshRate+KeepAlive) { zero frame time }`() {
         // WHEN
         testedScope.handleEvent(
-            RumRawEvent.UpdateExternalRefreshRate(0L),
+            RumRawEvent.UpdateExternalRefreshRate(0.0),
             mockWriter
         )
         val result = testedScope.handleEvent(
@@ -7964,7 +7964,7 @@ internal class RumViewScopeTest {
         forge: Forge
     ) {
         // GIVEN
-        val negativeFrameTime = -forge.aLong(min = 1L, max = 1_000_000L)
+        val negativeFrameTime = -forge.aDouble(min = 0.001, max = 1.0)
 
         // WHEN
         testedScope.handleEvent(
@@ -7991,8 +7991,8 @@ internal class RumViewScopeTest {
         forge: Forge
     ) {
         // GIVEN
-        val externalFrameTime = forge.aLong(min = 16_000_000L, max = 17_000_000L) // ~60 FPS
-        val expectedExternalRefreshRate = 1_000_000_000.0 / externalFrameTime.toDouble()
+        val externalFrameTime = forge.aDouble(min = 0.016, max = 0.017) // ~60 FPS
+        val expectedExternalRefreshRate = 1.0 / externalFrameTime
 
         val internalRefreshRate = forge.aDouble(min = 30.0, max = 45.0) // Different range
         val listenerCaptor = argumentCaptor<VitalListener> {
@@ -8059,11 +8059,11 @@ internal class RumViewScopeTest {
     ) {
         // GIVEN
         testedScope.handleEvent(RumRawEvent.StopView(fakeKey, emptyMap()), mockWriter)
-        val frameTimeNanos = forge.aLong(min = 16_000_000L, max = 17_000_000L)
+        val frameTimeSeconds = forge.aDouble(min = 0.016, max = 0.017)
 
         // WHEN
         val result = testedScope.handleEvent(
-            RumRawEvent.UpdateExternalRefreshRate(frameTimeNanos),
+            RumRawEvent.UpdateExternalRefreshRate(frameTimeSeconds),
             mockWriter
         )
 
@@ -8075,13 +8075,13 @@ internal class RumViewScopeTest {
     @Test
     fun `M accumulate external refresh rate samples correctly W multiple updates`() {
         // GIVEN
-        val frameTime1 = 16_666_667L // 60 FPS
-        val frameTime2 = 33_333_333L // 30 FPS
-        val frameTime3 = 11_111_111L // 90 FPS
+        val frameTime1 = 1.0 / 60.0 // 60 FPS
+        val frameTime2 = 1.0 / 30.0 // 30 FPS
+        val frameTime3 = 1.0 / 90.0 // 90 FPS
 
-        val refreshRate1 = 1_000_000_000.0 / frameTime1.toDouble()
-        val refreshRate2 = 1_000_000_000.0 / frameTime2.toDouble()
-        val refreshRate3 = 1_000_000_000.0 / frameTime3.toDouble()
+        val refreshRate1 = 1.0 / frameTime1
+        val refreshRate2 = 1.0 / frameTime2
+        val refreshRate3 = 1.0 / frameTime3
 
         val expectedAverage = (refreshRate1 + refreshRate2 + refreshRate3) / 3.0
         val expectedMin = kotlin.math.min(refreshRate2, kotlin.math.min(refreshRate1, refreshRate3))

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/monitor/DatadogRumMonitorTest.kt

@@ -2003,10 +2003,10 @@ internal class DatadogRumMonitorTest {
         forge: Forge
     ) {
         // Given
-        val frameTimeNanos = forge.aLong(min = 1_000_000L, max = 50_000_000L)
+        val frameTimeSeconds = forge.aDouble(min = 0.001, max = 1.0)
 
         // When
-        testedMonitor.updateExternalRefreshRate(frameTimeNanos)
+        testedMonitor.updateExternalRefreshRate(frameTimeSeconds)
         Thread.sleep(PROCESSING_DELAY)
 
         // Then
@@ -2015,7 +2015,7 @@ internal class DatadogRumMonitorTest {
                 capture(),
                 eq(mockWriter)
             )
-            assertThat(lastValue.frameTimeNanos).isEqualTo(frameTimeNanos)
+            assertThat(lastValue.frameTimeSeconds).isEqualTo(frameTimeSeconds)
         }
     }