From 63fd8414e3f9a5b2da0140ae5da5d49a1bfb053d Mon Sep 17 00:00:00 2001 From: Vitor Hugo Schwaab Date: Fri, 23 Feb 2024 11:52:12 +0100 Subject: [PATCH] chore: fix tag logging (#2730) Co-authored-by: MohamadJaara --- .../com/wire/android/util/DataDogLogger.kt | 16 +++++++++------- .../typing/TypingIndicatorViewModel.kt | 1 - kalium | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/beta/kotlin/com/wire/android/util/DataDogLogger.kt b/app/src/beta/kotlin/com/wire/android/util/DataDogLogger.kt index eb345c431e..547c9b0fd6 100644 --- a/app/src/beta/kotlin/com/wire/android/util/DataDogLogger.kt +++ b/app/src/beta/kotlin/com/wire/android/util/DataDogLogger.kt @@ -34,13 +34,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() - + 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/main/kotlin/com/wire/android/ui/home/conversations/typing/TypingIndicatorViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/typing/TypingIndicatorViewModel.kt index a4b14851a2..512f065bf8 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/typing/TypingIndicatorViewModel.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/typing/TypingIndicatorViewModel.kt @@ -23,7 +23,6 @@ import androidx.compose.runtime.setValue import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.wire.android.appLogger import com.wire.android.ui.home.conversations.ConversationNavArgs import com.wire.android.ui.home.conversations.usecase.ObserveUsersTypingInConversationUseCase import com.wire.android.ui.navArgs diff --git a/kalium b/kalium index 630462f7b8..23d2fca42b 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 630462f7b887f976855b6f254be628ed937717d2 +Subproject commit 23d2fca42b578a6aa12b02f8d17873038f116065