From bff456228a34f7f9f99dfc75af8f75410d896691 Mon Sep 17 00:00:00 2001
From: Roman Zavarnitsyn <rom4ek93@gmail.com>
Date: Tue, 3 Jan 2023 16:20:21 +0100
Subject: [PATCH 1/3] Don't override sdk version with timber

---
 .../android/timber/SentryTimberIntegration.kt     | 15 ++-------------
 .../android/timber/SentryTimberIntegrationTest.kt | 15 ++-------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt b/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt
index 75d73bac82f..faeca657869 100644
--- a/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt
+++ b/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt
@@ -22,7 +22,8 @@ class SentryTimberIntegration(
     private lateinit var logger: ILogger
 
     override fun register(hub: IHub, options: SentryOptions) {
-        createSdkVersion(options)
+        options.sdkVersion?.addPackage("maven:io.sentry:sentry-android-timber", VERSION_NAME)
+
         logger = options.logger
 
         tree = SentryTimberTree(hub, minEventLevel, minBreadcrumbLevel)
@@ -40,16 +41,4 @@ class SentryTimberIntegration(
             }
         }
     }
-
-    private fun createSdkVersion(options: SentryOptions): SdkVersion {
-        var sdkVersion = options.sdkVersion
-
-        val name = SENTRY_TIMBER_SDK_NAME
-        val version = VERSION_NAME
-        sdkVersion = SdkVersion.updateSdkVersion(sdkVersion, name, version)
-
-        sdkVersion.addPackage("maven:io.sentry:sentry-android-timber", VERSION_NAME)
-
-        return sdkVersion
-    }
 }
diff --git a/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt b/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt
index 9f7db6deaaf..2c2b248c5d9 100644
--- a/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt
+++ b/sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt
@@ -97,20 +97,9 @@ class SentryTimberIntegrationTest {
 
         assertTrue(
             fixture.options.sdkVersion!!.packages!!.any {
-                it.name == "maven:io.sentry:sentry-android-timber"
-                it.version == BuildConfig.VERSION_NAME
+                it.name == "maven:io.sentry:sentry-android-timber" &&
+                    it.version == BuildConfig.VERSION_NAME
             }
         )
     }
-
-    @Test
-    fun `Integration sets SDK name and version to options`() {
-        val sut = fixture.getSut()
-        sut.register(fixture.hub, fixture.options)
-
-        val sdkVersion = fixture.options.sdkVersion!!
-
-        assertEquals(sdkVersion.name, "sentry.java.android.timber")
-        assertEquals(sdkVersion.version, BuildConfig.VERSION_NAME)
-    }
 }

From 74ffb7958cbc1eac3db06cc42a6b87bbb7cfa4a6 Mon Sep 17 00:00:00 2001
From: Sentry Github Bot <bot+github-bot@sentry.io>
Date: Tue, 3 Jan 2023 15:24:38 +0000
Subject: [PATCH 2/3] Format code

---
 .../java/io/sentry/android/timber/SentryTimberIntegration.kt    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt b/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt
index faeca657869..52999502250 100644
--- a/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt
+++ b/sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt
@@ -5,9 +5,7 @@ import io.sentry.ILogger
 import io.sentry.Integration
 import io.sentry.SentryLevel
 import io.sentry.SentryOptions
-import io.sentry.android.timber.BuildConfig.SENTRY_TIMBER_SDK_NAME
 import io.sentry.android.timber.BuildConfig.VERSION_NAME
-import io.sentry.protocol.SdkVersion
 import timber.log.Timber
 import java.io.Closeable
 

From 9a06be8c38b6349e95f7c47e4091d1c594531b44 Mon Sep 17 00:00:00 2001
From: Roman Zavarnitsyn <rom4ek93@gmail.com>
Date: Tue, 3 Jan 2023 17:00:34 +0100
Subject: [PATCH 3/3] Changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4658a65397b..2725fd89443 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Don't override sdk name with Timber ([#2450](https://github.com/getsentry/sentry-java/pull/2450))
+
 ## 6.11.0
 
 ### Features