dd-trace 5.133.0 → 5.134.0

package/ci/vitest-no-worker-init-runner-setup.mjs

@@ -2,7 +2,34 @@ try {
   // Vitest does not expose setFn from its public setup API; keep this optional for strict installers.
   const vitestRunner = await import('@vitest/runner')
   globalThis[Symbol.for('dd-trace.vitest.set-fn')] = vitestRunner.setFn
+  trackNativeRetryOptions(vitestRunner.getCurrentSuite())
 } catch {}
 globalThis[Symbol.for('dd-trace.vitest.browser-context-importer')] = () => import('@vitest/browser/context')
 
 await import('./vitest-no-worker-init-setup.mjs')
+
+/**
+ * Legacy Vitest inherits numeric retries and loses their origin during collection.
+ * These collectors and their chainable callbacks are created at runtime.
+ * @param {object} collector
+ */
+function trackNativeRetryOptions (collector) {
+  const original = collector.test.fn
+  collector.test.fn = function (name, optionsOrFn, fnOrOptions) {
+    const options = optionsOrFn !== null && typeof optionsOrFn === 'object' ? optionsOrFn : fnOrOptions
+    const length = collector.tasks.length
+    const result = original.apply(this, arguments)
+    if ((options?.retry !== undefined || collector.options?.retry !== undefined) && collector.tasks.length > length) {
+      const task = collector.tasks.at(-1)
+      task.meta = { ...task.meta, __ddTestOptNativeRetry: true }
+    }
+    return result
+  }
+  const push = collector.tasks.push
+  collector.tasks.push = function (...tasks) {
+    for (const task of tasks) {
+      if (task.type === 'collector') trackNativeRetryOptions(task)
+    }
+    return push.apply(this, tasks)
+  }
+}

package/index.d.ts

