ref(android): Align log capture manifest option names

Rename the Timber and Logcat manifest options to describe Sentry's log
capture direction consistently with their Android option accessors.

Co-Authored-By: Claude <noreply@anthropic.com>

Author: adinauer

.cursor/rules/options.mdc

@@ -76,7 +76,7 @@ Allows setting options via `AndroidManifest.xml` `<meta-data>` tags.
 - Add a `static final String` constant for the key
 - Read it in `applyMetadata()` using `readBool(metadata, logger, CONSTANT, defaultValue)`
 - Apply automatic-source options directly, for example
-  `options.setLogcatLogCaptureEnabled(...)` for `io.sentry.logcat.logs.enabled`
+  `options.setLogcatLogCaptureEnabled(...)` for `io.sentry.logcat.log-capture.enabled`
 - Do not add or restore `io.sentry.logs.enabled` or `io.sentry.metrics.enabled`; those aggregate
   keys are obsolete.
 
@@ -114,8 +114,8 @@ or breadcrumb paths. Current Logs controls are:
 - Log4j2: appender `logsEnabled`
 - JUL: handler `logsEnabled`
 - Spring Boot Logback: `sentry.logging.logs-enabled`
-- Timber: `timberLogCaptureEnabled` / `io.sentry.timber.logs.enabled`
-- Logcat: `logcatLogCaptureEnabled` / `io.sentry.logcat.logs.enabled`
+- Timber: `timberLogCaptureEnabled` / `io.sentry.timber.log-capture.enabled`
+- Logcat: `logcatLogCaptureEnabled` / `io.sentry.logcat.log-capture.enabled`
 
 All source-local options default to `false` and gate only Sentry Logs forwarding.
 

CHANGELOG.md

@@ -25,9 +25,9 @@
   - JUL handler: `io.sentry.jul.SentryHandler.logsEnabled`
   - Spring Boot logging auto-configuration: `sentry.logging.logs-enabled`
   - Auto-installed Timber integration: `timberLogCaptureEnabled` or
-    `io.sentry.timber.logs.enabled` manifest metadata
+    `io.sentry.timber.log-capture.enabled` manifest metadata
   - Manually installed Timber integration: `logsEnabled` constructor argument
-  - Logcat: `logcatLogCaptureEnabled` or `io.sentry.logcat.logs.enabled` manifest metadata
+  - Logcat: `logcatLogCaptureEnabled` or `io.sentry.logcat.log-capture.enabled` manifest metadata
 
 ### Features
 

sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java

@@ -192,9 +192,9 @@ final class ManifestMetadataReader {
 
   static final String IN_APP_EXCLUDES = "io.sentry.in-app-excludes";
 
-  static final String ENABLE_TIMBER_LOGS = "io.sentry.timber.logs.enabled";
+  static final String TIMBER_LOG_CAPTURE_ENABLED = "io.sentry.timber.log-capture.enabled";
 
-  static final String ENABLE_LOGCAT_LOGS = "io.sentry.logcat.logs.enabled";
+  static final String LOGCAT_LOG_CAPTURE_ENABLED = "io.sentry.logcat.log-capture.enabled";
 
   static final String ENABLE_AUTO_TRACE_ID_GENERATION =
       "io.sentry.traces.enable-auto-id-generation";
@@ -751,10 +751,18 @@ static void applyMetadata(
         }
 
         options.setTimberLogCaptureEnabled(
-            readBool(metadata, logger, ENABLE_TIMBER_LOGS, options.getTimberLogCaptureEnabled()));
+            readBool(
+                metadata,
+                logger,
+                TIMBER_LOG_CAPTURE_ENABLED,
+                options.getTimberLogCaptureEnabled()));
 
         options.setLogcatLogCaptureEnabled(
-            readBool(metadata, logger, ENABLE_LOGCAT_LOGS, options.getLogcatLogCaptureEnabled()));
+            readBool(
+                metadata,
+                logger,
+                LOGCAT_LOG_CAPTURE_ENABLED,
+                options.getLogcatLogCaptureEnabled()));
 
         final @NotNull SentryFeedbackOptions feedbackOptions = options.getFeedbackOptions();
         feedbackOptions.setNameRequired(

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

@@ -2186,7 +2186,7 @@ class ManifestMetadataReaderTest {
 
   @Test
   fun `applyMetadata reads Timber log capture enabled to options`() {
-    val bundle = bundleOf(ManifestMetadataReader.ENABLE_TIMBER_LOGS to true)
+    val bundle = bundleOf(ManifestMetadataReader.TIMBER_LOG_CAPTURE_ENABLED to true)
     val context = fixture.getContext(metaData = bundle)
 
     ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
@@ -2205,7 +2205,7 @@ class ManifestMetadataReaderTest {
 
   @Test
   fun `applyMetadata reads Logcat log capture enabled to options`() {
-    val bundle = bundleOf(ManifestMetadataReader.ENABLE_LOGCAT_LOGS to true)
+    val bundle = bundleOf(ManifestMetadataReader.LOGCAT_LOG_CAPTURE_ENABLED to true)
     val context = fixture.getContext(metaData = bundle)
 
     ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
@@ -2216,7 +2216,7 @@ class ManifestMetadataReaderTest {
   @Test
   fun `applyMetadata reads Logcat log capture disabled to options`() {
     fixture.options.logcatLogCaptureEnabled = true
-    val bundle = bundleOf(ManifestMetadataReader.ENABLE_LOGCAT_LOGS to false)
+    val bundle = bundleOf(ManifestMetadataReader.LOGCAT_LOG_CAPTURE_ENABLED to false)
     val context = fixture.getContext(metaData = bundle)
 
     ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)

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

@@ -262,7 +262,7 @@ class SentryAndroidTest {
     val metadata =
       Bundle().apply {
         putString(ManifestMetadataReader.DSN, "https://key@sentry.io/123")
-        putBoolean(ManifestMetadataReader.ENABLE_TIMBER_LOGS, true)
+        putBoolean(ManifestMetadataReader.TIMBER_LOG_CAPTURE_ENABLED, true)
       }
     val mockContext = ContextUtilsTestHelper.mockMetaData(metaData = metadata)
     val logs = mutableListOf<SentryLogEvent>()

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

@@ -86,7 +86,8 @@ class SentryLogcatAdapterTest {
 
   @Test
   fun `Logcat log capture can be enabled through manifest metadata`() {
-    val metadata = Bundle().apply { putBoolean(ManifestMetadataReader.ENABLE_LOGCAT_LOGS, true) }
+    val metadata =
+      Bundle().apply { putBoolean(ManifestMetadataReader.LOGCAT_LOG_CAPTURE_ENABLED, true) }
     fixture.initSut(logcatLogCaptureEnabled = null, metadata = metadata)
 
     SentryLogcatAdapter.d(tag, commonMsg)

sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml

@@ -149,12 +149,12 @@
 
     <!--    how to enable Sentry Logs capture from Timber-->
     <meta-data
-      android:name="io.sentry.timber.logs.enabled"
+      android:name="io.sentry.timber.log-capture.enabled"
       android:value="true" />
 
     <!--    how to enable Sentry Logs capture from Logcat-->
     <meta-data
-      android:name="io.sentry.logcat.logs.enabled"
+      android:name="io.sentry.logcat.log-capture.enabled"
       android:value="true" />
 
     <!--    how to disable verbose logging of the session replay feature-->