Skip to content

Commit 0de410e

Browse files
authored
Merge branch 'develop' into onur/firebase-instrumentation
2 parents 5eff48e + 68d7ee4 commit 0de410e

File tree

116 files changed

+1500
-2848
lines changed

Some content is hidden

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

116 files changed

+1500
-2848
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: '145 KB',
236+
limit: '146 KB',
237237
},
238238
{
239239
name: '@sentry/node - without tracing',

MIGRATION.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,6 @@ Sentry.init({
6161
});
6262
```
6363

64-
## No Version Support Timeline
65-
66-
Version support timelines are stressful for everybody using the SDK, so we won't be defining one.
67-
Instead, we will be applying bug fixes and features to older versions as long as there is demand.
68-
69-
Additionally, we hold ourselves accountable to any security issues, meaning that if any vulnerabilities are found, we will in almost all cases backport them.
70-
71-
Note, that it is decided on a case-per-case basis, what gets backported or not.
72-
If you need a fix or feature in a previous version of the SDK, please reach out via a GitHub Issue.
73-
7464
## 3. Behaviour Changes
7565

7666
### Removal of First Input Delay (FID) Web Vital Reporting
@@ -87,3 +77,13 @@ The removal entails **no breaking API changes**. However, in rare cases, you mig
8777
- Remove any logic in `beforeSend` or other filtering/event processing logic that depends on FID or replace it with INP logic.
8878
- If you set up Sentry Alerts that depend on FID, be aware that these could trigger once you upgrade the SDK, due to a lack of new values.
8979
To replace them, adjust your alerts (or dashbaords) to use INP.
80+
81+
## No Version Support Timeline
82+
83+
Version support timelines are stressful for everybody using the SDK, so we won't be defining one.
84+
Instead, we will be applying bug fixes and features to older versions as long as there is demand.
85+
86+
Additionally, we hold ourselves accountable to any security issues, meaning that if any vulnerabilities are found, we will in almost all cases backport them.
87+
88+
Note, that it is decided on a case-per-case basis, what gets backported or not.
89+
If you need a fix or feature in a previous version of the SDK, please reach out via a GitHub Issue.

dev-packages/e2e-tests/test-applications/aws-lambda-layer-cjs/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,5 @@
1919
},
2020
"volta": {
2121
"extends": "../../package.json"
22-
},
23-
"sentryTest": {
24-
"skip": true
2522
}
2623
}

dev-packages/e2e-tests/test-applications/aws-lambda-layer-esm/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,5 @@
1919
},
2020
"volta": {
2121
"extends": "../../package.json"
22-
},
23-
"sentryTest": {
24-
"skip": true
2522
}
2623
}

dev-packages/e2e-tests/test-applications/nextjs-15/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,5 @@ next-env.d.ts
4444

4545
test-results
4646
event-dumps
47+
48+
.tmp_dev_server_logs
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export default function Page() {
2+
return <p>Next 15 test app</p>;
3+
}

dev-packages/e2e-tests/test-applications/nextjs-15/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"scripts": {
66
"build": "next build > .tmp_build_stdout 2> .tmp_build_stderr || (cat .tmp_build_stdout && cat .tmp_build_stderr && exit 1)",
7-
"clean": "npx rimraf node_modules pnpm-lock.yaml",
7+
"clean": "npx rimraf node_modules pnpm-lock.yaml .tmp_dev_server_logs",
88
"test:prod": "TEST_ENV=production playwright test",
99
"test:dev": "TEST_ENV=development playwright test",
1010
"test:dev-turbo": "TEST_ENV=dev-turbopack playwright test",

dev-packages/e2e-tests/test-applications/nextjs-15/playwright.config.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ if (!testEnv) {
77

88
const getStartCommand = () => {
99
if (testEnv === 'dev-turbopack') {
10-
return 'pnpm next dev -p 3030 --turbopack';
10+
return 'pnpm next dev -p 3030 --turbopack 2>&1 | tee .tmp_dev_server_logs';
1111
}
1212

1313
if (testEnv === 'development') {
14-
return 'pnpm next dev -p 3030';
14+
return 'pnpm next dev -p 3030 2>&1 | tee .tmp_dev_server_logs';
1515
}
1616

1717
if (testEnv === 'production') {
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { expect, test } from '@playwright/test';
2+
import fs from 'fs';
3+
4+
test('should not print warning for async params', async ({ page }) => {
5+
test.skip(
6+
process.env.TEST_ENV !== 'development' && process.env.TEST_ENV !== 'dev-turbopack',
7+
'should be skipped for non-dev mode',
8+
);
9+
await page.goto('/');
10+
11+
// If the server exits with code 1, the test will fail (see instrumentation.ts)
12+
const devStdout = fs.readFileSync('.tmp_dev_server_logs', 'utf-8');
13+
expect(devStdout).not.toContain('`params` should be awaited before using its properties.');
14+
15+
await expect(page.getByText('Next 15 test app')).toBeVisible();
16+
});
Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,30 @@
11
import { expect, test } from '@playwright/test';
22
import { waitForError } from '@sentry-internal/test-utils';
33

4-
test.describe('dev mode error symbolification', () => {
5-
if (process.env.TEST_ENV !== 'development') {
6-
test.skip('should be skipped for non-dev mode', () => {});
7-
return;
8-
}
4+
test('should have symbolicated dev errors', async ({ page }) => {
5+
test.skip(process.env.TEST_ENV !== 'development', 'should be skipped for non-dev mode');
96

10-
test('should have symbolicated dev errors', async ({ page }) => {
11-
await page.goto('/');
7+
await page.goto('/');
128

13-
const errorEventPromise = waitForError('nextjs-app-dir', errorEvent => {
14-
return errorEvent?.exception?.values?.[0]?.value === 'Click Error';
15-
});
9+
const errorEventPromise = waitForError('nextjs-app-dir', errorEvent => {
10+
return errorEvent?.exception?.values?.[0]?.value === 'Click Error';
11+
});
1612

17-
await page.getByText('Throw error').click();
13+
await page.getByText('Throw error').click();
1814

19-
const errorEvent = await errorEventPromise;
20-
const errorEventFrames = errorEvent.exception?.values?.[0]?.stacktrace?.frames;
15+
const errorEvent = await errorEventPromise;
16+
const errorEventFrames = errorEvent.exception?.values?.[0]?.stacktrace?.frames;
2117

22-
expect(errorEventFrames?.[errorEventFrames?.length - 1]).toEqual(
23-
expect.objectContaining({
24-
function: 'onClick',
25-
filename: 'components/client-error-debug-tools.tsx',
26-
lineno: 54,
27-
colno: expect.any(Number),
28-
in_app: true,
29-
pre_context: [' <button', ' onClick={() => {'],
30-
context_line: " throw new Error('Click Error');",
31-
post_context: [' }}', ' >', ' Throw error'],
32-
}),
33-
);
34-
});
18+
expect(errorEventFrames?.[errorEventFrames?.length - 1]).toEqual(
19+
expect.objectContaining({
20+
function: 'onClick',
21+
filename: 'components/client-error-debug-tools.tsx',
22+
lineno: 54,
23+
colno: expect.any(Number),
24+
in_app: true,
25+
pre_context: [' <button', ' onClick={() => {'],
26+
context_line: " throw new Error('Click Error');",
27+
post_context: [' }}', ' >', ' Throw error'],
28+
}),
29+
);
3530
});

0 commit comments

Comments
 (0)