dd-trace 5.81.0 → 5.83.0

package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/bullmq.json

@@ -0,0 +1,106 @@
+[
+  {
+    "module": {
+      "name": "bullmq",
+      "versionRange": ">=5.66.0",
+      "filePath": "dist/cjs/classes/queue.js"
+    },
+    "functionQuery": {
+      "methodName": "add",
+      "className": "Queue",
+      "kind": "Async"
+    },
+    "channelName": "Queue_add"
+  },
+  {
+    "module": {
+      "name": "bullmq",
+      "versionRange": ">=5.66.0",
+      "filePath": "dist/cjs/classes/queue.js"
+    },
+    "functionQuery": {
+      "methodName": "addBulk",
+      "className": "Queue",
+      "kind": "Async"
+    },
+    "channelName": "Queue_addBulk"
+  },
+  {
+    "module": {
+      "name": "bullmq",
+      "versionRange": ">=5.66.0",
+      "filePath": "dist/cjs/classes/worker.js"
+    },
+    "functionQuery": {
+      "methodName": "callProcessJob",
+      "className": "Worker",
+      "kind": "Async"
+    },
+    "channelName": "Worker_callProcessJob"
+  },
+  {
+    "module": {
+      "name": "bullmq",
+      "versionRange": ">=5.66.0",
+      "filePath": "dist/cjs/classes/flow-producer.js"
+    },
+    "functionQuery": {
+      "methodName": "add",
+      "className": "FlowProducer",
+      "kind": "Async"
+    },
+    "channelName": "FlowProducer_add"
+  },
+  {
+    "module": {
+      "name": "bullmq",
+      "versionRange": ">=5.66.0",
+      "filePath": "dist/esm/classes/queue.js"
+    },
+    "functionQuery": {
+      "methodName": "add",
+      "className": "Queue",
+      "kind": "Async"
+    },
+    "channelName": "Queue_add"
+  },
+  {
+    "module": {
+      "name": "bullmq",
+      "versionRange": ">=5.66.0",
+      "filePath": "dist/esm/classes/queue.js"
+    },
+    "functionQuery": {
+      "methodName": "addBulk",
+      "className": "Queue",
+      "kind": "Async"
+    },
+    "channelName": "Queue_addBulk"
+  },
+  {
+    "module": {
+      "name": "bullmq",
+      "versionRange": ">=5.66.0",
+      "filePath": "dist/esm/classes/worker.js"
+    },
+    "functionQuery": {
+      "methodName": "callProcessJob",
+      "className": "Worker",
+      "kind": "Async"
+    },
+    "channelName": "Worker_callProcessJob"
+  },
+  {
+    "module": {
+      "name": "bullmq",
+      "versionRange": ">=5.66.0",
+      "filePath": "dist/esm/classes/flow-producer.js"
+    },
+    "functionQuery": {
+      "methodName": "add",
+      "className": "FlowProducer",
+      "kind": "Async"
+    },
+    "channelName": "FlowProducer_add"
+  }
+]

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

@@ -1,5 +1,6 @@
 'use strict'
 
 module.exports = [
-  ...require('./langchain')
+  ...require('./langchain'),
+  ...require('./bullmq')
 ]

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const { channel } = require('./instrument')
 const shimmer = require('../../../datadog-shimmer')
+const { channel } = require('./instrument')
 
 const routerMountPaths = new WeakMap() // to track mount paths for router instances
 const layerMatchers = new WeakMap() // to store layer matchers

package/packages/datadog-instrumentations/src/helpers/shared-utils.js

@@ -0,0 +1,9 @@
+'use strict'
+
+function isRelativeRequire (moduleName) {
+  return moduleName.startsWith('./') || moduleName.startsWith('../')
+}
+
+module.exports = {
+  isRelativeRequire
+}

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

