Skip to content

Commit a7e713b

Browse files
authored
Merge branch 'develop' into external-contributor/patch-ha1fstack
2 parents 5ee1a2c + 377c7fc commit a7e713b

File tree

29 files changed

+1519
-75
lines changed

29 files changed

+1519
-75
lines changed

.size-limit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ module.exports = [
233233
import: createImport('init'),
234234
ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
235235
gzip: true,
236-
limit: '147 KB',
236+
limit: '148 KB',
237237
},
238238
{
239239
name: '@sentry/node - without tracing',

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const DEPENDENTS: Dependent[] = [
5252
'NodeClient',
5353
'NODE_VERSION',
5454
'childProcessIntegration',
55+
'systemErrorIntegration',
5556
],
5657
},
5758
{
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import * as Sentry from '@sentry/node-core';
2+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
3+
import { readFileSync } from 'fs';
4+
5+
Sentry.init({
6+
dsn: 'https://[email protected]/1337',
7+
transport: loggingTransport,
8+
sendDefaultPii: true,
9+
});
10+
11+
readFileSync('non-existent-file.txt');
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import * as Sentry from '@sentry/node-core';
2+
import { loggingTransport } from '@sentry-internal/node-integration-tests';
3+
import { readFileSync } from 'fs';
4+
5+
Sentry.init({
6+
dsn: 'https://[email protected]/1337',
7+
transport: loggingTransport,
8+
});
9+
10+
readFileSync('non-existent-file.txt');
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
import { afterAll, describe, test } from 'vitest';
2+
import { cleanupChildProcesses, createRunner } from '../../utils/runner';
3+
4+
afterAll(() => {
5+
cleanupChildProcesses();
6+
});
7+
8+
describe('SystemError integration', () => {
9+
test('sendDefaultPii: false', async () => {
10+
await createRunner(__dirname, 'basic.mjs')
11+
.expect({
12+
event: {
13+
contexts: {
14+
node_system_error: {
15+
errno: -2,
16+
code: 'ENOENT',
17+
syscall: 'open',
18+
},
19+
},
20+
exception: {
21+
values: [
22+
{
23+
type: 'Error',
24+
value: 'ENOENT: no such file or directory, open',
25+
},
26+
],
27+
},
28+
},
29+
})
30+
.start()
31+
.completed();
32+
});
33+
34+
test('sendDefaultPii: true', async () => {
35+
await createRunner(__dirname, 'basic-pii.mjs')
36+
.expect({
37+
event: {
38+
contexts: {
39+
node_system_error: {
40+
errno: -2,
41+
code: 'ENOENT',
42+
syscall: 'open',
43+
path: 'non-existent-file.txt',
44+
},
45+
},
46+
exception: {
47+
values: [
48+
{
49+
type: 'Error',
50+
value: 'ENOENT: no such file or directory, open',
51+
},
52+
],
53+
},
54+
},
55+
})
56+
.start()
57+
.completed();
58+
});
59+
});

packages/astro/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"@sentry/browser": "10.4.0",
6060
"@sentry/core": "10.4.0",
6161
"@sentry/node": "10.4.0",
62-
"@sentry/vite-plugin": "^4.0.0"
62+
"@sentry/vite-plugin": "^4.1.0"
6363
},
6464
"devDependencies": {
6565
"astro": "^3.5.0",

packages/astro/src/index.server.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ export {
124124
startSession,
125125
startSpan,
126126
startSpanManual,
127+
systemErrorIntegration,
127128
tediousIntegration,
128129
trpcMiddleware,
129130
updateSpanName,

packages/aws-serverless/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ export {
114114
spanToJSON,
115115
spanToTraceHeader,
116116
spanToBaggageHeader,
117+
systemErrorIntegration,
117118
trpcMiddleware,
118119
updateSpanName,
119120
supabaseIntegration,

packages/core/src/build-time-plugins/buildTimeOptionsBase.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,12 @@ interface SourceMapsOptions {
205205
*
206206
* By default (`false`), the plugin automatically uploads source maps during a production build if a Sentry auth token is detected.
207207
*
208+
* If set to `"disable-upload"`, the plugin will not upload source maps to Sentry, but will inject debug IDs into the build artifacts.
209+
* This is useful if you want to manually upload source maps to Sentry at a later point in time.
210+
*
208211
* @default false
209212
*/
210-
disable?: boolean;
213+
disable?: boolean | 'disable-upload';
211214

212215
/**
213216
* A glob or an array of globs that specify the build artifacts and source maps that will be uploaded to Sentry.

packages/google-cloud-serverless/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ export {
115115
trpcMiddleware,
116116
updateSpanName,
117117
supabaseIntegration,
118+
systemErrorIntegration,
118119
instrumentSupabaseClient,
119120
zodErrorsIntegration,
120121
profiler,

0 commit comments

Comments
 (0)