Merge pull request #52 from DataDog/stephenf/fix-http-patching

Don't unpatch HTTP lib if the Datadog tracer is initialized

Author: swfunc

package.json

@@ -1,6 +1,6 @@
 {
   "name": "datadog-lambda-js",
-  "version": "2.16.0",
+  "version": "2.17.0",
   "description": "Lambda client library that supports hybrid tracing in node js",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/trace/listener.ts

@@ -50,6 +50,7 @@ export class TraceListener {
       logDebug("Didn't patch console output with trace context");
     }
 
+    // If the DD tracer is initialized then it's doing http patching so we don't again here
     if (this.config.autoPatchHTTP && !tracerInitialized) {
       logDebug("Patching HTTP libraries");
       patchHttp(this.contextService);
@@ -63,7 +64,9 @@ export class TraceListener {
   }
 
   public async onCompleteInvocation() {
-    if (this.config.autoPatchHTTP) {
+    // If the DD tracer is initialized it manages patching of the http lib on its own
+    const tracerInitialized = this.tracerWrapper.isTracerAvailable;
+    if (this.config.autoPatchHTTP && !tracerInitialized) {
       logDebug("Unpatching HTTP libraries");
       unpatchHttp();
     }