Simplify global log attribute application code

DataDog · Mar 5, 2024 · 5fe9530 · 5fe9530
1 parent 736c82f
commit 5fe9530
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 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
@@ -84,7 +84,7 @@ internal class LogsFeature(
         @Suppress("UnsafeThirdPartyFunctionCall") // NPE cannot happen here
         return attributes.toMap()
     }
-    
+
     // endregion
 
     // region Feature

diff --git a/...android-logs/src/main/kotlin/com/datadog/android/log/internal/logger/DatadogLogHandler.kt b/...android-logs/src/main/kotlin/com/datadog/android/log/internal/logger/DatadogLogHandler.kt
@@ -116,12 +116,13 @@ internal class DatadogLogHandler(
         }
 
         val resolvedTimeStamp = timestamp ?: System.currentTimeMillis()
-        var combinedAttributes = attributes
+        val combinedAttributes = mutableMapOf<String, Any?>()
         val logsFeature = sdkCore.getFeature(Feature.LOGS_FEATURE_NAME)
         if (logsFeature != null) {
-            combinedAttributes = logsFeature.unwrap<LogsFeature>().getAttributes().toMutableMap()
-            combinedAttributes.putAll(attributes)
+            combinedAttributes.putAll(logsFeature.unwrap<LogsFeature>().getAttributes().toMutableMap())
         }
+        combinedAttributes.putAll(attributes)
+
         if (sampler.sample()) {
             if (logsFeature != null) {
                 val threadName = Thread.currentThread().name