chore(java): Collect v9 documentation changes

docs/get-started/guides/logs.mdx

@@ -883,7 +883,6 @@ SentryAndroid.init(context) { options ->
     options.dsn = "..."
     options.environment = "development"
     options.tracesSampleRate = 1.0  // 100% of traces
-    options.logs.enabled = true
 }
 ```
 

docs/platforms/android/configuration/options.mdx

@@ -450,9 +450,9 @@ Controls whether the SDK should propagate the W3C `traceparent` HTTP header alon
 
 </SdkOption>
 
-<SdkOption name="traceOptionsRequests" type="bool" defaultValue="true">
+<SdkOption name="traceOptionsRequests" type="bool" defaultValue="false">
 
-Set this boolean to `false` to disable tracing for `OPTIONS` requests. This option's default value will likely be changed in the next major version, meaning you will have to set it to `true` if you want to keep tracing `OPTIONS` requests.
+By default, the SDK does not trace `OPTIONS` requests. Set this option to `true` to create transactions for them.
 
 </SdkOption>
 

docs/platforms/android/index.mdx

@@ -130,10 +130,6 @@ Configuration is done via the application `AndroidManifest.xml`. Here's an examp
   <!-- Set profiling lifecycle, can be `manual` (controlled through `Sentry.startProfiler()` and `Sentry.stopProfiler()`) or `trace` (automatically starts and stop a profile whenever a sampled trace starts and finishes) -->
   <meta-data android:name="io.sentry.traces.profiling.lifecycle" android:value="trace" />
   <!-- ___PRODUCT_OPTION_END___ profiling -->
-  <!-- ___PRODUCT_OPTION_START___ logs -->
-  <!-- Enable logs to be sent to Sentry -->
-  <meta-data android:name="io.sentry.logs.enabled" android:value="true" />
-  <!-- ___PRODUCT_OPTION_END___ logs -->
   <!-- ___PRODUCT_OPTION_START___ session-replay -->
   <!-- Record session replays for 100% of errors and 10% of sessions -->
   <meta-data android:name="io.sentry.session-replay.on-error-sample-rate" android:value="1.0" />
@@ -142,6 +138,14 @@ Configuration is done via the application `AndroidManifest.xml`. Here's an examp
 </application>
 ```
 
+<OnboardingOption optionId="logs">
+<Alert>
+
+Calls to `Sentry.logger()` send logs without additional configuration. To capture Timber or Logcat output automatically, enable log capture for the applicable <PlatformLink to="/logs/#other-logging-integrations">logging integration</PlatformLink>.
+
+</Alert>
+</OnboardingOption>
+
 ## Verify
 
 Verify that your app is sending events to Sentry by adding the following snippet, which includes an intentional error. You should see the error reported in Sentry within a few minutes.

docs/platforms/android/integrations/logcat/index.mdx

@@ -10,7 +10,7 @@ og_image: /og-images/platforms-android-integrations-logcat.png
 
 <Alert level="warning" title="Did you mean logs instead?">
 
-This integration captures Logcat logs as breadcrumbs (great for error context!). But if you need to search and query your logs across your entire application, use <PlatformLink to="/logs/">Sentry Logs</PlatformLink> instead. Logcat logs at or above the `minLevel` are automatically sent as Sentry Logs when enabled. See the <PlatformLink to="/integrations/logcat/#support-with-sentry-logs">Support With Sentry Logs</PlatformLink> section below.
+This integration captures Logcat logs as breadcrumbs (great for error context!). But if you need to search and query your logs across your entire application, use <PlatformLink to="/logs/">Sentry Logs</PlatformLink> instead. Logcat logs at or above the `minLevel` are sent as Sentry Logs when Logcat log capture is enabled. See the <PlatformLink to="/integrations/logcat/#support-with-sentry-logs">Support With Sentry Logs</PlatformLink> section below.
 
 </Alert>
 
@@ -135,4 +135,30 @@ Sentry Logs for Logcat are supported in Sentry Android SDK version `8.17.0` and
 
 </Alert>
 
