From 060811b70668b2ad941b29eace9340b264228f2a Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <5731772+marandaneto@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:45 +0100
Subject: [PATCH] Fix: Sentry Timber integration does not submit msg.formatted
 breadcrumbs (#1957)

---
 CHANGELOG.md                                         |  4 ++++
 .../io/sentry/android/timber/SentryTimberTree.kt     |  2 +-
 .../io/sentry/android/timber/SentryTimberTreeTest.kt | 12 ++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index baebee849e..e40d12fff4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+* Fix: Sentry Timber integration does not submit msg.formatted breadcrumbs (#)
+
 ## 5.7.0
 
 * Feat: Automatically enable `Timber` and `Fragment` integrations if they are present on the classpath (#1936)
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
index 282573647c..6da51ba84a 100644
--- 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
@@ -252,7 +252,7 @@ class SentryTimberTree(
                 msg.message != null -> Breadcrumb().apply {
                     level = sentryLevel
                     category = "Timber"
-                    message = msg.message
+                    message = msg.formatted ?: msg.message
                 }
                 throwableMsg != null -> Breadcrumb.error(throwableMsg).apply {
                     category = "exception"
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
index 802599a41a..e507b58177 100644
--- 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
@@ -215,6 +215,18 @@ class SentryTimberTreeTest {
         )
     }
 
+    @Test
+    fun `Tree adds a breadcrumb with formatted message and arguments, when provided`() {
+        val sut = fixture.getSut()
+        sut.e("test count: %d", 32)
+
+        verify(fixture.hub).addBreadcrumb(
+                check<Breadcrumb> {
+                    assertEquals("test count: 32", it.message)
+                }
+        )
+    }
+
     @Test
     fun `Tree adds a breadcrumb if min level is equal`() {
         val sut = fixture.getSut()