Skip to content

Commit b305410

Browse files
committed
Merge branch 'develop' into bete/mcp-server-semantic-convention-fill
2 parents 6c67f51 + 9c7c6bf commit b305410

File tree

825 files changed

+22248
-3408
lines changed

Some content is hidden

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

825 files changed

+22248
-3408
lines changed

.craft.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ targets:
88
- name: npm
99
id: '@sentry/types'
1010
includeNames: /^sentry-types-\d.*\.tgz$/
11-
## 1.2 Core SDK
11+
## 1.2 Core SDKs
1212
- name: npm
1313
id: '@sentry/core'
1414
includeNames: /^sentry-core-\d.*\.tgz$/
15+
- name: npm
16+
id: '@sentry/node-core'
17+
includeNames: /^sentry-node-core-\d.*\.tgz$/
1518
## 1.3 Browser Utils package
1619
- name: npm
1720
id: '@sentry-internal/browser-utils'
@@ -43,6 +46,9 @@ targets:
4346
- name: npm
4447
id: '@sentry/profiling-node'
4548
includeNames: /^sentry-profiling-node-\d.*\.tgz$/
49+
- name: npm
50+
id: '@sentry/node-native'
51+
includeNames: /^sentry-node-native-\d.*\.tgz$/
4652

4753
## 3 Browser-based Packages
4854
- name: npm

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ updates:
1616
- dependency-name: '@sentry/*'
1717
- dependency-name: '@opentelemetry/*'
1818
- dependency-name: '@prisma/instrumentation'
19-
- dependency-name: 'opentelemetry-instrumentation-remix'
19+
- dependency-name: '@playwright/test'
2020
versioning-strategy: increase
2121
commit-message:
2222
prefix: feat

.github/workflows/auto-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- name: Get auth token
1717
id: token
18-
uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1.12.0
18+
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
1919
with:
2020
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2121
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

.github/workflows/build.yml

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -920,19 +920,23 @@ jobs:
920920
env:
921921
E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }}
922922

923+
- name: Copy to temp
924+
run: yarn ci:copy-to-temp ./test-applications/${{ matrix.test-application }} ${{ runner.temp }}/test-application
925+
working-directory: dev-packages/e2e-tests
926+
923927
- name: Build E2E app
924-
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
928+
working-directory: ${{ runner.temp }}/test-application
925929
timeout-minutes: 7
926930
run: pnpm ${{ matrix.build-command || 'test:build' }}
927931

928932
- name: Install Playwright
929933
uses: ./.github/actions/install-playwright
930934
with:
931935
browsers: chromium
932-
cwd: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
936+
cwd: ${{ runner.temp }}/test-application
933937

934938
- name: Run E2E test
935-
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
939+
working-directory: ${{ runner.temp }}/test-application
936940
timeout-minutes: 10
937941
run: pnpm test:assert
938942

@@ -941,7 +945,7 @@ jobs:
941945
if: failure()
942946
with:
943947
name: playwright-traces-job_e2e_playwright_tests-${{ matrix.test-application}}
944-
path: dev-packages/e2e-tests/test-applications/${{ matrix.test-application}}/test-results
948+
path: ${{ runner.temp }}/test-application/test-results
945949
overwrite: true
946950
retention-days: 7
947951

@@ -955,7 +959,7 @@ jobs:
955959
if: always()
956960
with:
957961
name: E2E Test Dump (${{ matrix.label || matrix.test-application }})
958-
path: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/event-dumps
962+
path: ${{ runner.temp }}/test-application/event-dumps
959963
overwrite: true
960964
retention-days: 7
961965
if-no-files-found: ignore
@@ -1037,19 +1041,23 @@ jobs:
10371041
env:
10381042
E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }}
10391043

1044+
- name: Copy to temp
1045+
run: yarn ci:copy-to-temp ./test-applications/${{ matrix.test-application }} ${{ runner.temp }}/test-application
1046+
working-directory: dev-packages/e2e-tests
1047+
10401048
- name: Build E2E app
1041-
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
1049+
working-directory: ${{ runner.temp }}/test-application
10421050
timeout-minutes: 7
10431051
run: pnpm ${{ matrix.build-command || 'test:build' }}
10441052

10451053
- name: Install Playwright
10461054
uses: ./.github/actions/install-playwright
10471055
with:
10481056
browsers: chromium
1049-
cwd: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
1057+
cwd: ${{ runner.temp }}/test-application
10501058

10511059
- name: Run E2E test
1052-
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
1060+
working-directory: ${{ runner.temp }}/test-application
10531061
timeout-minutes: 10
10541062
run: pnpm ${{ matrix.assert-command || 'test:assert' }}
10551063

