Clear global log attributes on feature stop.

Suppress unchecked cast warnings in tests.
DataDog · Mar 5, 2024 · 4562a27 · 4562a27
1 parent 7606c1c
commit 4562a27
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/features/dd-sdk-android-logs/src/main/kotlin/com/datadog/android/log/internal/LogsFeature.kt b/features/dd-sdk-android-logs/src/main/kotlin/com/datadog/android/log/internal/LogsFeature.kt
@@ -115,6 +115,8 @@ internal class LogsFeature(
         dataWriter = NoOpDataWriter()
         packageName = ""
         initialized.set(false)
+        @Suppress("UnsafeThirdPartyFunctionCall")
+        attributes.clear()
     }
 
     // endregion

diff --git a/...oid-logs/src/test/kotlin/com/datadog/android/log/internal/logger/DatadogLogHandlerTest.kt b/...oid-logs/src/test/kotlin/com/datadog/android/log/internal/logger/DatadogLogHandlerTest.kt
@@ -467,6 +467,7 @@ internal class DatadogLogHandlerTest {
             verify(mockRumFeature).sendEvent(
                 capture()
             )
+            @Suppress("UNCHECKED_CAST")
             assertThat(lastValue["attributes"] as Map<String, *>)
                 .containsEntry(key, value)
                 .containsAllEntriesOf(fakeAttributes)
@@ -502,6 +503,7 @@ internal class DatadogLogHandlerTest {
             verify(mockRumFeature).sendEvent(
                 capture()
             )
+            @Suppress("UNCHECKED_CAST")
             assertThat(lastValue["attributes"] as Map<String, *>)
                 .containsEntry(key, value)
                 .containsAllEntriesOf(fakeAttributes)