Skip to content

Commit a8c0351

Browse files
authored
Merge branch 'develop' into timfish/test/update-vitest
2 parents 14f6e69 + 6858602 commit a8c0351

File tree

63 files changed

+941
-150
lines changed

Some content is hidden

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

63 files changed

+941
-150
lines changed

CHANGELOG.md

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

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

7+
## 9.31.0
8+
9+
### Important Changes
10+
11+
- feat(nextjs): Add option for auto-generated random tunnel route ([#16626](https://github.com/getsentry/sentry-javascript/pull/16626))
12+
13+
Adds an option to automatically generate a random tunnel route for the Next.js SDK. This helps prevent ad blockers and other tools from blocking Sentry requests by using a randomized path instead of the predictable `/monitoring` endpoint.
14+
15+
- feat(core): Allow to pass `scope` & `client` to `getTraceData` ([#16633](https://github.com/getsentry/sentry-javascript/pull/16633))
16+
17+
Adds the ability to pass custom `scope` and `client` parameters to the `getTraceData` function, providing more flexibility when generating trace data for distributed tracing.
18+
19+
### Other Changes
20+
21+
- feat(core): Add support for `x-forwarded-host` and `x-forwarded-proto` headers ([#16687](https://github.com/getsentry/sentry-javascript/pull/16687))
22+
- deps: Remove unused `@sentry/opentelemetry` dependency ([#16677](https://github.com/getsentry/sentry-javascript/pull/16677))
23+
- deps: Update all bundler plugin instances to latest & allow caret ranges ([#16641](https://github.com/getsentry/sentry-javascript/pull/16641))
24+
- feat(deps): Bump @prisma/instrumentation from 6.8.2 to 6.9.0 ([#16608](https://github.com/getsentry/sentry-javascript/pull/16608))
25+
- feat(flags): add node support for generic featureFlagsIntegration and move utils to core ([#16585](https://github.com/getsentry/sentry-javascript/pull/16585))
26+
- feat(flags): capture feature flag evaluations on spans ([#16485](https://github.com/getsentry/sentry-javascript/pull/16485))
27+
- feat(pino): Add initial package for `@sentry/pino-transport` ([#16652](https://github.com/getsentry/sentry-javascript/pull/16652))
28+
- fix: Wait for the correct clientWidth/clientHeight when showing Feedback Screenshot previews ([#16648](https://github.com/getsentry/sentry-javascript/pull/16648))
29+
- fix(browser): Remove usage of Array.at() method ([#16647](https://github.com/getsentry/sentry-javascript/pull/16647))
30+
- fix(core): Improve `safeJoin` usage in console logging integration ([#16658](https://github.com/getsentry/sentry-javascript/pull/16658))
31+
- fix(google-cloud-serverless): Make `CloudEvent` type compatible ([#16661](https://github.com/getsentry/sentry-javascript/pull/16661))
32+
- fix(nextjs): Fix lookup of `instrumentation-client.js` file ([#16637](https://github.com/getsentry/sentry-javascript/pull/16637))
33+
- fix(node): Ensure graphql errors result in errored spans ([#16678](https://github.com/getsentry/sentry-javascript/pull/16678))
34+
735
## 9.30.0
836

937
- feat(nextjs): Add URL to tags of server components and generation functions issues ([#16500](https://github.com/getsentry/sentry-javascript/pull/16500))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/browser-integration-tests",
3-
"version": "9.30.0",
3+
"version": "9.31.0",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {
@@ -42,7 +42,7 @@
4242
"@babel/preset-typescript": "^7.16.7",
4343
"@playwright/test": "~1.50.0",
4444
"@sentry-internal/rrweb": "2.34.0",
45-
"@sentry/browser": "9.30.0",
45+
"@sentry/browser": "9.31.0",
4646
"@supabase/supabase-js": "2.49.3",
4747
"axios": "1.8.2",
4848
"babel-loader": "^8.2.2",

dev-packages/bundle-analyzer-scenarios/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/bundle-analyzer-scenarios",
3-
"version": "9.30.0",
3+
"version": "9.31.0",
44
"description": "Scenarios to test bundle analysis with",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/dev-packages/bundle-analyzer-scenarios",

dev-packages/clear-cache-gh-action/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@sentry-internal/clear-cache-gh-action",
33
"description": "An internal Github Action to clear GitHub caches.",
4-
"version": "9.30.0",
4+
"version": "9.31.0",
55
"license": "MIT",
66
"engines": {
77
"node": ">=18"

dev-packages/e2e-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/e2e-tests",
3-
"version": "9.30.0",
3+
"version": "9.31.0",
44
"license": "MIT",
55
"private": true,
66
"scripts": {

dev-packages/external-contributor-gh-action/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@sentry-internal/external-contributor-gh-action",
33
"description": "An internal Github Action to add external contributors to the CHANGELOG.md file.",
4-
"version": "9.30.0",
4+
"version": "9.31.0",
55
"license": "MIT",
66
"engines": {
77
"node": ">=18"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/node-integration-tests",
3-
"version": "9.30.0",
3+
"version": "9.31.0",
44
"license": "MIT",
55
"engines": {
66
"node": ">=18"
@@ -30,9 +30,9 @@
3030
"@nestjs/common": "11.0.16",
3131
"@nestjs/core": "10.4.6",
3232
"@nestjs/platform-express": "10.4.6",
33-
"@sentry/aws-serverless": "9.30.0",
34-
"@sentry/core": "9.30.0",
35-
"@sentry/node": "9.30.0",
33+
"@sentry/aws-serverless": "9.31.0",
34+
"@sentry/core": "9.31.0",
35+
"@sentry/node": "9.31.0",
3636
"@types/mongodb": "^3.6.20",
3737
"@types/mysql": "^2.15.21",
3838
"@types/pg": "^8.6.5",

dev-packages/opentelemetry-v2-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/opentelemetry-v2-tests",
3-
"version": "9.30.0",
3+
"version": "9.31.0",
44
"private": true,
55
"description": "Tests for @sentry/opentelemetry with OpenTelemetry v2",
66
"engines": {

dev-packages/rollup-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/rollup-utils",
3-
"version": "9.30.0",
3+
"version": "9.31.0",
44
"description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",

dev-packages/size-limit-gh-action/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@sentry-internal/size-limit-gh-action",
33
"description": "An internal Github Action to compare the current size of a PR against the one on develop.",
4-
"version": "9.30.0",
4+
"version": "9.31.0",
55
"license": "MIT",
66
"engines": {
77
"node": ">=18"

dev-packages/test-utils/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"private": true,
3-
"version": "9.30.0",
3+
"version": "9.31.0",
44
"name": "@sentry-internal/test-utils",
55
"author": "Sentry",
66
"license": "MIT",
@@ -45,7 +45,7 @@
4545
},
4646
"devDependencies": {
4747
"@playwright/test": "~1.50.0",
48-
"@sentry/core": "9.30.0"
48+
"@sentry/core": "9.31.0"
4949
},
5050
"volta": {
5151
"extends": "../../package.json"

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
3-
"version": "9.30.0",
3+
"version": "9.31.0",
44
"npmClient": "yarn"
55
}

packages/angular/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/angular",
3-
"version": "9.30.0",
3+
"version": "9.31.0",
44
"description": "Official Sentry SDK for Angular",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,8 +21,8 @@
2121
"rxjs": "^6.5.5 || ^7.x"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "9.30.0",
25-
"@sentry/core": "9.30.0",
24+
"@sentry/browser": "9.31.0",
25+
"@sentry/core": "9.31.0",
2626
"tslib": "^2.4.1"
2727
},
2828
"devDependencies": {

packages/astro/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/astro",
3-
"version": "9.30.0",
3+
"version": "9.31.0",
44
"description": "Official Sentry SDK for Astro",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/astro",
@@ -56,9 +56,9 @@
5656
"astro": ">=3.x || >=4.0.0-beta || >=5.x"
5757
},
5858
"dependencies": {
59-
"@sentry/browser": "9.30.0",
60-
"@sentry/core": "9.30.0",
61-
"@sentry/node": "9.30.0",
59+
"@sentry/browser": "9.31.0",
60+
"@sentry/core": "9.31.0",
61+
"@sentry/node": "9.31.0",
6262
"@sentry/vite-plugin": "^2.22.6"
6363
},
6464
"devDependencies": {

packages/aws-serverless/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/aws-serverless",
3-
"version": "9.30.0",
3+
"version": "9.31.0",
44
"description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/serverless",
@@ -68,8 +68,8 @@
6868
"@opentelemetry/instrumentation": "^0.57.2",
6969
"@opentelemetry/instrumentation-aws-lambda": "0.50.3",
7070
"@opentelemetry/instrumentation-aws-sdk": "0.49.1",
71-
"@sentry/core": "9.30.0",
72-
"@sentry/node": "9.30.0",
71+
"@sentry/core": "9.31.0",
72+
"@sentry/node": "9.31.0",
7373
"@types/aws-lambda": "^8.10.62"
7474
},
7575
"devDependencies": {

packages/browser-utils/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/browser-utils",
3-
"version": "9.30.0",
3+
"version": "9.31.0",
44
"description": "Browser Utilities for all Sentry JavaScript SDKs",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils",
@@ -39,7 +39,7 @@
3939
"access": "public"
4040
},
4141
"dependencies": {
42-
"@sentry/core": "9.30.0"
42+
"@sentry/core": "9.31.0"
4343
},
4444
"scripts": {
4545
"build": "run-p build:transpile build:types",

packages/browser/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/browser",
3-
"version": "9.30.0",
3+
"version": "9.31.0",
44
"description": "Official Sentry SDK for browsers",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -39,14 +39,14 @@
3939
"access": "public"
4040
},
4141
"dependencies": {
42-
"@sentry-internal/browser-utils": "9.30.0",
43-
"@sentry-internal/feedback": "9.30.0",
44-
"@sentry-internal/replay": "9.30.0",
45-
"@sentry-internal/replay-canvas": "9.30.0",
46-
"@sentry/core": "9.30.0"
42+
"@sentry-internal/browser-utils": "9.31.0",
43+
"@sentry-internal/feedback": "9.31.0",
44+
"@sentry-internal/replay": "9.31.0",
45+
"@sentry-internal/replay-canvas": "9.31.0",
46+
"@sentry/core": "9.31.0"
4747
},
4848
"devDependencies": {
49-
"@sentry-internal/integration-shims": "9.30.0",
49+
"@sentry-internal/integration-shims": "9.31.0",
5050
"fake-indexeddb": "^4.0.1"
5151
},
5252
"scripts": {

packages/bun/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/bun",
3-
"version": "9.30.0",
3+
"version": "9.31.0",
44
"description": "Official Sentry SDK for bun",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/bun",
@@ -39,8 +39,8 @@
3939
"access": "public"
4040
},
4141
"dependencies": {
42-
"@sentry/core": "9.30.0",
43-
"@sentry/node": "9.30.0"
42+
"@sentry/core": "9.31.0",
43+
"@sentry/node": "9.31.0"
4444
},
4545
"devDependencies": {
4646
"bun-types": "^1.2.9"

packages/cloudflare/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/cloudflare",
3-
"version": "9.30.0",
3+
"version": "9.31.0",
44
"description": "Official Sentry SDK for Cloudflare Workers and Pages",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/cloudflare",
@@ -49,7 +49,7 @@
4949
"access": "public"
5050
},
5151
"dependencies": {
52-
"@sentry/core": "9.30.0"
52+
"@sentry/core": "9.31.0"
5353
},
5454
"peerDependencies": {
5555
"@cloudflare/workers-types": "^4.x"
@@ -60,7 +60,7 @@
6060
}
6161
},
6262
"devDependencies": {
63-
"@cloudflare/workers-types": "4.20240725.0",
63+
"@cloudflare/workers-types": "4.20250620.0",
6464
"@types/node": "^18.19.1",
6565
"wrangler": "^3.67.1"
6666
},

packages/cloudflare/src/client.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,14 @@ export class CloudflareClient extends ServerRuntimeClient<CloudflareClientOption
2929
}
3030
}
3131

32-
// eslint-disable-next-line @typescript-eslint/no-empty-interface
33-
interface BaseCloudflareOptions {}
32+
interface BaseCloudflareOptions {
33+
/**
34+
* @ignore Used internally to disable the deDupeIntegration for workflows.
35+
* @hidden Used internally to disable the deDupeIntegration for workflows.
36+
* @default true
37+
*/
38+
enableDedupe?: boolean;
39+
}
3440

3541
/**
3642
* Configuration options for the Sentry Cloudflare SDK

packages/cloudflare/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,6 @@ export { fetchIntegration } from './integrations/fetch';
110110

111111
export { instrumentD1WithSentry } from './d1';
112112

113+
export { instrumentWorkflowWithSentry } from './workflows';
114+
113115
export { setAsyncLocalStorageAsyncContextStrategy } from './async';

packages/cloudflare/src/pages-plugin.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ export function sentryPagesPlugin<
4949
setAsyncLocalStorageAsyncContextStrategy();
5050
return context => {
5151
const options = typeof handlerOrOptions === 'function' ? handlerOrOptions(context) : handlerOrOptions;
52-
return wrapRequestHandler({ options, request: context.request, context }, () => context.next());
52+
return wrapRequestHandler({ options, request: context.request, context: { ...context, props: {} } }, () =>
53+
context.next(),
54+
);
5355
};
5456
}

packages/cloudflare/src/sdk.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ import { defaultStackParser } from './vendor/stacktrace';
2020
export function getDefaultIntegrations(options: CloudflareOptions): Integration[] {
2121
const sendDefaultPii = options.sendDefaultPii ?? false;
2222
return [
23-
dedupeIntegration(),
23+
// The Dedupe integration should not be used in workflows because we want to
24+
// capture all step failures, even if they are the same error.
25+
...(options.enableDedupe === false ? [] : [dedupeIntegration()]),
2426
// TODO(v10): Replace with `eventFiltersIntegration` once we remove the deprecated `inboundFiltersIntegration`
2527
// eslint-disable-next-line deprecation/deprecation
2628
inboundFiltersIntegration(),

0 commit comments

Comments
 (0)