@@ -218,6 +218,7 @@ interface Tracer extends opentracing.Tracer {
    * @env DD_FEATURE_FLAGS_ENABLED
    * @env DD_FEATURE_FLAGS_CONFIGURATION_SOURCE
    * @env DD_FLAGGING_EVALUATION_COUNTS_ENABLED
+   * @env DD_FEATURE_FLAGS_EXPOSURES_DATADOG_LOGGING_ENABLED
    */
   openfeature: tracer.OpenFeatureProvider;
 
@@ -5076,11 +5077,14 @@ declare namespace tracer {
     }
 
     /**
-     * Declares the agent an `agent` span represents, reported as the agent's manifest. Only applies to
-     * `agent` spans. Unreportable values are dropped with a warning, and unset values (`undefined`, `null`,
-     * `''`, `[]`) leave what an earlier annotation declared in place.
+     * Declares the agent an `agent` span represents. `version` is set as an `agent_version` tag on the agent
+     * span and its child spans within the same process. The other fields are reported as the agent's manifest.
+     * Only applies to `agent` spans. Unreportable values are dropped with a warning, and unset values
+     * (`undefined`, `null`, `''`, `[]`) leave what an earlier annotation declared in place.
      */
     interface Agent {
+      /** The version of the agent. Must not contain a comma. */
+      version?: string,
       /** The agent's name. Defaults to the agent span's name. */
       name?: string,
       /** The system instructions the agent runs with. */
@@ -5176,8 +5180,8 @@ declare namespace tracer {
       prompt?: Prompt,
 
       /**
-       * Declares the agent running in this context, read when the context is entered. The manifest is
-       * reported on every `agent` span in the context, nested ones included. Use `annotate` on a nested agent
+       * Declares the agent running in this context, read when the context is entered. The version and manifest
+       * are reported on every `agent` span in the context, nested ones included. Use `annotate` on a nested agent
        * span to declare its own agent.
        */
       agent?: Agent,
@@ -5238,6 +5242,13 @@ declare namespace tracer {
        * If not provided for LLM or embedding spans, a default value of 'custom' will be set.
        */
       modelProvider?: string,
+
+      /**
+       * The version of the agent, set as an `agent_version` tag on the agent span and its child spans within the
+       * same process. Must not contain a comma. Only used on `agent` spans, and wins over a version declared by an
+       * enclosing `annotationContext`.
+       */
+      version?: string,
     }
 
     interface LLMObsNamedSpanOptions extends LLMObsSpanOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.133.0",
+  "version": "5.134.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -84,8 +84,8 @@
     "test:integration:appsec:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/appsec/*.spec.js\"",
     "test:integration:crashtracking": "mocha --timeout 60000 \"integration-tests/crashtracking/*.spec.js\"",
     "test:integration:bun": "mocha --timeout 60000 \"integration-tests/bun/*.spec.js\"",
-    "test:integration:cucumber": "mocha --timeout 60000 \"integration-tests/cucumber/*.spec.js\"",
-    "test:integration:cucumber:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/cucumber/*.spec.js\"",
+    "test:integration:cucumber": "mocha --timeout 60000 \"integration-tests/cucumber/${SPEC:-cucumber*}.spec.js\"",
+    "test:integration:cucumber:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/cucumber/${SPEC:-cucumber*}.spec.js\"",
     "test:integration:cypress": "mocha --timeout 60000 \"integration-tests/cypress/${SPEC:-cypress-*}.spec.js\"",
     "test:integration:cypress:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/cypress/${SPEC:-cypress-*}.spec.js\"",
     "test:integration:debugger": "mocha --timeout 60000 \"integration-tests/debugger/*.spec.js\"",
@@ -94,24 +94,25 @@
     "test:integration:esbuild": "mocha --timeout 60000 \"integration-tests/esbuild/*.spec.js\"",
     "test:integration:esbuild:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/esbuild/*.spec.js\"",
     "test:integration:turbopack": "mocha --timeout 60000 \"integration-tests/turbopack/*.spec.js\"",
+    "test:integration:vite": "mocha --timeout 60000 \"integration-tests/vite/*.spec.js\"",
     "test:integration:webpack": "mocha --timeout 60000 \"integration-tests/webpack/*.spec.js\"",
     "test:integration:openfeature": "mocha --timeout 60000 \"integration-tests/openfeature/*.spec.js\"",
     "test:integration:openfeature:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/openfeature/*.spec.js\"",
     "test:integration:jest": "mocha --timeout 60000 \"integration-tests/jest/${SPEC:-jest*}.spec.js\"",
     "test:integration:jest:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/jest/${SPEC:-jest*}.spec.js\"",
-    "test:integration:mocha": "mocha --timeout 60000 \"integration-tests/mocha/*.spec.js\"",
-    "test:integration:mocha:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/mocha/*.spec.js\"",
+    "test:integration:mocha": "mocha --timeout 60000 \"integration-tests/mocha/${SPEC:-mocha*}.spec.js\"",
+    "test:integration:mocha:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/mocha/${SPEC:-mocha*}.spec.js\"",
     "test:integration:playwright": "mocha --timeout 60000 \"integration-tests/playwright/${SPEC:-playwright-*}.spec.js\"",
     "test:integration:playwright:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/playwright/${SPEC:-playwright-*}.spec.js\"",
     "test:integration:selenium": "mocha --timeout 60000 \"integration-tests/selenium/*.spec.js\"",
     "test:integration:selenium:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/selenium/*.spec.js\"",
-    "test:integration:test-optimization:helpers": "mocha \"integration-tests/cypress/*dependencies.spec.js\" \"integration-tests/jest/*dependencies.spec.js\" \"integration-tests/playwright/version*.spec.js\"",
+    "test:integration:test-optimization:helpers": "mocha \"integration-tests/cypress/*dependencies.spec.js\" \"integration-tests/jest/*dependencies.spec.js\" \"integration-tests/playwright/version*.spec.js\" \"integration-tests/mocha/version*.spec.js\"",
     "test:integration:webdriverio": "mocha --timeout 60000 \"integration-tests/webdriverio/${SPEC:-*}.spec.js\"",
     "test:integration:webdriverio:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/webdriverio/${SPEC:-*}.spec.js\"",
     "test:integration:vitest": "mocha --timeout 60000 \"integration-tests/vitest/${SPEC:-vitest*}.spec.js\"",
     "test:integration:vitest:coverage": "node ./integration-tests/vitest/run-with-coverage.js --timeout 60000 \"integration-tests/vitest/${SPEC:-vitest*}.spec.js\"",
-    "test:integration:testopt": "mocha --timeout 120000 \"integration-tests/ci-visibility/*.spec.js\"",
-    "test:integration:testopt:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 120000 \"integration-tests/ci-visibility/*.spec.js\"",
+    "test:integration:testopt": "mocha --timeout 120000 \"integration-tests/ci-visibility/${SPEC:-*}.spec.js\"",
+    "test:integration:testopt:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 120000 \"integration-tests/ci-visibility/${SPEC:-*}.spec.js\"",
     "test:integration:profiler": "mocha --timeout 180000 \"integration-tests/profiler/*.spec.js\"",
     "test:integration:profiler:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 180000 \"integration-tests/profiler/*.spec.js\"",
     "test:integration:plugins": "yarn services && mocha \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/${SPEC:-*}*.spec.js\"",
@@ -186,7 +187,7 @@
   ],
   "dependencies": {
     "dc-polyfill": "^0.1.11",
-    "import-in-the-middle": "3.5.1",
+    "import-in-the-middle": "3.5.3",
     "opentracing": ">=0.14.7"
   },
   "optionalDependencies": {
@@ -204,7 +205,7 @@
   "devDependencies": {
     "@actions/core": "^3.0.1",
     "@actions/github": "^9.1.1",
-    "@babel/helpers": "^8.0.7",
+    "@babel/helpers": "^8.0.8",
     "@eslint/eslintrc": "^3.3.7",
     "@eslint/js": "^10.0.1",
     "@eslint/plugin-kit": "^0.7.3",
@@ -215,24 +216,24 @@
     "@stylistic/eslint-plugin": "^5.10.0",
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.106",
-    "@types/sinon": "^22.0.0",
+    "@types/sinon": "^22.0.1",
     "@vercel/nft": "^1.11.0",
     "@yarnpkg/lockfile": "^1.1.0",
     "benchmark": "^2.1.4",
-    "body-parser": "^2.3.0",
-    "bun": "1.4.3",
+    "body-parser": "^2.4.0",
+    "bun": "1.4.4",
     "c8": "^12.0.0",
     "codeowners-audit": "^2.9.0",
     "eslint": "^10.13.0",
     "eslint-plugin-cypress": "^7.0.2",
     "eslint-plugin-import-x": "^4.16.2",
-    "eslint-plugin-jsdoc": "^65.3.12",
+    "eslint-plugin-jsdoc": "^65.4.2",
     "eslint-plugin-mocha": "^12.0.2",
     "eslint-plugin-n": "^18.5.0",
     "eslint-plugin-promise": "^7.3.0",
     "eslint-plugin-regexp": "^3.3.1",
     "eslint-plugin-sonarjs": "^4.2.2",
-    "eslint-plugin-unicorn": "^74.0.0",
+    "eslint-plugin-unicorn": "^78.0.0",
     "express": "^5.3.0",
     "glob": "^10.4.5",
     "globals": "^17.13.0",
@@ -247,7 +248,7 @@
     "mocha": "^11.8.0",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.2",
-    "multer": "^2.4.0",
+    "multer": "^2.5.0",
     "nock": "^14.0.17",
     "node-preload": "^0.2.1",
     "nyc": "^18.0.0",

package/packages/datadog-instrumentations/index.js

@@ -2,4 +2,5 @@
 
 require('./src/helpers/bundler-register')
 require('./src/helpers/register')
-require('./src/helpers/rewriter/loader')
+// The extension is required: bundlers that prefer `.mjs` (e.g. Vite) would otherwise pick the ESM loader hook.
+require('./src/helpers/rewriter/loader.js')

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

@@ -129,6 +129,7 @@ let earlyFlakeDetectionRetryPolicy = EMPTY_EFD_RETRY_POLICY
 let earlyFlakeDetectionFaultyThreshold = 0
 let isEarlyFlakeDetectionFaulty = false
 let isFlakyTestRetriesEnabled = false
+let hasAutomaticRetries = false
 let isDynamicAtrEnabled = false
 let dynamicAtrBuckets
 let isKnownTestsEnabled = false
@@ -255,6 +256,7 @@ function configureParallelWorkerWorldParameters (options) {
   }
 
   options.worldParameters._ddIsFlakyTestRetriesEnabled = isFlakyTestRetriesEnabled
+  options.worldParameters._ddHasAutomaticRetries = hasAutomaticRetries
   options.worldParameters._ddNumTestRetries = numTestRetries
   options.worldParameters._ddIsDynamicAtrEnabled = isDynamicAtrEnabled
   options.worldParameters._ddDynamicAtrBuckets = dynamicAtrBuckets
@@ -298,6 +300,7 @@ function readParallelWorkerWorldParameters (options) {
 /**
  * @param {object} worldParameters
  * @param {boolean} [worldParameters._ddIsFlakyTestRetriesEnabled]
+ * @param {boolean} [worldParameters._ddHasAutomaticRetries]
  * @param {number} [worldParameters._ddNumTestRetries]
  * @param {boolean} [worldParameters._ddIsDynamicAtrEnabled]
  * @param {number[]} [worldParameters._ddDynamicAtrBuckets]
@@ -306,6 +309,7 @@ function readParallelWorkerWorldParameters (options) {
  */
 function readParallelWorkerAtrParameters (worldParameters) {
   isFlakyTestRetriesEnabled = !!worldParameters._ddIsFlakyTestRetriesEnabled
+  hasAutomaticRetries = !!worldParameters._ddHasAutomaticRetries
   numTestRetries = worldParameters._ddNumTestRetries ?? 0
   isDynamicAtrEnabled = !!worldParameters._ddIsDynamicAtrEnabled
   dynamicAtrBuckets = worldParameters._ddDynamicAtrBuckets
@@ -741,9 +745,10 @@ function publishRetriedAttempt (runner, state) {
   const nextAttempt = currentAttempt + 1
   const failedAttemptCtx = numAttemptToCtx.get(currentAttempt)
   const isFirstAttempt = currentAttempt === 0
-  const isAtrRetry = !isFirstAttempt && isFlakyTestRetriesEnabled
+  const isAtrRetry = !isFirstAttempt && state.hasAutomaticRetries
 
   if (isFirstAttempt && isDynamicAtrEnabled && isFlakyTestRetriesEnabled) {
+    state.hasAutomaticRetries = true
     state.dynamicAtrRetryCount = getDynamicAtrRetryCount(
       performance.now() - state.executionStart,
       earlyFlakeDetectionRetryPolicy,
@@ -755,7 +760,7 @@ function publishRetriedAttempt (runner, state) {
   }
 
   // ATR: record this attempt as failed so when run().finally runs (after retry) we have all statuses
-  if (isFlakyTestRetriesEnabled) {
+  if (state.hasAutomaticRetries) {
     const nameForKey = getCucumberTestName(runner.pickle.name, currentAttempt > 0)
     const atrKey = `${runner.pickle.uri}:${nameForKey}`
     if (atrStatusesByScenarioKey.has(atrKey)) {
@@ -831,7 +836,7 @@ function wrapRun (pl, isLatestVersion, version) {
     }
     const ctx = testStartPayload
     const promises = {}
-    const state = { numAttempt: 0, promises, testStartPayload }
+    const state = { numAttempt: 0, promises, testStartPayload, hasAutomaticRetries }
     numAttemptToCtx.set(state.numAttempt, ctx)
     runnerToRetryState.set(this, state)
     if (isTestManagementTestsEnabled && getTestProperties(testSuitePath, this.pickle.name).attemptToFix) {
@@ -961,7 +966,7 @@ function wrapRun (pl, isLatestVersion, version) {
 
         // ATR: accumulate statuses by stable scenario key (uri:name) so retries are grouped.
         // Cucumber appends " (attempt N)" or " (attempt N, retried)" to the scenario name; normalize for keying.
-        if (isFlakyTestRetriesEnabled && !isAttemptToFix && !isEfdRetry && numTestRetries > 0) {
+        if (state.hasAutomaticRetries && !isAttemptToFix && !isEfdRetry && numTestRetries > 0) {
           const atrKey = `${this.pickle.uri}:${testName}`
           if (atrStatusesByScenarioKey.has(atrKey)) {
             atrStatusesByScenarioKey.get(atrKey).push(status)
@@ -1010,7 +1015,7 @@ function wrapRun (pl, isLatestVersion, version) {
 
         // Notice that ATR is handled using cucumber native retries features.
         // Therefore, if we reach this point, we are certain that it's the last ATR execution
-        const isLastAtrRetry = isFlakyTestRetriesEnabled && !isAttemptToFix && !isEfdRetry &&
+        const isLastAtrRetry = state.hasAutomaticRetries && !isAttemptToFix && !isEfdRetry &&
           numTestRetries > 0 && this.maxAttempts > 1
 
         const statuses = lastStatusByPickleId.get(this.pickle.id)
@@ -1039,8 +1044,8 @@ function wrapRun (pl, isLatestVersion, version) {
           error,
           isNew,
           isEfdRetry,
-          isFlakyRetry: state.numAttempt > 0 && isFlakyTestRetriesEnabled,
-          isExternalRetry: state.numAttempt > 0 && !isFlakyTestRetriesEnabled,
+          isFlakyRetry: state.numAttempt > 0 && state.hasAutomaticRetries,
+          isExternalRetry: state.numAttempt > 0 && !state.hasAutomaticRetries,
           isAttemptToFix,
           isAttemptToFixRetry,
           hasFailedAllRetries,
@@ -1261,7 +1266,9 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
     const processArgv = process.argv.slice(2).join(' ')
     const command = getEnvironmentVariable('npm_lifecycle_script') || `cucumber-js ${processArgv}`
 
-    if (isFlakyTestRetriesEnabled && !options.retry && numTestRetries > 0) {
+    const originalRetryCount = options.retry
+    hasAutomaticRetries = isFlakyTestRetriesEnabled && !options.retry && numTestRetries > 0
+    if (hasAutomaticRetries) {
       options.retry = numTestRetries
     }
 
@@ -1303,6 +1310,8 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
         log.error('Cucumber test session finalization error: %s', finalizationError)
       }
       throw error
+    } finally {
+      if (hasAutomaticRetries) options.retry = originalRetryCount
     }
     const success = satisfies(frameworkVersion, '>=13.1.0') ? result.success : result
 

package/packages/datadog-instrumentations/src/helpers/bundler-register.js

@@ -4,7 +4,7 @@ const Module = require('module')
 const dc = require('dc-polyfill')
 
 const log = require('../../../dd-trace/src/log')
-const { activate, loadChannel } = require('./register.js')
+const { activate, loadChannel, registeredBuiltinNames } = require('./register.js')
 const {
   filename,
   getDisabledInstrumentations,
@@ -17,25 +17,44 @@ const { isRewriteActivationEnabled } = require('./rewriter/targets')
 const disabledInstrumentations = getDisabledInstrumentations()
 
 // register.js has now set up ritm (require-in-the-middle). In bundled
-// environments (webpack, esbuild), Node.js built-in modules required by
-// dd-trace internal modules (e.g. http from request.js) may have been loaded
-// before ritm was active. The bundler's module cache then returns those
-// pre-loaded modules for any subsequent require() calls, bypassing ritm.
-// Re-requiring them via the real Module.prototype.require ensures ritm applies
-// their instrumentation hooks.
+// environments (webpack, esbuild, Turbopack), Node.js built-ins required by the
+// application or by dd-trace itself may have been loaded and cached by the
+// bundle before ritm was active, bypassing it. Re-requiring them via the real
+// Module.prototype.require lets ritm apply their hooks to the shared exports.
 //
 // In regular Node.js, `module` is an instance of Module. In bundlers, the
 // module wrapper object is a plain object (not a Module instance), so we use
 // that to detect a bundled context and avoid unintended side-effects in
 // normal Node.js (e.g. shimmer-wrapping http before ESM modules load).
 if (!(module instanceof Module)) {
-  for (const name of ['http', 'https']) {
+  patchLoadedBuiltins()
+}
+
+function patchLoadedBuiltins () {
+  // A built-in nobody has loaded cannot be cached by the bundle yet, and a later require reaches ritm, so it is
+  // skipped. moduleLoadList is undocumented: if it ever disappears, every registered built-in is loaded instead.
+  // @ts-expect-error - process.moduleLoadList is not typed
+  const { moduleLoadList } = process
+  const loadedBuiltins = Array.isArray(moduleLoadList) ? moduleLoadList : undefined
+
+  let patched = false
+  for (const name of registeredBuiltinNames) {
+    if (loadedBuiltins?.includes(`NativeModule ${name}`) === false) continue
+
     try {
       Module.prototype.require.call(module, name)
+      patched = true
     } catch {
       // Built-in not available in this environment, skip
     }
   }
+
+  if (!patched) return
+  try {
+    Module.syncBuiltinESMExports()
+  } catch (error) {
+    log.error('Error synchronizing bundled built-in ESM exports: %s', String(error?.message ?? error), error)
+  }
 }
 
 const CHANNEL = 'dd-trace:bundler:load'

package/packages/datadog-instrumentations/src/helpers/hooks.js

@@ -97,6 +97,7 @@ module.exports = {
   'jest-config': () => require('../jest'),
   'jest-environment-node': () => require('../jest'),
   'jest-environment-jsdom': () => require('../jest'),
+  'jest-runner': () => require('../jest'),
   'jest-runtime': () => require('../jest'),
   'jest-worker': () => require('../jest'),
   knex: () => require('../knex'),

package/packages/datadog-instrumentations/src/helpers/register.js

@@ -15,6 +15,7 @@ const {
 } = require('./instrumentation-utils')
 const rewriter = require('./rewriter')
 const { getActivationSetup } = require('./rewriter/instrumentation-registry')
+const { isNodeBuiltinModuleName } = require('./shared-utils')
 
 const DD_TRACE_DEBUG = getValueFromEnvSources('DD_TRACE_DEBUG')
 
@@ -61,6 +62,11 @@ const alreadyLoggedIncompatibleIntegrations = new Set()
 const compatibleOrchestrionTargets = new Set()
 /** @type {Set<(activation: import('./rewriter/instrumentation-registry').Activation) => void>} */
 const blockedActivationSetups = new Set()
+/**
+ * Node.js built-ins that passed the disabled and serverless checks and received a hook.
+ * @type {string[]}
+ */
+const registeredBuiltinNames = []
 
 /**
  * @param {string} moduleName
@@ -124,6 +130,8 @@ for (const name of names) {
     hook = hook.fn
   }
 
+  if (isNodeBuiltinModuleName(name)) registeredBuiltinNames.push(name)
+
   Hook([name], hookOptions, (moduleExports, moduleName, moduleBaseDir, moduleVersion, isIitm) => {
     // All loaded versions are first expected to fail instrumentation.
     if (!instrumentedIntegrationsSuccess.has(`${name}@${moduleVersion}`)) {
@@ -214,4 +222,5 @@ module.exports = {
   filename,
   pathSepExpr,
   loadChannel,
+  registeredBuiltinNames,
 }

package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentation-registry.js

@@ -32,6 +32,7 @@ const registry = [
   },
   { instrumentations: require('./instrumentations/graphql') },
   { instrumentations: require('./instrumentations/graphql-jit') },
+  { instrumentations: require('./instrumentations/jest') },
   { activate: true, instrumentations: require('./instrumentations/langchain') },
   { activate: true, instrumentations: require('./instrumentations/langgraph') },
   { activate: true, instrumentations: require('./instrumentations/mercurius') },
@@ -39,6 +40,7 @@ const registry = [
   { instrumentations: require('./instrumentations/openai-agents') },
   { instrumentations: require('./instrumentations/playwright') },
   { activate: true, instrumentations: require('./instrumentations/postgres') },
+  { instrumentations: require('./instrumentations/vitest') },
   { instrumentations: require('./instrumentations/webdriverio') },
   {
     activate: { setup: () => require('../../aws-durable-execution-sdk-js') },

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

@@ -0,0 +1,12 @@
+'use strict'
+
+module.exports = [
+  ['>=24.8.0 <30.0.0', 'build/runTest.js'],
+  ['>=30.0.0', 'build/index.js'],
+  ['>=30.0.0', 'build/testWorker.js'],
+].map(([versionRange, filePath]) => ({
+  module: { name: 'jest-runner', versionRange, filePath },
+  // Wrap the returned promise so completion covers both successful and failed teardown.
+  functionQuery: { functionName: 'runTestInternal', kind: 'Sync' },
+  channelName: 'runTestInternal',
+}))

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

@@ -0,0 +1,8 @@
+'use strict'
+
+module.exports = ['dist/index.js', 'dist/chunk-hooks.js'].map(filePath => ({
+  module: { name: '@vitest/runner', versionRange: '>=1.6.0 <4.1.0', filePath },
+  astQuery: 'FunctionDeclaration[id.name="createSuiteCollector"] ' +
+    'VariableDeclarator[id.name="task"] > FunctionExpression',
+  channelName: 'createTestTask',
+}))

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

@@ -41,6 +41,8 @@
   "@supabase/realtime-js/dist/module/RealtimeChannel.js": "@supabase/realtime-js",
   "@supabase/storage-js/dist/index.cjs": "@supabase/storage-js",
   "@supabase/storage-js/dist/index.mjs": "@supabase/storage-js",
+  "@vitest/runner/dist/chunk-hooks.js": "@vitest/runner",
+  "@vitest/runner/dist/index.js": "@vitest/runner",
   "@wdio/cli/build/index.js": "@wdio/cli",
   "@wdio/config/build/node/index.js": "@wdio/config",
   "@wdio/jasmine-framework/build/index.js": "@wdio/jasmine-framework",
@@ -76,6 +78,9 @@
   "graphql/validation/validate.js": "graphql",
   "graphql/validation/validate.mjs": "graphql",
   "jasmine-core/lib/jasmine-core/jasmine.js": "jasmine-core",
+  "jest-runner/build/index.js": "jest-runner",
+  "jest-runner/build/runTest.js": "jest-runner",
+  "jest-runner/build/testWorker.js": "jest-runner",
   "mercurius/index.js": "mercurius",
   "playwright-core/lib/coreBundle.js": "playwright-core",
   "playwright/lib/common/config.js": "playwright",