chore: fix tag logging for internal and staging flavors (#2739)

wireapp · Feb 26, 2024 · 295d618 · 295d618
1 parent 8e38267
commit 295d618
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/app/src/internal/kotlin/com/wire/android/util/DataDogLogger.kt b/app/src/internal/kotlin/com/wire/android/util/DataDogLogger.kt
@@ -36,13 +36,15 @@ object DataDogLogger : LogWriter() {
         .build()
 
     override fun log(severity: Severity, message: String, tag: String, throwable: Throwable?) {
-        val attributes = KaliumLogger.UserClientData.getFromTag(tag)?.let { userClientData ->
-            mapOf(
-                "userId" to userClientData.userId,
-                "clientId" to userClientData.clientId,
-            )
-        } ?: emptyMap<String, Any?>()
-
+        val logInfo = KaliumLogger.LogAttributes.getInfoFromTagString(tag)
+        val userAccountData = mapOf(
+            "userId" to logInfo.userClientData?.userId,
+            "clientId" to logInfo.userClientData?.clientId,
+        )
+        val attributes = mapOf(
+            "wireAccount" to userAccountData,
+            "tag" to logInfo.textTag
+        )
         when (severity) {
             Severity.Debug -> logger.d(message, throwable, attributes)
             Severity.Info -> logger.i(message, throwable, attributes)

diff --git a/app/src/staging/kotlin/com/wire/android/util/DataDogLogger.kt b/app/src/staging/kotlin/com/wire/android/util/DataDogLogger.kt
@@ -36,13 +36,15 @@ object DataDogLogger : LogWriter() {
         .build()
 
     override fun log(severity: Severity, message: String, tag: String, throwable: Throwable?) {
-        val attributes = KaliumLogger.UserClientData.getFromTag(tag)?.let { userClientData ->
-            mapOf(
-                "userId" to userClientData.userId,
-                "clientId" to userClientData.clientId,
-            )
-        } ?: emptyMap<String, Any?>()
-
+        val logInfo = KaliumLogger.LogAttributes.getInfoFromTagString(tag)
+        val userAccountData = mapOf(
+            "userId" to logInfo.userClientData?.userId,
+            "clientId" to logInfo.userClientData?.clientId,
+        )
+        val attributes = mapOf(
+            "wireAccount" to userAccountData,
+            "tag" to logInfo.textTag
+        )
         when (severity) {
             Severity.Debug -> logger.d(message, throwable, attributes)
             Severity.Info -> logger.i(message, throwable, attributes)