Merge remote-tracking branch 'upstream/master' into feat/separate-source-reading

Author: timfish

CHANGELOG.md

@@ -4,6 +4,24 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 6.17.9
+
+- fix(gatsby): Add missing React peer dependency ([#4576](https://github.com/getsentry/sentry-javascript/pull/4576))
+- fix(types): Use Sentry event type instead of dom one ([#4584](https://github.com/getsentry/sentry-javascript/pull/4584))
+
+Work in this release contributed by @aaronadamsCA. Thank you for your contribution!
+
+## 6.17.8
+
+- feat(types): Add Envelope types ([#4527](https://github.com/getsentry/sentry-javascript/pull/4527))
+- fix(build): Remove node code from CDN bundles ([#4548](https://github.com/getsentry/sentry-javascript/pull/4548))
+- fix(build): Prevent unused utils code in integration bundles ([#4547](https://github.com/getsentry/sentry-javascript/pull/4547))
+- fix(tracing): Export BrowserTracing directly in CDN bundle ([#4570](https://github.com/getsentry/sentry-javascript/pull/4570))
+- fix(utils): Use apply in console instrumentation ([#4568](https://github.com/getsentry/sentry-javascript/pull/4568))
+- ref(core): Log `normalizeDepth` when normalization is skipped([#4574](https://github.com/getsentry/sentry-javascript/pull/4574))
+
+Work in this release contributed by @mydea. Thank you for your contribution!
+
 ## 6.17.7
 
 - fix(utils): Make new non-enumerable properties mutable ([#4528](https://github.com/getsentry/sentry-javascript/pull/4528))

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "3.4.0",
-  "version": "6.17.7",
+  "version": "6.17.9",
   "packages": "packages/*",
   "npmClient": "yarn",
   "useWorkspaces": true

package.json

@@ -51,6 +51,8 @@
   ],
   "devDependencies": {
     "@google-cloud/storage": "^5.7.0",
+    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-node-resolve": "^13.1.3",
     "@rollup/plugin-replace": "^3.0.1",
     "@size-limit/preset-small-lib": "^4.5.5",
     "@strictsoftware/typedoc-plugin-monorepo": "^0.3.1",
@@ -72,6 +74,7 @@
     "prettier": "2.5.1",
     "replace-in-file": "^4.0.0",
     "rimraf": "^3.0.2",
+    "rollup": "^2.67.1",
     "rollup-plugin-license": "^2.6.1",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript2": "^0.31.2",

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "6.17.7",
+  "version": "6.17.9",
   "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.7",
-    "@sentry/types": "6.17.7",
-    "@sentry/utils": "6.17.7",
+    "@sentry/browser": "6.17.9",
+    "@sentry/types": "6.17.9",
+    "@sentry/utils": "6.17.9",
     "rxjs": "^6.6.0",
     "tslib": "^1.9.3"
   },

packages/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "6.17.7",
+  "version": "6.17.9",
   "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.7",
-    "@sentry/types": "6.17.7",
-    "@sentry/utils": "6.17.7",
+    "@sentry/core": "6.17.9",
+    "@sentry/types": "6.17.9",
+    "@sentry/utils": "6.17.9",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
@@ -40,9 +40,6 @@
     "karma-webkit-launcher": "^1.0.2",
     "node-fetch": "^2.6.0",
     "playwright": "^1.17.1",
-    "rollup": "^1.10.1",
-    "rollup-plugin-commonjs": "^9.3.4",
-    "rollup-plugin-node-resolve": "^4.2.3",
     "sinon": "^7.3.2",
     "webpack": "^4.30.0"
   },

packages/browser/rollup.config.js

@@ -1,8 +1,7 @@
 import { terser } from 'rollup-plugin-terser';
 import typescript from 'rollup-plugin-typescript2';
 import license from 'rollup-plugin-license';
-import resolve from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
+import resolve from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
 
 const commitHash = require('child_process')
@@ -72,7 +71,6 @@ const plugins = [
   resolve({
     mainFields: ['module'],
   }),
-  commonjs(),
 ];
 
 const bundleConfig = {
@@ -82,6 +80,7 @@ const bundleConfig = {
     name: 'Sentry',
     sourcemap: true,
     strict: false,
+    esModule: false,
   },
   context: 'window',
   plugins: [

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "6.17.7",
+  "version": "6.17.9",
   "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.7",
-    "@sentry/minimal": "6.17.7",
-    "@sentry/types": "6.17.7",
-    "@sentry/utils": "6.17.7",
+    "@sentry/hub": "6.17.9",
+    "@sentry/minimal": "6.17.9",
+    "@sentry/types": "6.17.9",
+    "@sentry/utils": "6.17.9",
     "tslib": "^1.9.3"
   },
   "scripts": {

packages/core/src/baseclient.ts

@@ -374,6 +374,11 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
     }
 
     return result.then(evt => {
+      if (evt) {
+        // TODO this is more of the hack trying to solve https://github.com/getsentry/sentry-javascript/issues/2809
+        // it is only attached as extra data to the event if the event somehow skips being normalized
+        evt.sdkProcessingMetadata = { ...evt.sdkProcessingMetadata, normalizeDepth: normalize(normalizeDepth) };
+      }
       if (typeof normalizeDepth === 'number' && normalizeDepth > 0) {
         return this._normalizeEvent(evt, normalizeDepth);
       }

packages/core/src/request.ts

@@ -59,23 +59,28 @@ export function eventToSentryRequest(event: Event, api: APIDetails): SentryReque
   const { method: samplingMethod, rate: sampleRate } = transactionSampling || {};
 
   // TODO: Below is a temporary hack in order to debug a serialization error - see
-  // https://github.com/getsentry/sentry-javascript/issues/2809 and
-  // https://github.com/getsentry/sentry-javascript/pull/4425. TL;DR: even though we normalize all events (which should
-  // prevent this), something is causing `JSON.stringify` to throw a circular reference error.
+  // https://github.com/getsentry/sentry-javascript/issues/2809,
+  // https://github.com/getsentry/sentry-javascript/pull/4425, and
+  // https://github.com/getsentry/sentry-javascript/pull/4574.
+  //
+  // TL; DR: even though we normalize all events (which should prevent this), something is causing `JSON.stringify` to
+  // throw a circular reference error.
   //
   // When it's time to remove it:
   // 1. Delete everything between here and where the request object `req` is created, EXCEPT the line deleting
   //    `sdkProcessingMetadata`
   // 2. Restore the original version of the request body, which is commented out
-  // 3. Search for `skippedNormalization` and pull out the companion hack in the browser playwright tests
+  // 3. Search for either of the PR URLs above and pull out the companion hacks in the browser playwright tests and the
+  //    baseClient tests in this package
   enhanceEventWithSdkInfo(event, api.metadata.sdk);
   event.tags = event.tags || {};
   event.extra = event.extra || {};
 
   // In theory, all events should be marked as having gone through normalization and so
-  // we should never set this tag
+  // we should never set this tag/extra data
   if (!(event.sdkProcessingMetadata && event.sdkProcessingMetadata.baseClientNormalized)) {
     event.tags.skippedNormalization = true;
+    event.extra.normalizeDepth = event.sdkProcessingMetadata ? event.sdkProcessingMetadata.normalizeDepth : 'unset';
   }
 
   // prevent this data from being sent to sentry

packages/core/src/version.ts

@@ -1 +1 @@
-export const SDK_VERSION = '6.17.7';
+export const SDK_VERSION = '6.17.9';