Merge branch 'master' into byk/ci/mdx-cache

BYK · BYK · commit 6c1a7fc90006 · 2025-06-24T11:57:16.000+01:00
diff --git a/docs/platforms/python/configuration/draining.mdx b/docs/platforms/python/configuration/draining.mdx
@@ -7,4 +7,18 @@ description: "Learn more about the default behavior of our SDK if the applicatio
 The default behavior of most SDKs is to send out events over the network
 asynchronously in the background. This means that some events might be lost if the application shuts down unexpectedly. The SDKs provide mechanisms to cope with this.
 
-<PlatformContent includePath="configuration/drain-example" />
+The Python SDK automatically drains on shutdown unless the `AtexitIntegration` is removed or the `shutdown_timeout`
+config key is set to 0. If you need to manually drain, the client provides a `close` method:
+
+```python
+import sentry_sdk
+
+client = sentry_sdk.get_client()
+client.close(timeout=2.0)
+```
+
+After a call to `close`, the client  is disabled. It's important to
+only call `close` immediately before shutting down the application.
+
+Alternatively, the `flush` method drains the event queue while keeping the
+client enabled for continued use.
diff --git a/docs/platforms/python/configuration/draining__v1.x.mdx b/docs/platforms/python/configuration/draining__v1.x.mdx
@@ -1,4 +1,13 @@
-The Python SDK automatically drains on shutdown unless the `AtExitIntegration` is removed or the `shutdown_timeout`
+---
+title: Shutdown and Draining
+sidebar_order: 80
+description: "Learn more about the default behavior of our SDK if the application shuts down unexpectedly."
+---
+
+The default behavior of most SDKs is to send out events over the network
+asynchronously in the background. This means that some events might be lost if the application shuts down unexpectedly. The SDKs provide mechanisms to cope with this.
+
+The Python SDK automatically drains on shutdown unless the `AtexitIntegration` is removed or the `shutdown_timeout`
 config key is set to 0. To manually drain the client provides a `close` method:
 
 ```python
diff --git a/docs/platforms/react-native/migration/sentry-expo.mdx b/docs/platforms/react-native/migration/sentry-expo.mdx
@@ -74,10 +74,17 @@ Replace `sentry-expo` export `Native` with `@sentry/react-native`:
 
 The `enableInExpoDevelopment` option is no longer supported. If you were using it, remove it and replace it with a `__DEV__` check, or leave the SDK enabled in development.
 
-```javascript {tabTitle:JavaScript} diff
+```javascript {tabTitle:Disabled in development} diff
+Sentry.init({
+-  enableInExpoDevelopment: false,
++  enabled: !__DEV__,
+});
+```
+
+```javascript {tabTitle:Enabled in development} diff
 Sentry.init({
 -  enableInExpoDevelopment: true,
-+  enabled: __DEV__,
++  enabled: true,
 });
 ```
 
diff --git a/platform-includes/configuration/integrations/javascript.nestjs.mdx b/platform-includes/configuration/integrations/javascript.nestjs.mdx
@@ -1,7 +1,7 @@
 ### Integrations
 
 |                                                           | **Auto Enabled** | **Errors** | **Tracing** | **Additional Context** |
-| --------------------------------------------------------- | :--------------: | :--------: | :---------: | :--------------------: | --- |
+| --------------------------------------------------------- | :--------------: | :--------: | :---------: | :--------------------: |
 | [`amqplibIntegration`](./amqplib)                         |        ✓         |            |      ✓      |                        |
 | [`consoleIntegration`](./console)                         |        ✓         |            |             |           ✓            |
 | [`contextLinesIntegration`](./contextlines)               |        ✓         |     ✓      |             |                        |
@@ -39,6 +39,6 @@
 | [`localVariablesIntegration`](./localvariables)           |                  |     ✓      |             |                        |
 | [`nodeProfilingIntegration`](./nodeprofiling)             |                  |            |      ✓      |                        |
 | [`rewriteFramesIntegration`](./rewriteframes)             |                  |     ✓      |             |                        |
-| [`supabaseIntegration`](./supabase)                       |                  |     ✓      |      ✓      |                        |     |
+| [`supabaseIntegration`](./supabase)                       |                  |     ✓      |      ✓      |                        |
 | [`trpcMiddleware`](./trpc)                                |                  |     ✓      |      ✓      |           ✓            |
-| [`unleashIntegration`](./unleash)                         |                  |            |             |                        | ✓   |
+| [`unleashIntegration`](./unleash)                         |                  |            |             |           ✓            |
diff --git a/platform-includes/logs/usage/android.mdx b/platform-includes/logs/usage/android.mdx
@@ -2,8 +2,6 @@ Once the feature is enabled on the SDK and the SDK is initialized, you can send
 
 The `Sentry.logger()` namespace exposes six methods that you can use to log messages at different log levels: `trace`, `debug`, `info`, `warn`, `error`, and `fatal`.
 
