Merge branch 'master' into abhi-envelope-functions

AbhiPrasad · AbhiPrasad · commit 4baeaa0a2e5c · 2022-02-24T14:27:32.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,18 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 6.18.0
+
+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.
+
+- fix(browser): Only set event.stacktrace if we have 1 or more frames ([#4614](https://github.com/getsentry/sentry-javascript/pull/4614))
+- fix(hub): keep hint event id if it's provided ([#4577](https://github.com/getsentry/sentry-javascript/pull/4577))
+- fix(nextjs): Use env variable for build detection ([#4608](https://github.com/getsentry/sentry-javascript/pull/4608))
+- ref(node): Refactor node source fetching into integration ([#3729](https://github.com/getsentry/sentry-javascript/pull/3729))
+- feat(serverless): Added `ignoreSentryErrors` option for AWS lambda ([#4620](https://github.com/getsentry/sentry-javascript/pull/4620))
+
+Work in this release contributed by @GoshaEgorian and @ichina. Thank you for your contributions!
+
 ## 6.17.9
 
 - fix(gatsby): Add missing React peer dependency ([#4576](https://github.com/getsentry/sentry-javascript/pull/4576))
diff --git a/MIGRATION.md b/MIGRATION.md
@@ -1,3 +1,21 @@
+# Upgrading from 6.17.x to 6.18.0
+
+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.
+
+```js
+// New in 6.18.0
+init({
+  dsn: '__DSN__',
+  integrations: [new ContextLines({ frameContextLines: 10 })]
+});
+
+// Before:
+init({
+  dsn: '__DSN__',
+  frameContextLines: 10,
+});
+```
+
 # Upgrading from 6.x to 6.17.x
 
 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
 
 ```js
 // New in 6.17.0:
-import { spanStatusfromHttpCode } from '@sentry/utils';
+import { spanStatusfromHttpCode } from '@sentry/tracing';
 
 const status = spanStatusfromHttpCode(403);
 
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "lerna": "3.4.0",
-  "version": "6.17.9",
+  "version": "6.18.0",
   "packages": "packages/*",
   "npmClient": "yarn",
   "useWorkspaces": true
diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "6.17.9",
+  "version": "6.18.0",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,9 +21,9 @@
     "@angular/router": "10.x || 11.x || 12.x || 13.x"
   },
   "dependencies": {
-    "@sentry/browser": "6.17.9",
-    "@sentry/types": "6.17.9",
-    "@sentry/utils": "6.17.9",
+    "@sentry/browser": "6.18.0",
+    "@sentry/types": "6.18.0",
+    "@sentry/utils": "6.18.0",
     "rxjs": "^6.6.0",
     "tslib": "^1.9.3"
   },
diff --git a/packages/browser/package.json b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "6.17.9",
+  "version": "6.18.0",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -16,9 +16,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "6.17.9",
-    "@sentry/types": "6.17.9",
-    "@sentry/utils": "6.17.9",
+    "@sentry/core": "6.18.0",
+    "@sentry/types": "6.18.0",
+    "@sentry/utils": "6.18.0",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "6.17.9",
+  "version": "6.18.0",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
@@ -16,10 +16,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/hub": "6.17.9",
-    "@sentry/minimal": "6.17.9",
-    "@sentry/types": "6.17.9",
-    "@sentry/utils": "6.17.9",
+    "@sentry/hub": "6.18.0",
+    "@sentry/minimal": "6.18.0",
+    "@sentry/types": "6.18.0",
+    "@sentry/utils": "6.18.0",
     "tslib": "^1.9.3"
   },
   "scripts": {
diff --git a/packages/core/src/version.ts b/packages/core/src/version.ts
@@ -1 +1 @@
-export const SDK_VERSION = '6.17.9';
+export const SDK_VERSION = '6.18.0';
diff --git a/packages/ember/package.json b/packages/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "6.17.9",
+  "version": "6.18.0",
   "description": "Official Sentry SDK for Ember.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -31,10 +31,10 @@
   },
   "dependencies": {
     "@embroider/macros": "~0.47.2",
-    "@sentry/browser": "6.17.9",
-    "@sentry/tracing": "6.17.9",
-    "@sentry/types": "6.17.9",
-    "@sentry/utils": "6.17.9",
+    "@sentry/browser": "6.18.0",
+    "@sentry/tracing": "6.18.0",
+    "@sentry/types": "6.18.0",
+    "@sentry/utils": "6.18.0",
     "ember-auto-import": "^1.12.0 || ^2.2.0",
     "ember-cli-babel": "~7.26.6",
     "ember-cli-htmlbars": "^6.0.1",
diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-config-sdk",
-  "version": "6.17.9",
+  "version": "6.18.0",
   "description": "Official Sentry SDK eslint config",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -19,8 +19,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/eslint-plugin-sdk": "6.17.9",
-    "@sentry-internal/typescript": "6.17.9",
+    "@sentry-internal/eslint-plugin-sdk": "6.18.0",
+    "@sentry-internal/typescript": "6.18.0",
     "@typescript-eslint/eslint-plugin": "^3.9.0",
     "@typescript-eslint/parser": "^3.9.0",
     "eslint-config-prettier": "^6.11.0",
diff --git a/packages/eslint-plugin-sdk/package.json b/packages/eslint-plugin-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-plugin-sdk",
-  "version": "6.17.9",
+  "version": "6.18.0",
   "description": "Official Sentry SDK eslint plugin",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/gatsby",
-  "version": "6.17.9",
+  "version": "6.18.0",
   "description": "Official Sentry SDK for Gatsby.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
@@ -26,16 +26,16 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/react": "6.17.9",
-    "@sentry/tracing": "6.17.9",
+    "@sentry/react": "6.18.0",
+    "@sentry/tracing": "6.18.0",
     "@sentry/webpack-plugin": "1.18.5"
   },
   "peerDependencies": {
     "gatsby": "^2.0.0 || ^3.0.0 || ^4.0.0",
     "react": "15.x || 16.x || 17.x"
   },
   "devDependencies": {
-    "@sentry/types": "6.17.9",
+    "@sentry/types": "6.18.0",
     "@testing-library/react": "^10.4.9",
     "react": "^17.0.0"
   },
diff --git a/packages/hub/package.json b/packages/hub/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/hub",
-  "version": "6.17.9",
+  "version": "6.18.0",
   "description": "Sentry hub which handles global state managment.",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/hub",
@@ -16,8 +16,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/types": "6.17.9",
-    "@sentry/utils": "6.17.9",
+    "@sentry/types": "6.18.0",
+    "@sentry/utils": "6.18.0",
     "tslib": "^1.9.3"
   },
   "scripts": {
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "6.17.9",
+  "version": "6.18.0",
   "main": "index.js",
   "license": "MIT",
   "engines": {
diff --git a/packages/integrations/package.json b/packages/integrations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/integrations",
-  "version": "6.17.9",
+  "version": "6.18.0",
   "description": "Pluggable integrations that can be used to enhance JS SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/integrations",
@@ -16,8 +16,8 @@
   "module": "esm/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@sentry/types": "6.17.9",
-    "@sentry/utils": "6.17.9",
+    "@sentry/types": "6.18.0",
+    "@sentry/utils": "6.18.0",
     "localforage": "^1.8.1",
     "tslib": "^1.9.3"
   },
diff --git a/packages/minimal/package.json b/packages/minimal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/minimal",
-  "version": "6.17.9",
+  "version": "6.18.0",
   "description": "Sentry minimal library that can be used in other packages",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/minimal",
@@ -16,8 +16,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/hub": "6.17.9",
-    "@sentry/types": "6.17.9",
+    "@sentry/hub": "6.18.0",
+    "@sentry/types": "6.18.0",
     "tslib": "^1.9.3"
   },
   "scripts": {
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nextjs",
-  "version": "6.17.9",
+  "version": "6.18.0",
   "description": "Official Sentry SDK for Next.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs",
@@ -17,18 +17,18 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "6.17.9",
-    "@sentry/hub": "6.17.9",
-    "@sentry/integrations": "6.17.9",
-    "@sentry/node": "6.17.9",
-    "@sentry/react": "6.17.9",
-    "@sentry/tracing": "6.17.9",
-    "@sentry/utils": "6.17.9",
+    "@sentry/core": "6.18.0",
+    "@sentry/hub": "6.18.0",
+    "@sentry/integrations": "6.18.0",
+    "@sentry/node": "6.18.0",
+    "@sentry/react": "6.18.0",
+    "@sentry/tracing": "6.18.0",
+    "@sentry/utils": "6.18.0",
     "@sentry/webpack-plugin": "1.18.5",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
-    "@sentry/types": "6.17.9",
+    "@sentry/types": "6.18.0",
     "@types/webpack": "^4.41.31",
     "next": "10.1.3"
   },
diff --git a/packages/nextjs/src/index.server.ts b/packages/nextjs/src/index.server.ts
@@ -23,12 +23,20 @@ const domain = domainModule as typeof domainModule & { active: (domainModule.Dom
 // During build, the main process is invoked by
 //   `node next build`
 // and child processes are invoked as
-//   `node <path>/node_modules/jest-worker/build/workers/processChild.js`,
-// whereas at runtime the process is invoked as
+//   `node <path>/node_modules/.../jest-worker/processChild.js`.
+// The former is (obviously) easy to recognize, but the latter could happen at runtime as well. Fortunately, the main
+// process hits this file before any of the child processes do, so we're able to set an env variable which the child
+// processes can then check. During runtime, the main process is invoked as
 //   `node next start`
 // or
-//   `node /var/runtime/index.js`.
-const isBuild = new RegExp('build').test(process.argv.toString());
+//   `node /var/runtime/index.js`,
+// so we never drop into the `if` in the first place.
+let isBuild = false;
+if (process.argv.includes('build') || process.env.SENTRY_BUILD_PHASE) {
+  process.env.SENTRY_BUILD_PHASE = 'true';
+  isBuild = true;
+}
+
 const isVercel = !!process.env.VERCEL;
 
 /** Inits the Sentry NextJS SDK on node. */
diff --git a/packages/node/package.json b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node",
-  "version": "6.17.9",
+  "version": "6.18.0",
   "description": "Official Sentry SDK for Node.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node",
@@ -16,11 +16,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "6.17.9",
-    "@sentry/hub": "6.17.9",
-    "@sentry/tracing": "6.17.9",
-    "@sentry/types": "6.17.9",
-    "@sentry/utils": "6.17.9",
+    "@sentry/core": "6.18.0",
+    "@sentry/hub": "6.18.0",
+    "@sentry/tracing": "6.18.0",
+    "@sentry/types": "6.18.0",
+    "@sentry/utils": "6.18.0",
     "cookie": "^0.4.1",
     "https-proxy-agent": "^5.0.0",
     "lru_map": "^0.3.3",
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react",
-  "version": "6.17.9",
+  "version": "6.18.0",
   "description": "Official Sentry SDK for React.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react",
@@ -16,10 +16,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "6.17.9",
-    "@sentry/minimal": "6.17.9",
-    "@sentry/types": "6.17.9",
-    "@sentry/utils": "6.17.9",
+    "@sentry/browser": "6.18.0",
+    "@sentry/minimal": "6.18.0",
+    "@sentry/types": "6.18.0",
+    "@sentry/utils": "6.18.0",
     "hoist-non-react-statics": "^3.3.2",
     "tslib": "^1.9.3"
   },
diff --git a/packages/serverless/package.json b/packages/serverless/package.json
diff --git a/packages/tracing/package.json b/packages/tracing/package.json
diff --git a/packages/types/package.json b/packages/types/package.json
diff --git a/packages/typescript/package.json b/packages/typescript/package.json
diff --git a/packages/utils/package.json b/packages/utils/package.json
diff --git a/packages/utils/test/is.test.ts b/packages/utils/test/is.test.ts
diff --git a/packages/utils/test/syncpromise.test.ts b/packages/utils/test/syncpromise.test.ts
diff --git a/packages/vue/package.json b/packages/vue/package.json
diff --git a/packages/wasm/package.json b/packages/wasm/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"lerna": "3.4.0",`
`3`		`- "version": "6.17.9",`
	`3`	`+ "version": "6.18.0",`
`4`	`4`	`"packages": "packages/*",`
`5`	`5`	`"npmClient": "yarn",`
`6`	`6`	`"useWorkspaces": true`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export const SDK_VERSION = '6.17.9';`
	`1`	`+export const SDK_VERSION = '6.18.0';`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sentry-internal/eslint-plugin-sdk",`
`3`		`- "version": "6.17.9",`
	`3`	`+ "version": "6.18.0",`
`4`	`4`	`"description": "Official Sentry SDK eslint plugin",`
`5`	`5`	`"repository": "git://github.com/getsentry/sentry-javascript.git",`
`6`	`6`	`"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",`