i did it...

Author: kamilogorek

packages/browser/package.json

@@ -42,6 +42,7 @@
     "rollup-plugin-license": "^0.6.0",
     "rollup-plugin-node-resolve": "^3.3.0",
     "rollup-plugin-npm": "^2.0.0",
+    "rollup-plugin-shim": "^1.0.0",
     "rollup-plugin-typescript2": "^0.13.0",
     "rollup-plugin-uglify": "^3.0.0",
     "sinon": "^5.0.3",

packages/browser/rollup.config.js

@@ -3,6 +3,7 @@ import uglify from 'rollup-plugin-uglify';
 import resolve from 'rollup-plugin-node-resolve';
 import typescript from 'rollup-plugin-typescript2';
 import license from 'rollup-plugin-license';
+import shim from 'rollup-plugin-shim';
 
 const commitHash = require('child_process')
   .execSync('git rev-parse --short HEAD', { encoding: 'utf-8' })
@@ -17,6 +18,9 @@ const bundleConfig = {
   },
   context: 'window',
   plugins: [
+    shim({
+      domain: `export default {}`,
+    }),
     typescript({
       tsconfig: 'tsconfig.build.json',
       tsconfigOverride: { compilerOptions: { declaration: false } },

packages/hub/src/hub.ts

@@ -9,9 +9,20 @@ import {
 } from '@sentry/types';
 import { logger } from '@sentry/utils/logger';
 import { getGlobalObject, uuid4 } from '@sentry/utils/misc';
+import * as domain from 'domain';
 import { Carrier, Layer } from './interfaces';
 import { Scope } from './scope';
 
+declare module 'domain' {
+  export let active: Domain;
+  /**
+   * Extension for domain interface
+   */
+  export interface Domain {
+    __SENTRY__?: Carrier;
+  }
+}
+
 /**
  * API compatibility version of this hub.
  *
@@ -291,26 +302,21 @@ export function getMainCarrier(): Carrier {
   carrier.__SENTRY__ = carrier.__SENTRY__ || {
     hub: undefined,
   };
-  return carrier.__SENTRY__;
+  return carrier;
 }
 
 /**
  * Replaces the current main hub with the passed one on the global object
  *
  * @returns The old replaced hub
  */
-export function makeMain(hub?: Hub): Hub | undefined {
+export function makeMain(hub: Hub): Hub {
   const registry = getMainCarrier();
-  const oldHub = registry.hub;
-  registry.hub = hub;
+  const oldHub = getHubFromCarrier(registry);
+  setHubOnCarrier(registry, hub);
   return oldHub;
 }
 
-/** Domain interface with attached Hub */
-interface SentryDomain extends NodeJS.Domain {
-  __SENTRY__?: Carrier;
-}
-
 /**
  * Returns the default hub instance.
  *
@@ -319,26 +325,46 @@ interface SentryDomain extends NodeJS.Domain {
  * Otherwise, the currently registered hub will be returned.
  */
 export function getCurrentHub(): Hub {
+  // Get main carrier (global for every environment)
   const registry = getMainCarrier();
 
-  if (!registry.hub || registry.hub.isOlderThan(API_VERSION)) {
-    registry.hub = new Hub();
+  // If there's no hub, or its an old API, assign a new one
+  if (!hasHubOnCarrier(registry) || getHubFromCarrier(registry).isOlderThan(API_VERSION)) {
+    setHubOnCarrier(registry, new Hub());
   }
 
+  // Prefer domains over global if they are there
   try {
-    const domain = process.domain as SentryDomain;
+    const activeDomain = domain.active;
 
-    if (!domain.__SENTRY__) {
-      return registry.hub;
+    // If there no active domain, just return global hub
+    if (!activeDomain) {
+      return getHubFromCarrier(registry);
     }
 
-    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 there's no hub on current domain, or its an old API, assign a new one
+    if (!hasHubOnCarrier(activeDomain) || getHubFromCarrier(activeDomain).isOlderThan(API_VERSION)) {
+      const registryHubTopStack = getHubFromCarrier(registry).getStackTop();
+      setHubOnCarrier(activeDomain, new Hub(registryHubTopStack.client, Scope.clone(registryHubTopStack.scope)));
     }
 
-    return domain.__SENTRY__.hub;
+    // Return hub that lives on a domain
+    return getHubFromCarrier(activeDomain);
   } catch (_Oo) {
-    return registry.hub;
+    // Return hub that lives on a global object
+    return getHubFromCarrier(registry);
+  }
+}
+
+/**
+ * This will tell whether a carrier has a hub on it or not
+ * @param carrier object
+ */
+export function hasHubOnCarrier(carrier: any): boolean {
+  if (carrier && carrier.__SENTRY__ && carrier.__SENTRY__.hub) {
+    return true;
+  } else {
+    return false;
   }
 }
 

packages/hub/src/interfaces.ts

@@ -9,5 +9,7 @@ export interface Layer {
 
 /** An object that contains a hub and maintains a scope stack. */
 export interface Carrier {
-  hub?: Hub;
+  __SENTRY__?: {
+    hub?: Hub;
+  };
 }

packages/node/src/sdk.ts

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

packages/node/test/domain.test.ts

@@ -26,35 +26,39 @@ describe('domains', () => {
     const d = domain.create();
     d.run(() => {
       expect(getCurrentHub()).toBe(getCurrentHub());
-      d.exit();
     });
   });
 
   test('concurrent domain hubs', done => {
     const d1 = domain.create();
     const d2 = domain.create();
+    let d1done = false;
+    let d2done = false;
 
     d1.run(() => {
-      getCurrentHub()
-        .getStack()
-        .push({ client: 'process' });
-
+      const hub = getCurrentHub();
+      hub.getStack().push({ client: 'process' });
+      expect(hub.getStack()[1]).toEqual({ client: 'process' });
+      // Just in case so we don't have to worry which one finishes first
+      // (although it always should be d2)
       setTimeout(() => {
-        expect(getCurrentHub().getStack()[1]).toEqual({ client: 'process' });
-        d1.exit();
-      }, 50);
+        d1done = true;
+        if (d2done) {
+          done();
+        }
+      });
     });
 
     d2.run(() => {
-      getCurrentHub()
-        .getStack()
-        .push({ client: 'local' });
-
+      const hub = getCurrentHub();
+      hub.getStack().push({ client: 'local' });
+      expect(hub.getStack()[1]).toEqual({ client: 'local' });
       setTimeout(() => {
-        expect(getCurrentHub().getStack()[1]).toEqual({ client: 'local' });
-        d2.exit();
-        done();
-      }, 100);
+        d2done = true;
+        if (d1done) {
+          done();
+        }
+      });
     });
   });
 });

packages/node/test/index.test.ts

@@ -217,7 +217,6 @@ describe('SentryNode', () => {
           expect(event.message).toBe('test domain');
           expect(event.exception).toBeUndefined();
           done();
-          d.exit();
           return event;
         },
         dsn,

yarn.lock

@@ -7859,6 +7859,10 @@ rollup-plugin-npm@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-npm/-/rollup-plugin-npm-2.0.0.tgz#8a28ffdb5160bc8e1e371de39ed71faf009d655c"
 
+rollup-plugin-shim@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-shim/-/rollup-plugin-shim-1.0.0.tgz#b00f5cb44cdae81358c5342fe82fa71a1602b56b"
+
 rollup-plugin-typescript2@^0.13.0:
   version "0.13.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.13.0.tgz#5fc838657d05af82e04554832cadf06cdb32f657"