Log timber tag as attribute

Author: markushi

sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberTree.kt

@@ -3,6 +3,8 @@ package io.sentry.android.timber
 import android.util.Log
 import io.sentry.Breadcrumb
 import io.sentry.IScopes
+import io.sentry.SentryAttribute
+import io.sentry.SentryAttributes
 import io.sentry.SentryEvent
 import io.sentry.SentryLevel
 import io.sentry.SentryLogLevel
@@ -183,7 +185,7 @@ public class SentryTimberTree(
 
     captureEvent(level, tag, sentryMessage, throwable)
     addBreadcrumb(level, sentryMessage, throwable)
-    addLog(logLevel, message, throwable, *args)
+    addLog(logLevel, message, tag, throwable, *args)
   }
 
   /** do not log if it's lower than min. required level. */
@@ -240,12 +242,15 @@ public class SentryTimberTree(
   private fun addLog(
     sentryLogLevel: SentryLogLevel,
     msg: String?,
+    tag: String?,
     throwable: Throwable?,
     vararg args: Any?,
   ) {
     // checks the log level
     if (isLoggable(sentryLogLevel, minLogLevel)) {
-      val params = SentryLogParameters()
+      val attributes =
+        tag?.let { SentryAttributes.of(SentryAttribute.stringAttribute("timber.tag", tag)) }
+      val params = SentryLogParameters.create(attributes)
       params.origin = "auto.log.timber"
 
       val throwableMsg = throwable?.message

sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberTreeTest.kt

@@ -334,8 +334,28 @@ class SentryTimberTreeTest {
     verify(fixture.logs)
       .log(
         eq(SentryLogLevel.ERROR),
-        check<SentryLogParameters> { assertEquals("auto.log.timber", it.origin) },
+        check<SentryLogParameters> {
+          assertEquals("auto.log.timber", it.origin)
+          assertEquals(null, it.attributes?.attributes?.get("timber.tag"))
+        },
         eq("My message\nthrowable message"),
       )
   }
+
+  @Test
+  fun `Tree logs timber tag`() {
+    val sut = fixture.getSut()
+    Timber.plant(sut)
+    Timber.tag("timberTag").i("message")
+
+    verify(fixture.logs)
+      .log(
+        eq(SentryLogLevel.INFO),
+        check<SentryLogParameters> {
+          assertEquals("auto.log.timber", it.origin)
+          assertEquals("timberTag", it.attributes?.attributes?.get("timber.tag")?.value)
+        },
+        eq("message"),
+      )
+  }
 }