Refactor tracing initialization

Author: juffalow

src/index.ts

@@ -1,12 +1,9 @@
 import http from 'http';
 import { createTerminus } from '@godaddy/terminus';
-import app from './app';
 import config from './config';
 import logger from './logger';
 import services from './services';
 
-const server = http.createServer(app);
-
 async function onSignal(): Promise<void> {
   logger.warn('Server is going to shut down! Starting cleanup...');
 }
@@ -19,26 +16,28 @@ async function onHealthCheck(): Promise<void> {
   return;
 }
 
-createTerminus(server, {
-  healthChecks: {
-    '/health/liveness': onHealthCheck,
-  },
-  onSignal,
-  onShutdown,
-});
-
 async function start(): Promise<void> {
   try {
-    console.log('Main.start();');
     const namespace = config.services.trace.daemonAddressNamespace;
     const name = config.services.trace.daemonAddressName;
     if (typeof namespace === 'string' && typeof name === 'string') {
       const address = await services.ServiceDiscovery.discoverInstance(namespace, name);
 
       (services.Trace as any).setDaemonAddress(address);
-      (services.Trace as any).captureHTTPRequests();
     }
 
+    const app = (await import('./app')).default;
+    
+    const server = http.createServer(app);
+
+    createTerminus(server, {
+      healthChecks: {
+        '/health/liveness': onHealthCheck,
+      },
+      onSignal,
+      onShutdown,
+    });
+
     server.listen(config.port, () => {
       logger.info(`Server started at http://localhost:${ config.port }`);
     });
@@ -48,5 +47,4 @@ async function start(): Promise<void> {
   }
 }
 
-console.log('What the kurwa?!');
 start();

src/services/trace/AWSXRay.ts

@@ -5,6 +5,9 @@ import https from 'https';
 class AWSXRay implements Services.Trace {
   constructor (plugins: string) {
     this.setPlugins(plugins);
+
+    XRay.captureHTTPsGlobal(http, true);
+    XRay.captureHTTPsGlobal(https, true);
   }
 
   public openSegment(defaultName: string) {
@@ -60,11 +63,6 @@ class AWSXRay implements Services.Trace {
 
     XRay.config(xrayPlugins); 
   }
-
-  public captureHTTPRequests(): void {
-    XRay.captureHTTPsGlobal(http, true);
-    XRay.captureHTTPsGlobal(https, true);
-  }
 }
 
 export default AWSXRay;

src/services/trace/index.ts

@@ -4,8 +4,6 @@ import config from '../../config';
 
 const container = {
   get AWSXRay() {
-    console.log('Trace.AWSXRay()');
-
     if (typeof this._awsXRay === 'undefined') {
       this._awsXRay = new AWSXRay(config.services.trace.plugins);
     }
@@ -14,7 +12,6 @@ const container = {
   },
 
   get CLSHooked() {
-    console.log('Trace.CLSHooked()');
     if (typeof this._clsHooked === 'undefined') {
       this._clsHooked = new CLSHooked();
     }

src/worker.ts

@@ -10,7 +10,6 @@ async function start() {
     const address = await services.ServiceDiscovery.discoverInstance(namespace, name);
 
     (services.Trace as any).setDaemonAddress(address);
-    (services.Trace as any).captureHTTPRequests();
   }
 
   logger.info('Upload worker is running');