Simplify getCurrentHub and inherit hub from previous domain

Author: kamilogorek

packages/hub/src/hub.ts

@@ -325,28 +325,21 @@ export function getCurrentHub(): Hub {
     registry.hub = new Hub();
   }
 
-  let domain = null;
   try {
-    domain = process.domain as SentryDomain;
-  } catch (_Oo) {
-    // We do not have process
-  }
+    const domain = process.domain as SentryDomain;
 
-  if (!domain) {
-    return registry.hub;
-  }
+    if (!domain.__SENTRY__) {
+      return registry.hub;
+    }
 
-  let carrier = domain.__SENTRY__;
-  if (!carrier) {
-    domain.__SENTRY__ = carrier = {};
-  }
+    if (!domain.__SENTRY__.hub || domain.__SENTRY__.hub.isOlderThan(API_VERSION)) {
+      domain.__SENTRY__.hub = new Hub(registry.hub.getStackTop().client, Scope.clone(registry.hub.getStackTop().scope));
+    }
 
-  if (!carrier.hub) {
-    const top = registry.hub.getStackTop();
-    carrier.hub = top ? new Hub(top.client, Scope.clone(top.scope)) : new Hub();
+    return domain.__SENTRY__.hub;
+  } catch (_Oo) {
+    return registry.hub;
   }
-
-  return carrier.hub;
 }
 
 /**
@@ -363,3 +356,17 @@ export function getHubFromCarrier(carrier: any): Hub {
     return carrier.__SENTRY__.hub;
   }
 }
+
+/**
+ * This will set passed {@link Hub} on the passed object's __SENTRY__.hub attribute
+ * @param carrier object
+ * @param hub Hub
+ */
+export function setHubOnCarrier(carrier: any, hub: Hub): boolean {
+  if (!carrier) {
+    return false;
+  }
+  carrier.__SENTRY__ = carrier.__SENTRY__ || {};
+  carrier.__SENTRY__.hub = hub;
+  return true;
+}

packages/hub/src/index.ts

@@ -1,3 +1,3 @@
 export { Carrier, Layer } from './interfaces';
 export { addGlobalEventProcessor, Scope } from './scope';
-export { getCurrentHub, getHubFromCarrier, Hub } from './hub';
+export { getCurrentHub, getHubFromCarrier, getMainCarrier, Hub, setHubOnCarrier } from './hub';

packages/node/package.json

@@ -16,6 +16,7 @@
   },
   "dependencies": {
     "@sentry/core": "4.1.1",
+    "@sentry/hub": "4.1.1",
     "@sentry/types": "4.1.0",
     "@sentry/utils": "4.1.1",
     "cookie": "0.3.1",

packages/node/src/handlers.ts

@@ -1,5 +1,4 @@
 import { getCurrentHub } from '@sentry/core';
-import { Carrier, Hub } from '@sentry/hub';
 import { SentryEvent } from '@sentry/types';
 import { forget } from '@sentry/utils/async';
 import { logger } from '@sentry/utils/logger';

packages/node/src/sdk.ts

@@ -1,4 +1,5 @@
-import { initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
+import { getCurrentHub, initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
+import { getMainCarrier, setHubOnCarrier } from '@sentry/hub';
 import { NodeOptions } from './backend';
 import { NodeClient } from './client';
 import { Console, Http, LinkedErrors, OnUncaughtException, OnUnhandledRejection } from './integrations';
@@ -66,5 +67,10 @@ export function init(options: NodeOptions = {}): void {
   if (options.defaultIntegrations === undefined) {
     options.defaultIntegrations = defaultIntegrations;
   }
+
+  if (process.domain) {
+    setHubOnCarrier(getMainCarrier(), getCurrentHub());
+  }
+
   initAndBind(NodeClient, options);
 }