fix(timber): wrong .super() call in SentryTimberTree (#4844)

* Ensure tests cover non-error timber tags

* Fix wrong super call

* Update Changelog

Author: markushi

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixes
 
 - [ANR] Removed AndroidTransactionProfiler lock ([#4817](https://github.com/getsentry/sentry-java/pull/4817))
+- Fix wrong .super() call in SentryTimberTree ([#4844](https://github.com/getsentry/sentry-java/pull/4844))
 
 ### Improvements
 

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

@@ -66,7 +66,7 @@ public class SentryTimberTree(
 
   /** Log an info message with optional format args. */
   override fun i(message: String?, vararg args: Any?) {
-    super.d(message, *args)
+    super.i(message, *args)
     logWithSentry(Log.INFO, null, message, *args)
   }
 

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

@@ -1,5 +1,6 @@
 package io.sentry.android.timber
 
+import android.util.Log
 import io.sentry.Breadcrumb
 import io.sentry.Scopes
 import io.sentry.SentryLevel
@@ -23,18 +24,19 @@ import timber.log.Timber
 
 class SentryTimberTreeTest {
   private class Fixture {
-    val scopes = mock<Scopes>()
-    val logs = mock<ILoggerApi>()
-
-    init {
-      whenever(scopes.logger()).thenReturn(logs)
-    }
+    lateinit var scopes: Scopes
+    lateinit var logs: ILoggerApi
 
     fun getSut(
       minEventLevel: SentryLevel = SentryLevel.ERROR,
       minBreadcrumbLevel: SentryLevel = SentryLevel.INFO,
       minLogsLevel: SentryLogLevel = SentryLogLevel.INFO,
-    ): SentryTimberTree = SentryTimberTree(scopes, minEventLevel, minBreadcrumbLevel, minLogsLevel)
+    ): SentryTimberTree {
+      logs = mock<ILoggerApi>()
+      scopes = mock<Scopes>()
+      whenever(scopes.logger()).thenReturn(logs)
+      return SentryTimberTree(scopes, minEventLevel, minBreadcrumbLevel, minLogsLevel)
+    }
   }
 
   private val fixture = Fixture()
@@ -139,6 +141,56 @@ class SentryTimberTreeTest {
     verify(fixture.scopes).captureEvent(check { assertEquals("tag", it.getTag("TimberTag")) })
   }
 
+  @Test
+  fun `Tree captures an event with TimberTag tag for debug events`() {
+    val sut = fixture.getSut(minEventLevel = SentryLevel.INFO)
+    Timber.plant(sut)
+    // only available thru static class
+    Timber.tag("infoTag").i("message")
+    verify(fixture.scopes).captureEvent(check { assertEquals("infoTag", it.getTag("TimberTag")) })
+  }
+
+  @Test
+  fun `Tree captures an event with chained tag usage`() {
+    val sut = fixture.getSut(minEventLevel = SentryLevel.INFO)
+    Timber.plant(sut)
+    // only available thru static class
+    Timber.tag("infoTag").log(Log.INFO, "message")
+    verify(fixture.scopes).captureEvent(check { assertEquals("infoTag", it.getTag("TimberTag")) })
+  }
+
+  @Test
+  fun `Tree properly propagates all levels`() {
+    val levels =
+      listOf(
+        Pair(Log.DEBUG, SentryLevel.DEBUG),
+        Pair(Log.VERBOSE, SentryLevel.DEBUG),
+        Pair(Log.INFO, SentryLevel.INFO),
+        Pair(Log.WARN, SentryLevel.WARNING),
+        Pair(Log.ERROR, SentryLevel.ERROR),
+        Pair(Log.ASSERT, SentryLevel.FATAL),
+      )
+
+    for (level in levels) {
+      Timber.uprootAll()
+
+      val logLevel = level.first
+      val sentryLevel = level.second
+
+      val sut = fixture.getSut(minEventLevel = sentryLevel)
+      Timber.plant(sut)
+      // only available thru static class
+      Timber.tag("tag").log(logLevel, "message")
+      verify(fixture.scopes)
+        .captureEvent(
+          check {
+            assertEquals("tag", it.getTag("TimberTag"))
+            assertEquals(sentryLevel, it.level)
+          }
+        )
+    }
+  }
+
   @Test
   fun `Tree captures an event without TimberTag tag`() {
     val sut = fixture.getSut()