Skip to content

Commit a5631e1

Browse files
authored
Merge branch 'master' into lcian/feat/rust-logs
2 parents e283753 + af4f425 commit a5631e1

File tree

89 files changed

+1257
-646
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1257
-646
lines changed

.vscode/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
"**/src/wizard/**": true
1515
},
1616
"cSpell.words": [
17-
"laravel"
17+
"laravel",
18+
"subprocessor",
19+
"subprocessors"
1820
]
1921
}

apps/changelog/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@radix-ui/react-icons": "^1.3.2",
2626
"@radix-ui/react-toolbar": "^1.1.0",
2727
"@radix-ui/themes": "^3.1.3",
28-
"@sentry/nextjs": "9.10.1",
28+
"@sentry/nextjs": "9.27.0",
2929
"@spotlightjs/spotlight": "^2.1.1",
3030
"next": "15.2.3",
3131
"next-auth": "^4.24.5",
@@ -68,4 +68,4 @@
6868
"@types/react": "npm:[email protected]",
6969
"@types/react-dom": "npm:[email protected]"
7070
}
71-
}
71+
}

develop-docs/development-infrastructure/testing.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,10 +363,10 @@ See the [Frontend Handbook](/frontend/#testing) for more Jest testing tips.
363363

364364
```shell
365365
# Run jest in interactive mode
366-
yarn test
366+
pnpm test
367367

368368
# Run a single test
369-
yarn test tests/js/spec/views/issueList/overview.spec.js
369+
pnpm test tests/js/spec/views/issueList/overview.spec.js
370370
```
371371

372372
### API Fixtures

develop-docs/self-hosted/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The difference only resides on a few things that are impossible to be hosted by
1717
- Pricing tiers & Billing system.
1818
- [Spike protection](https://docs.sentry.io/pricing/quotas/spike-protection/), as it is tightly coupled with Billing Quotas.
1919
- [Spend Allocation](https://docs.sentry.io/pricing/quotas/spend-allocation/), as it is tightly coupled with Billing Quotas.
20-
- AI & ML features (such as autofix), although the code is open at [getsentry/seer](https://github.com/getsentry/seer).
20+
- Seer and other AI & ML features, although the code is open at [getsentry/seer](https://github.com/getsentry/seer).
2121
- [Data Storage Location](https://docs.sentry.io/organization/data-storage-location/), because you own your data.
2222
- [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.
2323

docs/contributing/environment.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ You will now be able to access docs via http://localhost:3000.
4343

4444
A few linters are available. Run `yarn lint` to apply them all.
4545

46-
Some lints can be autofixed with eslint
46+
Some lints can be auto-fixed with eslint
4747

4848
```bash
4949
yarn lint:eslint:fix

docs/platforms/apple/common/index.mdx

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,31 @@ func applicationDidFinishLaunching() {
311311
```
312312
</PlatformSection>
313313

314+
<PlatformSection supported={[ "apple.macos"]}>
315+
316+
## Uncaught NSExceptions
317+
318+
On macOS, the Sentry Apple SDK can't capture uncaught exceptions out of the box, therefore we recommend enabling `enableUncaughtNSExceptionReporting` in your `SentryOptions`. Alternatively, you can use the `SentryCrashExceptionApplication` class. Please visit <PlatformLink to="/usage/#capturing-uncaught-exceptions">capturing uncaught exceptions</PlatformLink> for more information.
319+
320+
```swift {tabTitle:Swift}
321+
import Sentry
322+
323+
SentrySDK.start { options in
324+
options.dsn = "___PUBLIC_DSN___"
325+
options.enableUncaughtNSExceptionReporting = true
326+
}
327+
```
328+
```objc {tabTitle:Objective-C}
329+
@import Sentry;
330+
331+
[SentrySDK startWithConfigureOptions:^(SentryOptions *options) {
332+
options.dsn = @"___PUBLIC_DSN___";
333+
options.enableUncaughtNSExceptionReporting = YES;
334+
}];
335+
```
336+
337+
</PlatformSection>
338+
314339
## Verify
315340
316341
Verify that your app is sending events to Sentry by adding the following snippet, which includes an intentional error. You should see the error reported in Sentry within a few minutes.
@@ -342,13 +367,6 @@ if (error) {
342367
}
343368
```
344369
345-
<PlatformSection supported={[ "apple.macos"]}>
346-
347-
## Uncaught Exceptions
348-
349-
On macOS, the Sentry Apple SDK can't capture uncaught exceptions out of the box. Please visit <PlatformLink to="/usage/#capturing-uncaught-exceptions">capturing uncaught exceptions</PlatformLink> for more information.
350-
351-
</PlatformSection>
352370
353371
## Next Steps
354372

docs/platforms/godot/configuration/options.mdx

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Specifies the types of errors captured as breadcrumbs. Accepts a single value or
127127
- `MASK_SCRIPT`: Script errors will be captured.
128128
- `MASK_SHADER`: Shader errors will be captured.
129129

130-
```gdscript
130+
```GDScript
131131
var mask = SentryOptions.MASK_ERROR | SentryOptions.MASK_SCRIPT
132132
options.logger_breadcrumb_mask = mask
133133
```
@@ -138,7 +138,7 @@ options.logger_breadcrumb_mask = mask
138138

139139
Specifies the types of errors captured as events. Accepts a single value or a bitwise combination of `GodotErrorMask` masks.
140140

141-
```gdscript
141+
```GDScript
142142
var mask = SentryOptions.MASK_ERROR | SentryOptions.MASK_SCRIPT
143143
options.logger_event_mask = mask
144144
```
@@ -178,7 +178,7 @@ thread-safe APIs and only use Godot-specific APIs after you've checked that you'
178178

179179
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.
180180

181-
```gdscript
181+
```GDScript
182182
func _before_send(event: SentryEvent) -> SentryEvent:
183183
if event.environment.contains("editor"):
184184
# Discard event if running from the editor.
@@ -191,19 +191,15 @@ func _before_send(event: SentryEvent) -> SentryEvent:
191191

192192
</ConfigKey>
193193

194-
<ConfigKey name="on-crash">
194+
<ConfigKey name="before-capture-screenshot">
195195

196-
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).
196+
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.
197197

198-
```gdscript
199-
func _on_crash(event: SentryEvent) -> SentryEvent:
200-
if event.environment.contains("editor"):
201-
# Discard event if running from the editor.
202-
return null
203-
if event.message.contains("Bruno"):
204-
# Remove sensitive information from the event.
205-
event.message = event.message.replace("Bruno", "REDACTED")
206-
return event
198+
```GDScript
199+
func _before_capture_screenshot(event: SentryEvent) -> bool:
200+
if is_showing_sensitive_info():
201+
return false # Don't capture screenshot!
202+
return true
207203
```
208204

209205
</ConfigKey>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ For more information, refer to [Sentry CLI](/cli/) documentation.
214214
You can also upload debug files for the Sentry SDK itself by running the following command from your project directory:
215215

216216
```bash {tabTitle:Bash/PowerShell}
217-
sentry-cli debug-files upload --org ___ORG_SLUG___ --project ___PROJECT_SLUG___ addons/sentrysdk/
217+
sentry-cli debug-files upload --org ___ORG_SLUG___ --project ___PROJECT_SLUG___ addons/sentry/
218218
```
219219

220220
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

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,44 @@ To enhance the spans collected by this integration, we recommend providing a `fu
4646
```javascript
4747
const result = await generateText({
4848
model: openai("gpt-4-turbo"),
49-
experimental_telemetry: { functionId: "my-awesome-function" },
49+
experimental_telemetry: {
50+
isEnabled: true,
51+
functionId: "my-awesome-function",
52+
},
53+
});
54+
```
55+
56+
## Options
57+
58+
### `recordInputs`
59+
60+
Requires SDK version `9.27.0` or higher.
61+
62+
_Type: `boolean`_
63+
64+
Records inputs to the `ai` function call.
65+
66+
Defaults to `true` if `sendDefaultPii` is `true` or if you explicitly set `experimental_telemetry.isEnabled` to `true` in your `ai` function callsites.
67+
68+
```javascript
69+
Sentry.init({
70+
integrations: [Sentry.vercelAIIntegration({ recordInputs: true })],
71+
});
72+
```
73+
74+
### `recordOutputs`
75+
76+
Requires SDK version `9.27.0` or higher.
77+
78+
_Type: `boolean`_
79+
80+
Records outputs to the `ai` function call.
81+
82+
Defaults to `true` if `sendDefaultPii` is `true` or if you explicitly set `experimental_telemetry.isEnabled` to `true` in your `ai` function callsites.
83+
84+
```javascript
85+
Sentry.init({
86+
integrations: [Sentry.vercelAIIntegration({ recordOutputs: true })],
5087
});
5188
```
5289

@@ -61,7 +98,7 @@ const result = await generateText({
6198
});
6299
```
63100

64-
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`.
101+
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.
65102

66103
```javascript
67104
const result = await generateText({

docs/platforms/javascript/common/index.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Select which Sentry features you'd like to install in addition to Error Monitori
4747
<PlatformCategorySection notSupported={["server"]}>
4848
<PlatformSection notSupported={["javascript", "javascript.cordova"]}>
4949
<OnboardingOptionButtons
50-
options={["error-monitoring", "performance", "session-replay"]}
50+
options={["error-monitoring", "performance", "session-replay", "user-feedback"]}
5151
/>
5252
</PlatformSection>
5353
</PlatformCategorySection>
@@ -78,7 +78,7 @@ Select which Sentry features you'd like to install in addition to Error Monitori
7878

7979
<PlatformSection notSupported={["javascript.nextjs"]}>
8080

81-
Sentry captures data by using an SDK within your applications runtime.
81+
Sentry captures data by using an SDK within your application's runtime.
8282

8383
</PlatformSection>
8484

0 commit comments

Comments
 (0)