Merge pull request #2503 from DataDog/tvaleev/rum-8449/fix-sampling-rate

[RUM 8449] Fixing sampling rate

Author: satween

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

@@ -1391,8 +1391,9 @@ internal open class RumViewScope(
                 sdkCore.internalLogger
             )
 
+            val viewType = RumViewType.FOREGROUND
             val viewEndedMetricDispatcher = ViewEndedMetricDispatcher(
-                viewType = RumViewType.FOREGROUND,
+                viewType = viewType,
                 internalLogger = sdkCore.internalLogger
             )
 
@@ -1408,6 +1409,7 @@ internal open class RumViewScope(
                 cpuVitalMonitor,
                 memoryVitalMonitor,
                 frameRateVitalMonitor,
+                type = viewType,
                 trackFrustrations = trackFrustrations,
                 sampleRate = sampleRate,
                 interactionToNextViewMetricResolver = interactionToNextViewMetricResolver,

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/metric/ViewEndedMetricDispatcher.kt

@@ -52,7 +52,7 @@ internal class ViewEndedMetricDispatcher(
         tnsState: ViewInitializationMetricsState
     ): Map<String, Any?> = buildMap {
         put(KEY_METRIC_TYPE, VALUE_METRIC_TYPE)
-        put(KEY_RVE, buildAttributesMap(invState, tnsState))
+        put(KEY_RUM_VIEW_ENDED, buildAttributesMap(invState, tnsState))
     }
 
     private fun buildAttributesMap(
@@ -87,15 +87,15 @@ internal class ViewEndedMetricDispatcher(
     }
 
     companion object {
-        const val DEFAULT_SAMPLE_RATE: Float = 75f
+        const val DEFAULT_SAMPLE_RATE: Float = 0.75f
 
         internal const val VIEW_ENDED_MESSAGE = "[Mobile Metric] RUM View Ended"
 
         internal const val KEY_METRIC_TYPE = "metric_type"
 
         private const val VALUE_METRIC_TYPE = "rum view ended"
 
-        internal const val KEY_RVE = "rve"
+        internal const val KEY_RUM_VIEW_ENDED = "rve"
         internal const val KEY_DURATION = "duration"
         internal const val KEY_LOADING_TIME = "loading_time"
 

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

@@ -205,7 +205,7 @@ internal class RumViewScopeTest {
     private lateinit var mockNetworkSettledMetricResolver: NetworkSettledMetricResolver
 
     @Mock
-    private lateinit var mockInteractionNextViewMetricResolver: InteractionToNextViewMetricResolver
+    private lateinit var mockInteractionToNextViewMetricResolver: InteractionToNextViewMetricResolver
 
     @Mock
     private lateinit var mockViewEndedMetricDispatcher: ViewEndedMetricDispatcher
@@ -232,8 +232,8 @@ internal class RumViewScopeTest {
         fakeInteractionToNextViewMetricValue = forge.aNullable { aPositiveLong() }
         whenever(mockNetworkSettledMetricResolver.resolveMetric()) doReturn fakeNetworkSettledMetricValue
         whenever(mockNetworkSettledMetricResolver.getState()) doReturn fakeTnsState
-        whenever(mockInteractionNextViewMetricResolver.getState(any())) doReturn fakeInvState
-        whenever(mockInteractionNextViewMetricResolver.resolveMetric(any())) doReturn
+        whenever(mockInteractionToNextViewMetricResolver.getState(any())) doReturn fakeInvState
+        whenever(mockInteractionToNextViewMetricResolver.resolveMetric(any())) doReturn
             fakeInteractionToNextViewMetricValue
         val isValidSource = forge.aBool()
 
@@ -7396,7 +7396,7 @@ internal class RumViewScopeTest {
     @Test
     fun `M notify the interactionToNextViewMetricResolver W view was created`() {
         // Then
-        verify(mockInteractionNextViewMetricResolver).onViewCreated(
+        verify(mockInteractionToNextViewMetricResolver).onViewCreated(
             testedScope.viewId,
             fakeEventTime.nanoTime
         )
@@ -7416,7 +7416,7 @@ internal class RumViewScopeTest {
         )
 
         // Then
-        verify(mockInteractionNextViewMetricResolver).onActionSent(
+        verify(mockInteractionToNextViewMetricResolver).onActionSent(
             InternalInteractionContext(
                 validActionSent.viewId,
                 validActionSent.type,
@@ -7436,7 +7436,7 @@ internal class RumViewScopeTest {
         )
 
         // Then
-        verify(mockInteractionNextViewMetricResolver, never()).onActionSent(any())
+        verify(mockInteractionToNextViewMetricResolver, never()).onActionSent(any())
     }
 
     // endregion
@@ -9574,7 +9574,8 @@ internal class RumViewScopeTest {
         type: RumViewType = RumViewType.FOREGROUND,
         trackFrustrations: Boolean = fakeTrackFrustrations,
         sampleRate: Float = fakeSampleRate,
-        interactionNextViewMetricResolver: InteractionToNextViewMetricResolver = mockInteractionNextViewMetricResolver,
+        interactionNextViewMetricResolver: InteractionToNextViewMetricResolver =
+            mockInteractionToNextViewMetricResolver,
         networkSettledMetricResolver: NetworkSettledMetricResolver = mockNetworkSettledMetricResolver,
         viewEndedMetricDispatcher: ViewMetricDispatcher = mockViewEndedMetricDispatcher
     ) = RumViewScope(

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

@@ -16,7 +16,7 @@ import com.datadog.android.rum.internal.metric.ViewEndedMetricDispatcher.Compani
 import com.datadog.android.rum.internal.metric.ViewEndedMetricDispatcher.Companion.KEY_LOADING_TIME
 import com.datadog.android.rum.internal.metric.ViewEndedMetricDispatcher.Companion.KEY_METRIC_TYPE
 import com.datadog.android.rum.internal.metric.ViewEndedMetricDispatcher.Companion.KEY_NO_VALUE_REASON
-import com.datadog.android.rum.internal.metric.ViewEndedMetricDispatcher.Companion.KEY_RVE
+import com.datadog.android.rum.internal.metric.ViewEndedMetricDispatcher.Companion.KEY_RUM_VIEW_ENDED
 import com.datadog.android.rum.internal.metric.ViewEndedMetricDispatcher.Companion.KEY_TIME_TO_NETWORK_SETTLED
 import com.datadog.android.rum.internal.metric.ViewEndedMetricDispatcher.Companion.KEY_VALUE
 import com.datadog.android.rum.internal.metric.ViewEndedMetricDispatcher.Companion.KEY_VIEW_TYPE
@@ -88,6 +88,8 @@ internal class ViewEndedMetricDispatcherTest {
     fun `M sendMetric only once W sendViewEnded`() {
         // When
         dispatcherUnderTest.sendViewEnded(fakeInvState, fakeTnsState)
+        dispatcherUnderTest.sendViewEnded(fakeInvState, fakeTnsState)
+
         // Then
         verify(mockInternalLogger).logMetric(
             messageBuilder = any(),
@@ -96,10 +98,6 @@ internal class ViewEndedMetricDispatcherTest {
             creationSampleRate = eq(null)
         )
 
-        // When
-        dispatcherUnderTest.sendViewEnded(fakeInvState, fakeTnsState)
-
-        // Then
         verify(mockInternalLogger).log(
             eq(InternalLogger.Level.WARN),
             target = eq(Target.TELEMETRY),
@@ -111,6 +109,22 @@ internal class ViewEndedMetricDispatcherTest {
         verifyNoMoreInteractions(mockInternalLogger)
     }
 
+    @Test
+    fun `M samplingRate = 0,75 W sendViewEnded { default sampling rate }`() {
+        // Given
+        val dispatcherUnderTest = ViewEndedMetricDispatcher(fakeViewType, mockInternalLogger)
+        // When
+        dispatcherUnderTest.sendViewEnded(fakeInvState, fakeTnsState)
+
+        // Then
+        verify(mockInternalLogger).logMetric(
+            messageBuilder = any(),
+            additionalProperties = any(),
+            samplingRate = eq(0.75f),
+            creationSampleRate = eq(null)
+        )
+    }
+
     @Test
     fun `M logMetric with expected arguments W sendViewEnded`() {
         // Given
@@ -188,6 +202,7 @@ internal class ViewEndedMetricDispatcherTest {
             when (it) {
                 RumViewType.NONE,
                 RumViewType.FOREGROUND -> "custom"
+
                 RumViewType.BACKGROUND -> "background"
                 RumViewType.APPLICATION_LAUNCH -> "application_launch"
             }
@@ -233,7 +248,7 @@ internal class ViewEndedMetricDispatcherTest {
             tnsNoValueReason: String?
         ): Map<String, Any?> = mapOf(
             KEY_METRIC_TYPE to "rum view ended",
-            KEY_RVE to mapOf(
+            KEY_RUM_VIEW_ENDED to mapOf(
                 KEY_DURATION to duration,
                 KEY_LOADING_TIME to buildMap { put(KEY_VALUE, loadingTime) },
                 KEY_VIEW_TYPE to viewType,

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/metric/interactiontonextview/TimeBasedInteractionIdentifierTest.kt

@@ -9,6 +9,7 @@ package com.datadog.android.rum.metric.interactiontonextview
 import com.datadog.android.rum.utils.forge.Configurator
 import com.datadog.tools.unit.ObjectTest
 import fr.xgouchet.elmyr.Forge
+import fr.xgouchet.elmyr.annotation.LongForgery
 import fr.xgouchet.elmyr.junit5.ForgeConfiguration
 import fr.xgouchet.elmyr.junit5.ForgeExtension
 import org.assertj.core.api.Assertions.assertThat
@@ -130,10 +131,12 @@ internal class TimeBasedInteractionIdentifierTest : ObjectTest<TimeBasedInteract
     }
 
     @Test
-    fun `M return false W defaultThresholdUsed{custom delay used}`(forge: Forge) {
+    fun `M return false W defaultThresholdUsed{custom delay used}`(
+        @LongForgery(min = 0, max = 100) timeThresholdMs: Long
+    ) {
         // Given
         val testedValidator = TimeBasedInteractionIdentifier(
-            TimeBasedInteractionIdentifier.DEFAULT_TIME_THRESHOLD_MS + forge.aLong(min = 0, max = 100)
+            TimeBasedInteractionIdentifier.DEFAULT_TIME_THRESHOLD_MS + timeThresholdMs
         )
         // When
         val result = testedValidator.defaultThresholdUsed()

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/metric/networksettled/TimeBasedInitialResourceIdentifierTest.kt

@@ -79,7 +79,7 @@ internal class TimeBasedInitialResourceIdentifierTest : ObjectTest<TimeBasedInit
     }
 
     @Test
-    fun `M return true W defaultThresholdUsed{default delay used}`() {
+    fun `M return true W defaultThresholdUsed {default delay used}`() {
         // Given
         val testedValidator = TimeBasedInitialResourceIdentifier()
 
@@ -91,7 +91,7 @@ internal class TimeBasedInitialResourceIdentifierTest : ObjectTest<TimeBasedInit
     }
 
     @Test
-    fun `M return false W defaultThresholdUsed{custom delay used}`(forge: Forge) {
+    fun `M return false W defaultThresholdUsed {custom delay used}`(forge: Forge) {
         // Given
         val testedValidator = TimeBasedInitialResourceIdentifier(
             TimeBasedInitialResourceIdentifier.DEFAULT_TIME_THRESHOLD_MS + forge.aTinyPositiveLong()

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/utils/forge/TelemetryViewInitializationMetricsStateForgeryFactory.kt

@@ -14,7 +14,7 @@ import fr.xgouchet.elmyr.ForgeryFactory
 
 internal class TelemetryViewInitializationMetricsStateForgeryFactory : ForgeryFactory<ViewInitializationMetricsState> {
     override fun getForgery(forge: Forge): ViewInitializationMetricsState {
-        val initializationTime = forge.aNullable { forge.aLong(min = 0L) }
+        val initializationTime = forge.aNullable { aLong(min = 0L) }
         return ViewInitializationMetricsState(
             initializationTime = initializationTime,
             config = forge.aValueFrom(ViewInitializationMetricsConfig::class.java),