@@ -1063,20 +1071,19 @@ jobs:
10631071
if: always()
10641072
with:
10651073
name: E2E Test Dump (${{ matrix.label || matrix.test-application }})
1066-
path: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/event-dumps
1074+
path: ${{ runner.temp }}/test-application/event-dumps
10671075
overwrite: true
10681076
retention-days: 7
10691077
if-no-files-found: ignore
10701078

10711079
- name: Deploy Astro to Cloudflare
1072-
uses: cloudflare/pages-action@v1
1080+
uses: cloudflare/wrangler-action@v3
10731081
if: matrix.test-application == 'cloudflare-astro'
10741082
with:
10751083
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
10761084
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
1077-
projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
1078-
directory: dist
1079-
workingDirectory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
1085+
command: pages deploy dist --project-name=${{ secrets.CLOUDFLARE_PROJECT_NAME }}
1086+
workingDirectory: ${{ runner.temp }}/test-application
10801087

10811088
job_required_jobs_passed:
10821089
name: All required jobs passed or were skipped

.github/workflows/canary.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,19 +153,23 @@ jobs:
153153
env:
154154
E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }}
155155

156+
- name: Copy to temp
157+
run: yarn ci:copy-to-temp ./test-applications/${{ matrix.test-application }} ${{ runner.temp }}/test-application
158+
working-directory: dev-packages/e2e-tests
159+
156160
- name: Build E2E app
157-
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
161+
working-directory: ${{ runner.temp }}/test-application
158162
timeout-minutes: 7
159163
run: yarn ${{ matrix.build-command }}
160164

161165
- name: Install Playwright
162166
uses: ./.github/actions/install-playwright
163167
with:
164168
browsers: chromium
165-
cwd: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
169+
cwd: ${{ runner.temp }}/test-application
166170

167171
- name: Run E2E test
168-
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
172+
working-directory: ${{ runner.temp }}/test-application
169173
timeout-minutes: 15
170174
run: yarn test:assert
171175

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Get auth token
2121
id: token
22-
uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1.12.0
22+
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
2323
with:
2424
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2525
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

CHANGELOG.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,82 @@
44

55
- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
66

