ref(timber)!: Require explicit Logs opt-in

Replace the no-argument SentryTimberIntegration constructor with a
boolean overload so manually installed integrations must choose whether
to forward Sentry Logs.

Keep the lazy evaluator path for auto-installed integrations and clarify
the separate Android option and constructor configuration paths.

BREAKING CHANGE: SentryTimberIntegration() now requires a logsEnabled argument.
Co-Authored-By: Claude <noreply@anthropic.com>

Author: adinauer

CHANGELOG.md

@@ -7,9 +7,10 @@
 - Add a `logsEnabled` argument to the preferred Log4j2 `SentryAppender` constructor and
   `createAppender` factory. Pass `true` to opt in to Sentry Logs capture or `false` to keep it
   disabled. ([#5941](https://github.com/getsentry/sentry-java/pull/5941))
-- Add a `logsEnabled` argument to the `SentryTimberIntegration` and `SentryTimberTree` JVM
-  constructors. It defaults to `false` for Kotlin callers; Java callers using the explicit level
-  constructors must pass the new argument. ([#5943](https://github.com/getsentry/sentry-java/pull/5943))
+- Require a `logsEnabled` argument when manually constructing `SentryTimberIntegration` or
+  `SentryTimberTree`. Replace `SentryTimberIntegration()` with
+  `SentryTimberIntegration(logsEnabled = false)` in Kotlin or `new SentryTimberIntegration(false)`
+  in Java to keep Sentry Logs disabled. ([#5943](https://github.com/getsentry/sentry-java/pull/5943))
 - Remove the obsolete aggregate Sentry Metrics options `metrics.enabled` and
   `options.getMetrics().setEnabled(...)`. Direct `Sentry.metrics()` calls continue to capture
   Metrics whenever the SDK is enabled. ([#5953](https://github.com/getsentry/sentry-java/pull/5953))
@@ -22,7 +23,9 @@
   - Log4j2 appender: `logsEnabled`
   - JUL handler: `io.sentry.jul.SentryHandler.logsEnabled`
   - Spring Boot logging auto-configuration: `sentry.logging.logs-enabled`
-  - Timber: `timberLogCaptureEnabled` or `io.sentry.timber.logs.enabled` manifest metadata
+  - Auto-installed Timber integration: `timberLogCaptureEnabled` or
+    `io.sentry.timber.logs.enabled` manifest metadata
+  - Manually installed Timber integration: `logsEnabled` constructor argument
   - Logcat: `logcatLogCaptureEnabled` or `io.sentry.logcat.logs.enabled` manifest metadata
 
 ### Features

sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidTest.kt

@@ -286,7 +286,13 @@ class SentryAndroidTest {
     fixture.initSut(autoInit = true) {
       it.addIntegration(FragmentLifecycleIntegration(ApplicationProvider.getApplicationContext()))
 
-      it.addIntegration(SentryTimberIntegration(minEventLevel = FATAL, minBreadcrumbLevel = DEBUG))
+      it.addIntegration(
+        SentryTimberIntegration(
+          minEventLevel = FATAL,
+          minBreadcrumbLevel = DEBUG,
+          logsEnabled = false,
+        )
+      )
 
       it.addIntegration(
         SystemEventsBreadcrumbsIntegration(

sentry-android-timber/api/sentry-android-timber.api

@@ -8,9 +8,9 @@ public final class io/sentry/android/timber/BuildConfig {
 }
 
 public final class io/sentry/android/timber/SentryTimberIntegration : io/sentry/Integration, java/io/Closeable {
-	public fun <init> ()V
 	public fun <init> (Lio/sentry/SentryLevel;Lio/sentry/SentryLevel;Lio/sentry/SentryLogLevel;Z)V
 	public synthetic fun <init> (Lio/sentry/SentryLevel;Lio/sentry/SentryLevel;Lio/sentry/SentryLogLevel;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Z)V
 	public fun close ()V
 	public final fun getLogsEnabled ()Z
 	public final fun getMinBreadcrumbLevel ()Lio/sentry/SentryLevel;

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

@@ -14,20 +14,45 @@ import java.io.Closeable
 import timber.log.Timber
 
 /** Sentry integration for Timber. */
-public class SentryTimberIntegration(
-  public val minEventLevel: SentryLevel = SentryLevel.ERROR,
-  public val minBreadcrumbLevel: SentryLevel = SentryLevel.INFO,
-  public val minLogsLevel: SentryLogLevel = SentryLogLevel.INFO,
-  logsEnabled: Boolean = false,
+public class SentryTimberIntegration
+private constructor(
+  public val minEventLevel: SentryLevel,
+  public val minBreadcrumbLevel: SentryLevel,
+  public val minLogsLevel: SentryLogLevel,
+  private val logsEnabledProvider: Evaluator<Boolean>,
 ) : Integration, Closeable {
-  public val logsEnabled: Boolean
-    get() = logsEnabledProvider.evaluate()
+  public constructor(
+    minEventLevel: SentryLevel = SentryLevel.ERROR,
+    minBreadcrumbLevel: SentryLevel = SentryLevel.INFO,
+    minLogsLevel: SentryLogLevel = SentryLogLevel.INFO,
+    logsEnabled: Boolean,
+  ) : this(
+    minEventLevel,
+    minBreadcrumbLevel,
+    minLogsLevel,
+    Evaluator { logsEnabled },
+  )
 
-  private var logsEnabledProvider: Evaluator<Boolean> = Evaluator { logsEnabled }
+  public constructor(
+    logsEnabled: Boolean
+  ) : this(
+    SentryLevel.ERROR,
+    SentryLevel.INFO,
+    SentryLogLevel.INFO,
+    logsEnabled,
+  )
 
-  internal constructor(logsEnabledProvider: Evaluator<Boolean>) : this() {
-    this.logsEnabledProvider = logsEnabledProvider
-  }
+  internal constructor(
+    logsEnabledProvider: Evaluator<Boolean>
+  ) : this(
+    SentryLevel.ERROR,
+    SentryLevel.INFO,
+    SentryLogLevel.INFO,
+    logsEnabledProvider,
+  )
+
+  public val logsEnabled: Boolean
+    get() = logsEnabledProvider.evaluate()
 
   private lateinit var tree: SentryTimberTree
   private lateinit var logger: ILogger

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

@@ -39,22 +39,14 @@ class SentryTimberIntegrationTest {
       minEventLevel: SentryLevel = SentryLevel.ERROR,
       minBreadcrumbLevel: SentryLevel = SentryLevel.INFO,
       minLogsLevel: SentryLogLevel = SentryLogLevel.INFO,
-      logsEnabled: Boolean? = null,
+      logsEnabled: Boolean = false,
     ): SentryTimberIntegration =
-      if (logsEnabled == null) {
-        SentryTimberIntegration(
-          minEventLevel = minEventLevel,
-          minBreadcrumbLevel = minBreadcrumbLevel,
-          minLogsLevel = minLogsLevel,
-        )
-      } else {
-        SentryTimberIntegration(
-          minEventLevel = minEventLevel,
-          minBreadcrumbLevel = minBreadcrumbLevel,
-          minLogsLevel = minLogsLevel,
-          logsEnabled = logsEnabled,
-        )
-      }
+      SentryTimberIntegration(
+        minEventLevel = minEventLevel,
+        minBreadcrumbLevel = minBreadcrumbLevel,
+        minLogsLevel = minLogsLevel,
+        logsEnabled = logsEnabled,
+      )
   }
 
   private val fixture = Fixture()
@@ -86,8 +78,8 @@ class SentryTimberIntegrationTest {
   }
 
   @Test
-  fun `Manual integration defaults logs to disabled while capturing events and breadcrumbs`() {
-    val sut = fixture.getSut()
+  fun `Manual integration keeps logs disabled when configured false`() {
+    val sut = SentryTimberIntegration(logsEnabled = false)
     sut.register(fixture.scopes, fixture.options)
 
     assertFalse(sut.logsEnabled)
@@ -100,7 +92,7 @@ class SentryTimberIntegrationTest {
 
   @Test
   fun `Manual integration captures logs when enabled`() {
-    val sut = fixture.getSut(logsEnabled = true)
+    val sut = SentryTimberIntegration(logsEnabled = true)
     sut.register(fixture.scopes, fixture.options)
 
     assertTrue(sut.logsEnabled)