add back in manual instrumentation

Dockerfile.enhanced

@@ -117,4 +117,4 @@ ENV OAS_MODULE_PATH=${WORK_DIRECTORY}/modules/oas-page-builder/index.js
 
 RUN mkdir repos && chmod 755 repos
 EXPOSE 3000
-CMD ["node", "--require", "@opentelemetry/auto-instrumentations-node/register", "enhanced/enhancedApp.js"]
+CMD ["node", "enhanced/enhancedApp.js"]

src/enhanced/enhancedApp.ts

@@ -2,6 +2,7 @@ import mongodb, { MongoClient } from 'mongodb';
 import c from 'config';
 import { handleJob } from './utils/job';
 import { listenToJobQueue } from './utils/queue';
+import { nodeSDKBuilder } from '../otel';
 
 let client: MongoClient | undefined;
 
@@ -49,6 +50,9 @@ async function handleJobAndCleanUp(jobId: string, db: mongodb.Db) {
     await cleanupJob();
   }
 }
+
+const sdk = nodeSDKBuilder();
+
 async function app(): Promise<void> {
   console.log('[app]: starting application');
 
@@ -69,4 +73,10 @@ app();
 
 process.on('SIGTERM', async () => {
   await cleanupJob();
+
+  sdk
+    .shutdown()
+    .then(() => console.log('Tracing and Metrics terminated'))
+    .catch((error) => console.log('Error terminating tracing and metrics', error))
+    .finally(() => process.exit(0));
 });

src/otel/index.ts

@@ -0,0 +1,37 @@
+import { NodeSDK } from '@opentelemetry/sdk-node';
+import { AWSXRayPropagator } from '@opentelemetry/propagator-aws-xray';
+
+import { detectResourcesSync } from '@opentelemetry/resources';
+import { awsEcsDetector } from '@opentelemetry/resource-detector-aws';
+import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
+import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
+import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
+import { AwsInstrumentation } from '@opentelemetry/instrumentation-aws-sdk';
+import { AWSXRayIdGenerator } from '@opentelemetry/id-generator-aws-xray';
+
+export function nodeSDKBuilder() {
+  const resource = detectResourcesSync({
+    detectors: [awsEcsDetector],
+  });
+
+  const traceExporter = new OTLPTraceExporter();
+  const spanProcessor = new BatchSpanProcessor(traceExporter);
+
+  const sdk = new NodeSDK({
+    textMapPropagator: new AWSXRayPropagator(),
+    instrumentations: [
+      new HttpInstrumentation(),
+      new AwsInstrumentation({
+        suppressInternalInstrumentation: true,
+      }),
+    ],
+    idGenerator: new AWSXRayIdGenerator(),
+    resource,
+    traceExporter,
+    spanProcessor,
+  });
+
+  sdk.start();
+
+  return sdk;
+}