Added case for timber logging both a message and a throwable

Author: stefanosiano

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

@@ -15,7 +15,7 @@ public class SentryTimberTree(
   private val scopes: IScopes,
   private val minEventLevel: SentryLevel,
   private val minBreadcrumbLevel: SentryLevel,
-  private val minLogsLevel: SentryLogLevel = SentryLogLevel.INFO,
+  private val minLogLevel: SentryLogLevel = SentryLogLevel.INFO,
 ) : Timber.Tree() {
   private val pendingTag = ThreadLocal<String?>()
 
@@ -243,9 +243,10 @@ public class SentryTimberTree(
     vararg args: Any?,
   ) {
     // checks the log level
-    if (isLoggable(sentryLogLevel, minLogsLevel)) {
+    if (isLoggable(sentryLogLevel, minLogLevel)) {
       val throwableMsg = throwable?.message
       when {
+        msg != null && throwableMsg != null -> scopes.logger().log(sentryLogLevel, "$msg\n$throwableMsg", *args)
         msg != null -> scopes.logger().log(sentryLogLevel, msg, *args)
         throwableMsg != null -> scopes.logger().log(sentryLogLevel, throwableMsg, *args)
       }

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

@@ -302,4 +302,12 @@ class SentryTimberTreeTest {
 
     verify(fixture.logs).log(eq(SentryLogLevel.ERROR), eq("throwable message"))
   }
+
+  @Test
+  fun `Tree logs throwable and message`() {
+    val sut = fixture.getSut()
+    sut.e(Throwable("throwable message"), "My message")
+
+    verify(fixture.logs).log(eq(SentryLogLevel.ERROR), eq("My message\nthrowable message"))
+  }
 }