fix: Update requestHandler to correctly pass scope

Author: kamilogorek

packages/node/src/handlers.ts

@@ -2,7 +2,7 @@ import { logger } from '@sentry/core';
 import { getHubFromCarrier, Scope } from '@sentry/hub';
 import { SentryEvent, Severity } from '@sentry/types';
 import { forget } from '@sentry/utils/async';
-import { serialize } from '@sentry/utils/object';
+import { clone, serialize } from '@sentry/utils/object';
 import * as cookie from 'cookie';
 import * as domain from 'domain';
 import * as http from 'http';
@@ -201,6 +201,40 @@ function parseRequest(
   return event;
 }
 
+/** Inherit globally configured data from Scope, but make sure to not use references */
+function inheritGlobalScope(to: Scope, from: Scope): void {
+  const user = from.getUser();
+  if (user) {
+    to.setUser(clone(user));
+  }
+
+  const tags = from.getTags();
+  if (tags) {
+    const clonedTags = clone(tags);
+    Object.keys(clonedTags).forEach(key => {
+      to.setTag(key, clonedTags[key]);
+    });
+  }
+
+  const extra = from.getExtra();
+  if (extra) {
+    const clonedExtra = clone(extra);
+    Object.keys(clonedExtra).forEach(key => {
+      to.setExtra(key, clonedExtra[key]);
+    });
+  }
+
+  const fingerprint = from.getFingerprint();
+  if (fingerprint) {
+    to.setFingerprint(clone(fingerprint));
+  }
+
+  const level = from.getLevel();
+  if (level) {
+    to.setLevel(level);
+  }
+}
+
 /** JSDoc */
 export function requestHandler(options?: {
   request?: boolean;
@@ -215,9 +249,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) {
+        inheritGlobalScope(scope, 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'",