Merge branch 'master' into feat/sidebar-section-separators

Resolved conflicts by combining sidebar separator feature with beta/new badge features:
- Added section_end_divider field alongside beta/new fields in Node type
- Kept beta/new badge rendering in sidebar links
- Merged CSS styles for both badge types and separator
- Both features are now compatible and working together

Author: codyde

develop-docs/sdk/telemetry/logs.mdx

@@ -398,6 +398,8 @@ A new data category for logs has been added to Relay, `log_item`. Both the `log`
 
 Logs should be buffered before being sent. SDKs should keep a buffer of logs on the client (so you can have logs from multiple traces in the buffer) that flushes out based on some kind of condition. We recommend to follow the [telemetry buffer specification outlined](/sdk/telemetry/telemetry-buffer/) in the develop docs, but you should choose the approach that works best for your platform. When starting initial development on the SDK you can choose a simple approach to buffer like flushing logs if the buffer length exceeds 100 items, or if 5 seconds have passed.
 
+SDKs must have a hard limit of 1000 log events queued up to avoid causing our customers applications going out of memory. Logs added once the hard limit has been reached are dropped.
+
 SDKS should NOT release logging capabilities to users if a buffering implementation has not been added to their SDK when adding logging APIs.
 
 ### SDK Integrations

develop-docs/sdk/telemetry/spans/scrubbing-data.mdx

