cleanup

Author: bengl

packages/datadog-instrumentations/src/dns.js

@@ -68,7 +68,7 @@ function wrap (prefix, fn, expectedArgs, rrtype) {
       startArgs.push(rrtype)
     }
 
-    const context = { args: startArgs }
+    const context = { args: startArgs, hasAsyncEnd: true }
     startCh.publish(context)
 
     arguments[arguments.length - 1] = function (error, result) {

packages/dd-trace/src/plugins/tracing.js

@@ -12,7 +12,8 @@ class TracingPlugin extends Plugin {
     this.operation = this.constructor.operation
 
     this.addTraceSub('start', message => {
-      if (message && typeof message === 'object') {
+      // TODO hasAsyncEnd is temporary until all plugins are converted to have asyncEnd
+      if (message && typeof message === 'object' && message.hasAsyncEnd) {
         message.parentStore = storage.getStore()
       }
       this.start(message)
@@ -28,12 +29,10 @@ class TracingPlugin extends Plugin {
 
     this.addTraceSub('async_end', message => {
       this.asyncEnd(message)
-      this.exit(message)
     })
 
     this.addTraceSub('end', message => {
       this.end(message)
-      this.exit(message)
     })
   }
 
@@ -61,9 +60,12 @@ class TracingPlugin extends Plugin {
 
   asyncEnd (...args) {
     this.finish(...args)
+    this.exit(message)
   }
 
-  end () {} // implemented by individual plugins
+  end () {
+    this.exit(message)
+  }
 
   error (error) {
     if (error && typeof error === 'object' && error.error) {