dd-trace 5.83.0 → 5.85.0

package/packages/datadog-esbuild/src/utils.js

@@ -59,18 +59,22 @@ function resolve (specifier, context) {
     specifier = fileURLToPath(specifier)
   }
 
-  const resolved = require.resolve(specifier, { conditions, paths: [fileURLToPath(context.parentURL)] })
+  const resolved = require.resolve(specifier, {
+    paths: [fileURLToPath(context.parentURL)],
+    // @ts-expect-error - Node.js 22+ unofficially supports a conditions option
+    conditions,
+  })
 
   return {
     url: pathToFileURL(resolved),
-    format: isESMFile(resolved) ? 'module' : 'commonjs'
+    format: isESMFile(resolved) ? 'module' : 'commonjs',
   }
 }
 
 function getSource (url, { format }) {
   return {
     source: fs.readFileSync(fileURLToPath(url), 'utf8'),
-    format
+    format,
   }
 }
 
@@ -79,12 +83,12 @@ function getSource (url, { format }) {
  *
  * @param {object} moduleData
  * @param {string} moduleData.path
- * @param {boolean} moduleData.internal
+ * @param {boolean} [moduleData.internal = false]
  * @param {object} moduleData.context
- * @param {boolean} moduleData.excludeDefault
+ * @param {boolean} [moduleData.excludeDefault = false]
  * @returns {Promise<Map>}
  */
-async function processModule ({ path, internal, context, excludeDefault }) {
+async function processModule ({ path, internal = false, context, excludeDefault = false }) {
   let exportNames, srcUrl
   if (internal) {
     // we can not read and parse of internal modules
@@ -144,7 +148,7 @@ async function processModule ({ path, internal, context, excludeDefault }) {
       const subSetters = await processModule({
         path: fileURLToPath(result.url),
         context: { ...context, format: result.format },
-        excludeDefault: true
+        excludeDefault: true,
       })
 
       for (const [name, setter] of subSetters.entries()) {
@@ -210,5 +214,5 @@ function isESMFile (fullPathToModule, modulePackageJsonPath, packageJson = {}) {
 
 module.exports = {
   processModule,
-  isESMFile
+  isESMFile,
 }

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

@@ -4,7 +4,7 @@ const tracingChannel = require('dc-polyfill').tracingChannel
 
 const shimmer = require('../../datadog-shimmer')
 const {
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 const ch = tracingChannel('apm:aerospike:command')
@@ -31,7 +31,7 @@ function wrapProcess (process) {
     const ctx = {
       commandName: this.constructor.name,
       commandArgs: this.args,
-      clientConfig: this.client.config
+      clientConfig: this.client.config,
     }
 
     return ch.traceCallback(process, -1, ctx, this, ...args)
@@ -41,7 +41,7 @@ function wrapProcess (process) {
 addHook({
   name: 'aerospike',
   file: 'lib/commands/command.js',
-  versions: ['4', '5', '6']
+  versions: ['4', '5', '6'],
 },
 commandFactory => {
   return shimmer.wrapFunction(commandFactory, f => wrapCreateCommand(f))

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

@@ -13,7 +13,7 @@ const TRACED_FUNCTIONS = {
   streamObject: wrapWithTracer,
   embed: wrapWithTracer,
   embedMany: wrapWithTracer,
-  tool: wrapTool
+  tool: wrapTool,
 }
 
 const vercelAiTracingChannel = tracingChannel('dd-trace:vercel-ai')
@@ -34,11 +34,11 @@ const noopTracer = {
       updateName () { return this },
       end () { return this },
       isRecording () { return false },
-      recordException () { return this }
+      recordException () { return this },
     }
 
     return fn(span)
-  }
+  },
 }
 
 const tracers = new WeakSet()
@@ -58,7 +58,7 @@ function wrapTracer (tracer) {
 
       const ctx = {
         name,
-        attributes: options.attributes ?? {}
+        attributes: options.attributes ?? {},
       }
 
       arguments[arguments.length - 1] = shimmer.wrapFunction(cb, function (originalCb) {
@@ -145,7 +145,7 @@ addHook({
 addHook({
   name: 'ai',
   versions: ['>=4.0.0'],
-  file: 'dist/index.mjs'
+  file: 'dist/index.mjs',
 }, exports => {
   for (const [fnName, patchingFn] of Object.entries(TRACED_FUNCTIONS)) {
     exports = shimmer.wrap(exports, fnName, patchingFn, { replaceGetter: true })

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

@@ -3,7 +3,7 @@
 const shimmer = require('../../datadog-shimmer')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 addHook({ name: 'amqp10', file: 'lib/sender_link.js', versions: ['>=3'] }, SenderLink => {

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

@@ -6,7 +6,7 @@ const shimmer = require('../../datadog-shimmer')
 const { NODE_MAJOR, NODE_MINOR } = require('../../../version')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 const MIN_VERSION = ((NODE_MAJOR > 22) || (NODE_MAJOR === 22 && NODE_MINOR >= 2)) ? '>=0.5.3' : '>=0.5.0'
 

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

@@ -92,7 +92,7 @@ for (const extension of extensions) {
   addHook({
     name: '@anthropic-ai/sdk',
     file: `resources/messages.${extension}`,
-    versions: ['>=0.14.0 <0.33.0']
+    versions: ['>=0.14.0 <0.33.0'],
   }, exports => {
     const Messages = exports.Messages
 
@@ -104,7 +104,7 @@ for (const extension of extensions) {
   addHook({
     name: '@anthropic-ai/sdk',
     file: `resources/messages/messages.${extension}`,
-    versions: ['>=0.33.0']
+    versions: ['>=0.33.0'],
   }, exports => {
     const Messages = exports.Messages
 
@@ -116,7 +116,7 @@ for (const extension of extensions) {
   addHook({
     name: '@anthropic-ai/sdk',
     file: `resources/beta/messages/messages.${extension}`,
-    versions: ['>=0.33.0']
+    versions: ['>=0.33.0'],
   }, exports => {
     const Messages = exports.Messages
 

package/packages/datadog-instrumentations/src/apollo-server.js

@@ -32,17 +32,17 @@ function wrapExecuteHTTPGraphQLRequest (originalExecuteHTTPGraphQLRequest) {
         // This method is expected to return response data
         // with headers, status and body
         const headers = new HeaderMap()
-        Object.keys(abortData.headers).forEach(key => {
+        for (const key of Object.keys(abortData.headers)) {
           headers.set(key, abortData.headers[key])
-        })
+        }
 
         resolve({
           headers,
           status: abortData.statusCode,
           body: {
             kind: 'complete',
-            string: abortData.message
-          }
+            string: abortData.message,
+          },
         })
       }, { once: true })
     })

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

@@ -5,7 +5,7 @@ const tracingChannel = require('dc-polyfill').tracingChannel
 const shimmer = require('../../datadog-shimmer')
 const {
   addHook,
-  channel
+  channel,
 } = require('./helpers/instrument')
 
 const CHANNELS = {
@@ -14,7 +14,7 @@ const CHANNELS = {
   'gateway.validate': tracingChannel('apm:apollo:gateway:validate'),
   'gateway.execute': tracingChannel('apm:apollo:gateway:execute'),
   'gateway.fetch': tracingChannel('apm:apollo:gateway:fetch'),
-  'gateway.postprocessing': tracingChannel('apm:apollo:gateway:postprocessing')
+  'gateway.postprocessing': tracingChannel('apm:apollo:gateway:postprocessing'),
 }
 
 const generalErrorCh = channel('apm:apollo:gateway:general:error')

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

@@ -30,7 +30,7 @@ function wrapDeserialization (Type) {
 
 addHook({
   name: 'avsc',
-  versions: ['>=5.0.0']
+  versions: ['>=5.0.0'],
 }, avro => {
   wrapDeserialization(avro.Type)
   wrapSerialization(avro.Type)

package/packages/datadog-instrumentations/src/aws-sdk.js

@@ -20,7 +20,7 @@ function wrapRequest (send) {
       awsRegion: this.service.config && this.service.config.region,
       awsService: this.service.api && this.service.api.className,
       request: this,
-      cbExists: typeof cb === 'function'
+      cbExists: typeof cb === 'function',
     }
 
     this.on('complete', response => {
@@ -59,7 +59,7 @@ function wrapSmithySend (send) {
     const operation = `${commandName[0].toLowerCase()}${commandName.slice(1).replace(/Command$/, '')}`
     const request = {
       operation,
-      params: command.input
+      params: command.input,
     }
 
     const startCh = channel(`apm:aws:request:start:${channelSuffix}`)
@@ -83,7 +83,7 @@ function wrapSmithySend (send) {
       serviceIdentifier,
       operation,
       awsService: clientName,
-      request
+      request,
     }
 
     return startCh.runStores(ctx, () => {
@@ -224,7 +224,7 @@ function getChannelSuffix (name) {
     'sqs',
     'states',
     'stepfunctions',
-    'bedrockruntime'
+    'bedrockruntime',
   ].includes(name)
     ? name
     : 'default'

package/packages/datadog-instrumentations/src/azure-event-hubs.js

@@ -3,14 +3,14 @@
 const dc = require('dc-polyfill')
 const shimmer = require('../../datadog-shimmer')
 const {
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 const producerCh = dc.tracingChannel('apm:azure-event-hubs:send')
 
 addHook({
   name: '@azure/event-hubs',
-  versions: ['>=6.0.0']
+  versions: ['>=6.0.0'],
 }, obj => {
   const EventHubProducerClient = obj.EventHubProducerClient
 

package/packages/datadog-instrumentations/src/azure-functions.js

@@ -3,7 +3,7 @@
 const dc = require('dc-polyfill')
 const shimmer = require('../../datadog-shimmer')
 const {
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 const azureFunctionsChannel = dc.tracingChannel('datadog:azure:functions:invoke')

package/packages/datadog-instrumentations/src/azure-service-bus.js

@@ -3,7 +3,7 @@
 const dc = require('dc-polyfill')
 const shimmer = require('../../datadog-shimmer')
 const {
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 const producerCh = dc.tracingChannel('apm:azure-service-bus:send')

package/packages/datadog-instrumentations/src/body-parser.js

@@ -23,7 +23,7 @@ function publishRequestBodyAndNext (req, res, next) {
 addHook({
   name: 'body-parser',
   file: 'lib/read.js',
-  versions: ['>=1.4.0 <1.20.0']
+  versions: ['>=1.4.0 <1.20.0'],
 }, read => {
   return shimmer.wrapFunction(read, read => function (req, res, next) {
     const nextResource = new AsyncResource('bound-anonymous-fn')
@@ -35,7 +35,7 @@ addHook({
 addHook({
   name: 'body-parser',
   file: 'lib/read.js',
-  versions: ['>=1.20.0']
+  versions: ['>=1.20.0'],
 }, read => {
   return shimmer.wrapFunction(read, read => function (req, res, next) {
     arguments[2] = publishRequestBodyAndNext(req, res, next)

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

@@ -3,7 +3,7 @@
 const shimmer = require('../../datadog-shimmer')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 addHook({ name: 'bunyan', versions: ['>=1'] }, Logger => {

package/packages/datadog-instrumentations/src/cassandra-driver.js

@@ -3,7 +3,7 @@
 const shimmer = require('../../datadog-shimmer')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 const startCh = channel('apm:cassandra-driver:query:start')

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

@@ -6,7 +6,7 @@ const util = require('util')
 const dc = require('dc-polyfill')
 const shimmer = require('../../datadog-shimmer')
 const {
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 const childProcessChannel = dc.tracingChannel('datadog:child_process:execution')
@@ -31,13 +31,13 @@ function returnSpawnSyncError (error, context) {
     output: null,
     stdout: null,
     stderr: null,
-    pid: 0
+    pid: 0,
   }
 
   return context.result
 }
 
-names.forEach(name => {
+for (const name of names) {
   addHook({ name }, childProcess => {
     if (!patched) {
       patched = true
@@ -49,12 +49,12 @@ names.forEach(name => {
 
     return childProcess
   })
-})
+}
 
 function normalizeArgs (args, shell) {
   const childProcessInfo = {
     command: args[0],
-    file: args[0]
+    file: args[0],
   }
 
   if (Array.isArray(args[1])) {
@@ -80,7 +80,7 @@ function createContextFromChildProcessInfo (childProcessInfo) {
     command: childProcessInfo.command,
     file: childProcessInfo.file,
     shell: childProcessInfo.shell,
-    abortController: new AbortController()
+    abortController: new AbortController(),
   }
 
   if (childProcessInfo.fileArgs) {
@@ -238,7 +238,7 @@ function wrapChildProcessAsyncMethod (ChildProcess, shell = false) {
         util.promisify.custom,
         {
           ...descriptor,
-          value: wrapedChildProcessCustomPromisifyMethod
+          value: wrapedChildProcessCustomPromisifyMethod,
         })
     }
     return wrappedChildProcessMethod

package/packages/datadog-instrumentations/src/confluentinc-kafka-javascript.js

@@ -5,7 +5,7 @@ const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
 const {
   addHook,
-  channel
+  channel,
 } = require('./helpers/instrument')
 
 // Create channels for Confluent Kafka JavaScript
@@ -23,7 +23,7 @@ const channels = {
   batchConsumerStart: channel('apm:confluentinc-kafka-javascript:consume-batch:start'),
   batchConsumerFinish: channel('apm:confluentinc-kafka-javascript:consume-batch:finish'),
   batchConsumerError: channel('apm:confluentinc-kafka-javascript:consume-batch:error'),
-  batchConsumerCommit: channel('apm:confluentinc-kafka-javascript:consume-batch:commit')
+  batchConsumerCommit: channel('apm:confluentinc-kafka-javascript:consume-batch:commit'),
 }
 
 const disabledHeaderWeakSet = new WeakSet()
@@ -63,7 +63,7 @@ function instrumentBaseModule (module) {
               const ctx = {
                 topic,
                 messages: [{ key, value: message }],
-                bootstrapServers: brokers
+                bootstrapServers: brokers,
               }
 
               return channels.producerStart.runStores(ctx, () => {
@@ -111,13 +111,13 @@ function instrumentBaseModule (module) {
               }
 
               const ctx = {
-                groupId
+                groupId,
               }
               // Handle callback-based consumption
               if (typeof callback === 'function') {
                 return consume.call(this, numMessages, function wrappedCallback (err, messages) {
                   if (messages && messages.length > 0) {
-                    messages.forEach(message => {
+                    for (const message of messages) {
                       ctx.topic = message?.topic
                       ctx.partition = message?.partition
                       ctx.message = message
@@ -125,7 +125,7 @@ function instrumentBaseModule (module) {
                       // TODO: We should be using publish here instead of runStores but we need bindStart to be called
                       channels.consumerStart.runStores(ctx, () => {})
                       updateLatestOffset(message?.topic, message?.partition, message?.offset, groupId)
-                    })
+                    }
                   }
 
                   if (err) {
@@ -215,7 +215,7 @@ function instrumentKafkaJS (kafkaJS) {
                       topic: payload?.topic,
                       messages: payload?.messages || [],
                       bootstrapServers: kafka._ddBrokers,
-                      disableHeaderInjection: disabledHeaderWeakSet.has(producer)
+                      disableHeaderInjection: disabledHeaderWeakSet.has(producer),
                     }
 
                     return channels.producerStart.runStores(ctx, () => {
@@ -234,9 +234,10 @@ function instrumentKafkaJS (kafkaJS) {
                             // This approach is implemented by other tracers as well.
                             if (err.name === 'KafkaJSError' && err.type === 'ERR_UNKNOWN') {
                               disabledHeaderWeakSet.add(producer)
-                              log.error('Kafka Broker responded with UNKNOWN_SERVER_ERROR (-1). ' +
-                                'Please look at broker logs for more information. ' +
-                                'Tracer message header injection for Kafka is disabled.')
+                              log.error(
+                                // eslint-disable-next-line @stylistic/max-len
+                                'Kafka Broker responded with UNKNOWN_SERVER_ERROR (-1). Please look at broker logs for more information. Tracer message header injection for Kafka is disabled.'
+                              )
                             }
                             ctx.error = err
                             channels.producerError.publish(ctx)
@@ -285,7 +286,7 @@ function instrumentKafkaJS (kafkaJS) {
                           startCh: channels.consumerStart,
                           commitCh: channels.consumerCommit,
                           finishCh: channels.consumerFinish,
-                          errorCh: channels.consumerError
+                          errorCh: channels.consumerError,
                         },
                         (payload) => {
                           return {
@@ -293,7 +294,7 @@ function instrumentKafkaJS (kafkaJS) {
                             partition: payload?.partition,
                             offset: payload?.message?.offset,
                             message: payload?.message,
-                            groupId
+                            groupId,
                           }
                         })
                     } else if (eachBatch) {
@@ -303,7 +304,7 @@ function instrumentKafkaJS (kafkaJS) {
                           startCh: channels.batchConsumerStart,
                           commitCh: channels.batchConsumerCommit,
                           finishCh: channels.batchConsumerFinish,
-                          errorCh: channels.batchConsumerError
+                          errorCh: channels.batchConsumerError,
                         },
                         (payload) => {
                           const { batch } = payload
@@ -312,7 +313,7 @@ function instrumentKafkaJS (kafkaJS) {
                             partition: batch?.partition,
                             offset: batch?.messages[batch?.messages?.length - 1]?.offset,
                             messages: batch?.messages,
-                            groupId
+                            groupId,
                           }
                         }
                       )
@@ -357,7 +358,7 @@ function wrapKafkaCallback (callback, { startCh, commitCh, finishCh, errorCh },
     const commitPayload = getPayload(payload)
 
     const ctx = {
-      extractedArgs: commitPayload
+      extractedArgs: commitPayload,
     }
 
     return startCh.runStores(ctx, () => {
@@ -406,7 +407,7 @@ function updateLatestOffset (topic, partition, offset, groupId) {
     topic,
     partition,
     offset,
-    groupId
+    groupId,
   })
 }
 

package/packages/datadog-instrumentations/src/cookie-parser.js

@@ -23,7 +23,7 @@ function publishRequestCookieAndNext (req, res, next) {
 
 addHook({
   name: 'cookie-parser',
-  versions: ['>=1.0.0']
+  versions: ['>=1.0.0'],
 }, cookieParser => {
   return shimmer.wrapFunction(cookieParser, cookieParser => function () {
     const cookieMiddleware = cookieParser.apply(this, arguments)

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

@@ -4,7 +4,7 @@ const { errorMonitor } = require('events')
 const shimmer = require('../../datadog-shimmer')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 function findCallbackIndex (args, lowerbound = 2) {
@@ -20,7 +20,9 @@ function getQueryResource (q) {
 }
 
 function wrapAllNames (names, action) {
-  names.forEach(name => action(name))
+  for (const name of names) {
+    action(name)
+  }
 }
 
 function wrapCallback (callback, ctx, channelPrefix) {
@@ -96,7 +98,7 @@ function wrap (prefix, fn) {
         return fn.apply(this, arguments)
       } catch (error) {
         ctx.error = error
-        error.stack // trigger getting the stack at the original throwing point
+        void error.stack // trigger getting the stack at the original throwing point
         errorCh.publish(ctx)
 
         throw error
@@ -162,7 +164,7 @@ function wrapCBandPromise (fn, name, startData, thisArg, args) {
       )
       return res
     } catch (e) {
-      e.stack
+      void e.stack
       ctx.error = e
       errorCh.publish(ctx)
       throw e
@@ -176,7 +178,7 @@ function wrapWithName (name) {
       return wrapCBandPromise(operation, name, {
         collection: { name: this._name || '_default' },
         bucket: { name: this._scope._bucket._name },
-        seedNodes: this._dd_connStr
+        seedNodes: this._dd_connStr,
       }, this, arguments)
     }
   }
@@ -226,7 +228,7 @@ addHook({ name: 'couchbase', file: 'lib/bucket.js', versions: ['^2.6.12'] }, Buc
       try {
         return _n1qlReq.apply(this, arguments)
       } catch (err) {
-        err.stack // trigger getting the stack at the original throwing point
+        void err.stack // trigger getting the stack at the original throwing point
         ctx.error = err
         errorCh.publish(ctx)
 

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

@@ -3,7 +3,7 @@
 const shimmer = require('../../datadog-shimmer')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 const cryptoHashCh = channel('datadog:crypto:hashing:start')