remove async storage from child_process instrumentation (#5960)

Author: wconti27

packages/datadog-instrumentations/src/child_process.js

@@ -4,8 +4,7 @@ const { errorMonitor } = require('events')
 const util = require('util')
 
 const {
-  addHook,
-  AsyncResource
+  addHook
 } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const dc = require('dc-polyfill')
@@ -80,7 +79,8 @@ function createContextFromChildProcessInfo (childProcessInfo) {
   const context = {
     command: childProcessInfo.command,
     file: childProcessInfo.file,
-    shell: childProcessInfo.shell
+    shell: childProcessInfo.shell,
+    abortController: new AbortController()
   }
 
   if (childProcessInfo.fileArgs) {
@@ -98,17 +98,12 @@ function wrapChildProcessSyncMethod (returnError, shell = false) {
       }
 
       const childProcessInfo = normalizeArgs(arguments, shell)
+      const context = createContextFromChildProcessInfo(childProcessInfo)
 
-      const innerResource = new AsyncResource('bound-anonymous-fn')
-      return innerResource.runInAsyncScope(() => {
-        const context = createContextFromChildProcessInfo(childProcessInfo)
-        const abortController = new AbortController()
-
-        childProcessChannel.start.publish({ ...context, abortController })
-
+      return childProcessChannel.start.runStores(context, () => {
         try {
-          if (abortController.signal.aborted) {
-            const error = abortController.signal.reason || new Error('Aborted')
+          if (context.abortController.signal.aborted) {
+            const error = context.abortController.signal.reason || new Error('Aborted')
             // expected behaviors on error are different
             return returnError(error, context)
           }
@@ -141,21 +136,17 @@ function wrapChildProcessCustomPromisifyMethod (customPromisifyMethod, shell) {
     const context = createContextFromChildProcessInfo(childProcessInfo)
 
     const { start, end, asyncStart, asyncEnd, error } = childProcessChannel
-    const abortController = new AbortController()
-
-    start.publish({
-      ...context,
-      abortController
-    })
+    start.publish(context)
 
     let result
-    if (abortController.signal.aborted) {
-      result = Promise.reject(abortController.signal.reason || new Error('Aborted'))
+    if (context.abortController.signal.aborted) {
+      result = Promise.reject(context.abortController.signal.reason || new Error('Aborted'))
     } else {
       try {
         result = customPromisifyMethod.apply(this, arguments)
       } catch (error) {
-        error.publish({ ...context, error })
+        context.error = error
+        error.publish(context)
         throw error
       } finally {
         end.publish(context)
@@ -192,26 +183,15 @@ function wrapChildProcessAsyncMethod (ChildProcess, shell = false) {
 
       const childProcessInfo = normalizeArgs(arguments, shell)
 
-      const cb = arguments[arguments.length - 1]
-      if (typeof cb === 'function') {
-        const callbackResource = new AsyncResource('bound-anonymous-fn')
-        arguments[arguments.length - 1] = callbackResource.bind(cb)
-      }
-
-      const innerResource = new AsyncResource('bound-anonymous-fn')
-      return innerResource.runInAsyncScope(() => {
-        const context = createContextFromChildProcessInfo(childProcessInfo)
-        const abortController = new AbortController()
-
-        childProcessChannel.start.publish({ ...context, abortController })
-
+      const context = createContextFromChildProcessInfo(childProcessInfo)
+      return childProcessChannel.start.runStores(context, () => {
         let childProcess
-        if (abortController.signal.aborted) {
+        if (context.abortController.signal.aborted) {
           childProcess = new ChildProcess()
           childProcess.on('error', () => {}) // Original method does not crash when non subscribers
 
           process.nextTick(() => {
-            const error = abortController.signal.reason || new Error('Aborted')
+            const error = context.abortController.signal.reason || new Error('Aborted')
             childProcess.emit('error', error)
 
             const cb = arguments[arguments.length - 1]
@@ -230,17 +210,16 @@ function wrapChildProcessAsyncMethod (ChildProcess, shell = false) {
 
           childProcess.on(errorMonitor, (e) => {
             errorExecuted = true
-            childProcessChannel.error.publish(e)
+            context.error = e
+            childProcessChannel.error.publish(context)
           })
 
           childProcess.on('close', (code = 0) => {
             if (!errorExecuted && code !== 0) {
-              childProcessChannel.error.publish()
+              childProcessChannel.error.publish(context)
             }
-            childProcessChannel.asyncEnd.publish({
-              ...context,
-              result: code
-            })
+            context.result = code
+            childProcessChannel.asyncEnd.publish(context)
           })
         }