dd-trace 5.103.0 → 5.104.0

package/packages/datadog-instrumentations/src/helpers/rewriter/transforms.js

@@ -10,17 +10,25 @@ const tracingChannelPredicate = (node) => (
 )
 
 const transforms = module.exports = {
-  tracingChannelImport ({ dcModule, sourceType }, node) {
+  /**
+   * @param {{ dcModule: string, moduleType: 'esm' | 'cjs' }} state
+   * @param {import('estree').Program} node
+   */
+  tracingChannelImport ({ dcModule, moduleType }, node) {
     if (node.body.some(tracingChannelPredicate)) return
 
+    // The vendored matcher state exposes `moduleType` (`esm` / `cjs`), so we
+    // read that field directly. Naming it `sourceType` here used to silently
+    // pick the CJS branch for every ESM file, leaving `require()` baked into
+    // pure ESM modules like `@langchain/langgraph/dist/pregel/index.js`.
+    const isModule = moduleType === 'esm'
+
     const index = node.body.findIndex(child => child.directive === 'use strict')
-    const code = isModuleSourceType(sourceType)
-      ? `import { tracingChannel as tr_ch_apm_tracingChannel } from "${dcModule}"`
+    const code = isModule
+      ? `import tr_ch_apm_dc from "${dcModule}"; const {tracingChannel: tr_ch_apm_tracingChannel} = tr_ch_apm_dc`
       : `const {tracingChannel: tr_ch_apm_tracingChannel} = require("${dcModule}")`
 
-    node.body.splice(index + 1, 0, parse(code, {
-      isModule: isModuleSourceType(sourceType),
-    }).body[0])
+    node.body.splice(index + 1, 0, ...parse(code, { isModule }).body)
   },
 
   tracingChannelDeclaration (state, node) {
@@ -53,13 +61,6 @@ function traceAny (state, node, _parent, ancestry) {
   }
 }
 
-/**
- * @param {string} sourceType
- */
-function isModuleSourceType (sourceType) {
-  return sourceType === 'module' || sourceType === 'esm'
-}
-
 function traceFunction (state, node, program) {
   transforms.tracingChannelDeclaration(state, program)
 

package/packages/datadog-instrumentations/src/http/client.js

@@ -188,8 +188,8 @@ function patch (http, methodName) {
         let finished = false
         let callback = args.callback
 
-        if (callback) {
-          callback = shimmer.wrapFunction(args.callback, cb => function (...args) {
+        if (typeof callback === 'function') {
+          callback = shimmer.wrapCallback(args.callback, cb => function (...args) {
             return asyncStartChannel.runStores(ctx, () => {
               return cb.apply(this, args)
             })

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

@@ -14,9 +14,9 @@ const connectionOptionsCache = new WeakMap()
 
 function wrapRedis (Redis) {
   shimmer.wrap(Redis.prototype, 'sendCommand', sendCommand => function (command, stream) {
-    if (!startCh.hasSubscribers) return sendCommand.apply(this, arguments)
+    if (!startCh.hasSubscribers) return sendCommand.call(this, command, stream)
 
-    if (!command || !command.promise) return sendCommand.apply(this, arguments)
+    if (!command?.promise) return sendCommand.call(this, command, stream)
 
     const options = this.options || {}
     let connectionOptions = connectionOptionsCache.get(this)
@@ -35,7 +35,7 @@ function wrapRedis (Redis) {
     return startCh.runStores(ctx, () => {
       command.promise.then(() => finish(finishCh, errorCh, ctx), err => finish(finishCh, errorCh, ctx, err))
 
-      return sendCommand.apply(this, arguments)
+      return sendCommand.call(this, command, stream)
     })
   })
   return Redis

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

@@ -30,6 +30,7 @@ const {
   logAttemptToFixTestExecution,
   logTestOptimizationSummary,
   getEfdRetryCount,
+  getTestOptimizationRequestResults,
 } = require('../../dd-trace/src/plugins/util/test')
 const {
   SEED_SUFFIX_RE,
@@ -1173,6 +1174,12 @@ function getWrappedScheduleTests (scheduleTests, frameworkVersion) {
   }
 }
 
+function getChannelPromise (channelToPublishTo, payload = {}) {
+  return new Promise(resolve => {
+    channelToPublishTo.publish({ ...payload, onDone: resolve })
+  })
+}
+
 function searchSourceWrapper (searchSourcePackage, frameworkVersion) {
   const SearchSource = searchSourcePackage.default ?? searchSourcePackage
 
@@ -1234,17 +1241,14 @@ function getCliWrapper (isNewJestVersion) {
     }
     return shimmer.wrap(cli, 'runCLI', runCLI => async function () {
       let onDone
-      const configurationPromise = new Promise((resolve) => {
-        onDone = resolve
-      })
       if (!libraryConfigurationCh.hasSubscribers) {
         return runCLI.apply(this, arguments)
       }
 
-      libraryConfigurationCh.publish({ onDone, frameworkVersion: jestVersion })
-
       try {
-        const { err, libraryConfig } = await configurationPromise
+        const { err, libraryConfig } = await getChannelPromise(libraryConfigurationCh, {
+          frameworkVersion: jestVersion,
+        })
         if (!err) {
           isCodeCoverageEnabled = libraryConfig.isCodeCoverageEnabled
           isSuitesSkippingEnabled = libraryConfig.isSuitesSkippingEnabled
@@ -1263,15 +1267,22 @@ function getCliWrapper (isNewJestVersion) {
         log.error('Jest library configuration error', err)
       }
 
-      if (isKnownTestsEnabled) {
-        const knownTestsPromise = new Promise((resolve) => {
-          onDone = resolve
-        })
-
-        knownTestsCh.publish({ onDone })
+      const {
+        knownTestsResponse,
+        testManagementTestsResponse,
+        skippableSuitesResponse,
+      } = await getTestOptimizationRequestResults({
+        isKnownTestsEnabled,
+        isTestManagementTestsEnabled,
+        isSuitesSkippingEnabled,
+        getKnownTests: () => getChannelPromise(knownTestsCh),
+        getTestManagementTests: () => getChannelPromise(testManagementTestsCh),
+        getSkippableSuites: () => getChannelPromise(skippableSuitesCh),
+      })
 
+      if (isKnownTestsEnabled) {
         try {
-          const { err, knownTests: receivedKnownTests } = await knownTestsPromise
+          const { err, knownTests: receivedKnownTests } = knownTestsResponse || await getChannelPromise(knownTestsCh)
           if (err) {
             // We disable EFD if there has been an error in the known tests request
             isEarlyFlakeDetectionEnabled = false
@@ -1285,14 +1296,9 @@ function getCliWrapper (isNewJestVersion) {
       }
 
       if (isSuitesSkippingEnabled) {
-        const skippableSuitesPromise = new Promise((resolve) => {
-          onDone = resolve
-        })
-
-        skippableSuitesCh.publish({ onDone })
-
         try {
-          const { err, skippableSuites: receivedSkippableSuites } = await skippableSuitesPromise
+          const { err, skippableSuites: receivedSkippableSuites } =
+            skippableSuitesResponse || await getChannelPromise(skippableSuitesCh)
           if (!err) {
             skippableSuites = receivedSkippableSuites
           }
@@ -1302,14 +1308,9 @@ function getCliWrapper (isNewJestVersion) {
       }
 
       if (isTestManagementTestsEnabled) {
-        const testManagementTestsPromise = new Promise((resolve) => {
-          onDone = resolve
-        })
-
-        testManagementTestsCh.publish({ onDone })
-
         try {
-          const { err, testManagementTests: receivedTestManagementTests } = await testManagementTestsPromise
+          const { err, testManagementTests: receivedTestManagementTests } =
+            testManagementTestsResponse || await getChannelPromise(testManagementTestsCh)
           if (err) {
             isTestManagementTestsEnabled = false
             testManagementTests = {}
@@ -1323,14 +1324,8 @@ function getCliWrapper (isNewJestVersion) {
       }
 
       if (isImpactedTestsEnabled) {
-        const impactedTestsPromise = new Promise((resolve) => {
-          onDone = resolve
-        })
-
-        modifiedFilesCh.publish({ onDone })
-
         try {
-          const { err, modifiedFiles: receivedModifiedFiles } = await impactedTestsPromise
+          const { err, modifiedFiles: receivedModifiedFiles } = await getChannelPromise(modifiedFilesCh)
           if (!err) {
             modifiedFiles = receivedModifiedFiles
           }
@@ -2047,10 +2042,12 @@ function getStaticMockedFiles (suiteFilePath) {
 
 function getMockedFiles (suiteFilePath) {
   const mockedFiles = testSuiteMockedFiles.get(suiteFilePath)
+  const staticMockedFiles = getStaticMockedFiles(suiteFilePath)
+
   if (mockedFiles?.length) {
-    return mockedFiles
+    return [...new Set([...mockedFiles, ...staticMockedFiles])]
   }
-  return getStaticMockedFiles(suiteFilePath)
+  return staticMockedFiles
 }
 
 function wrapJestObject (jestObject, suiteFilePath) {

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

@@ -8,6 +8,7 @@ const {
   addHook,
 } = require('./helpers/instrument')
 const {
+  brokerSupportsMessageHeaders,
   clientToCluster,
   cloneMessages,
 } = require('./helpers/kafka')
@@ -26,7 +27,7 @@ const batchConsumerStartCh = channel('apm:kafkajs:consume-batch:start')
 const batchConsumerFinishCh = channel('apm:kafkajs:consume-batch:finish')
 const batchConsumerErrorCh = channel('apm:kafkajs:consume-batch:error')
 
-const disabledHeaderWeakSet = new WeakSet()
+const noop = () => {}
 
 addHook({ name: 'kafkajs', file: 'src/producer/index.js', versions: ['>=1.4'] }, (createProducer) =>
   shimmer.wrapFunction(createProducer, original => function wrappedCreateProducer (params) {
@@ -64,15 +65,26 @@ addHook({ name: 'kafkajs', file: 'src/index.js', versions: ['>=1.4'] }, (BaseKaf
     const bootstrapServers = this._brokers
     const cluster = clientToCluster.get(producer)
 
+    let disableHeaderInjection = false
+
+    let refreshHeaderSupport = () => {
+      if (!brokerSupportsMessageHeaders(cluster?.brokerPool)) {
+        disableHeaderInjection = true
+        refreshHeaderSupport = noop
+        log.info('kafkajs broker negotiated Produce <v3; tracer header injection disabled.')
+      }
+    }
+
     producer.send = function (...args) {
       if (!producerStartCh.hasSubscribers) {
         return originalSend.apply(this, args)
       }
 
-      // Fast path: kafkajs has fetched metadata, so clusterId is already on
-      // the broker pool.
+      // Fast path: kafkajs has fetched metadata, so versions and clusterId
+      // are already on the broker pool.
       const metadata = cluster?.brokerPool?.metadata
       if (metadata) {
+        refreshHeaderSupport()
         return runSend.call(this, args, metadata.clusterId)
       }
 
@@ -84,7 +96,10 @@ addHook({ name: 'kafkajs', file: 'src/index.js', versions: ['>=1.4'] }, (BaseKaf
         return runSend.call(this, args)
       }
       return cluster.refreshMetadataIfNecessary().then(
-        () => runSend.call(this, args, cluster.brokerPool?.metadata?.clusterId),
+        () => {
+          refreshHeaderSupport()
+          return runSend.call(this, args, cluster.brokerPool?.metadata?.clusterId)
+        },
         () => runSend.call(this, args)
       )
     }
@@ -93,7 +108,6 @@ addHook({ name: 'kafkajs', file: 'src/index.js', versions: ['>=1.4'] }, (BaseKaf
       const arg0 = args[0]
       const topic = arg0?.topic
       const inputMessages = Array.isArray(arg0?.messages) ? arg0.messages : []
-      const disableHeaderInjection = disabledHeaderWeakSet.has(producer)
 
       // Hand kafkajs and the plugin a shallow clone so injection writes to
       // tracer-owned objects instead of the caller's. With injection
@@ -125,8 +139,13 @@ addHook({ name: 'kafkajs', file: 'src/index.js', versions: ['>=1.4'] }, (BaseKaf
             (error) => {
               ctx.error = error
               if (error) {
+                // Safety net for mixed-version clusters where the seed
+                // broker advertised Produce v3+ but the leader we shipped to
+                // could not parse the headers, surfacing as
+                // KafkaJSProtocolError UNKNOWN (server error code -1).
                 if (error.name === 'KafkaJSProtocolError' && error.type === 'UNKNOWN') {
-                  disabledHeaderWeakSet.add(producer)
+                  disableHeaderInjection = true
+                  refreshHeaderSupport = noop
                   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.'

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

@@ -93,7 +93,7 @@ function createWrapQueryCallback (options) {
       }
 
       if (typeof cb === 'function') {
-        arguments[arguments.length - 1] = shimmer.wrapFunction(cb, wrapper)
+        arguments[arguments.length - 1] = shimmer.wrapCallback(cb, wrapper)
       } else {
         arguments.length += 1
         arguments[arguments.length - 1] = wrapper()

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

@@ -23,7 +23,8 @@ addHook({ name: 'memcached', versions: ['>=2.2'] }, Memcached => {
 
       const ctx = { client, server, query }
       startCh.runStores(ctx, () => {
-        query.callback = shimmer.wrapFunction(query.callback, callback => function (err) {
+        if (typeof query.callback !== 'function') return
+        query.callback = shimmer.wrapCallback(query.callback, callback => function (err) {
           if (err) {
             ctx.error = err
             errorCh.publish(ctx)