Merge branch '9.x.x' into sync/main-to-9.x.x-2026-10-15

Resolve .craft.yml: keep main's registry metadata for sentry-jul and drop the sentry-apache-http-client-5 entry removed on 9.x.x (#6214).

Fix SentryClientInternalEventProcessorTest (added on main in #6140) to stop using logs/metrics isEnabled, which 9.x.x removed (#5939).

Co-Authored-By: Alexander Dinauer <alexander.dinauer@sentry.io>

Author: sentry-junior[bot]

.craft.yml

@@ -95,11 +95,6 @@ targets:
         packageUrl: https://central.sonatype.com/artifact/io.sentry/sentry-jul
         mainDocsUrl: https://docs.sentry.io/platforms/java/guides/jul/
         apiDocsUrl: https://javadoc.io/doc/io.sentry
-      maven:io.sentry:sentry-apache-http-client-5:
-        name: io.sentry:sentry-apache-http-client-5
-        packageUrl: https://central.sonatype.com/artifact/io.sentry/sentry-apache-http-client-5
-        mainDocsUrl: https://docs.sentry.io/platforms/java/
-        apiDocsUrl: https://javadoc.io/doc/io.sentry
       maven:io.sentry:sentry-android:
         name: io.sentry:sentry-android
         packageUrl: https://central.sonatype.com/artifact/io.sentry/sentry-android

.cursor/rules/options.mdc

@@ -4,20 +4,24 @@ description: Adding and modifying SDK options
 ---
 # Adding Options to the SDK
 
-New features must be **opt-in by default**. Options control whether a feature is enabled and how it behaves.
+New automatic capture features must be **opt-in by default**. Deliberate API calls such as
+`Sentry.logger()` and `Sentry.metrics()` capture whenever the SDK is enabled and do not have
+aggregate signal enable flags. Options control signal behavior and whether individual automatic
+sources are enabled.
 
 ## Namespaced Options
 
 Newer features use namespaced option classes nested inside `SentryOptions`, e.g.:
 - `SentryOptions.getLogs()` → `SentryOptions.Logs`
 - `SentryOptions.getMetrics()` → `SentryOptions.Metrics`
 
-Each namespaced options class is a `public static final class` inside `SentryOptions` with its own fields, getters/setters, and callbacks (e.g. `BeforeSendLogCallback`, `BeforeSendMetricCallback`).
+Each namespaced options class is a `public static final class` inside `SentryOptions` with its own fields, getters/setters, factories, and callbacks (e.g. `BeforeSendLogCallback`, `BeforeSendMetricCallback`).
 
-A typical namespaced options class contains:
-- `enabled` boolean (default `false` for opt-in)
-- `sampleRate` double (if the feature supports sampling)
-- `beforeSend` callback interface (nested inside the options class)
+Do not assume that a namespaced signal needs an aggregate `enabled` field. In particular, Logs and
+Metrics are available through deliberate API calls whenever the SDK is enabled. Their namespaced
+options contain signal-specific behavior such as `beforeSend`, limits, and processor factories. Add
+options such as sampling only when the signal supports them. Automatic capture integrations use
+source-local enable options that default to `false`.
 
 To add a new namespaced options class:
 1. Create the `public static final class` inside `SentryOptions` with fields, getters/setters, and any callback interfaces
@@ -47,21 +51,18 @@ The core options class. Add the field (or nested class) with getter/setter here.
 Allows setting options via `sentry.properties` file or system properties. Fields use nullable wrapper types (`@Nullable Boolean`, `@Nullable Double`) since unset means "don't override the default."
 
 **File:** `sentry/src/main/java/io/sentry/ExternalOptions.java`
-- Add `@Nullable` fields with getter/setter for each externally configurable option (e.g. `enableMetrics`, `logsSampleRate`)
-- Wire them in the static `from(PropertiesProvider)` method:
-  - Boolean: `propertiesProvider.getBooleanProperty("metrics.enabled")`
-  - Double: `propertiesProvider.getDoubleProperty("logs.sample-rate")`
+- Add `@Nullable` fields with getter/setter for each externally configurable option (e.g. `logsSampleRate`)
+- Wire them in the static `from(PropertiesProvider)` method, for example:
+  `propertiesProvider.getDoubleProperty("logs.sample-rate")`
 
 **File:** `sentry/src/main/java/io/sentry/SentryOptions.java` — `merge()` method
 - Add null-check blocks to apply each external option onto the namespaced options class:
   ```java
-  if (options.isEnableMetrics() != null) {
-      getMetrics().setEnabled(options.isEnableMetrics());
-  }
   if (options.getLogsSampleRate() != null) {
       getLogs().setSampleRate(options.getLogsSampleRate());
   }
   ```
+- Do not add or restore `logs.enabled` or `metrics.enabled`; these aggregate options are obsolete.
 
 **Tests:**
 - `sentry/src/test/java/io/sentry/ExternalOptionsTest.kt` — test true/false/null for booleans, valid values and null for doubles
@@ -72,9 +73,12 @@ Allows setting options via `sentry.properties` file or system properties. Fields
 Allows setting options via `AndroidManifest.xml` `<meta-data>` tags.
 
 **File:** `sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java`
-- Add a `static final String` constant for the key (e.g. `"io.sentry.metrics.enabled"`)
+- Add a `static final String` constant for the key
 - Read it in `applyMetadata()` using `readBool(metadata, logger, CONSTANT, defaultValue)`
-- Apply to the namespaced options, e.g. `options.getMetrics().setEnabled(...)`
+- Apply automatic-source options directly, for example
+  `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.
 
 **Tests:** `sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt`
 - Test default value preserved when not in manifest
@@ -83,21 +87,37 @@ Allows setting options via `AndroidManifest.xml` `<meta-data>` tags.
 
 ### 4. Spring Boot Properties (Spring Boot only)
 
-`SentryProperties` extends `SentryOptions`, so namespaced options (nested classes) are automatically available as Spring Boot properties without extra code. For example, `SentryOptions.Logs` is automatically mapped to `sentry.logs.enabled` in `application.properties`.
+`SentryProperties` extends `SentryOptions`, so bindable namespaced behavior options are available
+through the `SentryOptions` class hierarchy. Spring-owned integration controls belong to a Spring
+namespace instead. For example, `SentryProperties.Logging.logsEnabled` binds to
+`sentry.logging.logs-enabled` and controls Logs forwarding from the auto-configured Logback
+appender. `sentry.logging.enabled` separately controls whether that appender is installed.
 
-No additional code is needed for namespaced options — Spring Boot auto-configuration handles this via property binding on the `SentryOptions` class hierarchy.
+Do not add or restore `sentry.logs.enabled` or `sentry.metrics.enabled`; those aggregate properties
+are obsolete.
 
 **Tests:** `sentry-spring-boot*/src/test/kotlin/.../SentryAutoConfigurationTest.kt`
-- Add the property (e.g. `"sentry.logs.enabled=true"`) to the existing `resolves all properties` test
+- Add the new property to the existing binding test
 - Assert the value is set on the resolved `SentryProperties` bean
+- Test default, explicit `true`, explicit `false`, and propagation into the owning integration
 - There are three Spring Boot modules with separate test files: `sentry-spring-boot`, `sentry-spring-boot-jakarta`, `sentry-spring-boot-4`
 
 ### 5. Reading Options at Runtime
 
-Features check their options at usage time. For namespaced features the check typically happens in the feature's API class (e.g. `LoggerApi`, `MetricsApi`):
-- Check `options.getLogs().isEnabled()` early and return if disabled
-- Apply sampling via `options.getLogs().getSampleRate()` if applicable
-- Apply `beforeSend` callback in `SentryClient` before sending
+Deliberate APIs such as `LoggerApi` and `MetricsApi` do not check aggregate signal enable flags.
+They capture whenever their scopes are enabled, then apply signal behavior such as sampling and
+`beforeSend`.
+
+Automatic integrations must check their source-local opt-in without affecting their existing event
+or breadcrumb paths. Current Logs controls are:
+- Logback: appender `logsEnabled`
+- Log4j2: appender `logsEnabled`
+- JUL: handler `logsEnabled`
+- Spring Boot Logback: `sentry.logging.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.
 
 When a feature has its own capture path (e.g. `captureLog`), the relevant classes are:
 - `ISentryClient` — add the capture method signature
@@ -106,10 +126,11 @@ When a feature has its own capture path (e.g. `captureLog`), the relevant classe
 
 ## Checklist for Adding a New Namespaced Option
 
-1. `SentryOptions.java` — nested options class + getter/setter on `SentryOptions`
-2. `ExternalOptions.java` — `@Nullable` fields + wiring in `from()`
-3. `SentryOptions.java` `merge()` — apply external options to namespaced class
-4. `ManifestMetadataReader.java` — Android manifest support (if Android-relevant)
-5. `SentryAutoConfigurationTest.kt` — Spring Boot property binding tests (all three Spring Boot modules)
-6. Tests for all of the above (`SentryOptionsTest`, `ExternalOptionsTest`, `ManifestMetadataReaderTest`)
-7. Run `./gradlew apiDump` — the nested class and its methods appear in `sentry.api`
+1. Decide whether the option controls deliberate API behavior or an automatic capture source
+2. `SentryOptions.java` — nested behavior option + getter/setter where core ownership is appropriate
+3. `ExternalOptions.java` and `SentryOptions.merge()` — add external support if applicable
+4. `ManifestMetadataReader.java` — add Android support if applicable
+5. Spring properties — use the owning integration namespace and test all three Spring Boot modules
+6. Test defaults and every supported configuration layer
+7. Verify automatic-source opt-ins default to `false` and do not gate events or breadcrumbs
+8. Run `./gradlew spotlessApply apiDump`

.github/ISSUE_TEMPLATE/bug_report_java.yml

@@ -39,7 +39,6 @@ body:
         - sentry-openfeign
         - sentry-openfeature
         - sentry-launchdarkly-server
-        - sentry-apache-http-client-5
         - sentry-okhttp
         - sentry-reactor
         - other

.github/file-filters.yml

@@ -6,7 +6,6 @@ high_risk_code: &high_risk_code
   - "sentry/src/main/java/io/sentry/transport/HttpConnection.java"
   - "sentry/src/main/java/io/sentry/transport/QueuedThreadPoolExecutor.java"
   - "sentry/src/main/java/io/sentry/transport/RateLimiter.java"
-  - "sentry-apache-http-client-5/src/main/java/io/sentry/transport/apache/ApacheHttpClientTransport.java"
 
   # Class used by hybrid SDKs
   - "sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java"

AGENTS.md

@@ -96,7 +96,7 @@ The repository is organized into multiple modules:
 ### Integration Modules
 - **Spring Framework**: `sentry-spring*`, `sentry-spring-boot*`
 - **Logging**: `sentry-logback`, `sentry-log4j2`, `sentry-jul`, `sentry-android-timber`
-- **Web**: `sentry-servlet*`, `sentry-okhttp`, `sentry-openfeign`, `sentry-apache-http-client-5`
+- **Web**: `sentry-servlet*`, `sentry-okhttp`, `sentry-openfeign`
 - **GraphQL**: `sentry-graphql*`, `sentry-apollo*`
 - **Android UI**: `sentry-android-fragment`, `sentry-android-navigation`, `sentry-android-navigation3`, `sentry-compose`
 - **Session Replay**: `sentry-android-replay`

CHANGELOG.md

@@ -32,6 +32,41 @@
 
 ## 8.60.0
 
+### Breaking Changes
+
+- Remove the aggregate Sentry Logs and Metrics enable options from all configuration surfaces:
+  - Java API: `options.getLogs().setEnabled(...)` and `options.getMetrics().setEnabled(...)`
+  - Properties files: `logs.enabled` and `metrics.enabled`
+  - Environment variables: `SENTRY_LOGS_ENABLED` and `SENTRY_METRICS_ENABLED`
+  - JVM system properties and Spring Boot: `sentry.logs.enabled` and `sentry.metrics.enabled`
+  - Android manifest metadata: `io.sentry.logs.enabled` and `io.sentry.metrics.enabled`
+
+  The Java accessors are removed. Values supplied through the other configuration surfaces no
+  longer affect capture.
+  ([#5939](https://github.com/getsentry/sentry-java/pull/5939),
+  [#5947](https://github.com/getsentry/sentry-java/pull/5947),
+  [#5953](https://github.com/getsentry/sentry-java/pull/5953))
+  - **Automatic Logs capture:** Disabled by default. Enable it separately for each integration:
+    - Spring Boot logging auto-configuration: `sentry.logging.logs-enabled`
+      ([#5946](https://github.com/getsentry/sentry-java/pull/5946))
+    - Logback appender: `logsEnabled` ([#5940](https://github.com/getsentry/sentry-java/pull/5940))
+    - Log4j2 appender: `logsEnabled` ([#5941](https://github.com/getsentry/sentry-java/pull/5941))
+    - JUL handler: `logsEnabled` or `io.sentry.jul.SentryHandler.logsEnabled`
+      ([#5942](https://github.com/getsentry/sentry-java/pull/5942))
+    - Auto-installed Timber integration: `timberLogCaptureEnabled` or
+      `io.sentry.timber.log-capture.enabled` manifest metadata
+      ([#5943](https://github.com/getsentry/sentry-java/pull/5943))
+    - Manually installed Timber integration or tree: `logsEnabled`
+      ([#5943](https://github.com/getsentry/sentry-java/pull/5943))
+    - Logcat: `logcatLogCaptureEnabled` or `io.sentry.logcat.log-capture.enabled` manifest metadata
+      ([#5945](https://github.com/getsentry/sentry-java/pull/5945))
+  - **Constructor migrations:**
+    - The remaining Log4j2 `SentryAppender` constructor and `createAppender` factory require a
+      `logsEnabled` argument. The deprecated constructor without `minimumLevel` is removed.
+    - Manually constructed `SentryTimberIntegration` and `SentryTimberTree` instances require a
+      `logsEnabled` argument. Pass `false` to keep Sentry Logs disabled.
+- Remove the Apache HttpClient transport and stop publishing `sentry-apache-http-client-5` ([#6214](https://github.com/getsentry/sentry-java/pull/6214))
+
 ### Features
 
 - Add support for Android Navigation 3 through the new `sentry-android-navigation3` library ([#6233](https://github.com/getsentry/sentry-java/pull/6233))

README.md

@@ -31,7 +31,6 @@ Sentry SDK for Java and Android
 | sentry-compose-android                  | [![Maven Central Version](https://img.shields.io/maven-central/v/io.sentry/sentry-compose-android?style=for-the-badge&logo=sentry&color=green)](https://central.sonatype.com/artifact/io.sentry/sentry-compose-android)                  | 21 |
 | sentry-compose-desktop                  | [![Maven Central Version](https://img.shields.io/maven-central/v/io.sentry/sentry-compose-desktop?style=for-the-badge&logo=sentry&color=green)](https://central.sonatype.com/artifact/io.sentry/sentry-compose-desktop)                  | 
 | sentry-compose                          | [![Maven Central Version](https://img.shields.io/maven-central/v/io.sentry/sentry-compose?style=for-the-badge&logo=sentry&color=green)](https://central.sonatype.com/artifact/io.sentry/sentry-compose)                          | 
-| sentry-apache-http-client-5             | [![Maven Central Version](https://img.shields.io/maven-central/v/io.sentry/sentry-apache-http-client-5?style=for-the-badge&logo=sentry&color=green)](https://central.sonatype.com/artifact/io.sentry/sentry-apache-http-client-5)             |
 | sentry                                  | [![Maven Central Version](https://img.shields.io/maven-central/v/io.sentry/sentry?style=for-the-badge&logo=sentry&color=green)](https://central.sonatype.com/artifact/io.sentry/sentry)                                  | 21 |
 | sentry-jul                              | [![Maven Central Version](https://img.shields.io/maven-central/v/io.sentry/sentry-jul?style=for-the-badge&logo=sentry&color=green)](https://central.sonatype.com/artifact/io.sentry/sentry-jul)                              |
 | sentry-jdbc                             | [![Maven Central Version](https://img.shields.io/maven-central/v/io.sentry/sentry-jdbc?style=for-the-badge&logo=sentry&color=green)](https://central.sonatype.com/artifact/io.sentry/sentry-jdbc)                             |

sentry-android-core/api/sentry-android-core.api

@@ -429,12 +429,14 @@ public final class io/sentry/android/core/SentryAndroidOptions : io/sentry/Sentr
 	public fun getBeforeViewHierarchyCaptureCallback ()Lio/sentry/android/core/SentryAndroidOptions$BeforeCaptureCallback;
 	public fun getDebugImagesLoader ()Lio/sentry/android/core/IDebugImagesLoader;
 	public fun getFrameMetricsCollector ()Lio/sentry/android/core/internal/util/SentryFrameMetricsCollector;
+	public fun getLogcatLogCaptureEnabled ()Z
 	public fun getMonotonicTicker ()Lio/sentry/time/MonotonicTicker;
 	public fun getNativeSdkName ()Ljava/lang/String;
 	public fun getNdkAppHangTimeoutIntervalMillis ()J
 	public fun getNdkHandlerStrategy ()I
 	public fun getScreenshot ()Lio/sentry/android/core/SentryScreenshotOptions;
 	public fun getStartupCrashDurationThresholdMillis ()J
+	public fun getTimberLogCaptureEnabled ()Z
 	public fun getTombstoneMergeTimeThresholdMillis ()J
 	public fun isAnrEnabled ()Z
 	public fun isAnrProfilingEnabled ()Z
@@ -498,13 +500,15 @@ public final class io/sentry/android/core/SentryAndroidOptions : io/sentry/Sentr
 	public fun setEnableSystemEventBreadcrumbs (Z)V
 	public fun setEnableSystemEventBreadcrumbsExtras (Z)V
 	public fun setFrameMetricsCollector (Lio/sentry/android/core/internal/util/SentryFrameMetricsCollector;)V
+	public fun setLogcatLogCaptureEnabled (Z)V
 	public fun setMemoryLimiterEnabled (Z)V
 	public fun setNativeHandlerStrategy (Lio/sentry/android/core/NdkHandlerStrategy;)V
 	public fun setNativeSdkName (Ljava/lang/String;)V
 	public fun setNdkAppHangTimeoutIntervalMillis (J)V
 	public fun setReportHistoricalAnrs (Z)V
 	public fun setReportHistoricalMemoryLimiterExits (Z)V
 	public fun setReportHistoricalTombstones (Z)V
+	public fun setTimberLogCaptureEnabled (Z)V
 	public fun setTombstoneEnabled (Z)V
 	public fun setTombstoneMergeTimeThresholdMillis (J)V
 }

sentry-android-core/build.gradle.kts

@@ -123,6 +123,7 @@ dependencies {
   testImplementation(projects.sentrySpotlight)
   testImplementation(projects.sentryAndroidFragment)
   testImplementation(projects.sentryAndroidTimber)
+  testImplementation(libs.timber)
   testImplementation(projects.sentryAndroidReplay)
   testImplementation(projects.sentryCompose)
   testImplementation(projects.sentryAndroidNdk)
@@ -133,5 +134,4 @@ dependencies {
   testImplementation(libs.androidx.compose.foundation.layout)
   testImplementation(libs.androidx.compose.material3)
   testRuntimeOnly(libs.androidx.fragment.ktx)
-  testRuntimeOnly(libs.timber)
 }

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

@@ -479,7 +479,8 @@ static void installDefaultIntegrations(
     }
 
     if (isTimberAvailable) {
-      options.addIntegration(new SentryTimberIntegration());
+      options.addIntegration(
+          new SentryTimberIntegration(() -> options.getTimberLogCaptureEnabled()));
     }
     options.addIntegration(new AppComponentsBreadcrumbsIntegration(context));
     options.addIntegration(new SystemEventsBreadcrumbsIntegration(context));