remove async storage from memcached instrumentation (#5936)

* remove async storage from memcached

Author: wconti27

packages/datadog-instrumentations/src/memcached.js

@@ -2,8 +2,7 @@
 
 const {
   channel,
-  addHook,
-  AsyncResource
+  addHook
 } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 
@@ -17,35 +16,29 @@ addHook({ name: 'memcached', versions: ['>=2.2'] }, Memcached => {
       return command.apply(this, arguments)
     }
 
-    const callbackResource = new AsyncResource('bound-anonymous-fn')
-    const asyncResource = new AsyncResource('bound-anonymous-fn')
-
     const client = this
 
-    const wrappedQueryCompiler = asyncResource.bind(function () {
+    const wrappedQueryCompiler = function () {
       const query = queryCompiler.apply(this, arguments)
-      const callback = callbackResource.bind(query.callback)
-
-      query.callback = shimmer.wrapFunction(callback, callback => asyncResource.bind(function (err) {
-        if (err) {
-          errorCh.publish(err)
-        }
-        finishCh.publish()
-
-        return callback.apply(this, arguments)
-      }))
-      startCh.publish({ client, server, query })
 
+      const ctx = { client, server, query }
+      startCh.runStores(ctx, () => {
+        query.callback = shimmer.wrapFunction(query.callback, callback => function (err) {
+          if (err) {
+            ctx.error = err
+            errorCh.publish(ctx)
+          }
+          finishCh.publish(ctx)
+
+          return finishCh.runStores(ctx, callback, this, ...arguments)
+        })
+      })
       return query
-    })
-
-    return asyncResource.runInAsyncScope(() => {
-      arguments[0] = wrappedQueryCompiler
+    }
 
-      const result = command.apply(this, arguments)
+    arguments[0] = wrappedQueryCompiler
 
-      return result
-    })
+    return command.apply(this, arguments)
   })
 
   return Memcached

packages/datadog-plugin-memcached/src/index.js

@@ -6,7 +6,9 @@ const CachePlugin = require('../../dd-trace/src/plugins/cache')
 class MemcachedPlugin extends CachePlugin {
   static get id () { return 'memcached' }
 
-  start ({ client, server, query }) {
+  bindStart (ctx) {
+    const { client, server, query } = ctx
+
     const address = getAddress(client, server, query)
 
     const meta = {
@@ -23,7 +25,9 @@ class MemcachedPlugin extends CachePlugin {
       resource: query.type,
       type: 'memcached',
       meta
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }
 

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

@@ -5,11 +5,11 @@ const StoragePlugin = require('./storage')
 class CachePlugin extends StoragePlugin {
   static get operation () { return 'command' }
 
-  startSpan (options) {
+  startSpan (options, ctx) {
     if (!options.kind) {
       options.kind = this.constructor.kind
     }
-    return super.startSpan(this.operationName(), options)
+    return super.startSpan(this.operationName(), options, ctx)
   }
 }