dd-trace 5.61.0 → 5.62.0

package/packages/datadog-instrumentations/src/mongoose.js

@@ -2,19 +2,24 @@
 
 const { addHook, channel } = require('./helpers/instrument')
 const { wrapThen } = require('./helpers/promise')
-const { AsyncResource } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 
+const startCh = channel('datadog:mongoose:model:filter:start')
+const finishCh = channel('datadog:mongoose:model:filter:finish')
+// this channel is for wrapping the callback of exec methods and handling store context
+const execStartCh = channel('apm:mongoose:exec:start')
+const execFinishCh = channel('apm:mongoose:exec:finish')
+
 function wrapAddQueue (addQueue) {
-  return function addQueueWithTrace (name) {
-    if (typeof name === 'function') {
-      arguments[0] = AsyncResource.bind(name)
-    } else if (typeof this[name] === 'function') {
-      arguments[0] = AsyncResource.bind((...args) => this[name](...args))
-    }
+  const ctx = {}
 
-    return addQueue.apply(this, arguments)
-  }
+  return execStartCh.runStores(ctx, () => {
+    return function addQueueWithTrace (name) {
+      return execFinishCh.runStores(ctx, () => {
+        return addQueue.apply(this, arguments)
+      })
+    }
+  })
 }
 
 addHook({
@@ -31,9 +36,6 @@ addHook({
   return mongoose
 })
 
-const startCh = channel('datadog:mongoose:model:filter:start')
-const finishCh = channel('datadog:mongoose:model:filter:finish')
-
 const collectionMethodsWithFilter = [
   'count',
   'countDocuments',
@@ -68,27 +70,21 @@ addHook({
           return method.apply(this, arguments)
         }
 
-        const asyncResource = new AsyncResource('bound-anonymous-fn')
-
         const filters = [arguments[0]]
         if (useTwoArguments) {
           filters.push(arguments[1])
         }
 
-        const finish = asyncResource.bind(function () {
-          finishCh.publish()
-        })
-
         let callbackWrapped = false
 
-        const wrapCallbackIfExist = (args) => {
+        const wrapCallbackIfExist = (args, ctx) => {
           const lastArgumentIndex = args.length - 1
 
           if (typeof args[lastArgumentIndex] === 'function') {
             // is a callback, wrap it to execute finish()
             shimmer.wrap(args, lastArgumentIndex, originalCb => {
               return function () {
-                finish()
+                finishCh.publish(ctx)
 
                 return originalCb.apply(this, arguments)
               }
@@ -98,13 +94,13 @@ addHook({
           }
         }
 
-        wrapCallbackIfExist(arguments)
+        const ctx = {
+          filters,
+          methodName
+        }
 
-        return asyncResource.runInAsyncScope(() => {
-          startCh.publish({
-            filters,
-            methodName
-          })
+        return startCh.runStores(ctx, () => {
+          wrapCallbackIfExist(arguments, ctx)
 
           const res = method.apply(this, arguments)
 
@@ -113,7 +109,7 @@ addHook({
             shimmer.wrap(res, 'exec', originalExec => {
               return function wrappedExec () {
                 if (!callbackWrapped) {
-                  wrapCallbackIfExist(arguments)
+                  wrapCallbackIfExist(arguments, ctx)
                 }
 
                 const execResult = originalExec.apply(this, arguments)
@@ -129,7 +125,7 @@ addHook({
                     const reject = arguments[1]
 
                     arguments[0] = shimmer.wrapFunction(resolve, resolve => function wrappedResolve () {
-                      finish()
+                      finishCh.publish(ctx)
 
                       if (resolve) {
                         return resolve.apply(this, arguments)
@@ -137,7 +133,7 @@ addHook({
                     })
 
                     arguments[1] = shimmer.wrapFunction(reject, reject => function wrappedReject () {
-                      finish()
+                      finishCh.publish(ctx)
 
                       if (reject) {
                         return reject.apply(this, arguments)

package/packages/datadog-instrumentations/src/openai.js

@@ -151,7 +151,6 @@ addHook({ name: 'openai', file: 'dist/api.js', versions: ['>=3.0.0 <4'] }, expor
         methodName,
         args: arguments,
         basePath: this.basePath,
-        apiKey: this.configuration.apiKey
       }
 
       return ch.tracePromise(fn, ctx, this, ...arguments)
@@ -224,7 +223,6 @@ for (const extension of extensions) {
             methodName: `${baseResource}.${methodName}`,
             args: arguments,
             basePath: client.baseURL,
-            apiKey: client.apiKey
           }
 
           return ch.start.runStores(ctx, () => {

package/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,49 +29,55 @@ 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
               }
             )
@@ -80,7 +85,8 @@ addHook({ name: 'oracledb', versions: ['>=5'] }, oracledb => {
 
           return result
         } catch (err) {
-          errorChannel.publish(err)
+          ctx.error = err
+          finish(ctx)
           throw err
         }
       })

package/packages/datadog-instrumentations/src/router.js

@@ -146,7 +146,7 @@ function createWrapRouterMethod (name) {
       }
 
       if (routeAddedChannel.hasSubscribers) {
-        routeAddedChannel.publish({ topOfStackFunc: methodWithTrace, layer: this.stack[0] })
+        routeAddedChannel.publish({ topOfStackFunc: methodWithTrace, layer: this.stack.at(-1) })
       }
 
       if (this.stack.length > offset) {

package/packages/datadog-plugin-aerospike/src/index.js

@@ -6,16 +6,12 @@ const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 const AEROSPIKE_PEER_SERVICE = 'aerospike.namespace'
 
 class AerospikePlugin extends DatabasePlugin {
-  static get id () { return 'aerospike' }
-  static get operation () { return 'command' }
-  static get system () { return 'aerospike' }
-  static get prefix () {
-    return 'tracing:apm:aerospike:command'
-  }
+  static id = 'aerospike'
+  static operation = 'command'
+  static system = 'aerospike'
+  static prefix = 'tracing:apm:aerospike:command'
 
-  static get peerServicePrecursors () {
-    return [AEROSPIKE_PEER_SERVICE]
-  }
+  static peerServicePrecursors = [AEROSPIKE_PEER_SERVICE]
 
   bindStart (ctx) {
     const { commandName, commandArgs } = ctx

package/packages/datadog-plugin-amqp10/src/consumer.js

@@ -4,8 +4,8 @@ const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
 const { getAddress, getShortName } = require('./util')
 
 class Amqp10ConsumerPlugin extends ConsumerPlugin {
-  static get id () { return 'amqp10' }
-  static get system () { return 'amqp' }
+  static id = 'amqp10'
+  static system = 'amqp'
 
   bindStart (ctx) {
     const { link } = ctx

package/packages/datadog-plugin-amqp10/src/index.js

@@ -5,7 +5,7 @@ const ConsumerPlugin = require('./consumer')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class Amqp10Plugin extends CompositePlugin {
-  static get id () { return 'amqp10' }
+  static id = 'amqp10'
   static get plugins () {
     return {
       producer: ProducerPlugin,

package/packages/datadog-plugin-amqp10/src/producer.js

@@ -5,9 +5,9 @@ const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 const { getAddress, getShortName } = require('./util')
 
 class Amqp10ProducerPlugin extends ProducerPlugin {
-  static get id () { return 'amqp10' }
-  static get operation () { return 'send' }
-  static get system () { return 'amqp' }
+  static id = 'amqp10'
+  static operation = 'send'
+  static system = 'amqp'
 
   bindStart (ctx) {
     const { link } = ctx

package/packages/datadog-plugin-amqplib/src/client.js

@@ -6,9 +6,9 @@ const ClientPlugin = require('../../dd-trace/src/plugins/client')
 const { getResourceName } = require('./util')
 
 class AmqplibClientPlugin extends ClientPlugin {
-  static get id () { return 'amqplib' }
-  static get type () { return 'messaging' }
-  static get operation () { return 'command' }
+  static id = 'amqplib'
+  static type = 'messaging'
+  static operation = 'command'
 
   bindStart (ctx) {
     const { channel = {}, method, fields } = ctx

package/packages/datadog-plugin-amqplib/src/consumer.js

@@ -6,8 +6,8 @@ const { getAmqpMessageSize } = require('../../dd-trace/src/datastreams')
 const { getResourceName } = require('./util')
 
 class AmqplibConsumerPlugin extends ConsumerPlugin {
-  static get id () { return 'amqplib' }
-  static get operation () { return 'consume' }
+  static id = 'amqplib'
+  static operation = 'consume'
 
   bindStart (ctx) {
     const { method, fields, message, queue } = ctx

package/packages/datadog-plugin-amqplib/src/index.js

@@ -7,7 +7,7 @@ const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 // TODO: Consider splitting channels for publish/receive in the instrumentation.
 class AmqplibPlugin extends CompositePlugin {
-  static get id () { return 'amqplib' }
+  static id = 'amqplib'
   static get plugins () {
     return {
       producer: ProducerPlugin,

package/packages/datadog-plugin-amqplib/src/producer.js

@@ -7,8 +7,8 @@ const { DsmPathwayCodec, getAmqpMessageSize } = require('../../dd-trace/src/data
 const { getResourceName } = require('./util')
 
 class AmqplibProducerPlugin extends ProducerPlugin {
-  static get id () { return 'amqplib' }
-  static get operation () { return 'publish' }
+  static id = 'amqplib'
+  static operation = 'publish'
 
   bindStart (ctx) {
     const { channel = {}, method, fields, message } = ctx

package/packages/datadog-plugin-apollo/src/gateway/execute.js

@@ -3,10 +3,8 @@
 const ApolloBasePlugin = require('../../../dd-trace/src/plugins/apollo')
 
 class ApolloGatewayExecutePlugin extends ApolloBasePlugin {
-  static get operation () { return 'execute' }
-  static get prefix () {
-    return 'tracing:apm:apollo:gateway:execute'
-  }
+  static operation = 'execute'
+  static prefix = 'tracing:apm:apollo:gateway:execute'
 }
 
 module.exports = ApolloGatewayExecutePlugin

package/packages/datadog-plugin-apollo/src/gateway/fetch.js

@@ -4,10 +4,8 @@ const { storage } = require('../../../datadog-core')
 const ApolloBasePlugin = require('../../../dd-trace/src/plugins/apollo')
 
 class ApolloGatewayFetchPlugin extends ApolloBasePlugin {
-  static get operation () { return 'fetch' }
-  static get prefix () {
-    return 'tracing:apm:apollo:gateway:fetch'
-  }
+  static operation = 'fetch'
+  static prefix = 'tracing:apm:apollo:gateway:fetch'
 
   bindStart (ctx) {
     const store = storage('legacy').getStore()

package/packages/datadog-plugin-apollo/src/gateway/index.js

@@ -10,7 +10,7 @@ const ApolloGatewayValidatePlugin = require('./validate')
 const ApolloGatewayFetchPlugin = require('./fetch')
 
 class ApolloGatewayPlugin extends CompositePlugin {
-  static get id () { return 'gateway' }
+  static id = 'gateway'
   static get plugins () {
     return {
       execute: ApolloGatewayExecutePlugin,

package/packages/datadog-plugin-apollo/src/gateway/plan.js

@@ -3,10 +3,8 @@
 const ApolloBasePlugin = require('../../../dd-trace/src/plugins/apollo')
 
 class ApolloGatewayPlanPlugin extends ApolloBasePlugin {
-  static get operation () { return 'plan' }
-  static get prefix () {
-    return 'tracing:apm:apollo:gateway:plan'
-  }
+  static operation = 'plan'
+  static prefix = 'tracing:apm:apollo:gateway:plan'
 }
 
 module.exports = ApolloGatewayPlanPlugin

package/packages/datadog-plugin-apollo/src/gateway/postprocessing.js

@@ -3,10 +3,8 @@
 const ApolloBasePlugin = require('../../../dd-trace/src/plugins/apollo')
 
 class ApolloGatewayPostProcessingPlugin extends ApolloBasePlugin {
-  static get operation () { return 'postprocessing' }
-  static get prefix () {
-    return 'tracing:apm:apollo:gateway:postprocessing'
-  }
+  static operation = 'postprocessing'
+  static prefix = 'tracing:apm:apollo:gateway:postprocessing'
 }
 
 module.exports = ApolloGatewayPostProcessingPlugin

package/packages/datadog-plugin-apollo/src/gateway/request.js

@@ -9,10 +9,8 @@ const OPERATION_DEFINITION = 'OperationDefinition'
 const FRAGMENT_DEFINITION = 'FragmentDefinition'
 
 class ApolloGatewayRequestPlugin extends ApolloBasePlugin {
-  static get operation () { return 'request' }
-  static get prefix () {
-    return 'tracing:apm:apollo:gateway:request'
-  }
+  static operation = 'request'
+  static prefix = 'tracing:apm:apollo:gateway:request'
 
   bindStart (ctx) {
     const store = storage('legacy').getStore()

package/packages/datadog-plugin-apollo/src/gateway/validate.js

@@ -3,10 +3,8 @@
 const ApolloBasePlugin = require('../../../dd-trace/src/plugins/apollo')
 
 class ApolloGatewayValidatePlugin extends ApolloBasePlugin {
-  static get operation () { return 'validate' }
-  static get prefix () {
-    return 'tracing:apm:apollo:gateway:validate'
-  }
+  static operation = 'validate'
+  static prefix = 'tracing:apm:apollo:gateway:validate'
 
   end (ctx) {
     const result = ctx.result

package/packages/datadog-plugin-apollo/src/index.js

@@ -4,7 +4,7 @@ const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 const ApolloGatewayPlugin = require('./gateway')
 
 class ApolloPlugin extends CompositePlugin {
-  static get id () { return 'apollo' }
+  static id = 'apollo'
   static get plugins () {
     return {
       gateway: ApolloGatewayPlugin

package/packages/datadog-plugin-avsc/src/index.js

@@ -4,8 +4,8 @@ const SchemaPlugin = require('../../dd-trace/src/plugins/schema')
 const SchemaExtractor = require('./schema_iterator')
 
 class AvscPlugin extends SchemaPlugin {
-  static get id () { return 'avsc' }
-  static get schemaExtractor () { return SchemaExtractor }
+  static id = 'avsc'
+  static schemaExtractor = SchemaExtractor
 }
 
 module.exports = AvscPlugin