Skip to content

Don't override sdk version with timber #2450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 3, 2023
Merged

Don't override sdk version with timber #2450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bff4562
Don't override sdk version with timber
romtsn Jan 3, 2023
74ffb79
Format code
getsentry-bot Jan 3, 2023
9a06be8
Changelog
romtsn Jan 3, 2023
2f2097e
Merge branch 'main' into fix/timber-sdk-version
romtsn Jan 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

- Collect memory usage in transactions ([#2445](https://github.com/getsentry/sentry-java/pull/2445))

### Fixes

- Don't override sdk name with Timber ([#2450](https://github.com/getsentry/sentry-java/pull/2450))

## 6.11.0

### Features
Expand Down
17 changes: 2 additions & 15 deletions sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -22,7 +20,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)
Expand All @@ -40,16 +39,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
}
}
15 changes: 2 additions & 13 deletions sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}