fix: Update requestHandler to correctly pass scope

Author: kamilogorek

CHANGELOG.md

@@ -28,6 +28,7 @@
 - [node] feat: Make node transactions a pluggable integration with tests 
 - [node] feat: Transactions handling for RequestHandler in Express/Hapi
 - [node] fix: Dont wrap native modules more than once to prevent leaks
+- [node] fix: Update requestHandler to correctly pass scope
 - [utils] ref: implemented includes, assign and isNaN polyfills
 
 ## 4.0.6

packages/hub/src/scope.ts

@@ -1,5 +1,5 @@
 import { Breadcrumb, SentryEvent, SentryEventHint, Severity, User } from '@sentry/types';
-import { assign } from '@sentry/utils/object';
+import { assign, clone } from '@sentry/utils/object';
 
 /**
  * Holds additional event information. {@link Scope.applyToEvent} will be
@@ -185,6 +185,40 @@ export class Scope {
     this.notifyScopeListeners();
   }
 
+  /** Inherit user data from provided scope, but make sure to not use references */
+  public inheritUserData(from: Scope): void {
+    const user = from.getUser();
+    if (user) {
+      this.setUser(clone(user));
+    }
+
+    const tags = from.getTags();
+    if (tags) {
+      const clonedTags = clone(tags);
+      Object.keys(clonedTags).forEach(key => {
+        this.setTag(key, clonedTags[key]);
+      });
+    }
+
+    const extra = from.getExtra();
+    if (extra) {
+      const clonedExtra = clone(extra);
+      Object.keys(clonedExtra).forEach(key => {
+        this.setExtra(key, clonedExtra[key]);
+      });
+    }
+
+    const fingerprint = from.getFingerprint();
+    if (fingerprint) {
+      this.setFingerprint(clone(fingerprint));
+    }
+
+    const level = from.getLevel();
+    if (level) {
+      this.setLevel(level);
+    }
+  }
+
   /**
    * Sets the breadcrumbs in the scope
    * @param breadcrumbs Breadcrumb

packages/node/src/handlers.ts

@@ -215,9 +215,14 @@ export function requestHandler(options?: {
     next: () => void,
   ): void {
     const local = domain.create();
+    const currentHub = getCurrentHub();
+    const currentScope = currentHub.getScope();
     const hub = getHubFromCarrier(req);
-    hub.bindClient(getCurrentHub().getClient());
+    hub.bindClient(currentHub.getClient());
     hub.configureScope((scope: Scope) => {
+      if (currentScope) {
+        scope.inheritUserData(currentScope);
+      }
       scope.addEventProcessor(async (event: SentryEvent) => parseRequest(event, req, options));
     });
     local.on('error', next);

packages/utils/package.json

@@ -27,7 +27,7 @@
   },
   "scripts": {
     "build": "run-s clean; tsc -p tsconfig.build.json",
-    "build:watch": "run-s clean; tsc -p tsconfig.build.json -w --preserveWatchOutput",
+    "build:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput",
     "clean": "rimraf dist coverage *.js *.js.map *.d.ts",
     "lint": "run-s lint:prettier lint:tslint",
     "lint:prettier": "prettier-check '{src,test}/**/*.ts'",