Fix issue with missing context

Author: juffalow

src/index.ts

@@ -3,6 +3,7 @@ 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);
 
@@ -28,6 +29,14 @@ createTerminus(server, {
 
 async function start(): Promise<void> {
   try {
+    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);
+    }
+
     server.listen(config.port, () => {
       logger.info(`Server started at http://localhost:${ config.port }`);
     });

src/services/index.ts

@@ -8,6 +8,7 @@ import metadata from './metadata';
 import job from './job';
 import cache from './cache';
 import trace from './trace';
+import ServiceDiscovery from './serviceDiscovery';
 import config from '../config';
 
 const container = {
@@ -62,6 +63,10 @@ const container = {
       default:
         return trace.CLSHooked;
     }
+  },
+
+  get ServiceDiscovery() {
+    return new ServiceDiscovery();
   }
 };
 

src/services/serviceDiscovery/index.ts

@@ -0,0 +1,25 @@
+import { ServiceDiscoveryClient, DiscoverInstancesCommand, HealthStatusFilter } from '@aws-sdk/client-servicediscovery';
+
+export class ServiceDiscovery {
+  public async discoverInstance(namespace: string, name: string): Promise<string> {
+    const client = new ServiceDiscoveryClient({ region: process.env.AWS_XRAY_REGION });
+
+    const input = {
+      NamespaceName: namespace,
+      ServiceName: name,
+      MaxResults: 1,
+      HealthStatus: HealthStatusFilter.HEALTHY_OR_ELSE_ALL,
+    };
+
+    const command = new DiscoverInstancesCommand(input);
+
+    const result = await client.send(command);
+
+    const ip = result.Instances[0].Attributes.AWS_INSTANCE_IPV4;
+    const port = result.Instances[0].Attributes.AWS_INSTANCE_PORT;
+
+    return `${ip}:${port}`;
+  }
+}
+
+export default ServiceDiscovery;

src/services/trace/index.ts

@@ -1,37 +1,11 @@
-import { ServiceDiscoveryClient, DiscoverInstancesCommand, HealthStatusFilter } from '@aws-sdk/client-servicediscovery';
 import AWSXRay from './AWSXRay';
 import CLSHooked from './CLSHooked';
 import config from '../../config';
-import { nextTick } from 'process';
 
 const container = {
   get AWSXRay() {
     if (typeof this._awsXRay === 'undefined') {
       this._awsXRay = new AWSXRay(config.services.trace.plugins);
-
-      if (typeof config.services.trace.daemonAddressNamespace === 'string') {
-        const setDaemonAddress = async () => {
-          const client = new ServiceDiscoveryClient({ region: process.env.AWS_XRAY_REGION });
-
-          const input = {
-            NamespaceName: config.services.trace.daemonAddressNamespace,
-            ServiceName: config.services.trace.daemonAddressName,
-            MaxResults: 1,
-            HealthStatus: HealthStatusFilter.HEALTHY_OR_ELSE_ALL,
-          };
-        
-          const command = new DiscoverInstancesCommand(input);
-        
-          const result = await client.send(command);
-        
-          const ip = result.Instances[0].Attributes.AWS_INSTANCE_IPV4;
-          const port = result.Instances[0].Attributes.AWS_INSTANCE_PORT;
-        
-          this._awsXRay.setDaemonAddress(`${ip}:${port}`);
-        };
-
-        nextTick(setDaemonAddress);
-      }
     }
 
     return this._awsXRay;

src/worker.ts

@@ -69,6 +69,18 @@ app.on('timeout_error', (err) => {
   logger.error('Timeout error!', { message: err.message, stack: err.stack });
 });
 
-logger.info('Upload worker is running');
+async function 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);
 
-app.start();
+    (services.Trace as any).setDaemonAddress(address);
+  }
+  
+  logger.info('Upload worker is running');
+
+  app.start();
+}
+
+start();