@@ -9,6 +9,10 @@ const {
 const routeChannel = channel('apm:hono:request:route')
 const handleChannel = channel('apm:hono:request:handle')
 const errorChannel = channel('apm:hono:request:error')
+const nextChannel = channel('apm:hono:middleware:next')
+const enterChannel = channel('apm:hono:middleware:enter')
+const exitChannel = channel('apm:hono:middleware:exit')
+const finishChannel = channel('apm:hono:middleware:finish')
 
 function wrapFetch (fetch) {
   return function (request, env, executionCtx) {
@@ -34,21 +38,62 @@ function wrapCompose (compose) {
 
     const instrumentedMiddlewares = middlewares.map(h => {
       const [[fn, meta], params] = h
-
-      const instrumentedFn = (...args) => {
-        const context = args[0]
-        routeChannel.publish({
-          req: context.env.incoming,
-          route: meta?.path
-        })
-        return fn(...args)
-      }
-      return [[instrumentedFn, meta], params]
+      return [[wrapMiddleware(fn, meta?.path), meta], params]
     })
     return compose.call(this, instrumentedMiddlewares, instrumentedOnError, onNotFound)
   }
 }
 
+function wrapNext (req, route, next) {
+  return shimmer.wrapFunction(
+    next,
+    (next) =>
+      function () {
+        nextChannel.publish({ req, route })
+
+        return next.apply(this, arguments)
+      }
+  )
+}
+
+function wrapMiddleware (middleware, route) {
+  const name = middleware.name
+  return shimmer.wrapFunction(
+    middleware,
+    (middleware) =>
+      function (context, next) {
+        const req = context.env.incoming
+        routeChannel.publish({ req, route })
+        enterChannel.publish({ req, name, route })
+        if (typeof next === 'function') {
+          arguments[1] = wrapNext(req, route, next)
+        }
+        try {
+          const result = middleware.apply(this, arguments)
+          if (result && typeof result.then === 'function') {
+            return result.then(
+              (result) => {
+                finishChannel.publish({ req })
+                return result
+              },
+              (error) => {
+                errorChannel.publish({ req, error })
+                throw error
+              }
+            )
+          }
+          finishChannel.publish({ req })
+          return result
+        } catch (error) {
+          errorChannel.publish({ req, error })
+          throw error
+        } finally {
+          exitChannel.publish({ req, route })
+        }
+      }
+  )
+}
+
 addHook({
   name: 'hono',
   versions: ['>=4'],

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

@@ -101,8 +101,8 @@ function patch (http, methodName) {
               case 'response': {
                 const res = arg
                 ctx.res = res
-                res.on('end', finish)
-                res.on(errorMonitor, finish)
+                res.once('end', finish)
+                res.once(errorMonitor, finish)
                 break
               }
               case 'connect':

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

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 const startCh = channel('apm:ioredis:command:start')
 const finishCh = channel('apm:ioredis:command:finish')

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

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 const startCh = channel('apm:iovalkey:command:start')
 const finishCh = channel('apm:iovalkey:command:finish')

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

@@ -1,9 +1,8 @@
 'use strict'
 
-const { addHook, channel } = require('./helpers/instrument')
+const path = require('path')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
-const path = require('path')
 const {
   getCoveredFilenamesFromCoverage,
   JEST_WORKER_TRACE_PAYLOAD_CODE,
@@ -21,6 +20,7 @@ const {
   getJestTestName,
   getJestSuitesToRun
 } = require('../../datadog-plugin-jest/src/util')
+const { addHook, channel } = require('./helpers/instrument')
 
 const testSessionStartCh = channel('ci:jest:session:start')
 const testSessionFinishCh = channel('ci:jest:session:finish')
@@ -93,6 +93,8 @@ const testsToBeRetried = new Set()
 const testSuiteAbsolutePathsWithFastCheck = new Set()
 
 const BREAKPOINT_HIT_GRACE_PERIOD_MS = 200
+const ATR_RETRY_SUPPRESSION_FLAG = '_ddDisableAtrRetry'
+const atrSuppressedErrors = new Map()
 
 // based on https://github.com/facebook/jest/blob/main/packages/jest-circus/src/formatNodeAssertErrors.ts#L41
 function formatJestError (errors) {
@@ -378,7 +380,10 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
           isNewTest = retriedTestsToNumAttempts.has(testName)
         }
 
-        if (this.isEarlyFlakeDetectionEnabled && (isNewTest || isModified)) {
+        const willRunEfd = this.isEarlyFlakeDetectionEnabled && (isNewTest || isModified)
+        event.test[ATR_RETRY_SUPPRESSION_FLAG] = Boolean(isAttemptToFix || willRunEfd)
+
+        if (!isAttemptToFix && willRunEfd) {
           numEfdRetry = retriedTestsToNumAttempts.get(testName)
           retriedTestsToNumAttempts.set(testName, numEfdRetry + 1)
         }
@@ -434,19 +439,22 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
 
         const testFullName = this.getTestNameFromAddTestEvent(event, state)
         const isSkipped = event.mode === 'todo' || event.mode === 'skip'
-        if (this.isTestManagementTestsEnabled) {
-          const isAttemptToFix = this.testManagementTestsForThisSuite?.attemptToFix?.includes(testFullName)
-          if (isAttemptToFix && !isSkipped && !retriedTestsToNumAttempts.has(testFullName)) {
-            retriedTestsToNumAttempts.set(testFullName, 0)
-            testsToBeRetried.add(testFullName)
-            this.retryTest({
-              jestEvent: event,
-              retryCount: testManagementAttemptToFixRetries,
-              retryType: 'Test Management (Attempt to Fix)'
-            })
-          }
+        const isAttemptToFix = this.isTestManagementTestsEnabled &&
+          this.testManagementTestsForThisSuite?.attemptToFix?.includes(testFullName)
+        if (
+          isAttemptToFix &&
+          !isSkipped &&
+          !retriedTestsToNumAttempts.has(testFullName)
+        ) {
+          retriedTestsToNumAttempts.set(testFullName, 0)
+          testsToBeRetried.add(testFullName)
+          this.retryTest({
+            jestEvent: event,
+            retryCount: testManagementAttemptToFixRetries,
+            retryType: 'Test Management (Attempt to Fix)'
+          })
         }
-        if (this.isImpactedTestsEnabled) {
+        if (!isAttemptToFix && this.isImpactedTestsEnabled) {
           const testStartLine = getTestLineStart(event.asyncError, this.testSuite)
           const testEndLine = getTestEndLine(event.fn, testStartLine)
           const isModified = isModifiedTest(
@@ -466,7 +474,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             })
           }
         }
-        if (this.isKnownTestsEnabled) {
+        if (!isAttemptToFix && this.isKnownTestsEnabled) {
           const isNew = !this.knownTestsForThisSuite.includes(testFullName)
           if (isNew && !isSkipped && !retriedTestsToNumAttempts.has(testFullName)) {
             retriedTestsToNumAttempts.set(testFullName, 0)
@@ -488,6 +496,13 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         }
         // restore in case it is retried
         event.test.fn = originalTestFns.get(event.test)
+        // If ATR retry is being suppressed for this test (due to EFD or Attempt to Fix taking precedence)
+        // and the test has errors for this attempt, store the errors temporarily and clear them
+        // so Jest won't treat this attempt as failed (the real status will be reported after retries).
+        if (event.test?.[ATR_RETRY_SUPPRESSION_FLAG] && event.test.errors?.length) {
+          atrSuppressedErrors.set(event.test, event.test.errors)
+          event.test.errors = []
+        }
 
         let attemptToFixPassed = false
         let attemptToFixFailed = false
@@ -581,6 +596,12 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
           await promises.isProbeReady
         }
       }
+      if (event.name === 'run_finish') {
+        for (const [test, errors] of atrSuppressedErrors) {
+          test.errors = errors
+        }
+        atrSuppressedErrors.clear()
+      }
       if (event.name === 'test_skip' || event.name === 'test_todo') {
         const testName = getJestTestName(event.test, this.getShouldStripSeedFromTestName())
         testSkippedCh.publish({

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

@@ -1,12 +1,12 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
+
+const log = require('../../dd-trace/src/log')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
-
-const log = require('../../dd-trace/src/log')
 
 const producerStartCh = channel('apm:kafkajs:produce:start')
 const producerCommitCh = channel('apm:kafkajs:produce:commit')

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

@@ -1,8 +1,8 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const { addHook, channel } = require('./helpers/instrument')
 const { wrapThen } = require('./helpers/promise')
-const shimmer = require('../../datadog-shimmer')
 
 const startRawQueryCh = channel('datadog:knex:raw:start')
 const rawQuerySubscribes = channel('datadog:knex:raw:subscribes')

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

@@ -90,7 +90,8 @@ function wrapMiddleware (fn, layer) {
     const req = ctx.req
 
     const path = layer && layer.path
-    const route = typeof path === 'string' && !path.endsWith('(.*)') && !path.endsWith('([^/]*)') && path
+    const route = typeof path === 'string' && !path.endsWith('(.*)') && !path.endsWith('([^/]*)') &&
+      !path.includes('(?:') && path
 
     enterChannel.publish({ req, name, route })
 

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

@@ -1,11 +1,11 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook,
   AsyncResource
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 function isString (value) {
   // eslint-disable-next-line unicorn/no-instanceof-builtins

package/packages/datadog-instrumentations/src/light-my-request.js

@@ -0,0 +1,93 @@
+'use strict'
+
+/**
+ * light-my-request instrumentation
+ *
+ * This instrumentation enables dd-trace to capture spans for Fastify inject() calls
+ * which use light-my-request internally. Without this, inject() bypasses the HTTP
+ * server instrumentation since it doesn't go through http.Server.emit('request').
+ *
+ * This is critical for platforms like Platformatic that use undici-thread-interceptor
+ * to route requests between worker threads using Fastify inject().
+ */
+
+const shimmer = require('../../datadog-shimmer')
+const {
+  channel,
+  addHook
+} = require('./helpers/instrument')
+
+// Reuse the same channels as HTTP server instrumentation
+const startServerCh = channel('apm:http:server:request:start')
+const exitServerCh = channel('apm:http:server:request:exit')
+const errorServerCh = channel('apm:http:server:request:error')
+const finishServerCh = channel('apm:http:server:request:finish')
+
+addHook({ name: 'light-my-request', versions: ['>=3'] }, (lightMyRequest) => {
+  // Wrap the inject function
+  return shimmer.wrapFunction(lightMyRequest, lightMyRequest => {
+    return function wrappedInject (dispatchFunc, options, callback) {
+      // If no subscribers, use original behavior
+      if (!startServerCh.hasSubscribers) {
+        return lightMyRequest.apply(this, arguments)
+      }
+
+      // Wrap the dispatch function to add tracing
+      const wrappedDispatch = wrapDispatchFunc(dispatchFunc)
+
+      // Call original with wrapped dispatch
+      return lightMyRequest.call(this, wrappedDispatch, options, callback)
+    }
+  })
+})
+
+function wrapDispatchFunc (dispatchFunc) {
+  return function tracedDispatch (req, res) {
+    const abortController = new AbortController()
+
+    // Link res.req like HTTP instrumentation does
+    res.req = req
+
+    // Publish start event (same as HTTP server)
+    startServerCh.publish({ req, res, abortController })
+
+    // Track when response finishes via 'finish' event (like HTTP instrumentation)
+    let finishCalled = false
+    const onFinish = () => {
+      if (!finishCalled) {
+        finishCalled = true
+        finishServerCh.publish({ req })
+      }
+    }
+
+    // light-my-request Response emits 'finish' when done
+    if (res.on && typeof res.on === 'function') {
+      res.once('finish', onFinish)
+      res.once('close', onFinish)
+    }
+
+    // Also wrap end() as fallback
+    const originalEnd = res.end
+    if (originalEnd) {
+      res.end = function wrappedEnd () {
+        const result = originalEnd.apply(this, arguments)
+        // Trigger finish if events don't fire
+        setImmediate(onFinish)
+        return result
+      }
+    }
+
+    try {
+      if (abortController.signal.aborted) {
+        return
+      }
+
+      return dispatchFunc.call(this, req, res)
+    } catch (err) {
+      errorServerCh.publish(err)
+      throw err
+    } finally {
+      exitServerCh.publish({ req })
+    }
+  }
+}

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const { addHook, AsyncResource } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { addHook, AsyncResource } = require('./helpers/instrument')
 
 function wrapRequest (original) {
   return function () {

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

@@ -1,8 +1,7 @@
 'use strict'
 
-const { channel, addHook } = require('./helpers/instrument')
-
 const shimmer = require('../../datadog-shimmer')
+const { channel, addHook } = require('./helpers/instrument')
 
 addHook({ name: 'lodash', versions: ['>=4'] }, lodash => {
   const lodashOperationCh = channel('datadog:lodash:operation')

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

@@ -1,8 +1,7 @@
 'use strict'
 
-const { channel, addHook } = require('./helpers/instrument')
-
 const shimmer = require('../../datadog-shimmer')
+const { channel, addHook } = require('./helpers/instrument')
 
 const commandAddCh = channel('apm:mariadb:command:add')
 const connectionStartCh = channel('apm:mariadb:connection:start')

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

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 addHook({ name: 'memcached', versions: ['>=2.2'] }, Memcached => {
   const startCh = channel('apm:memcached:command:start')

package/packages/datadog-instrumentations/src/mocha/main.js

@@ -5,7 +5,7 @@ const { addHook, channel } = require('../helpers/instrument')
 const shimmer = require('../../../datadog-shimmer')
 const { isMarkedAsUnskippable } = require('../../../datadog-plugin-jest/src/util')
 const log = require('../../../dd-trace/src/log')
-const { getEnvironmentVariable } = require('../../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../../dd-trace/src/config/helper')
 const {
   getTestSuitePath,
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,
@@ -282,7 +282,7 @@ function getExecutionConfiguration (runner, isParallel, frameworkVersion, onFini
     if (config.isTestManagementTestsEnabled) {
       ctx.onDone = onReceivedTestManagementTests
       testManagementTestsCh.runStores(ctx, () => {})
-    } if (config.isImpactedTestsEnabled) {
+    } else if (config.isImpactedTestsEnabled) {
       ctx.onDone = onReceivedImpactedTests
       modifiedFilesCh.runStores(ctx, () => {})
     } else if (config.isSuitesSkippingEnabled) {

package/packages/datadog-instrumentations/src/mocha/worker.js

@@ -67,7 +67,7 @@ addHook({
       return run.apply(this, arguments)
     }
     // We flush when the worker ends with its test file (a mocha instance in a worker runs a single test file)
-    this.on('end', () => {
+    this.once('end', () => {
       workerFinishCh.publish()
     })
     this.on('test', getOnTestHandler(false))

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 
 if (getEnvironmentVariable('MOCHA_WORKER_ID')) {
   require('./mocha/worker')

package/packages/datadog-instrumentations/src/mongodb-core.js

@@ -1,11 +1,11 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook,
   AsyncResource
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 const startCh = channel('apm:mongodb:query:start')
 const finishCh = channel('apm:mongodb:query:finish')

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

@@ -2,11 +2,11 @@
 
 require('./mongodb-core')
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 // collection methods with filter
 const collectionMethodsWithFilter = [

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

@@ -1,8 +1,8 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const { addHook, channel } = require('./helpers/instrument')
 const { wrapThen } = require('./helpers/promise')
-const shimmer = require('../../datadog-shimmer')
 
 const startCh = channel('datadog:mongoose:model:filter:start')
 const finishCh = channel('datadog:mongoose:model:filter:finish')

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

@@ -1,11 +1,11 @@
 'use strict'
 
 const dc = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 const prepareCh = channel('datadog:mquery:filter:prepare')
 const tracingCh = dc.tracingChannel('datadog:mquery:filter')

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const { channel, addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { channel, addHook } = require('./helpers/instrument')
 
 addHook({ name: 'mysql', file: 'lib/Connection.js', versions: ['>=2'] }, Connection => {
   const startCh = channel('apm:mysql:query:start')
@@ -39,7 +39,7 @@ addHook({ name: 'mysql', file: 'lib/Connection.js', versions: ['>=2'] }, Connect
             return finishCh.runStores(ctx, cb, this, error, result)
           })
         } else {
-          res.on('end', () => finishCh.publish(ctx))
+          res.once('end', () => finishCh.publish(ctx))
         }
 
         return res