7+
## 9.37.0
8+
9+
### Important Changes
10+
11+
- **feat(nuxt): Parametrize SSR routes ([#16843](https://github.com/getsentry/sentry-javascript/pull/16843))**
12+
13+
When requesting dynamic or catch-all routes in Nuxt, those will now be shown as parameterized routes in Sentry.
14+
For example, `/users/123` will be shown as `/users/:userId()` in Sentry. This will make it easier to identify patterns and make grouping easier.
15+
16+
### Other Changes
17+
18+
- feat(astro): Deprecate passing runtime config to astro integration ([#16839](https://github.com/getsentry/sentry-javascript/pull/16839))
19+
- feat(browser): Add `beforeStartNavigationSpan` lifecycle hook ([#16863](https://github.com/getsentry/sentry-javascript/pull/16863))
20+
- feat(browser): Detect redirects when emitting navigation spans ([#16324](https://github.com/getsentry/sentry-javascript/pull/16324))
21+
- feat(cloudflare): Add option to opt out of capturing errors in `wrapRequestHandler` ([#16852](https://github.com/getsentry/sentry-javascript/pull/16852))
22+
- feat(feedback): Return the eventId into the onSubmitSuccess callback ([#16835](https://github.com/getsentry/sentry-javascript/pull/16835))
23+
- feat(vercel-edge): Do not vendor in all OpenTelemetry dependencies ([#16841](https://github.com/getsentry/sentry-javascript/pull/16841))
24+
- fix(browser): Ensure standalone CLS and LCP spans have traceId of pageload span ([#16864](https://github.com/getsentry/sentry-javascript/pull/16864))
25+
- fix(nextjs): Use value injection loader on `instrumentation-client.ts|js` ([#16855](https://github.com/getsentry/sentry-javascript/pull/16855))
26+
- fix(sveltekit): Avoid capturing `redirect()` calls as errors in Cloudflare ([#16853](https://github.com/getsentry/sentry-javascript/pull/16853))
27+
- docs(nextjs): Update `deleteSourcemapsAfterUpload` jsdoc default value ([#16867](https://github.com/getsentry/sentry-javascript/pull/16867))
28+
29+
Work in this release was contributed by @zachkirsch. Thank you for your contribution!
30+
31+
## 9.36.0
32+
33+
### Important Changes
34+
35+
- **feat(node-core): Add node-core SDK ([#16745](https://github.com/getsentry/sentry-javascript/pull/16745))**
36+
37+
This release adds a new SDK `@sentry/node-core` which ships without any OpenTelemetry instrumententation out of the box. All OpenTelemetry dependencies are peer dependencies and OpenTelemetry has to be set up manually.
38+
39+
Use `@sentry/node-core` when:
40+
41+
- You already have OpenTelemetry set up
42+
- You need custom OpenTelemetry configuration
43+
- You want minimal dependencies
44+
- You need fine-grained control over instrumentation
45+
46+
Use `@sentry/node` when:
47+
48+
- You want an automatic setup
49+
- You're new to OpenTelemetry
50+
- You want sensible defaults
51+
- You prefer convenience over control
52+
53+
* **feat(node): Deprecate ANR integration ([#16832](https://github.com/getsentry/sentry-javascript/pull/16832))**
54+
55+
The ANR integration has been deprecated and will be removed in future versions. Use `eventLoopBlockIntegration` from `@sentry/node-native` instead.
56+
57+
- **feat(replay): Add `_experiments.ignoreMutations` option ([#16816](https://github.com/getsentry/sentry-javascript/pull/16816))**
58+
59+
This replay option allows to configure a selector list of elements to not capture mutations for.
60+
61+
```js
62+
Sentry.replayIntegration({
63+
_experiments: {
64+
ignoreMutations: ['.dragging'],
65+
},
66+
});
67+
```
68+
69+
### Other changes
70+
71+
- feat(deps): bump @prisma/instrumentation from 6.10.1 to 6.11.1 ([#16833](https://github.com/getsentry/sentry-javascript/pull/16833))
72+
- feat(nextjs): Add flag for suppressing router transition warning ([#16823](https://github.com/getsentry/sentry-javascript/pull/16823))
73+
- feat(nextjs): Automatically skip middleware requests for tunnel route ([#16812](https://github.com/getsentry/sentry-javascript/pull/16812))
74+
- feat(replay): Export compression worker from `@sentry/replay-internal` ([#16794](https://github.com/getsentry/sentry-javascript/pull/16794))
75+
- fix(browser): Avoid 4xx response for succesful `diagnoseSdkConnectivity` request ([#16840](https://github.com/getsentry/sentry-javascript/pull/16840))
76+
- fix(browser): Guard against undefined nextHopProtocol ([#16806](https://github.com/getsentry/sentry-javascript/pull/16806))
77+
- fix(cloudflare): calculate retries not attempts ([#16834](https://github.com/getsentry/sentry-javascript/pull/16834))
78+
- fix(nuxt): Parametrize routes on the server-side ([#16785](https://github.com/getsentry/sentry-javascript/pull/16785))
79+
- fix(vue): Make pageload span handling more reliable ([#16799](https://github.com/getsentry/sentry-javascript/pull/16799))
80+
81+
Work in this release was contributed by @Spice-King and @stayallive. Thank you for your contributions!
82+
783
## 9.35.0
884

985
- feat(browser): Add ElementTiming instrumentation and spans ([#16589](https://github.com/getsentry/sentry-javascript/pull/16589))

dev-packages/browser-integration-tests/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/browser-integration-tests",
3-
"version": "9.35.0",
3+
"version": "9.37.0",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {
@@ -39,10 +39,11 @@
3939
"test:detect-flaky": "ts-node scripts/detectFlakyTests.ts"
4040
},
4141
"dependencies": {
42+
"@babel/core": "^7.27.7",
4243
"@babel/preset-typescript": "^7.16.7",
43-
"@playwright/test": "~1.50.0",
44+
"@playwright/test": "~1.53.2",
4445
"@sentry-internal/rrweb": "2.34.0",
45-
"@sentry/browser": "9.35.0",
46+
"@sentry/browser": "9.37.0",
4647
"@supabase/supabase-js": "2.49.3",
4748
"axios": "1.8.2",
4849
"babel-loader": "^8.2.2",

dev-packages/browser-integration-tests/suites/errors/fetch/init.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,4 @@ window.Sentry = Sentry;
44

55
Sentry.init({
66
dsn: 'https://[email protected]/1337',
7-
transportOptions: {
8-
fetchOptions: {
9-
// See: https://github.com/microsoft/playwright/issues/34497
10-
keepalive: false,
11-
},
12-
},
137
});
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import * as Sentry from '@sentry/browser';
2+
3+
window.Sentry = Sentry;
4+
window.Replay = Sentry.replayIntegration({
5+
flushMinDelay: 200,
6+
flushMaxDelay: 200,
7+
minReplayDuration: 0,
8+
useCompression: false,
9+
_experiments: {
10+
ignoreMutations: ['.moving'],
11+
},
12+
});
13+
14+
Sentry.init({
15+
dsn: 'https://[email protected]/1337',
16+
sampleRate: 0,
17+
replaysSessionSampleRate: 1.0,
18+
replaysOnErrorSampleRate: 0.0,
19+
20+
integrations: [window.Replay],
21+
});

0 commit comments

Comments
 (0)