Merge branch 'master' of github.com:getsentry/sentry-docs into smi/quick-start/react-manual-tracing

Author: inventarSarah

app/[[...path]]/page.tsx

@@ -22,7 +22,7 @@ import {isDeveloperDocs} from 'sentry-docs/isDeveloperDocs';
 import {
   getDevDocsFrontMatter,
   getDocsFrontMatter,
-  getFileBySlug,
+  getFileBySlugWithCache,
   getVersionsFromDoc,
 } from 'sentry-docs/mdx';
 import {mdxComponents} from 'sentry-docs/mdxComponents';
@@ -106,9 +106,9 @@ export default async function Page(props: {params: Promise<{path?: string[]}>})
 
   if (isDeveloperDocs) {
     // get the MDX for the current doc and render it
-    let doc: Awaited<ReturnType<typeof getFileBySlug>> | null = null;
+    let doc: Awaited<ReturnType<typeof getFileBySlugWithCache>>;
     try {
-      doc = await getFileBySlug(`develop-docs/${params.path?.join('/') ?? ''}`);
+      doc = await getFileBySlugWithCache(`develop-docs/${params.path?.join('/') ?? ''}`);
     } catch (e) {
       if (e.code === 'ENOENT') {
         // eslint-disable-next-line no-console
@@ -144,9 +144,9 @@ export default async function Page(props: {params: Promise<{path?: string[]}>})
   }
 
   // get the MDX for the current doc and render it
-  let doc: Awaited<ReturnType<typeof getFileBySlug>> | null = null;
+  let doc: Awaited<ReturnType<typeof getFileBySlugWithCache>>;
   try {
-    doc = await getFileBySlug(`docs/${pageNode.path}`);
+    doc = await getFileBySlugWithCache(`docs/${pageNode.path}`);
   } catch (e) {
     if (e.code === 'ENOENT') {
       // eslint-disable-next-line no-console

apps/changelog/package.json

@@ -25,7 +25,7 @@
     "@radix-ui/react-icons": "^1.3.2",
     "@radix-ui/react-toolbar": "^1.1.0",
     "@radix-ui/themes": "^3.1.3",
-    "@sentry/nextjs": "9.9.0",
+    "@sentry/nextjs": "9.10.1",
     "@spotlightjs/spotlight": "^2.1.1",
     "next": "15.2.3",
     "next-auth": "^4.24.5",
@@ -68,4 +68,4 @@
     "@types/react": "npm:[email protected]",
     "@types/react-dom": "npm:[email protected]"
   }
-}
+}

apps/changelog/sentry.client.config.ts …/changelog/src/instrumentation-client.tsapps/changelog/sentry.client.config.ts renamed to apps/changelog/src/instrumentation-client.ts apps/changelog/sentry.client.config.ts renamed to apps/changelog/src/instrumentation-client.ts

@@ -1,7 +1,3 @@
-// This file configures the initialization of Sentry on the client.
-// The config you add here will be used whenever a users loads a page in their browser.
-// https://docs.sentry.io/platforms/javascript/guides/nextjs/
-
 import * as SentryCore from '@sentry/core';
 import * as Sentry from '@sentry/nextjs';
 import * as Spotlight from '@spotlightjs/spotlight';

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

@@ -134,9 +134,9 @@ This is complicated due to our deploy process. When we deploy, we run migrations
 
 To avoid this, follow these steps:
 
-- Make a PR to remove all uses of the column in the codebase in a separate PR. This mostly helps with code cleanliness. This should be merged ahead of the migration prs, but we don't need to worry about whether it is deployed first.
+- First, if the column is either not nullable, or doesn't have a `db_default` set, then make a PR to make it nullable via `null=True`.
+- Then, remove all uses of the column in the codebase in a separate PR; this mostly helps with code cleanliness. This should be merged ahead of the next migration PRs, but we don't need to worry about whether it is deployed first.
 - Make another PR that:
-    - Checks if the column is either not nullable, or doesn't have a `db_default` set. If either of these is true, then make it nullable via `null=True`.
     - If the column is a foreign key, remove the database level foreign key constraint it by setting `db_constraint=False`.
     - Remove the column and in the generated migration use `SafeRemoveField(..., deletion_action=DeletionAction.MOVE_TO_PENDING)` to replace `RemoveField(...)`. This only marks the state for the column as removed.
     - Combine these migrations together to save making multiple deploys

develop-docs/development-infrastructure/continuous-integration.mdx

@@ -32,7 +32,7 @@ You might also be interested in <Link to="/development/environment/#troubleshoot
 
 **Problem:**
 
-When pushing your build to staging and you it fails the `Ensure test image` step on Travis.
+When pushing your build to staging and it fails the `Ensure test image` step on Travis.
 
 **Solution:**
 

docs/concepts/migration/index.mdx

@@ -48,7 +48,7 @@ Below is a non-exhaustive list of some items that will not be relocated:
 - Issues
 - Events
 - Replays and/or other [Event Attachments](/platforms/javascript/enriching-events/attachments/)
-- Source Maps, [Debug Information Files](/cli/dif/) and/or [Artifact Bundles](/platforms/javascript/sourcemaps/troubleshooting_js/artifact-bundles/)
+- Source Maps, [Debug Information Files](/cli/dif/) and/or [Debug IDs](/platforms/javascript/sourcemaps/troubleshooting_js/debug-ids/)
 - Release information, including any references to external repositories via specific Pull Requests
 - Deployment information
 - Custom Avatars

docs/concepts/search/searchable-properties/session-replay.mdx

@@ -226,9 +226,9 @@ A release is a version of your code deployed to an environment. You can create a
 
 - **Type:** string
 
-### `replayType`
+### `replay_type`
 
-The reason a replay was triggered. For example, `session` when `replaysSessionSampleRate` takes effect, or `error` when `replaysOnErrorSampleRate` is sampled instead of `session`.
+The reason a replay was triggered. For example, `session` when `replaysSessionSampleRate` takes effect, or `buffer` when `replaysOnErrorSampleRate` is sampled instead of `session`. Learn more in the [Session Replay docs](/platforms/javascript/session-replay/understanding-sessions/).
 
 - **Type:** string
 

docs/contributing/pages/components.mdx

@@ -130,6 +130,12 @@ Render an expandable section to provide additional information to users on deman
   provide optional information that can help users be more successful.
 </Expandable>
 
+<Expandable title="Expandable with a code block">
+  ```js
+  const foo = 'bar';
+  ```
+</Expandable>
+
 ```markdown {tabTitle:Example}
 <Expandable title="Here's something worth noting">
   This is an expandable section in an `'info'` alert style.

docs/platforms/android/configuration/options.mdx

@@ -305,13 +305,13 @@ Set this boolean to `false` to disable tracing for `OPTIONS` requests. This opti
 
 <ConfigKey name="profiles-sample-rate">
 
-A number between `0` and `1`, controlling the percentage chance a given profile will be sent to Sentry. (`0` represents 0% while `1` represents 100%.) Applies only to sampled transactions created in the app. Either this or <PlatformIdentifier name="profiles-sampler" /> must be defined to enable profiling.
+A number between `0` and `1`, controlling the percentage chance a given profile will be sent to Sentry. (`0` represents 0% while `1` represents 100%.) Applies only to sampled transactions created in the app. Either this or <PlatformIdentifier name="profiles-sampler" /> must be defined to enable transaction profiling. Don't set it if you want to use <PlatformLink to="/profiling/#continuous-profiling">Continuous Profiling</PlatformLink>.
 
 </ConfigKey>
 
 <ConfigKey name="profiles-sampler">
 
-A function responsible for determining the percentage chance a given profile will be sent to Sentry. It will automatically be passed information about the transaction and the context in which it's being created, and must return a number between `0` (0% chance of being sent) and `1` (100% chance of being sent). Can also be used for filtering profiles, by returning 0 for those that are unwanted. Either this or <PlatformIdentifier name="profiles-sample-rate" /> must be defined to enable profiling.
+A function responsible for determining the percentage chance a given profile will be sent to Sentry. It will automatically be passed information about the transaction and the context in which it's being created, and must return a number between `0` (0% chance of being sent) and `1` (100% chance of being sent). Can also be used for filtering profiles, by returning 0 for those that are unwanted. Either this or <PlatformIdentifier name="profiles-sample-rate" /> must be defined to enable transaction profiling. Don't set it if you want to use <PlatformLink to="/profiling/#continuous-profiling">Continuous Profiling</PlatformLink>.
 
 </ConfigKey>
 
@@ -320,3 +320,35 @@ A function responsible for determining the percentage chance a given profile wil
 A boolean value that determines whether the app start process will be profiled. When true, the startup process, including ContentProviders, Application and first Activity creation, will be profiled. Note that <PlatformIdentifier name="profiles-sample-rate" /> or <PlatformIdentifier name="profiles-sampler" /> must be defined.
 
 </ConfigKey>
+
+## Continuous Profiling Options
+
+<Alert>
+
+This feature is experimental and may have bugs.
+
+</Alert>
+
+<ConfigKey name="profile-session-sample-rate">
+
+A number between `0` and `1`, controlling the percentage chance the session will be profiled. `0` represents 0% while `1` represents 100%. The default is null (disabled). <PlatformIdentifier name="profiles-sampler" /> and <PlatformIdentifier name="profiles-sample-rate" /> must not be set to enable <PlatformLink to="/profiling/#continuous-profiling">Continuous Profiling</PlatformLink>.
+
+</ConfigKey>
+
+<ConfigKey name="profile-lifecycle">
+
+Whether the profiling lifecycle is controlled manually or based on the trace lifecycle. Possible values are:
+
+- `manual`: **default** Profiler must be started and stopped through `Sentry.startProfiler()` and `Sentry.stopProfiler()` APIs
+- `trace`: Profiler is started and stopped automatically whenever a sampled trace starts and finishes
+
+</ConfigKey>
+
+<ConfigKey name="start-profiler-on-app-start">
+
+A boolean value that determines whether the app start process will be profiled. When true, the startup process, including ContentProviders, Application and first Activity creation, will be profiled. Note that <PlatformIdentifier name="profile-session-sample-rate" /> must be defined.
+
+- If profileLifecycle is set to `manual`: profiling is started automatically on startup and stopProfiler must be called manually whenever the app startup is deemed to be completed
+- If profileLifecycle is set to `trace`: profiling is started automatically on startup, and will automatically be stopped when the root span that is associated with app startup ends
+
+</ConfigKey>

docs/platforms/android/index.mdx

@@ -75,16 +75,20 @@ The wizard will prompt you to log in to Sentry. It'll then automatically do the
 Configuration is done via the application `AndroidManifest.xml`. Here's an example config which should get you started:
 
 
-```xml {filename:AndroidManifest.xml} {"onboardingOptions": {"performance": "6-7", "profiling": "8-9", "session-replay": "10-12"}}
+```xml {filename:AndroidManifest.xml} {"onboardingOptions": {"performance": "6-7", "profiling": "8-13", "session-replay": "14-16"}}
 <application>
   <!-- Required: set your sentry.io project identifier (DSN) -->
   <meta-data android:name="io.sentry.dsn" android:value="___PUBLIC_DSN___" />
   <!-- Add data like request headers, user ip address and device name, see https://docs.sentry.io/platforms/android/data-management/data-collected/ for more info -->
   <meta-data android:name="io.sentry.send-default-pii" android:value="true" />
-  <!-- enable the performance API by setting a sample-rate, adjust in production env -->
+  <!-- Enable the performance API by setting a sample-rate, adjust in production env -->
   <meta-data android:name="io.sentry.traces.sample-rate" android:value="1.0" />
-  <!-- enable profiling when starting transactions, adjust in production env -->
-  <meta-data android:name="io.sentry.traces.profiling.sample-rate" android:value="1.0" />
+  <!-- Enable profiling, adjust in production env. See https://docs.sentry.io/platforms/android/profiling for more info -->
+  <meta-data android:name="io.sentry.traces.profiling.session-sample-rate" android:value="1.0" />
+  <!-- Set profiling lifecycle, can be `manual` or `trace` -->
+  <meta-data android:name="io.sentry.traces.profiling.lifecycle" android:value="manual" />
+  <!-- Enable profiling on app start -->
+  <meta-data android:name="io.sentry.traces.profiling.start-on-app-start" android:value="true" />
   <!-- 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" />
   <meta-data android:name="io.sentry.session-replay.session-sample-rate" android:value="0.1" />
@@ -104,11 +108,15 @@ import io.sentry.Sentry;
 public class MyActivity extends AppCompatActivity {
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
+    // Any code running after this line will be
+    //profiled until Sentry.stopProfiler() is called.
+    Sentry.startProfiler();
     try {
       throw new Exception("This is a test.");
     } catch (Exception e) {
       Sentry.captureException(e);
     }
+    Sentry.stopProfiler();
   }
 }
 ```
@@ -121,11 +129,15 @@ import io.sentry.Sentry
 class MyActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
+    // Any code running after this line will be
+    //profiled until Sentry.stopProfiler() is called.
+    Sentry.startProfiler()
     try {
       throw Exception("This is a test.")
     } catch (e: Exception) {
       Sentry.captureException(e)
     }
+    Sentry.stopProfiler()
   }
 }
 ```