-Logcat logs at or above the `minLevel` captured by Sentry are automatically sent as <PlatformLink to="/logs/">Sentry Logs</PlatformLink>, if enabled.
+Automatic Sentry Logs capture from Logcat is disabled by default. Enable it in `AndroidManifest.xml`:
+
+```xml {filename:AndroidManifest.xml}
+<application>
+  <meta-data android:name="io.sentry.logcat.log-capture.enabled" android:value="true" />
+</application>
+```
+
+Or enable it when initializing the SDK:
+
+```java {tabTitle:Java}
+import io.sentry.android.core.SentryAndroid;
+
+SentryAndroid.init(this, options -> {
+  options.setLogcatLogCaptureEnabled(true);
+});
+```
+
+```kotlin {tabTitle:Kotlin}
+import io.sentry.android.core.SentryAndroid
+
+SentryAndroid.init(this) { options ->
+  options.logcatLogCaptureEnabled = true
+}
+```
+
+The Android Gradle plugin's `logcat.enabled` option controls Logcat bytecode instrumentation. `logcatLogCaptureEnabled` controls whether the instrumented records are also sent as Sentry Logs.

docs/platforms/android/integrations/okhttp/index.mdx

@@ -302,7 +302,7 @@ private final List<String> failedRequestTargets = Collections.singletonList(".*"
 private final OkHttpClient client = new OkHttpClient.Builder()
   .eventListener(new SentryOkHttpEventListener())
   .addInterceptor(new SentryOkHttpInterceptor(
-    Sentry.getCurrentHub(),
+    Sentry.getCurrentScopes(),
     null,
     true,
     codeRanges,
@@ -340,7 +340,7 @@ private final List<String> failedRequestTargets = Collections.singletonList(".*"
 private final OkHttpClient client = new OkHttpClient.Builder()
   .eventListener(new SentryOkHttpEventListener())
   .addInterceptor(new SentryOkHttpInterceptor(
-    Sentry.getCurrentHub(),
+    Sentry.getCurrentScopes(),
     null,
     true,
     codeRanges,
@@ -378,7 +378,7 @@ private final List<String> failedRequestTargets = Collections.singletonList("mya
 private final OkHttpClient client = new OkHttpClient.Builder()
   .eventListener(new SentryOkHttpEventListener())
   .addInterceptor(new SentryOkHttpInterceptor(
-    Sentry.getCurrentHub(),
+    Sentry.getCurrentScopes(),
     null,
     true,
     codeRanges,

docs/platforms/android/integrations/timber/index.mdx

@@ -8,7 +8,7 @@ description: "Learn more about the Sentry Timber integration for the Android SDK
 
 <Alert level="warning" title="Did you mean logs instead?">
 
-This integration captures Timber logs as breadcrumbs and error events (great for error context!). But if you need to search and query your logs across your entire application, use <PlatformLink to="/logs/">Sentry Logs</PlatformLink> instead. Timber logs at or above the `minLogsLevel` are automatically sent as Sentry Logs when enabled. See the <PlatformLink to="/integrations/timber/#support-with-sentry-logs">Support With Sentry Logs</PlatformLink> section below.
+This integration captures Timber logs as breadcrumbs and error events (great for error context!). But if you need to search and query your logs across your entire application, use <PlatformLink to="/logs/">Sentry Logs</PlatformLink> instead. Timber logs at or above the `minLogsLevel` are sent as Sentry Logs when Timber log capture is enabled. See the <PlatformLink to="/integrations/timber/#support-with-sentry-logs">Support With Sentry Logs</PlatformLink> section below.
 
 </Alert>
 
@@ -74,6 +74,8 @@ implementation 'io.sentry:sentry-android-timber:{{@inject packages.version('sent
 Configuration should happen as early as possible in your application's lifecycle.
 
 ```kotlin
+import io.sentry.SentryLevel
+import io.sentry.SentryLogLevel
 import io.sentry.android.core.SentryAndroid
 import io.sentry.android.timber.SentryTimberIntegration
 import timber.log.Timber
@@ -90,7 +92,8 @@ SentryAndroid.init(this) { options ->
       SentryTimberIntegration(
         minEventLevel = SentryLevel.ERROR,
         minBreadcrumbLevel = SentryLevel.INFO,
-        minLogsLevel = SentryLogLevel.INFO
+        minLogsLevel = SentryLogLevel.INFO,
+        logsEnabled = false
       )
     )
   } else {
@@ -100,9 +103,11 @@ SentryAndroid.init(this) { options ->
 ```
 
 ```java
+import io.sentry.SentryLevel;
+import io.sentry.SentryLogLevel;
 import io.sentry.android.core.SentryAndroid;
 import io.sentry.android.timber.SentryTimberIntegration;
-import timber.log.Timber
+import timber.log.Timber;
 // import BuildConfig
 
 SentryAndroid.init(this, options -> {
@@ -116,7 +121,8 @@ SentryAndroid.init(this, options -> {
          new SentryTimberIntegration(
              SentryLevel.ERROR,
              SentryLevel.INFO,
-             SentryLogLevel.INFO
+             SentryLogLevel.INFO,
+             false
          )
      );
    } else {
@@ -181,4 +187,50 @@ Sentry Logs for Timber are supported in Sentry Android SDK version `8.17.0` and
 
 </Alert>
 
-Timber logs at or above the `minLogsLevel` captured by Sentry are automatically sent as <PlatformLink to="/logs/">Sentry Logs</PlatformLink>, if enabled.
+Automatic Sentry Logs capture from Timber is disabled by default.
+
+For the auto-installed Timber integration, enable capture in `AndroidManifest.xml`:
+
+```xml {filename:AndroidManifest.xml}
+<application>
+  <meta-data android:name="io.sentry.timber.log-capture.enabled" android:value="true" />
+</application>
+```
+
+Or enable it when initializing the SDK:
+
+```java {tabTitle:Java}
+import io.sentry.android.core.SentryAndroid;
+
+SentryAndroid.init(this, options -> {
+  options.setTimberLogCaptureEnabled(true);
+});
+```
+
+```kotlin {tabTitle:Kotlin}
+import io.sentry.android.core.SentryAndroid
+
+SentryAndroid.init(this) { options ->
+  options.timberLogCaptureEnabled = true
+}
+```
+
+When manually adding `SentryTimberIntegration`, pass `true` as its `logsEnabled` argument instead:
+
+```kotlin {tabTitle:Kotlin}
+SentryTimberIntegration(
+  minEventLevel = SentryLevel.ERROR,
+  minBreadcrumbLevel = SentryLevel.INFO,
+  minLogsLevel = SentryLogLevel.INFO,
+  logsEnabled = true
+)
+```
+
+```java {tabTitle:Java}
+new SentryTimberIntegration(
+    SentryLevel.ERROR,
+    SentryLevel.INFO,
+    SentryLogLevel.INFO,
+    true
+);
+```

docs/platforms/android/manual-setup/index.mdx

@@ -84,9 +84,6 @@ Configuration is done via the application `AndroidManifest.xml`. Here's an examp
   See the Android Session Replay documentation for details: https://docs.sentry.io/platforms/android/session-replay/#screenshot-strategy -->
   <!-- <meta-data android:name="io.sentry.session-replay.screenshot-strategy" android:value="canvas" /> -->
 
-  <!-- enable logs to be sent to Sentry. Use Sentry.logger() to capture logs or check the available integrations that capture logs automatically: https://docs.sentry.io/platforms/android/logs/#integrations -->
-  <meta-data android:name="io.sentry.logs.enabled" android:value="true" />
-
   <!-- enable tombstone support for richer Native crashes context. See more at https://docs.sentry.io/platforms/android/configuration/tombstones/ -->
   <meta-data android:name="io.sentry.tombstone.enable" android:value="true" />
 </application>
@@ -167,9 +164,6 @@ class MyApplication : Application() {
       // See the Android Session Replay documentation for details: https://docs.sentry.io/platforms/android/session-replay/#screenshot-strategy
       // options.sessionReplay.screenshotStrategy = ScreenshotStrategyType.CANVAS
 
-      // enable logs to be sent to Sentry. Use Sentry.logger() to capture logs or check the available integrations that capture logs automatically: https://docs.sentry.io/platforms/android/logs/#integrations
-      options.logs.isEnabled = true
-
       // enable tombstone support for richer Native crashes context. See more at https://docs.sentry.io/platforms/android/configuration/tombstones/
       options.isTombstoneEnabled = true
 
@@ -226,9 +220,6 @@ public class MyApplication extends Application {
       // See the Android Session Replay documentation for details: https://docs.sentry.io/platforms/android/session-replay/#screenshot-strategy
       // options.getSessionReplay().setScreenshotStrategy(ScreenshotStrategyType.CANVAS);
 
-      // enable logs to be sent to Sentry. Use Sentry.logger() to capture logs or check the available integrations that capture logs automatically: https://docs.sentry.io/platforms/android/logs/#integrations
-      options.getLogs().setEnabled(true);
-
       // enable tombstone support for richer Native crashes context. See more at https://docs.sentry.io/platforms/android/configuration/tombstones/
       options.setTombstoneEnabled(true);
 

docs/platforms/android/migration/v8-to-v9.mdx

@@ -0,0 +1,73 @@
+---
+title: Migrate from Sentry 8.x to 9.0.0
+description: "Learn how to migrate from Sentry Android SDK 8.x to 9.0.0."
+sidebar_order: 8890
+---
+
+Version 9 removes the deprecated Hub compatibility APIs and the global Logs and Metrics enable options. Migrate remaining Hub references to Scopes, then update your telemetry configuration.
+
+## Removed Hub APIs
+
+Version 8 deprecated Hub and introduced Scopes. Version 9 removes the Hub compatibility layer:
+
+- `IHub` has been removed. Use `IScopes` instead.
+- `HubAdapter.getInstance()` has been removed. Use `ScopesAdapter.getInstance()` instead.
+- `HubScopesWrapper` has been removed. Use the wrapped `IScopes` instance directly.
+- `NoOpHub.getInstance()` has been removed. Use `NoOpScopes.getInstance()` instead.
+- `Sentry.getCurrentHub()` and `Sentry.setCurrentHub(...)` have been removed. Use `Sentry.getCurrentScopes()` and `Sentry.setCurrentScopes(...)` instead.
+- `IHub.clone()` and `IScopes.clone()` have been removed. Use `forkedScopes(...)` or `forkedCurrentScope(...)` when you need an independent Scopes instance. For temporary scope changes, use `withScope()` or `withIsolationScope()`.
+
+### Remove `popScope()` Calls
+
+`Sentry.popScope()` and `IScopes.popScope()` have been removed. Use `Sentry.withScope()` or `Sentry.withIsolationScope()` for temporary scope changes instead. Both methods restore the previous scopes after the callback finishes.
+
+### Scopes Model
+
+The Scopes model introduced in version 8 is the supported context model in version 9:
+
+- The global scope is attached to all events created by the SDK. To modify it before `SentryAndroid.init()`, call methods directly on `Sentry.getGlobalScope()`, such as `Sentry.getGlobalScope().setTag(...)`.
+- The isolation scope attaches data to events within an isolated lifecycle.
+- The current scope contains data for the active operation. Child scopes inherit its data, but parent scopes don't receive changes made in a child scope.
+
+On Android, APIs such as `Sentry.configureScope()` and `Sentry.setTag()` use the current scope by default.
+
+## Manual Logs and Metrics
+
+Calls to `Sentry.logger()` and `Sentry.metrics()` no longer require a global enable option. Remove calls to:
+
+- `options.getLogs().setEnabled(...)`
+- `options.getMetrics().setEnabled(...)`
+
+The `beforeSendLog` and `beforeSendMetric` callbacks remain available for filtering or modifying telemetry.
+
+## Android Manifest Options
+
+Remove these manifest entries:
+
+```xml {filename:AndroidManifest.xml}
+<meta-data android:name="io.sentry.logs.enabled" android:value="true" />
+<meta-data android:name="io.sentry.metrics.enabled" android:value="false" />
+```
+
+To capture logs from an automatic Android integration, use its integration-specific option instead:
+
+```xml {filename:AndroidManifest.xml}
+<meta-data android:name="io.sentry.timber.log-capture.enabled" android:value="true" />
+<meta-data android:name="io.sentry.logcat.log-capture.enabled" android:value="true" />
+```
+
+The equivalent `SentryAndroidOptions` properties are `timberLogCaptureEnabled` and `logcatLogCaptureEnabled`. Both default to `false`.
+
+## Timber Constructor Changes
+
+Manual `SentryTimberIntegration` and `SentryTimberTree` construction now requires a `logsEnabled` argument. Pass `false` to keep automatic Sentry Logs capture disabled:
+
+```kotlin {tabTitle:Kotlin}
+SentryTimberIntegration(logsEnabled = false)
+```
+
+```java {tabTitle:Java}
+new SentryTimberIntegration(false);
+```
+
+Pass `true` only when Timber records should also be sent as Sentry Logs.

docs/platforms/java/common/configuration/options.mdx

@@ -406,9 +406,9 @@ Controls whether the SDK should propagate the W3C `traceparent` HTTP header alon
 
 </SdkOption>
 
-<SdkOption name="traceOptionsRequests" type="boolean" defaultValue="true">
+<SdkOption name="traceOptionsRequests" type="boolean" defaultValue="false">
 
-Set this boolean to `false` to disable tracing for `OPTIONS` requests. This options default value will likely be changed in the next major version, meaning you will have to set it to `true` if you want to keep tracing `OPTIONS` requests.
+By default, the SDK does not trace `OPTIONS` requests. Set this option to `true` to create transactions for them.
 
 </SdkOption>