remove async storage from oracledb (#6217)

* remove async storage from oracledb

Author: wconti27

packages/datadog-instrumentations/src/oracledb.js

@@ -2,8 +2,7 @@
 
 const {
   channel,
-  addHook,
-  AsyncResource
+  addHook
 } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 
@@ -14,11 +13,11 @@ const startChannel = channel('apm:oracledb:query:start')
 const errorChannel = channel('apm:oracledb:query:error')
 const finishChannel = channel('apm:oracledb:query:finish')
 
-function finish (err) {
-  if (err) {
-    errorChannel.publish(err)
+function finish (ctx) {
+  if (ctx.error) {
+    errorChannel.publish(ctx)
   }
-  finishChannel.publish()
+  finishChannel.publish(ctx)
 }
 
 addHook({ name: 'oracledb', versions: ['>=5'] }, oracledb => {
@@ -30,57 +29,64 @@ addHook({ name: 'oracledb', versions: ['>=5'] }, oracledb => {
 
       if (arguments.length && typeof arguments[arguments.length - 1] === 'function') {
         const cb = arguments[arguments.length - 1]
-        const outerAr = new AsyncResource('apm:oracledb:outer-scope')
         arguments[arguments.length - 1] = shimmer.wrapFunction(cb, cb => function wrappedCb (err, result) {
-          finish(err)
-          return outerAr.runInAsyncScope(() => cb.apply(this, arguments))
+          if (err) {
+            ctx.error = err
+            errorChannel.publish(ctx)
+          }
+          return finishChannel.runStores(ctx, () => {
+            return cb.apply(this, arguments)
+          })
         })
       }
 
-      return new AsyncResource('apm:oracledb:inner-scope').runInAsyncScope(() => {
-        // The connAttrs are used to pass through the argument to the potential
-        // serviceName method a user might have passed through as well as parsing
-        // the connection string in v5.
-        const connAttrs = connectionAttributes.get(this)
+      // The connAttrs are used to pass through the argument to the potential
+      // serviceName method a user might have passed through as well as parsing
+      // the connection string in v5.
+      const connAttrs = connectionAttributes.get(this)
 
-        const details = typeof this.hostName === 'string' ? this : this._impl
+      const details = typeof this.hostName === 'string' ? this : this._impl
 
-        let hostname
-        let port
-        let dbInstance
+      let hostname
+      let port
+      let dbInstance
 
-        if (details) {
-          dbInstance = details.serviceName
-          hostname = details.hostName ?? details.nscon?.ntAdapter?.hostName
-          port = String(details.port ?? details.nscon?.ntAdapter?.port ?? '')
-        }
+      if (details) {
+        dbInstance = details.serviceName
+        hostname = details.hostName ?? details.nscon?.ntAdapter?.hostName
+        port = String(details.port ?? details.nscon?.ntAdapter?.port ?? '')
+      }
 
-        startChannel.publish({
-          query: dbQuery,
-          connAttrs,
-          dbInstance,
-          port,
-          hostname,
-        })
+      const ctx = {
+        dbInstance,
+        port,
+        hostname,
+        query: dbQuery,
+        connAttrs
+      }
+
+      return startChannel.runStores(ctx, () => {
         try {
           let result = execute.apply(this, arguments)
 
           if (typeof result?.then === 'function') {
             result = result.then(
               x => {
-                finish()
+                finish(ctx)
                 return x
               },
               e => {
-                finish(e)
+                ctx.error = e
+                finish(ctx)
                 throw e
               }
             )
           }
 
           return result
         } catch (err) {
-          errorChannel.publish(err)
+          ctx.error = err
+          finish(ctx)
           throw err
         }
       })

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

@@ -10,7 +10,9 @@ class OracledbPlugin extends DatabasePlugin {
   static system = 'oracle'
   static peerServicePrecursors = ['db.instance', 'db.hostname']
 
-  start ({ query, connAttrs, port, hostname, dbInstance }) {
+  bindStart (ctx) {
+    let { query, connAttrs, port, hostname, dbInstance } = ctx
+
     const service = this.serviceName({ pluginConfig: this.config, params: connAttrs })
 
     if (hostname === undefined) {
@@ -33,7 +35,9 @@ class OracledbPlugin extends DatabasePlugin {
         'db.hostname': hostname,
         [CLIENT_PORT_KEY]: port,
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }