Merge branch 'master' into span-protocol

Author: cleptric

.vscode/settings.json

@@ -14,6 +14,8 @@
     "**/src/wizard/**": true
   },
   "cSpell.words": [
-    "laravel"
+    "laravel",
+    "subprocessor",
+    "subprocessors"
   ]
 }

develop-docs/development-infrastructure/testing.mdx

@@ -363,10 +363,10 @@ See the [Frontend Handbook](/frontend/#testing) for more Jest testing tips.
 
 ```shell
 # Run jest in interactive mode
-yarn test
+pnpm test
 
 # Run a single test
-yarn test tests/js/spec/views/issueList/overview.spec.js
+pnpm test tests/js/spec/views/issueList/overview.spec.js
 ```
 
 ### API Fixtures

develop-docs/sdk/telemetry/logs.mdx

@@ -311,8 +311,6 @@ If a log is generated by an SDK integration, the SDK should also set the `sentry
 
 #### User Attributes
 
-If `sendDefaultPii`/`send_default_pii` is set to `true` in the SDK, the SDK should attach the following user data if available:
-
 1. `user.id`: The user ID. Maps to `id` in the [User](/sdk/data-model/event-payloads/user/) payload.
 2. `user.name`: The username. Maps to `username` in the [User](/sdk/data-model/event-payloads/user/) payload.
 3. `user.email`: The email address. Maps to `email` in the [User](/sdk/data-model/event-payloads/user/) payload.

develop-docs/self-hosted/index.mdx

@@ -17,7 +17,7 @@ The difference only resides on a few things that are impossible to be hosted by
 - Pricing tiers & Billing system.
 - [Spike protection](https://docs.sentry.io/pricing/quotas/spike-protection/), as it is tightly coupled with Billing Quotas.
 - [Spend Allocation](https://docs.sentry.io/pricing/quotas/spend-allocation/), as it is tightly coupled with Billing Quotas.
-- AI & ML features (such as autofix), although the code is open at [getsentry/seer](https://github.com/getsentry/seer).
+- Seer and other AI & ML features, although the code is open at [getsentry/seer](https://github.com/getsentry/seer).
 - [Data Storage Location](https://docs.sentry.io/organization/data-storage-location/), because you own your data.
 - [iOS Symbolication](https://docs.sentry.io/platforms/apple/data-management/debug-files/symbol-servers#built-in-repositories), because Apple does not provide a public symbol server, nor do they allow us to distribute the Debug Information Files (DIFs) ourselves.
 

docs/contributing/environment.mdx

@@ -43,7 +43,7 @@ You will now be able to access docs via http://localhost:3000.
 
 A few linters are available. Run `yarn lint` to apply them all.
 
-Some lints can be autofixed with eslint
+Some lints can be auto-fixed with eslint
 
 ```bash
 yarn lint:eslint:fix

docs/platforms/godot/configuration/options.mdx

@@ -127,7 +127,7 @@ Specifies the types of errors captured as breadcrumbs. Accepts a single value or
 - `MASK_SCRIPT`: Script errors will be captured.
 - `MASK_SHADER`: Shader errors will be captured.
 
-```gdscript
+```GDScript
 var mask = SentryOptions.MASK_ERROR | SentryOptions.MASK_SCRIPT
 options.logger_breadcrumb_mask = mask
 ```
@@ -138,7 +138,7 @@ options.logger_breadcrumb_mask = mask
 
 Specifies the types of errors captured as events. Accepts a single value or a bitwise combination of `GodotErrorMask` masks.
 
-```gdscript
+```GDScript
 var mask = SentryOptions.MASK_ERROR | SentryOptions.MASK_SCRIPT
 options.logger_event_mask = mask
 ```
@@ -178,7 +178,7 @@ thread-safe APIs and only use Godot-specific APIs after you've checked that you'
 
 If assigned, this callback runs before a message or error event is sent to Sentry. It takes `SentryEvent` as a parameter and returns either the same event object, with or without modifications, or `null` to skip reporting the event. You can assign it in a [configuration script](#configuration-script). This can be used, for instance, for stripping PII before sending.
 
-```gdscript
+```GDScript
 func _before_send(event: SentryEvent) -> SentryEvent:
 	if event.environment.contains("editor"):
 		# Discard event if running from the editor.
@@ -191,19 +191,15 @@ func _before_send(event: SentryEvent) -> SentryEvent:
 
 </ConfigKey>
 
-<ConfigKey name="on-crash">
+<ConfigKey name="before-capture-screenshot">
 
-If assigned, this callback runs before a crash event is sent to Sentry. In contrast to `before_send`, it is only called when a crash occurred. It takes `SentryEvent` as a parameter and returns either the same event object, with or without modifications, or `null` to skip reporting the event. You can assign it in a [configuration script](#configuration-script).
+If assigned, this callback runs before a screenshot is captured. It takes `SentryEvent` as a parameter and returns `false` to skip capturing the screenshot, or `true` to capture the screenshot.
 
-```gdscript
-func _on_crash(event: SentryEvent) -> SentryEvent:
-	if event.environment.contains("editor"):
-		# Discard event if running from the editor.
-		return null
-	if event.message.contains("Bruno"):
-		# Remove sensitive information from the event.
-		event.message = event.message.replace("Bruno", "REDACTED")
-	return event
+```GDScript
+func _before_capture_screenshot(event: SentryEvent) -> bool:
+	if is_showing_sensitive_info():
+		return false # Don't capture screenshot!
+	return true
 ```
 
 </ConfigKey>

docs/platforms/godot/configuration/stack-traces.mdx

@@ -214,7 +214,7 @@ For more information, refer to [Sentry CLI](/cli/) documentation.
 You can also upload debug files for the Sentry SDK itself by running the following command from your project directory:
 
 ```bash {tabTitle:Bash/PowerShell}
-sentry-cli debug-files upload --org ___ORG_SLUG___ --project ___PROJECT_SLUG___ addons/sentrysdk/
+sentry-cli debug-files upload --org ___ORG_SLUG___ --project ___PROJECT_SLUG___ addons/sentry/
 ```
 
 This uploads the SDK's debug files to Sentry. You can repeat this step for any other native extension used in your Godot project.

docs/platforms/javascript/common/configuration/integrations/vercelai.mdx

@@ -46,7 +46,44 @@ To enhance the spans collected by this integration, we recommend providing a `fu
 ```javascript
 const result = await generateText({
   model: openai("gpt-4-turbo"),
-  experimental_telemetry: { functionId: "my-awesome-function" },
+  experimental_telemetry: {
+    isEnabled: true,
+    functionId: "my-awesome-function",
+  },
+});
+```
+
+## Options
+
+### `recordInputs`
+
+Requires SDK version `9.27.0` or higher.
+
+_Type: `boolean`_
+
+Records inputs to the `ai` function call.
+
+Defaults to `true` if `sendDefaultPii` is `true` or if you explicitly set `experimental_telemetry.isEnabled` to `true` in your `ai` function callsites.
+
+```javascript
+Sentry.init({
+  integrations: [Sentry.vercelAIIntegration({ recordInputs: true })],
+});
+```
+
+### `recordOutputs`
+
+Requires SDK version `9.27.0` or higher.
+
+_Type: `boolean`_
+
+Records outputs to the `ai` function call.
+
+Defaults to `true` if `sendDefaultPii` is `true` or if you explicitly set `experimental_telemetry.isEnabled` to `true` in your `ai` function callsites.
+
+```javascript
+Sentry.init({
+  integrations: [Sentry.vercelAIIntegration({ recordOutputs: true })],
 });
 ```
 
@@ -61,7 +98,7 @@ const result = await generateText({
 });
 ```
 
-If you want to collect inputs and outputs for a specific call, you must specifically opt-in to each function call by setting `experimental_telemetry.recordInputs` and `experimental_telemetry.recordOutputs` to `true`.
+If you set `experimental_telemetry.recordInputs` and `experimental_telemetry.recordOutputs` it will override the default behavior of collecting inputs and outputs for that function call.
 
 ```javascript
 const result = await generateText({

docs/platforms/javascript/common/index.mdx

@@ -47,7 +47,7 @@ Select which Sentry features you'd like to install in addition to Error Monitori
 <PlatformCategorySection notSupported={["server"]}>
   <PlatformSection notSupported={["javascript", "javascript.cordova"]}>
     <OnboardingOptionButtons
-      options={["error-monitoring", "performance", "session-replay"]}
+      options={["error-monitoring", "performance", "session-replay", "user-feedback"]}
     />
   </PlatformSection>
 </PlatformCategorySection>
@@ -78,7 +78,7 @@ Select which Sentry features you'd like to install in addition to Error Monitori
 
 <PlatformSection notSupported={["javascript.nextjs"]}>
 
-Sentry captures data by using an SDK within your application’s runtime.
+Sentry captures data by using an SDK within your application's runtime.
 
 </PlatformSection>
 

docs/platforms/javascript/guides/angular/manual-setup.mdx

@@ -24,7 +24,7 @@ You need:
 Choose the features you want to configure, and this guide will show you how:
 
 <OnboardingOptionButtons
-  options={["error-monitoring", "performance", "session-replay"]}
+  options={["error-monitoring", "performance", "session-replay", "user-feedback"]}
 />
 
 <PlatformContent includePath="getting-started-features-expandable" />
@@ -102,6 +102,12 @@ Sentry.init({
     // which automatically captures Session Replays
     Sentry.replayIntegration(),
     // ___PRODUCT_OPTION_END___ session-replay
+    // ___PRODUCT_OPTION_START___ user-feedback
+    Sentry.feedbackIntegration({
+      // Additional SDK configuration goes in here, for example:
+      colorScheme: "system",
+    }),
+    // ___PRODUCT_OPTION_END___ user-feedback
   ],
   // ___PRODUCT_OPTION_START___ performance
 
@@ -156,6 +162,12 @@ Sentry.init({
     // which automatically captures Session Replays
     Sentry.replayIntegration(),
     // ___PRODUCT_OPTION_END___ session-replay
+    // ___PRODUCT_OPTION_START___ user-feedback
+    Sentry.feedbackIntegration({
+      // Additional SDK configuration goes in here, for example:
+      colorScheme: "system",
+    }),
+    // ___PRODUCT_OPTION_END___ user-feedback
   ],
   // ___PRODUCT_OPTION_START___ performance