meta: Cleanup

HazAT · HazAT · commit dcf4c7f8f861 · 2019-11-21T10:17:40.000+01:00
diff --git a/packages/apm/src/hub.ts b/packages/apm/src/hub.ts
@@ -1,4 +1,4 @@
-import { Hub as BaseHub } from '@sentry/hub';
+import { getCurrentHub, Hub as BaseHub, makeMain } from '@sentry/hub';
 import { Hub as BaseHubInterface, SpanContext } from '@sentry/types';
 
 import { Span } from './span';
@@ -82,3 +82,11 @@ export class Hub extends BaseHub implements ApmHubInterface {
     return span;
   }
 }
+
+/**
+ * This will make the APM Hub the main one while maintaining the client and scope of the current hub
+ */
+export function makeApmHubMain(): void {
+  const hub = getCurrentHub();
+  makeMain(new Hub(hub.getClient(), hub.getScope()));
+}
diff --git a/packages/apm/src/index.ts b/packages/apm/src/index.ts
@@ -1,5 +1,5 @@
 import * as ApmIntegrations from './integrations';
 
-export { Hub } from './hub';
+export { Hub, makeApmHubMain as makeMain } from './hub';
 export { ApmIntegrations as Integrations };
 export { Span, TRACEPARENT_REGEXP } from './span';
diff --git a/packages/apm/src/integrations/express.ts b/packages/apm/src/integrations/express.ts
@@ -3,7 +3,7 @@ import { logger } from '@sentry/utils';
 // tslint:disable-next-line:no-implicit-dependencies
 import { Application, ErrorRequestHandler, NextFunction, Request, RequestHandler, Response } from 'express';
 
-import { Hub } from '../hub';
+import { Hub, makeApmHubMain } from '../hub';
 
 /**
  * Express integration
@@ -32,6 +32,7 @@ export class Express implements Integration {
    */
   public constructor(options: { app?: Application } = {}) {
     this._app = options.app;
+    makeApmHubMain();
   }
 
   /**
diff --git a/packages/apm/src/integrations/tracing.ts b/packages/apm/src/integrations/tracing.ts
@@ -1,8 +1,7 @@
-import { makeMain } from '@sentry/hub';
 import { EventProcessor, Integration } from '@sentry/types';
 import { fill, getGlobalObject, isMatchingPattern, logger, supportsNativeFetch } from '@sentry/utils';
 
-import { Hub } from '../hub';
+import { Hub, makeApmHubMain } from '../hub';
 
 /** JSDoc */
 interface TracingOptions {
@@ -38,8 +37,7 @@ export class Tracing implements Integration {
    * @param _options TracingOptions
    */
   public constructor(private readonly _options: TracingOptions = {}) {
-    // TODO
-    makeMain(new Hub());
+    makeApmHubMain();
     if (!Array.isArray(_options.tracingOrigins) || _options.tracingOrigins.length === 0) {
       const defaultTracingOrigins = ['localhost', /^\//];
       logger.warn(
diff --git a/packages/apm/src/integrations/transactionactivity.ts b/packages/apm/src/integrations/transactionactivity.ts
@@ -1,8 +1,7 @@
-import { makeMain } from '@sentry/hub';
 import { EventProcessor, Integration, Span, SpanContext } from '@sentry/types';
 import { getGlobalObject } from '@sentry/utils';
 
-import { Hub } from '../hub';
+import { Hub, makeApmHubMain } from '../hub';
 
 /** JSDoc */
 interface TransactionActivityOptions {
@@ -56,8 +55,7 @@ export class TransactionActivity implements Integration {
    * @inheritDoc
    */
   public constructor(public readonly _options?: Partial<TransactionActivityOptions>) {
-    // TODO
-    makeMain(new Hub());
+    makeApmHubMain();
     const defaults = {
       idleTimeout: 500,
       startTransactionOnLocationChange: true,