-For more advanced use cases, use the `Sentry.logger().log()` methods.
-
 These properties will be sent to Sentry, and can be searched from within the Logs UI, and even added to the Logs views as a dedicated column.
 
 ```java {tabTitle: Java}
@@ -19,3 +17,51 @@ import io.sentry.Sentry
 Sentry.logger().info("A simple log message")
 Sentry.logger().error("A %s log message", "formatted")
 ```
+
+For more advanced use cases, like attaching custom attributes, use the `Sentry.logger().log()` methods:
+
+```java {tabTitle: Java}
+import io.sentry.Sentry;
+import io.sentry.SentryAttribute;
+import io.sentry.SentryAttributes;
+import io.sentry.SentryLogLevel;
+import io.sentry.logger.SentryLogParameters;
+
+Sentry.logger().log(
+    SentryLogLevel.FATAL,
+    SentryLogParameters.create(
+        SentryAttributes.of(
+            SentryAttribute.stringAttribute("my.string-attribute", "some-value"),
+            SentryAttribute.booleanAttribute("my.bool-attribute", true),
+            SentryAttribute.integerAttribute("my.int-attribute", 42),
+            SentryAttribute.doubleAttribute("my.double-attribute", 3.12),
+            SentryAttribute.named("my.attribute", new Point(1, 2))
+        )
+    ),
+    "log message %s",
+    "param1"
+);
+```
+
+```kotlin {tabTitle: Kotlin}
+import io.sentry.Sentry
+import io.sentry.SentryAttribute
+import io.sentry.SentryAttributes
+import io.sentry.SentryLogLevel
+import io.sentry.logger.SentryLogParameters
+
+Sentry.logger().log(
+    SentryLogLevel.FATAL,
+    SentryLogParameters.create(
+    	SentryAttributes.of(
+        	SentryAttribute.stringAttribute("my.string-attribute", "some-value"),
+        	SentryAttribute.booleanAttribute("my.bool-attribute", true),
+        	SentryAttribute.integerAttribute("my.int-attribute", 42),
+        	SentryAttribute.doubleAttribute("my.double-attribute", 3.12),
+        	SentryAttribute.named("my.attribute", Point(1, 2))
+    	)
+    ),
+    "log message %s",
+    "param1"
+)
+```
diff --git a/platform-includes/logs/usage/java.mdx b/platform-includes/logs/usage/java.mdx
@@ -2,8 +2,6 @@ Once the feature is enabled on the SDK and the SDK is initialized, you can send
 
 The `Sentry.logger()` namespace exposes six methods that you can use to log messages at different log levels: `trace`, `debug`, `info`, `warn`, `error`, and `fatal`.
 
-For more advanced use cases, use the `Sentry.logger().log()` methods.
-
 These properties will be sent to Sentry, and can be searched from within the Logs UI, and even added to the Logs views as a dedicated column.
 
 ```java {tabTitle: Java}
@@ -19,3 +17,51 @@ import io.sentry.Sentry
 Sentry.logger().info("A simple log message")
 Sentry.logger().error("A %s log message", "formatted")
 ```
+
+For more advanced use cases, like attaching custom attributes, use the `Sentry.logger().log()` methods:
+
+```java {tabTitle: Java}
+import io.sentry.Sentry;
+import io.sentry.SentryAttribute;
+import io.sentry.SentryAttributes;
+import io.sentry.SentryLogLevel;
+import io.sentry.logger.SentryLogParameters;
+
+Sentry.logger().log(
+    SentryLogLevel.FATAL,
+    SentryLogParameters.create(
+        SentryAttributes.of(
+            SentryAttribute.stringAttribute("my.string-attribute", "some-value"),
+            SentryAttribute.booleanAttribute("my.bool-attribute", true),
+            SentryAttribute.integerAttribute("my.int-attribute", 42),
+            SentryAttribute.doubleAttribute("my.double-attribute", 3.12),
+            SentryAttribute.named("my.attribute", new Point(1, 2))
+        )
+    ),
+    "log message %s",
+    "param1"
+);
+```
+
+```kotlin {tabTitle: Kotlin}
+import io.sentry.Sentry
+import io.sentry.SentryAttribute
+import io.sentry.SentryAttributes
+import io.sentry.SentryLogLevel
+import io.sentry.logger.SentryLogParameters
+
+Sentry.logger().log(
+    SentryLogLevel.FATAL,
+    SentryLogParameters.create(
+    	SentryAttributes.of(
+        	SentryAttribute.stringAttribute("my.string-attribute", "some-value"),
+        	SentryAttribute.booleanAttribute("my.bool-attribute", true),
+        	SentryAttribute.integerAttribute("my.int-attribute", 42),
+        	SentryAttribute.doubleAttribute("my.double-attribute", 3.12),
+        	SentryAttribute.named("my.attribute", Point(1, 2))
+    	)
+    ),
+    "log message %s",
+    "param1"
+)
+```
