Merge pull request #2065 from DataDog/nogorodnikov/merge-release-2.10…

….1-into-develop Merge release `2.10.1` into `develop` branch
DataDog · May 30, 2024 · eb5ca87 · eb5ca87
2 parents 8e9ada1 + a6b342c
commit eb5ca87
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 113 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.10.1 / 2024-05-30
+
+* [IMPROVEMENT] Reduce Method Call Sample Rate. See [#2060](https://github.com/DataDog/dd-sdk-android/pull/2060)
+* [IMPROVEMENT] Limit total telemetry events sent per session. See [#2061](https://github.com/DataDog/dd-sdk-android/pull/2061)
+
 # 2.10.0 / 2024-05-23
 
 * [FEATURE] Global: Add Method Call Telemetry. See [#1940](https://github.com/DataDog/dd-sdk-android/pull/1940)

diff --git a/...droid-rum/src/main/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandler.kt b/...droid-rum/src/main/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandler.kt
@@ -38,7 +38,8 @@ internal class TelemetryEventHandler(
 
     private var trackNetworkRequests = false
 
-    private val seenInCurrentSession = mutableSetOf<TelemetryEventId>()
+    private val eventIDsSeenInCurrentSession = mutableSetOf<TelemetryEventId>()
+    private var totalEventsSeenInCurrentSession = 0
 
     @AnyThread
     fun handleEvent(
@@ -47,7 +48,8 @@ internal class TelemetryEventHandler(
     ) {
         if (!canWrite(event)) return
 
-        seenInCurrentSession.add(event.identity)
+        eventIDsSeenInCurrentSession.add(event.identity)
+        totalEventsSeenInCurrentSession++
 
         sdkCore.getFeature(Feature.RUM_FEATURE_NAME)?.withWriteContext { datadogContext, eventBatchWriter ->
             val timestamp = event.eventTime.timestamp + datadogContext.time.serverTimeOffsetMs
@@ -105,7 +107,8 @@ internal class TelemetryEventHandler(
     }
 
     override fun onSessionStarted(sessionId: String, isDiscarded: Boolean) {
-        seenInCurrentSession.clear()
+        eventIDsSeenInCurrentSession.clear()
+        totalEventsSeenInCurrentSession = 0
     }
 
     // region private
@@ -120,7 +123,7 @@ internal class TelemetryEventHandler(
 
         val eventIdentity = event.identity
 
-        if (!event.isMetric && seenInCurrentSession.contains(eventIdentity)) {
+        if (!event.isMetric && eventIDsSeenInCurrentSession.contains(eventIdentity)) {
             sdkCore.internalLogger.log(
                 InternalLogger.Level.INFO,
                 InternalLogger.Target.MAINTAINER,
@@ -129,7 +132,7 @@ internal class TelemetryEventHandler(
             return false
         }
 
-        if (seenInCurrentSession.size >= maxEventCountPerSession) {
+        if (totalEventsSeenInCurrentSession >= maxEventCountPerSession) {
             sdkCore.internalLogger.log(
                 InternalLogger.Level.INFO,
                 InternalLogger.Target.MAINTAINER,

diff --git a/...d-rum/src/test/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandlerTest.kt b/...d-rum/src/test/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandlerTest.kt
@@ -686,13 +686,18 @@ internal class TelemetryEventHandlerTest {
     }
 
     @Test
-    fun `M not write events over the limit W handleEvent(SendTelemetry)`(forge: Forge) {
+    fun `M not write events over the limit W handleEvent(SendTelemetry)`() {
         // Given
-        val events = forge.aList(size = MAX_EVENTS_PER_SESSION_TEST * 5) { createRumRawTelemetryEvent() }
-            // remove unwanted identity collisions
-            .groupBy { it.identity }.map { it.value.first() }
-        val extraNumber = events.size - MAX_EVENTS_PER_SESSION_TEST
-        val expectedInvocations = MAX_EVENTS_PER_SESSION_TEST
+        val event = RumRawEvent.SendTelemetry(
+            TelemetryType.DEBUG,
+            "Metric event",
+            null,
+            null,
+            coreConfiguration = null,
+            additionalProperties = null,
+            isMetric = true
+        )
+        val events = (0..MAX_EVENTS_PER_SESSION_TEST).map { event }
 
         // When
         events.forEach {
@@ -701,122 +706,40 @@ internal class TelemetryEventHandlerTest {
 
         // Then
         mockInternalLogger.verifyLog(
-            InternalLogger.Level.INFO,
-            InternalLogger.Target.MAINTAINER,
-            TelemetryEventHandler.MAX_EVENT_NUMBER_REACHED_MESSAGE,
-            mode = times(extraNumber)
+            level = InternalLogger.Level.INFO,
+            target = InternalLogger.Target.MAINTAINER,
+            message = TelemetryEventHandler.MAX_EVENT_NUMBER_REACHED_MESSAGE
         )
-
-        argumentCaptor<Any> {
-            verify(mockWriter, times(expectedInvocations))
-                .write(eq(mockEventBatchWriter), capture(), eq(EventType.TELEMETRY))
-            allValues.withIndex().forEach {
-                when (val capturedValue = it.value) {
-                    is TelemetryDebugEvent -> {
-                        assertDebugEventMatchesRawEvent(
-                            capturedValue,
-                            events[it.index],
-                            fakeRumContext
-                        )
-                    }
-
-                    is TelemetryErrorEvent -> {
-                        assertErrorEventMatchesRawEvent(
-                            capturedValue,
-                            events[it.index],
-                            fakeRumContext
-                        )
-                    }
-
-                    is TelemetryConfigurationEvent -> {
-                        assertConfigEventMatchesRawEvent(
-                            capturedValue,
-                            events[it.index],
-                            fakeRumContext
-                        )
-                    }
-
-                    else -> throw IllegalArgumentException(
-                        "Unexpected type=${lastValue::class.jvmName} of the captured value."
-                    )
-                }
-            }
-        }
     }
 
     @Test
     fun `M continue writing events after new session W handleEvent(SendTelemetry)`(forge: Forge) {
         // Given
-        val eventMap = mutableMapOf<TelemetryEventId, RumRawEvent.SendTelemetry>()
-        while (eventMap.size <= MAX_EVENTS_PER_SESSION_TEST) {
-            val candidate = forge.createRumRawTelemetryEvent()
-            val id = candidate.identity
-            eventMap[id] = candidate
-        }
-        val eventsInOldSession = eventMap.map { it.value }
-        val extraNumber = eventsInOldSession.size - MAX_EVENTS_PER_SESSION_TEST
-
-        val eventsInNewSession = forge.aList(
-            size = forge.anInt(1, MAX_EVENTS_PER_SESSION_TEST)
-        ) { createRumRawTelemetryEvent() }
-            // remove unwanted identity collisions
-            .groupBy { it.identity }.map { it.value.first() }
-
-        val expectedEvents = eventsInOldSession
-            .take(MAX_EVENTS_PER_SESSION_TEST) + eventsInNewSession
-        val expectedInvocations = expectedEvents.size
+        val event = RumRawEvent.SendTelemetry(
+            TelemetryType.DEBUG,
+            "Metric event",
+            null,
+            null,
+            coreConfiguration = null,
+            additionalProperties = null,
+            isMetric = true // important because non-metric events can only be seen once
+        )
+        val eventsInOldSession = (0..MAX_EVENTS_PER_SESSION_TEST / 2).map { event }
+        val eventsInNewSession = (0..MAX_EVENTS_PER_SESSION_TEST / 2).map { event }
 
-        // When
         eventsInOldSession.forEach {
             testedTelemetryHandler.handleEvent(it, mockWriter)
         }
+
+        // When
         testedTelemetryHandler.onSessionStarted(forge.aString(), forge.aBool())
+
         eventsInNewSession.forEach {
             testedTelemetryHandler.handleEvent(it, mockWriter)
         }
 
         // Then
-        mockInternalLogger.verifyLog(
-            InternalLogger.Level.INFO,
-            InternalLogger.Target.MAINTAINER,
-            TelemetryEventHandler.MAX_EVENT_NUMBER_REACHED_MESSAGE,
-            mode = times(extraNumber)
-        )
-        argumentCaptor<Any> {
-            verify(mockWriter, times(expectedInvocations))
-                .write(eq(mockEventBatchWriter), capture(), eq(EventType.TELEMETRY))
-            allValues.withIndex().forEach {
-                when (val capturedValue = it.value) {
-                    is TelemetryDebugEvent -> {
-                        assertDebugEventMatchesRawEvent(
-                            capturedValue,
-                            expectedEvents[it.index],
-                            fakeRumContext
-                        )
-                    }
-
-                    is TelemetryErrorEvent -> {
-                        assertErrorEventMatchesRawEvent(
-                            capturedValue,
-                            expectedEvents[it.index],
-                            fakeRumContext
-                        )
-                    }
-
-                    is TelemetryConfigurationEvent -> {
-                        assertConfigEventMatchesRawEvent(
-                            capturedValue,
-                            expectedEvents[it.index],
-                            fakeRumContext
-                        )
-                    }
-
-                    else -> throw IllegalArgumentException(
-                        "Unexpected type=${lastValue::class.jvmName} of the captured value."
-                    )
-                }
-            }
-        }
+        verifyNoMoreInteractions(mockInternalLogger)
     }
 
     @Test

diff --git a/.../src/main/kotlin/com/datadog/android/sessionreplay/internal/recorder/TreeViewTraversal.kt b/.../src/main/kotlin/com/datadog/android/sessionreplay/internal/recorder/TreeViewTraversal.kt
@@ -110,7 +110,7 @@ internal class TreeViewTraversal(
     )
 
     companion object {
-        const val METHOD_CALL_SAMPLING_RATE = 5f
+        const val METHOD_CALL_SAMPLING_RATE = 0.1f
         private const val METHOD_CALL_MAP_PREFIX: String = "Map with"
     }
 }
diff --git a/...lin/com/datadog/android/sessionreplay/internal/recorder/listener/WindowsOnDrawListener.kt b/...lin/com/datadog/android/sessionreplay/internal/recorder/listener/WindowsOnDrawListener.kt
@@ -75,7 +75,7 @@ internal class WindowsOnDrawListener(
     }
 
     companion object {
-        const val METHOD_CALL_SAMPLING_RATE = 5f
+        const val METHOD_CALL_SAMPLING_RATE = 0.1f
         private const val METHOD_CALL_CAPTURE_RECORD: String = "Capture Record"
 
         private val METHOD_CALL_CALLER_CLASS = WindowsOnDrawListener::class.java