Merge remote-tracking branch 'origin' into mz/mobile-session-health-docs

Author: michellewzhang

develop-docs/backend/application-domains/database-migrations/index.mdx

@@ -54,7 +54,19 @@ Note that if you have added a new model, you also need to import the model in `_
 
 When merging to master you might notice a conflict with `migrations_lockfile.txt`. This file is in place to help us avoid merging two migrations with the same migration number to master, and if you're conflicting with it then it's likely someone has committed a migration ahead of you.
 
-To resolve this, rebase against latest master, delete your current migration and then regenerate it. If your migration was custom, just save the operations in a text file somewhere so that you can reapply them on the regenerated migration.
+### Automatically Resolving Conflicts
+
+There is a [useful script](https://github.com/getsentry/sentry/blob/master/bin/update-migration) for automatically moving your migration to the top of the migration history.
+
+```bash
+bin/update-migration <migration_name>
+```
+
+It will rename the migration, modify it to depend on the latest migration, and update the lockfile and the name of any tests if they exist.
+
+### Manually Resolving Conflicts
+
+To perform the steps manually, rebase against latest master, delete your current migration and then regenerate it. If your migration was custom, just save the operations in a text file somewhere so that you can reapply them on the regenerated migration.
 
 Always commit the changes to `migrations_lockfile.txt` with your migration.
 

develop-docs/sdk/telemetry/traces/span-data-conventions.mdx

@@ -102,6 +102,13 @@ Below describes the conventions for the Span interface for the `data` field on t
 | `thread.id`       | string  | Identifier of a thread from where the span originated.             | `123456` |
 | `thread.name`     | string  | Label identifying a thread from where the span originated.         | `main`   |
 
+## Flags
+
+| Attribute                           | Type    | Description                                     | Examples     |
+| ------------------------------------| ------- | ------------------------------------------------| ------------ |
+| `flag.evaluation.<flag-name>`       | string  | Identifier of a flag evaluated within the span. | `can_access` |
+
+
 ### Deprecated
 
 Names that SDKs are still sending so we cannot remove them yet, but should not be used in new code.

develop-docs/self-hosted/index.mdx

@@ -73,6 +73,10 @@ Thirty (30) day retention. No marketing. Privacy policy at sentry.io/privacy.
 
 Starting with the 22.10.0 release, we will require those running the Sentry installer to choose to opt in or out. If you are running the installer under automation, you may want to set `REPORT_SELF_HOSTED_ISSUES` or pass `--(no-)report-self-hosted-issues` to the installer accordingly.
 
+### Air-gapped installation
+
+Sentry can run in air-gapped environments, where there are no internet access. Depending on how air-tight your environment is, the best way to do so is to do installation and upgrades behind a proxy, see [Installing Behind a Proxy](#installing-behind-a-proxy) below. If it's not possible, you may build the entire Docker Compose stack on another machine, use `docker commit` to "freeze" the images, then use combination of `docker save` and `docker load` which convert the image as a `.tar` file and transfer it into the air-gapped machine. Then, you can use `docker-compose up` to start the services. Although this may seem possible, we don't provide any further help for this use case, as it's not a common scenario.
+
 ### Self-hosted Beacon
 
 If you opt-in to it, self-hosted Sentry will periodically communicate with a remote beacon server. This is utilized for a couple of things, primarily:

develop-docs/self-hosted/troubleshooting/docker.mdx

@@ -4,6 +4,10 @@ sidebar_title: Docker
 sidebar_order: 3
 ---
 
+## `FAIL: Docker Compose is required to run self-hosted` error but Docker Compose is installed
+
+Around version 25.1.0 to 25.4.0, users which did not have `docker compose` plugin installed, and relied only on `docker-compose` will face some issues. Notably for Amazon Linux 2023 distro that does not have `docker-compose-plugin` packaged, you may need to install the standalone `docker-compose` separately. See [docker/compose installation guide](https://github.com/docker/compose?tab=readme-ov-file#linux) for more details.
+
 ## Container Healthcheck
 
 There may be some circumstances which you may want to increase or decrease healthcheck interval, timeout or retries for your custom needs. This can be achieved by editing `HEALTHCHECK_INTERVAL`, `HEALTHCHECK_TIMEOUT`, `HEALTHCHECK_RETRIES` variables' values in `.env`.

docs/platforms/javascript/common/profiling/index.mdx

@@ -1,7 +1,7 @@
 ---
 title: Set Up Profiling
 sidebar_order: 5000
-description: "Collect & view performance insights for JavaScript programs with Sentry's Profiling integrations. Get started with browser and Node.js profiling to understand your application's performance."
+description: "Collect & view performance insights for JavaScript programs with Sentry's Profiling integrations. Get started with profiling to understand your application's performance."
 notSupported:
   - javascript.bun
   - javascript.cordova
@@ -10,4 +10,4 @@ notSupported:
   - javascript.cloudflare
 ---
 
-<PageGrid />
+<PlatformContent includePath="profiling/landing-page" />

docs/platforms/javascript/guides/astro/profiling/browser.mdx

@@ -0,0 +1,6 @@
+---
+title: Browser Profiling
+description: "Get started with Browser profiling to understand your application's performance."
+---
+
+<PlatformContent includePath="profiling/browser-profiling" />

docs/platforms/javascript/guides/astro/profiling/index.mdx

@@ -0,0 +1,7 @@
+---
+title: Set Up Profiling
+sidebar_order: 5000
+description: "Collect & view performance insights for JavaScript programs with Sentry's Profiling integrations."
+---
+
+<PageGrid />

docs/platforms/javascript/guides/astro/profiling/node.mdx

@@ -0,0 +1,6 @@
+---
+title: Node Profiling
+description: "Get started with Node.js profiling to understand your application's performance."
+---
+
+<PlatformContent includePath="profiling/node-profiling" />

docs/platforms/javascript/guides/cloudflare/index.mdx

@@ -105,6 +105,25 @@ export default Sentry.withSentry(
 );
 ```
 
+If you do not have access to the `onRequest` middleware API, you can use the `wrapRequestHandler` API instead. For example:
+
+```javascript
+// hooks.server.js
+import * as Sentry from '@sentry/cloudflare';
+
+export const handle = ({ event, resolve }) => {
+  const requestHandlerOptions = {
+    options: {
+      dsn: event.platform.env.SENTRY_DSN,
+      tracesSampleRate: 1.0,
+    },
+    request: event.request,
+    context: event.platform.ctx,
+  };
+  return Sentry.wrapRequestHandler(requestHandlerOptions, () => resolve(event));
+};
+```
+
 ## Add Readable Stack Traces to Errors
 
 Depending on how you've set up your project, the stack traces in your Sentry errors probably don't look like your actual code.

docs/platforms/javascript/guides/gatsby/profiling/browser.mdx

@@ -0,0 +1,6 @@
+---
+title: Browser Profiling
+description: "Get started with Browser profiling to understand your application's performance."
+---
+
+<PlatformContent includePath="profiling/browser-profiling" />