@@ -10,7 +10,7 @@ title: Scrubbing data
   This document uses key words such as "MUST", "SHOULD", and "MAY" as defined in [RFC 2119](https://www.ietf.org/rfc/rfc2119.txt) to indicate requirement levels.
 </Alert>
 
-## Scrubbing data with `beforeSendSpans`
+## Scrubbing data with `beforeSendSpan`
 
 This callback MUST NOT allow the removal of any spans from the span tree.
 It receives a deep copy of all spans in the span tree and their attributes.
@@ -28,4 +28,4 @@ It receives a deep copy of all spans in the span tree and their attributes.
 ```
 
 Users MAY mutate any exposed properties to perform sanitation on sensitive data or PII.
-The return value of `beforeSendSpans` MUST be merged with the original span tree prior to emission.
+The return value of `beforeSendSpan` MUST be merged with the original span tree prior to emission.

develop-docs/sdk/telemetry/telemetry-buffer/index.mdx

@@ -45,18 +45,18 @@ The BatchProcessor batches spans and logs into one envelope to reduce the number
 
 Whenever the SDK finishes a span or captures a log, it MUST put it into the BatchProcessor. The SDK MUST NOT put unfinished spans into the BatchProcessor.
 
-The BatchProcessor MUST start a timeout of 5 seconds when the SDK adds the first span or log. When the timeout exceeds, the BatchProcessor MUST send all spans or logs, no matter how many items it contains. The SDK MAY choose a different value for the timeout, but it MUST NOT exceed 30 seconds, as this can lead to problems with the span buffer on the backend, which uses a time interval of 60 seconds for determining segments for spans. The BatchProcessor SHOULD only start a new timeout, when it has spans or logs to send, to avoid running the timeout unnecessarily.
+The BatchProcessor MUST start a timeout of 5 seconds when the SDK adds the first span or log. When the timeout exceeds, the BatchProcessor MUST forward all spans or logs to the transport, no matter how many items it contains. The SDK MAY choose a different value for the timeout, but it MUST NOT exceed 30 seconds, as this can lead to problems with the span buffer on the backend, which uses a time interval of 60 seconds for determining segments for spans. The BatchProcessor SHOULD only start a new timeout, when it has spans or logs to send, to avoid running the timeout unnecessarily.
 
-The BatchProcessor MUST send all items after the SDK when containing spans or logs exceeding 1MiB in size. The SDK MAY choose a different value for the max batch size keeping the [envelope max sizes](/sdk/data-model/envelopes/#size-limits) in mind. The SDK MUST calculate the size of a span or a log to manage the BatchProcessor's memory footprint. The SDK MUST serialize the span or log and calculate the size based on the serialized JSON bytes. As serialization is expensive, the BatchProcessor SHOULD keep track of the serialized spans and logs and pass these to the envelope to avoid serializing multiple times.
+The BatchProcessor MUST forward all items to the transport after the SDK when containing spans or logs exceeding 1MiB in size. The SDK MAY choose a different value for the max batch size keeping the [envelope max sizes](/sdk/data-model/envelopes/#size-limits) in mind. The SDK MUST calculate the size of a span or a log to manage the BatchProcessor's memory footprint. The SDK MUST serialize the span or log and calculate the size based on the serialized JSON bytes. As serialization is expensive, the BatchProcessor SHOULD keep track of the serialized spans and logs and pass these to the envelope to avoid serializing multiple times.
 
-When the BatchProcessor sends all spans or logs, it MUST reset its timeout and remove all spans and logs. The SDK MUST apply filtering and sampling before adding spans or logs to the BatchProcessor. The SDK MUST apply rate limits to spans and logs after they leave the BatchProcessor to send as much data as possible by dropping data as late as possible.
+When the BatchProcessor forwards all spans or logs to the transport, it MUST reset its timeout and remove all spans and logs. The SDK MUST apply filtering and sampling before adding spans or logs to the BatchProcessor. The SDK MUST apply rate limits to spans and logs after they leave the BatchProcessor to send as much data as possible by dropping data as late as possible.
 
-The BatchProcessor MUST send all spans and logs in memory to avoid data loss in the following scenarios:
+The BatchProcessor MUST forward all spans and logs in memory to the transport to avoid data loss in the following scenarios:
 
-1. When the user calls `SentrySDK.flush()`, the BatchProcessor MUST send all data in memory.
-2. When the user calls  `SentrySDK.close()`, the BatchProcessor MUST send all data in memory.
-3. When the application shuts down gracefully, the BatchProcessor SHOULD send all data in memory. This is mostly relevant for mobile SDKs already subscribed to these hooks, such as [applicationWillTerminate](https://developer.apple.com/documentation/uikit/uiapplicationdelegate/applicationwillterminate(_:)) on iOS.
-4. When the application moves to the background, the BatchProcessor SHOULD send all data in memory and stop the timer. This is mostly relevant for mobile SDKs.
+1. When the user calls `SentrySDK.flush()`, the BatchProcessor MUST forward all data in memory to the transport, and only then the transport SHOULD flush the data.
+2. When the user calls  `SentrySDK.close()`, the BatchProcessor MUST forward all data in memory to the transport. SDKs SHOULD keep their existing closing behavior.
+3. When the application shuts down gracefully, the BatchProcessor SHOULD forward all data in memory to the transport. The transport SHOULD keep its existing behavior, which usually stores the data to disk as an envelope. It is not required to call transport `flush`. This is mostly relevant for mobile SDKs already subscribed to these hooks, such as [applicationWillTerminate](https://developer.apple.com/documentation/uikit/uiapplicationdelegate/applicationwillterminate(_:)) on iOS.
+4. When the application moves to the background, the BatchProcessor SHOULD forward all data in memory to the transport and stop the timer. The transport SHOULD keep its existing behavior, which usually stores the data to disk as an envelope. It is not required to call transport `flush`. This is mostly relevant for mobile SDKs.
 5. We're working on concept for crashes, and will update the specification when we have more details.
 
 The detailed specification is written in the [Gherkin syntax](https://cucumber.io/docs/gherkin/reference/). The specification uses spans as an example, but the same applies to logs or any other future telemetry data.
@@ -68,15 +68,15 @@ Scenario: No spans in BatchProcessor 1 span added
     When the SDK finishes 1 span
     Then the SDK puts this span to the BatchProcessor
     And starts a timeout of 5 seconds
-    And doesn't send the span to Sentry
+    And doesn't forward the span to the transport
 
 Scenario: Span added before timeout exceeds
     Given span A in the BatchProcessor
     Given 4.9 seconds pass
     When the SDK finishes span B
     Then the SDK adds span B to the BatchProcessor
     And doesn't reset the timeout
-    And doesn't send the spans A and B in the BatchProcessor to Sentry
+    And doesn't forward the spans A and B in the BatchProcessor to the transport
 
 Scenario: Timeout exceeds and no spans or logs to send
     Given no spans in the BatchProcessor
@@ -88,15 +88,15 @@ Scenario: Spans with size of 1 MiB - 1 byte added, timeout exceeds
     Given spans with size of 1 MiB - 1 byte in the BatchProcessor
     When the timeout exceeds
     Then the SDK adds all the spans to one envelope
-    And sends them to Sentry
+    And forwards them to the transport
     And resets the timeout
     And clears the BatchProcessor
 
 Scenario: Spans with size of 1 MiB - 1 byte added within 4.9 seconds
     Given spans with size of 1 MiB - 1 byte in the BatchProcessor
     When the SDK finishes another span and puts it into the BatchProcessor
     Then the BatchProcessor puts all spans into one envelope
-    And sends the envelope to Sentry
+    And forwards the envelope to the transport
     And resets the timeout
     And clears the BatchProcessor
 

develop-docs/sdk/telemetry/spans/sql-transactions.mdx renamed to develop-docs/sdk/telemetry/traces/sql-transactions.mdx

@@ -77,5 +77,5 @@ Here is further information on specific configuration topics related to self-hos
 - [Email](/self-hosted/email/)
 - [Geolocation](/self-hosted/geolocation/)
 - [Single Sign-On (SSO)](/self-hosted/sso/)
-- [Content Security Policy](/self-hosted/experimental/csp/)
-- [Errors Only](/self-hosted/experimental/errors-only/)
+- [Content Security Policy](/self-hosted/optional-features/csp/)
+- [Errors Only](/self-hosted/optional-features/errors-only/)

develop-docs/self-hosted/configuration.mdx

@@ -1,13 +1,9 @@
 ---
 title: Self-Hosted Content Security Policy (CSP)
 sidebar_title: Content Security Policy (CSP)
-sidebar_order: 70
+sidebar_order: 2
 ---
 
-<Alert level="warning">
-  This is an experimental feature. This means that features and workflows are not completely tested, so use at your own risk!
-</Alert>
-
 Starting with Sentry `23.5.0`, it is possible to enable the [CSP header](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP) on self-hosted Sentry installations. The good news is that Sentry itself supports [collecting of CSP reports](https://docs.sentry.io/product/security-policy-reporting/). We recommend creating a separate Sentry project for CSP reports. To enable CSP and reports collection, you'll want to configure the following settings in `sentry.conf.py`:
 
 ```python

develop-docs/self-hosted/experimental/index.mdx

@@ -1,13 +1,9 @@
 ---
-title: Errors Only Self-hosted
-sidebar_title: Errors Only
-sidebar_order: 100
+title: Self-Hosted Errors-Only
+sidebar_title: Errors-Only Mode
+sidebar_order: 1
 ---
 
-<Alert level="warning">
-  This is an experimental feature. This means that features and workflows are not completely tested, so use at your own risk!
-</Alert>
-
 Starting from 24.8.0+, users will have the ability to choose between two distinct types of self-hosted Sentry deployments.
 
 **Errors Only**
@@ -34,4 +30,4 @@ This is our default version of self-hosted Sentry. It includes most of the featu
 7. [Crons](https://docs.sentry.io/product/crons/)
 8. [Metrics](https://docs.sentry.io/product/explore/metrics/)
 
-This version of Sentry is enabled by default upon installation. Ensure that your [.env file](https://github.com/getsentry/self-hosted/blob/master/.env) includes `COMPOSE_PROFILES=feature-complete`.
+This version of Sentry is enabled by default upon installation. Ensure that your [.env file](https://github.com/getsentry/self-hosted/blob/master/.env) includes `COMPOSE_PROFILES=feature-complete`.

develop-docs/self-hosted/experimental/csp.mdx renamed to develop-docs/self-hosted/optional-features/csp.mdx

@@ -0,0 +1,7 @@
+---
+title: Self-Hosted Optional Features
+sidebar_title: Optional Features
+sidebar_order: 60
+---
+
+<PageGrid />

develop-docs/self-hosted/experimental/errors-only.mdx renamed to develop-docs/self-hosted/optional-features/errors-only.mdx

@@ -1,13 +1,9 @@
 ---
-title: Self Hosted External Storage
+title: Self-Hosted External Storage
 sidebar_title: External Storage
-sidebar_order: 90
+sidebar_order: 3
 ---
 
-<Alert title="Important" level="warning">
-    These are community-contributed docs. Sentry does not officially provide support for self-hosted configurations beyond the default install.
-</Alert>
-
 In some cases, storing Sentry data on-disk is not really something people can do. Sometimes, it's better to offload it into some bucket storage (like AWS S3 or Google Cloud Storage).
 
 <Alert title="Note">