Skip to content

Commit aab996f

Browse files
AbhiPrasadAbhiPrasad
committed
Merge branch 'master' into abhi-private-inboundfilter
2 parents f1fb39b + 21ae9f7 commit aab996f

File tree

26 files changed

+126
-88
lines changed

26 files changed

+126
-88
lines changed

‎CHANGELOG.md

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

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

7+
## 6.18.0
8+
9+
This patch deprecates the `frameContextLines` option for the Node SDK. The [migration documentation](./MIGRATION.md#upgrading-from-6.17.x-to-6.18.0) details how to migrate off the deprecated `frameContextLines` option.
10+
11+
- fix(browser): Only set event.stacktrace if we have 1 or more frames ([#4614](https://github.com/getsentry/sentry-javascript/pull/4614))
12+
- fix(hub): keep hint event id if it's provided ([#4577](https://github.com/getsentry/sentry-javascript/pull/4577))
13+
- fix(nextjs): Use env variable for build detection ([#4608](https://github.com/getsentry/sentry-javascript/pull/4608))
14+
- ref(node): Refactor node source fetching into integration ([#3729](https://github.com/getsentry/sentry-javascript/pull/3729))
15+
- feat(serverless): Added `ignoreSentryErrors` option for AWS lambda ([#4620](https://github.com/getsentry/sentry-javascript/pull/4620))
16+
17+
Work in this release contributed by @GoshaEgorian and @ichina. Thank you for your contributions!
18+
719
## 6.17.9
820

921
- fix(gatsby): Add missing React peer dependency ([#4576](https://github.com/getsentry/sentry-javascript/pull/4576))

‎MIGRATION.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
# Upgrading from 6.17.x to 6.18.0
2+
3+
Version 6.18.0 deprecates the `frameContextLines` top-level option for the Node SDK. This option will be removed in an upcoming major version. To migrate off of the top-level option, pass it instead to the new `ContextLines` integration.
4+
5+
```js
6+
// New in 6.18.0
7+
init({
8+
dsn: '__DSN__',
9+
integrations: [new ContextLines({ frameContextLines: 10 })]
10+
});
11+
12+
// Before:
13+
init({
14+
dsn: '__DSN__',
15+
frameContextLines: 10,
16+
});
17+
```
18+
119
# Upgrading from 6.x to 6.17.x
220

321
You only need to make changes when migrating to `6.17.x` if you are using our internal `Dsn` class. Our internal API class and typescript enums were deprecated, so we recommend you migrate them as well.
@@ -72,7 +90,7 @@ We deprecated the `Status` enum in `@sentry/tracing` and it will be removed in t
7290

7391
```js
7492
// New in 6.17.0:
75-
import { spanStatusfromHttpCode } from '@sentry/utils';
93+
import { spanStatusfromHttpCode } from '@sentry/tracing';
7694

7795
const status = spanStatusfromHttpCode(403);
7896

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"lerna": "3.4.0",
3-
"version": "6.17.9",
3+
"version": "6.18.0",
44
"packages": "packages/*",
55
"npmClient": "yarn",
66
"useWorkspaces": true

‎packages/angular/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/angular",
3-
"version": "6.17.9",
3+
"version": "6.18.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,9 +21,9 @@
2121
"@angular/router": "10.x || 11.x || 12.x || 13.x"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "6.17.9",
25-
"@sentry/types": "6.17.9",
26-
"@sentry/utils": "6.17.9",
24+
"@sentry/browser": "6.18.0",
25+
"@sentry/types": "6.18.0",
26+
"@sentry/utils": "6.18.0",
2727
"rxjs": "^6.6.0",
2828
"tslib": "^1.9.3"
2929
},

‎packages/browser/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/browser",
3-
"version": "6.17.9",
3+
"version": "6.18.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",
@@ -16,9 +16,9 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/core": "6.17.9",
20-
"@sentry/types": "6.17.9",
21-
"@sentry/utils": "6.17.9",
19+
"@sentry/core": "6.18.0",
20+
"@sentry/types": "6.18.0",
21+
"@sentry/utils": "6.18.0",
2222
"tslib": "^1.9.3"
2323
},
2424
"devDependencies": {

‎packages/core/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/core",
3-
"version": "6.17.9",
3+
"version": "6.18.0",
44
"description": "Base implementation 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/core",
@@ -16,10 +16,10 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/hub": "6.17.9",
20-
"@sentry/minimal": "6.17.9",
21-
"@sentry/types": "6.17.9",
22-
"@sentry/utils": "6.17.9",
19+
"@sentry/hub": "6.18.0",
20+
"@sentry/minimal": "6.18.0",
21+
"@sentry/types": "6.18.0",
22+
"@sentry/utils": "6.18.0",
2323
"tslib": "^1.9.3"
2424
},
2525
"scripts": {

‎packages/core/src/version.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const SDK_VERSION = '6.17.9';
1+
export const SDK_VERSION = '6.18.0';

‎packages/ember/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/ember",
3-
"version": "6.17.9",
3+
"version": "6.18.0",
44
"description": "Official Sentry SDK for Ember.js",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -31,10 +31,10 @@
3131
},
3232
"dependencies": {
3333
"@embroider/macros": "~0.47.2",
34-
"@sentry/browser": "6.17.9",
35-
"@sentry/tracing": "6.17.9",
36-
"@sentry/types": "6.17.9",
37-
"@sentry/utils": "6.17.9",
34+
"@sentry/browser": "6.18.0",
35+
"@sentry/tracing": "6.18.0",
36+
"@sentry/types": "6.18.0",
37+
"@sentry/utils": "6.18.0",
3838
"ember-auto-import": "^1.12.0 || ^2.2.0",
3939
"ember-cli-babel": "~7.26.6",
4040
"ember-cli-htmlbars": "^6.0.1",

‎packages/eslint-config-sdk/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/eslint-config-sdk",
3-
"version": "6.17.9",
3+
"version": "6.18.0",
44
"description": "Official Sentry SDK eslint config",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -19,8 +19,8 @@
1919
"access": "public"
2020
},
2121
"dependencies": {
22-
"@sentry-internal/eslint-plugin-sdk": "6.17.9",
23-
"@sentry-internal/typescript": "6.17.9",
22+
"@sentry-internal/eslint-plugin-sdk": "6.18.0",
23+
"@sentry-internal/typescript": "6.18.0",
2424
"@typescript-eslint/eslint-plugin": "^3.9.0",
2525
"@typescript-eslint/parser": "^3.9.0",
2626
"eslint-config-prettier": "^6.11.0",

‎packages/eslint-plugin-sdk/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/eslint-plugin-sdk",
3-
"version": "6.17.9",
3+
"version": "6.18.0",
44
"description": "Official Sentry SDK eslint plugin",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",

‎packages/gatsby/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/gatsby",
3-
"version": "6.17.9",
3+
"version": "6.18.0",
44
"description": "Official Sentry SDK for Gatsby.js",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
@@ -26,16 +26,16 @@
2626
"access": "public"
2727
},
2828
"dependencies": {
29-
"@sentry/react": "6.17.9",
30-
"@sentry/tracing": "6.17.9",
29+
"@sentry/react": "6.18.0",
30+
"@sentry/tracing": "6.18.0",
3131
"@sentry/webpack-plugin": "1.18.5"
3232
},
3333
"peerDependencies": {
3434
"gatsby": "^2.0.0 || ^3.0.0 || ^4.0.0",
3535
"react": "15.x || 16.x || 17.x"
3636
},
3737
"devDependencies": {
38-
"@sentry/types": "6.17.9",
38+
"@sentry/types": "6.18.0",
3939
"@testing-library/react": "^10.4.9",
4040
"react": "^17.0.0"
4141
},

‎packages/hub/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/hub",
3-
"version": "6.17.9",
3+
"version": "6.18.0",
44
"description": "Sentry hub which handles global state managment.",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/hub",
@@ -16,8 +16,8 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/types": "6.17.9",
20-
"@sentry/utils": "6.17.9",
19+
"@sentry/types": "6.18.0",
20+
"@sentry/utils": "6.18.0",
2121
"tslib": "^1.9.3"
2222
},
2323
"scripts": {

‎packages/integration-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/browser-integration-tests",
3-
"version": "6.17.9",
3+
"version": "6.18.0",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {

‎packages/integrations/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/integrations",
3-
"version": "6.17.9",
3+
"version": "6.18.0",
44
"description": "Pluggable integrations that can be used to enhance JS SDKs",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/integrations",
@@ -16,8 +16,8 @@
1616
"module": "esm/index.js",
1717
"types": "dist/index.d.ts",
1818
"dependencies": {
19-
"@sentry/types": "6.17.9",
20-
"@sentry/utils": "6.17.9",
19+
"@sentry/types": "6.18.0",
20+
"@sentry/utils": "6.18.0",
2121
"localforage": "^1.8.1",
2222
"tslib": "^1.9.3"
2323
},

‎packages/minimal/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/minimal",
3-
"version": "6.17.9",
3+
"version": "6.18.0",
44
"description": "Sentry minimal library that can be used in other packages",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/minimal",
@@ -16,8 +16,8 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/hub": "6.17.9",
20-
"@sentry/types": "6.17.9",
19+
"@sentry/hub": "6.18.0",
20+
"@sentry/types": "6.18.0",
2121
"tslib": "^1.9.3"
2222
},
2323
"scripts": {

‎packages/nextjs/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/nextjs",
3-
"version": "6.17.9",
3+
"version": "6.18.0",
44
"description": "Official Sentry SDK for Next.js",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs",
@@ -17,18 +17,18 @@
1717
"access": "public"
1818
},
1919
"dependencies": {
20-
"@sentry/core": "6.17.9",
21-
"@sentry/hub": "6.17.9",
22-
"@sentry/integrations": "6.17.9",
23-
"@sentry/node": "6.17.9",
24-
"@sentry/react": "6.17.9",
25-
"@sentry/tracing": "6.17.9",
26-
"@sentry/utils": "6.17.9",
20+
"@sentry/core": "6.18.0",
21+
"@sentry/hub": "6.18.0",
22+
"@sentry/integrations": "6.18.0",
23+
"@sentry/node": "6.18.0",
24+
"@sentry/react": "6.18.0",
25+
"@sentry/tracing": "6.18.0",
26+
"@sentry/utils": "6.18.0",
2727
"@sentry/webpack-plugin": "1.18.5",
2828
"tslib": "^1.9.3"
2929
},
3030
"devDependencies": {
31-
"@sentry/types": "6.17.9",
31+
"@sentry/types": "6.18.0",
3232
"@types/webpack": "^4.41.31",
3333
"next": "10.1.3"
3434
},

‎packages/nextjs/src/index.server.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,20 @@ const domain = domainModule as typeof domainModule & { active: (domainModule.Dom
2323
// During build, the main process is invoked by
2424
// `node next build`
2525
// and child processes are invoked as
26-
// `node <path>/node_modules/jest-worker/build/workers/processChild.js`,
27-
// whereas at runtime the process is invoked as
26+
// `node <path>/node_modules/.../jest-worker/processChild.js`.
27+
// The former is (obviously) easy to recognize, but the latter could happen at runtime as well. Fortunately, the main
28+
// process hits this file before any of the child processes do, so we're able to set an env variable which the child
29+
// processes can then check. During runtime, the main process is invoked as
2830
// `node next start`
2931
// or
30-
// `node /var/runtime/index.js`.
31-
const isBuild = new RegExp('build').test(process.argv.toString());
32+
// `node /var/runtime/index.js`,
33+
// so we never drop into the `if` in the first place.
34+
let isBuild = false;
35+
if (process.argv.includes('build') || process.env.SENTRY_BUILD_PHASE) {
36+
process.env.SENTRY_BUILD_PHASE = 'true';
37+
isBuild = true;
38+
}
39+
3240
const isVercel = !!process.env.VERCEL;
3341

3442
/** Inits the Sentry NextJS SDK on node. */

‎packages/node/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/node",
3-
"version": "6.17.9",
3+
"version": "6.18.0",
44
"description": "Official Sentry SDK for Node.js",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node",
@@ -16,11 +16,11 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/core": "6.17.9",
20-
"@sentry/hub": "6.17.9",
21-
"@sentry/tracing": "6.17.9",
22-
"@sentry/types": "6.17.9",
23-
"@sentry/utils": "6.17.9",
19+
"@sentry/core": "6.18.0",
20+
"@sentry/hub": "6.18.0",
21+
"@sentry/tracing": "6.18.0",
22+
"@sentry/types": "6.18.0",
23+
"@sentry/utils": "6.18.0",
2424
"cookie": "^0.4.1",
2525
"https-proxy-agent": "^5.0.0",
2626
"lru_map": "^0.3.3",

‎packages/react/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/react",
3-
"version": "6.17.9",
3+
"version": "6.18.0",
44
"description": "Official Sentry SDK for React.js",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react",
@@ -16,10 +16,10 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/browser": "6.17.9",
20-
"@sentry/minimal": "6.17.9",
21-
"@sentry/types": "6.17.9",
22-
"@sentry/utils": "6.17.9",
19+
"@sentry/browser": "6.18.0",
20+
"@sentry/minimal": "6.18.0",
21+
"@sentry/types": "6.18.0",
22+
"@sentry/utils": "6.18.0",
2323
"hoist-non-react-statics": "^3.3.2",
2424
"tslib": "^1.9.3"
2525
},

0 commit comments

Comments
 (0)