fix: Timber throwing on args usage (#1986)

getsentry · Apr 13, 2022 · f0786d3 · f0786d3
1 parent ed3d4e8
commit f0786d3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+* Fix: Sentry Timber integration throws an exception when using args (#1986)
+
 ## 5.7.2
 
 * Fix: bring back support for `Timber.tag` ([#1974](https://github.com/getsentry/sentry-java/pull/1974))

diff --git a/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberTree.kt b/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberTree.kt
@@ -42,7 +42,7 @@ class SentryTimberTree(
         message: String?,
         vararg args: Any?
     ) {
-        super.v(t, message, args)
+        super.v(t, message, *args)
         logWithSentry(Log.VERBOSE, t, message, *args)
     }
 
@@ -57,7 +57,7 @@ class SentryTimberTree(
         message: String?,
         vararg args: Any?
     ) {
-        super.d(message, args)
+        super.d(message, *args)
         logWithSentry(Log.DEBUG, null, message, *args)
     }
 
@@ -67,7 +67,7 @@ class SentryTimberTree(
         message: String?,
         vararg args: Any?
     ) {
-        super.d(t, message, args)
+        super.d(t, message, *args)
         logWithSentry(Log.DEBUG, t, message, *args)
     }
 
@@ -82,7 +82,7 @@ class SentryTimberTree(
         message: String?,
         vararg args: Any?
     ) {
-        super.d(message, args)
+        super.d(message, *args)
         logWithSentry(Log.INFO, null, message, *args)
     }
 
@@ -92,7 +92,7 @@ class SentryTimberTree(
         message: String?,
         vararg args: Any?
     ) {
-        super.i(t, message, args)
+        super.i(t, message, *args)
         logWithSentry(Log.INFO, t, message, *args)
     }
 
@@ -107,7 +107,7 @@ class SentryTimberTree(
         message: String?,
         vararg args: Any?
     ) {
-        super.w(message, args)
+        super.w(message, *args)
         logWithSentry(Log.WARN, null, message, *args)
     }
 

diff --git a/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberTreeTest.kt b/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberTreeTest.kt
@@ -276,4 +276,10 @@ class SentryTimberTreeTest {
         sut.e(Throwable())
         verify(fixture.hub, never()).addBreadcrumb(any<Breadcrumb>())
     }
+
+    @Test
+    fun `Tree does not throw when using log with args`() {
+        val sut = fixture.getSut()
+        sut.d("test %s, %s", 1, 1)
+    }
 }