dd-trace 5.90.0 → 5.92.0

package/index.d.ts

@@ -262,6 +262,7 @@ interface Plugins {
   "knex": tracer.plugins.knex;
   "koa": tracer.plugins.koa;
   "langchain": tracer.plugins.langchain;
+  "langgraph": tracer.plugins.langgraph;
   "mariadb": tracer.plugins.mariadb;
   "memcached": tracer.plugins.memcached;
   "microgateway-core": tracer.plugins.microgateway_core;
@@ -2579,6 +2580,12 @@ declare namespace tracer {
 
     /**
      * This plugin automatically instruments the
+     * [langgraph](https://github.com/npmjs/package/langgraph) library.
+     */
+    interface langgraph extends Instrumentation {}
+
+      /**
+     * This plugin automatically instruments the
      * [ldapjs](https://github.com/ldapjs/node-ldapjs/) module.
      */
     interface ldapjs extends Instrumentation {}

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "dd-trace",
-  "version": "5.90.0",
+  "version": "5.92.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
   "scripts": {
     "env": "bash ./plugin-env",
+    "prepare": "cd vendor && npm ci --include=dev",
     "preinstall": "node scripts/preinstall.js",
     "bench": "node benchmark/index.js",
     "bench:e2e:test-optimization": "node benchmark/e2e-test-optimization/benchmark-run.js",
@@ -142,17 +143,17 @@
     "@datadog/native-iast-taint-tracking": "4.1.0",
     "@datadog/native-metrics": "3.1.1",
     "@datadog/openfeature-node-server": "^1.1.0",
-    "@datadog/pprof": "5.13.5",
+    "@datadog/pprof": "5.14.0",
     "@datadog/wasm-js-rewriter": "5.0.1",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
     "@opentelemetry/api-logs": "<1.0.0",
-    "oxc-parser": "^0.116.0"
+    "oxc-parser": "^0.118.0"
   },
   "devDependencies": {
     "@actions/core": "^3.0.0",
     "@actions/github": "^9.0.0",
     "@babel/helpers": "^7.28.6",
-    "@eslint/eslintrc": "^3.3.1",
+    "@eslint/eslintrc": "^3.3.5",
     "@eslint/js": "^9.39.2",
     "@msgpack/msgpack": "^3.1.3",
     "@openfeature/core": "^1.8.1",
@@ -165,11 +166,11 @@
     "benchmark": "^2.1.4",
     "body-parser": "^2.2.2",
     "bun": "1.3.10",
-    "codeowners-audit": "^2.7.1",
+    "codeowners-audit": "^2.9.0",
     "eslint": "^9.39.2",
-    "eslint-plugin-cypress": "^6.1.0",
+    "eslint-plugin-cypress": "^6.2.0",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jsdoc": "^62.5.0",
+    "eslint-plugin-jsdoc": "^62.8.0",
     "eslint-plugin-mocha": "^11.2.0",
     "eslint-plugin-n": "^17.23.2",
     "eslint-plugin-promise": "^7.2.1",

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

@@ -12,7 +12,7 @@ const {
 const childProcessChannel = dc.tracingChannel('datadog:child_process:execution')
 
 // ignored exec method because it calls to execFile directly
-const execAsyncMethods = ['execFile', 'spawn']
+const execAsyncMethods = ['execFile', 'spawn', 'fork']
 
 const names = ['child_process', 'node:child_process']
 
@@ -97,8 +97,10 @@ function wrapChildProcessSyncMethod (returnError, shell = false) {
         return childProcessMethod.apply(this, arguments)
       }
 
-      const childProcessInfo = normalizeArgs(arguments, shell)
+      const callArgs = [...arguments]
+      const childProcessInfo = normalizeArgs(callArgs, shell)
       const context = createContextFromChildProcessInfo(childProcessInfo)
+      context.callArgs = callArgs
 
       return childProcessChannel.start.runStores(context, () => {
         try {
@@ -108,7 +110,7 @@ function wrapChildProcessSyncMethod (returnError, shell = false) {
             return returnError(error, context)
           }
 
-          const result = childProcessMethod.apply(this, arguments)
+          const result = childProcessMethod.apply(this, context.callArgs)
           context.result = result
 
           return result
@@ -131,9 +133,11 @@ function wrapChildProcessCustomPromisifyMethod (customPromisifyMethod, shell) {
       return customPromisifyMethod.apply(this, arguments)
     }
 
-    const childProcessInfo = normalizeArgs(arguments, shell)
+    const callArgs = [...arguments]
+    const childProcessInfo = normalizeArgs(callArgs, shell)
 
     const context = createContextFromChildProcessInfo(childProcessInfo)
+    context.callArgs = callArgs
 
     const { start, end, asyncStart, asyncEnd, error } = childProcessChannel
     start.publish(context)
@@ -143,7 +147,7 @@ function wrapChildProcessCustomPromisifyMethod (customPromisifyMethod, shell) {
       result = Promise.reject(context.abortController.signal.reason || new Error('Aborted'))
     } else {
       try {
-        result = customPromisifyMethod.apply(this, arguments)
+        result = customPromisifyMethod.apply(this, context.callArgs)
       } catch (error) {
         context.error = error
         error.publish(context)
@@ -181,9 +185,11 @@ function wrapChildProcessAsyncMethod (ChildProcess, shell = false) {
         return childProcessMethod.apply(this, arguments)
       }
 
-      const childProcessInfo = normalizeArgs(arguments, shell)
+      const callArgs = [...arguments]
+      const childProcessInfo = normalizeArgs(callArgs, shell)
 
       const context = createContextFromChildProcessInfo(childProcessInfo)
+      context.callArgs = callArgs
       return childProcessChannel.start.runStores(context, () => {
         let childProcess
         if (context.abortController.signal.aborted) {
@@ -194,7 +200,7 @@ function wrapChildProcessAsyncMethod (ChildProcess, shell = false) {
             const error = context.abortController.signal.reason || new Error('Aborted')
             childProcess.emit('error', error)
 
-            const cb = arguments[arguments.length - 1]
+            const cb = context.callArgs[context.callArgs.length - 1]
             if (typeof cb === 'function') {
               cb(error)
             }
@@ -202,7 +208,7 @@ function wrapChildProcessAsyncMethod (ChildProcess, shell = false) {
             childProcess.emit('close')
           })
         } else {
-          childProcess = childProcessMethod.apply(this, arguments)
+          childProcess = childProcessMethod.apply(this, context.callArgs)
         }
 
         if (childProcess) {

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

@@ -166,9 +166,9 @@ function getErrorFromCucumberResult (cucumberResult) {
   return error
 }
 
-function getChannelPromise (channelToPublishTo, isParallel = false, frameworkVersion = null) {
+function getChannelPromise (channelToPublishTo, frameworkVersion = null) {
   return new Promise(resolve => {
-    channelToPublishTo.publish({ onDone: resolve, isParallel, frameworkVersion })
+    channelToPublishTo.publish({ onDone: resolve, frameworkVersion })
   })
 }
 
@@ -505,7 +505,7 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
     }
     let errorSkippableRequest
 
-    const configurationResponse = await getChannelPromise(libraryConfigurationCh, isParallel, frameworkVersion)
+    const configurationResponse = await getChannelPromise(libraryConfigurationCh, frameworkVersion)
 
     isEarlyFlakeDetectionEnabled = configurationResponse.libraryConfig?.isEarlyFlakeDetectionEnabled
     earlyFlakeDetectionNumRetries = configurationResponse.libraryConfig?.earlyFlakeDetectionNumRetries
@@ -681,6 +681,7 @@ function getWrappedRunTestCase (runTestCaseFunction, isNewerCucumberVersion = fa
     let isQuarantined = false
     let isModified = false
 
+    const originalDryRun = this.options.dryRun
     if (isTestManagementTestsEnabled) {
       const testProperties = getTestProperties(testSuitePath, pickle.name)
       isAttemptToFix = testProperties.attemptToFix
@@ -719,6 +720,9 @@ function getWrappedRunTestCase (runTestCaseFunction, isNewerCucumberVersion = fa
     // TODO: for >=11 we could use `runTestCaseResult` instead of accumulating results in `lastStatusByPickleId`
     let runTestCaseResult = await runTestCaseFunction.apply(this, arguments)
 
+    // Restore dryRun so it doesn't affect subsequent tests in the same worker
+    this.options.dryRun = originalDryRun
+
     const testStatuses = lastStatusByPickleId.get(pickle.id)
     const lastTestStatus = testStatuses.at(-1)
 
@@ -1053,6 +1057,12 @@ addHook({
     this.options.worldParameters._ddIsFlakyTestRetriesEnabled = isFlakyTestRetriesEnabled
     this.options.worldParameters._ddNumTestRetries = numTestRetries
 
+    if (isTestManagementTestsEnabled) {
+      this.options.worldParameters._ddIsTestManagementTestsEnabled = true
+      this.options.worldParameters._ddTestManagementTests = testManagementTests
+      this.options.worldParameters._ddTestManagementAttemptToFixRetries = testManagementAttemptToFixRetries
+    }
+
     return startWorker.apply(this, arguments)
   })
   return adapterPackage
@@ -1090,6 +1100,11 @@ addHook({
       }
       isFlakyTestRetriesEnabled = !!this.options.worldParameters._ddIsFlakyTestRetriesEnabled
       numTestRetries = this.options.worldParameters._ddNumTestRetries ?? 0
+      isTestManagementTestsEnabled = !!this.options.worldParameters._ddIsTestManagementTestsEnabled
+      if (isTestManagementTestsEnabled) {
+        testManagementTests = this.options.worldParameters._ddTestManagementTests
+        testManagementAttemptToFixRetries = this.options.worldParameters._ddTestManagementAttemptToFixRetries
+      }
     }
   )
   return workerPackage

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

@@ -277,7 +277,7 @@ function assertField (rootCtx, info, args) {
   let field = fields[pathString]
 
   if (!field) {
-    const fieldCtx = { info, rootCtx, args }
+    const fieldCtx = { info, rootCtx, args, path, pathString }
     startResolveCh.publish(fieldCtx)
     field = fields[pathString] = {
       error: null,

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

@@ -4,6 +4,7 @@ module.exports = {
   '@anthropic-ai/sdk': { esmFirst: true, fn: () => require('../anthropic') },
   '@apollo/server': () => require('../apollo-server'),
   '@apollo/gateway': () => require('../apollo'),
+  '@langchain/langgraph': { esmFirst: true, fn: () => require('../langgraph') },
   'apollo-server-core': () => require('../apollo-server-core'),
   '@aws-sdk/smithy-client': () => require('../aws-sdk'),
   '@azure/event-hubs': () => require('../azure-event-hubs'),

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

@@ -4,4 +4,5 @@ module.exports = [
   ...require('./ai'),
   ...require('./bullmq'),
   ...require('./langchain'),
+  ...require('./langgraph'),
 ]

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

@@ -0,0 +1,30 @@
+'use strict'
+
+module.exports = [
+  {
+    module: {
+      name: '@langchain/langgraph',
+      versionRange: '>=1.1.2',
+      filePath: 'dist/pregel/index.js',
+    },
+    functionQuery: {
+      methodName: 'stream',
+      className: 'Pregel',
+      kind: 'AsyncIterator',
+    },
+    channelName: 'Pregel_stream',
+  },
+  {
+    module: {
+      name: '@langchain/langgraph',
+      versionRange: '>=1.1.2',
+      filePath: 'dist/pregel/index.cjs',
+    },
+    functionQuery: {
+      methodName: 'stream',
+      className: 'Pregel',
+      kind: 'AsyncIterator',
+    },
+    channelName: 'Pregel_stream',
+  },
+]

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

@@ -702,11 +702,15 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         const mightHitBreakpoint = this.isDiEnabled && numTestExecutions >= 2
 
         const ctx = testContexts.get(event.test)
+        if (!ctx) {
+          log.warn('"ci:jest:test_done": no context found for test "%s"', testName)
+          return
+        }
 
         const finalStatus = this.getFinalStatus(testName,
           status,
-          !!ctx?.isNew,
-          !!ctx?.isModified,
+          !!ctx.isNew,
+          !!ctx.isModified,
           isEfdRetry,
           isAttemptToFix,
           numTestExecutions)
@@ -761,6 +765,9 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         efdDeterminedRetries.clear()
         efdSlowAbortedTests.clear()
         efdNewTestCandidates.clear()
+        retriedTestsToNumAttempts.clear()
+        attemptToFixRetriedTestsStatuses.clear()
+        testsToBeRetried.clear()
       }
       if (event.name === 'test_skip' || event.name === 'test_todo') {
         const testName = getJestTestName(event.test, this.getShouldStripSeedFromTestName())

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

@@ -0,0 +1,7 @@
+'use strict'
+
+const { addHook, getHooks } = require('./helpers/instrument')
+
+for (const hook of getHooks('@langchain/langgraph')) {
+  addHook(hook, exports => exports)
+}

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

@@ -101,12 +101,12 @@ function getFilteredSuites (originalSuites) {
   }, { suitesToRun: [], skippedSuites: new Set() })
 }
 
-function getOnStartHandler (isParallel, frameworkVersion) {
+function getOnStartHandler (frameworkVersion) {
   return function () {
     const processArgv = process.argv.slice(2).join(' ')
     const command = `mocha ${processArgv}`
     testSessionStartCh.publish({ command, frameworkVersion })
-    if (!isParallel && skippedSuites.length) {
+    if (skippedSuites.length) {
       itrSkippedSuitesCh.publish({ skippedSuites, frameworkVersion })
     }
   }
@@ -315,8 +315,7 @@ function getExecutionConfiguration (runner, isParallel, frameworkVersion, onFini
     config.isTestManagementTestsEnabled = libraryConfig.isTestManagementEnabled
     config.testManagementAttemptToFixRetries = libraryConfig.testManagementAttemptToFixRetries
     config.isImpactedTestsEnabled = libraryConfig.isImpactedTestsEnabled
-    // ITR is not supported in parallel mode yet
-    config.isSuitesSkippingEnabled = !isParallel && libraryConfig.isSuitesSkippingEnabled
+    config.isSuitesSkippingEnabled = libraryConfig.isSuitesSkippingEnabled
     config.isFlakyTestRetriesEnabled = libraryConfig.isFlakyTestRetriesEnabled
     config.flakyTestRetriesCount = libraryConfig.flakyTestRetriesCount
 
@@ -452,7 +451,7 @@ addHook({
 
     const { suitesByTestFile, numSuitesByTestFile } = getSuitesByTestFile(this.suite)
 
-    this.once('start', getOnStartHandler(false, frameworkVersion))
+    this.once('start', getOnStartHandler(frameworkVersion))
 
     this.once('end', getOnEndHandler(false))
 
@@ -623,9 +622,16 @@ addHook({
       return run.apply(this, arguments)
     }
 
-    this.once('start', getOnStartHandler(true, frameworkVersion))
+    this.once('start', getOnStartHandler(frameworkVersion))
     this.once('end', getOnEndHandler(true))
 
+    // Populate unskippable suites before config is fetched (matches serial mode at Mocha.prototype.run)
+    for (const filePath of files) {
+      if (isMarkedAsUnskippable({ path: filePath })) {
+        unskippableSuites.push(filePath)
+      }
+    }
+
     getExecutionConfiguration(this, true, frameworkVersion, () => {
       if (config.isKnownTestsEnabled) {
         const testSuites = files.map(file => getTestSuitePath(file, process.cwd()))
@@ -640,7 +646,25 @@ addHook({
           config.isEarlyFlakeDetectionFaulty = true
         }
       }
-      run.apply(this, arguments)
+      if (config.isSuitesSkippingEnabled && suitesToSkip.length) {
+        const filteredFiles = []
+        const skippedFiles = []
+        for (const file of files) {
+          const testPath = getTestSuitePath(file, process.cwd())
+          const shouldSkip = suitesToSkip.includes(testPath)
+          const isUnskippable = unskippableSuites.includes(file)
+          if (shouldSkip && !isUnskippable) {
+            skippedFiles.push(testPath)
+          } else {
+            filteredFiles.push(file)
+          }
+        }
+        isSuitesSkipped = skippedFiles.length > 0
+        skippedSuites = skippedFiles
+        run.apply(this, [cb, { files: filteredFiles }])
+      } else {
+        run.apply(this, arguments)
+      }
     })
 
     return this
@@ -694,8 +718,7 @@ addHook({
     if (config.isTestManagementTestsEnabled) {
       const testSuiteTestManagementTests = config.testManagementTests?.mocha?.suites?.[testPath] || {}
       newWorkerArgs._ddIsTestManagementTestsEnabled = true
-      // TODO: attempt to fix does not work in parallel mode yet
-      // newWorkerArgs._ddTestManagementAttemptToFixRetries = config.testManagementAttemptToFixRetries
+      newWorkerArgs._ddTestManagementAttemptToFixRetries = config.testManagementAttemptToFixRetries
       newWorkerArgs._ddTestManagementTests = {
         mocha: {
           suites: {

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

@@ -140,7 +140,6 @@ function runnableWrapper (RunnablePackage, libraryConfig) {
     if (!testFinishCh.hasSubscribers) {
       return run.apply(this, arguments)
     }
-    // Flaky test retries does not work in parallel mode
     if (libraryConfig?.isFlakyTestRetriesEnabled) {
       this.retries(libraryConfig?.flakyTestRetriesCount)
     }

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

@@ -43,10 +43,10 @@ addHook({
     }
     if (this.options._ddIsTestManagementTestsEnabled) {
       config.isTestManagementTestsEnabled = true
-      // TODO: attempt to fix does not work in parallel mode yet
-      // config.testManagementAttemptToFixRetries = this.options._ddTestManagementAttemptToFixRetries
+      config.testManagementAttemptToFixRetries = this.options._ddTestManagementAttemptToFixRetries
       config.testManagementTests = this.options._ddTestManagementTests
       delete this.options._ddIsTestManagementTestsEnabled
+      delete this.options._ddTestManagementAttemptToFixRetries
       delete this.options._ddTestManagementTests
     }
     if (this.options._ddIsFlakyTestRetriesEnabled) {

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

@@ -146,8 +146,23 @@ function isReporterPackageNewest (vitestPackage) {
   return vitestPackage.h?.name === 'BaseSequencer'
 }
 
-function isBaseSequencer (vitestPackage) {
-  return vitestPackage.b?.name === 'BaseSequencer'
+/**
+ * Finds an export by its `.name` property in a minified vitest chunk.
+ * Minified export keys change across versions, so we search by function/class name.
+ * @param {object} pkg - The module exports object
+ * @param {string} name - The `.name` value to look for
+ * @returns {{ key: string, value: Function } | undefined}
+ */
+function findExportByName (pkg, name) {
+  for (const [key, value] of Object.entries(pkg)) {
+    if (value?.name === name) {
+      return { key, value }
+    }
+  }
+}
+
+function getBaseSequencerExport (vitestPackage) {
+  return findExportByName(vitestPackage, 'BaseSequencer')
 }
 
 function getChannelPromise (channelToPublishTo, frameworkVersion) {
@@ -157,19 +172,19 @@ function getChannelPromise (channelToPublishTo, frameworkVersion) {
 }
 
 function isCliApiPackage (vitestPackage) {
-  return vitestPackage.s?.name === 'startVitest'
+  return !!findExportByName(vitestPackage, 'startVitest')
 }
 
-function isTestPackage (testPackage) {
-  return testPackage.V?.name === 'VitestTestRunner'
+function getTestRunnerExport (testPackage) {
+  return findExportByName(testPackage, 'VitestTestRunner') || findExportByName(testPackage, 'TestRunner')
 }
 
-function hasForksPoolWorker (vitestPackage) {
-  return vitestPackage.f?.name === 'ForksPoolWorker'
+function getForksPoolWorkerExport (vitestPackage) {
+  return findExportByName(vitestPackage, 'ForksPoolWorker')
 }
 
-function hasThreadsPoolWorker (vitestPackage) {
-  return vitestPackage.T?.name === 'ThreadsPoolWorker'
+function getThreadsPoolWorkerExport (vitestPackage) {
+  return findExportByName(vitestPackage, 'ThreadsPoolWorker')
 }
 
 function getSessionStatus (state) {
@@ -447,7 +462,11 @@ function getCliOrStartVitestWrapper (frameworkVersion) {
 }
 
 function getCreateCliWrapper (vitestPackage, frameworkVersion) {
-  shimmer.wrap(vitestPackage, 'c', getCliOrStartVitestWrapper(frameworkVersion))
+  const createCliExport = findExportByName(vitestPackage, 'createCLI')
+  if (!createCliExport) {
+    return vitestPackage
+  }
+  shimmer.wrap(vitestPackage, createCliExport.key, getCliOrStartVitestWrapper(frameworkVersion))
 
   return vitestPackage
 }
@@ -534,27 +553,30 @@ function getStartVitestWrapper (cliApiPackage, frameworkVersion) {
   if (!isCliApiPackage(cliApiPackage)) {
     return cliApiPackage
   }
-  shimmer.wrap(cliApiPackage, 's', getCliOrStartVitestWrapper(frameworkVersion))
+  const startVitestExport = findExportByName(cliApiPackage, 'startVitest')
+  shimmer.wrap(cliApiPackage, startVitestExport.key, getCliOrStartVitestWrapper(frameworkVersion))
 
-  if (hasForksPoolWorker(cliApiPackage)) {
+  const forksPoolWorker = getForksPoolWorkerExport(cliApiPackage)
+  if (forksPoolWorker) {
     // function is async
-    shimmer.wrap(cliApiPackage.f.prototype, 'start', start => function () {
+    shimmer.wrap(forksPoolWorker.value.prototype, 'start', start => function () {
       vitestPool = 'child_process'
       this.env.DD_VITEST_WORKER = '1'
 
       return start.apply(this, arguments)
     })
-    shimmer.wrap(cliApiPackage.f.prototype, 'on', getWrappedOn)
+    shimmer.wrap(forksPoolWorker.value.prototype, 'on', getWrappedOn)
   }
 
-  if (hasThreadsPoolWorker(cliApiPackage)) {
+  const threadsPoolWorker = getThreadsPoolWorkerExport(cliApiPackage)
+  if (threadsPoolWorker) {
     // function is async
-    shimmer.wrap(cliApiPackage.T.prototype, 'start', start => function () {
+    shimmer.wrap(threadsPoolWorker.value.prototype, 'start', start => function () {
       vitestPool = 'worker_threads'
       this.env.DD_VITEST_WORKER = '1'
       return start.apply(this, arguments)
     })
-    shimmer.wrap(cliApiPackage.T.prototype, 'on', getWrappedOn)
+    shimmer.wrap(threadsPoolWorker.value.prototype, 'on', getWrappedOn)
   }
   return cliApiPackage
 }
@@ -747,7 +769,10 @@ function wrapVitestTestRunner (VitestTestRunner) {
     }
 
     const lastExecutionStatus = task.result.state
-    const shouldFlipStatus = isEarlyFlakeDetectionEnabled || attemptToFixTasks.has(task)
+    const isAtf = attemptToFixTasks.has(task)
+    const isQuarantinedOrDisabledAtf = isAtf && (quarantinedTasks.has(task) || disabledTasks.has(task))
+    const shouldTrackStatuses = isEarlyFlakeDetectionEnabled || isAtf
+    const shouldFlipStatus = isEarlyFlakeDetectionEnabled || isQuarantinedOrDisabledAtf
     const statuses = taskToStatuses.get(task)
 
     // These clauses handle task.repeats, whether EFD is enabled or not
@@ -765,8 +790,10 @@ function wrapVitestTestRunner (VitestTestRunner) {
         } else {
           testPassCh.publish({ task, ...ctx.currentStore })
         }
-        if (shouldFlipStatus) {
+        if (shouldTrackStatuses) {
           statuses.push(lastExecutionStatus)
+        }
+        if (shouldFlipStatus) {
           // If we don't "reset" the result.state to "pass", once a repetition fails,
           // vitest will always consider the test as failed, so we can't read the actual status
           // This means that we change vitest's behavior:
@@ -776,7 +803,7 @@ function wrapVitestTestRunner (VitestTestRunner) {
         }
       }
     } else if (numRepetition === task.repeats) {
-      if (shouldFlipStatus) {
+      if (shouldTrackStatuses) {
         statuses.push(lastExecutionStatus)
       }
 
@@ -864,11 +891,12 @@ addHook({
   versions: ['>=4.0.0'],
   filePattern: 'dist/chunks/test.*',
 }, (testPackage) => {
-  if (!isTestPackage(testPackage)) {
+  const testRunner = getTestRunnerExport(testPackage)
+  if (!testRunner) {
     return testPackage
   }
 
-  wrapVitestTestRunner(testPackage.V)
+  wrapVitestTestRunner(testRunner.value)
 
   return testPackage
 })
@@ -937,8 +965,9 @@ addHook({
   versions: ['>=3.0.9'],
   filePattern: 'dist/chunks/coverage.*',
 }, (coveragePackage) => {
-  if (isBaseSequencer(coveragePackage)) {
-    shimmer.wrap(coveragePackage.b.prototype, 'sort', getSortWrapper)
+  const baseSequencer = getBaseSequencerExport(coveragePackage)
+  if (baseSequencer) {
+    shimmer.wrap(baseSequencer.value.prototype, 'sort', getSortWrapper)
   }
   return coveragePackage
 })

package/packages/datadog-plugin-cypress/src/cypress-plugin.js

@@ -607,7 +607,7 @@ class CypressPlugin {
           [TEST_SESSION_NAME]: testSessionName,
         }
       }
-      const libraryCapabilitiesTags = getLibraryCapabilitiesTags(this.constructor.id, false, this.frameworkVersion)
+      const libraryCapabilitiesTags = getLibraryCapabilitiesTags(this.constructor.id, this.frameworkVersion)
       metadataTags.test = {
         ...metadataTags.test,
         ...libraryCapabilitiesTags,

package/packages/datadog-plugin-cypress/src/support.js

@@ -61,18 +61,16 @@ Cypress.on('fail', (err, runnable) => {
   }
 
   const testName = runnable.fullTitle()
-  const { isQuarantined, isAttemptToFix } = getTestProperties(testName)
+  const { isQuarantined, isDisabled } = getTestProperties(testName)
 
-  // For pure quarantined tests (not attemptToFix), suppress the failure
-  // This makes the test "pass" from Cypress's perspective while we still track the error
-  if (isQuarantined && !isAttemptToFix) {
-    // Store the error so we can report it to Datadog in afterEach
+  // Suppress failures for quarantined or disabled tests so they don't affect the exit code.
+  // This applies regardless of attempt-to-fix status: per spec, quarantined/disabled test
+  // results are always ignored.
+  if (isQuarantined || isDisabled) {
     quarantinedTestErrors.set(testName, err)
-    // Don't re-throw - this prevents Cypress from marking the test as failed
     return
   }
 
-  // For all other tests (including attemptToFix), let the error propagate normally
   throw err
 })
 

package/packages/datadog-plugin-graphql/src/execute.js

@@ -58,8 +58,8 @@ function addVariableTags (config, span, variableValues) {
 
   if (variableValues && config.variables) {
     const variables = config.variables(variableValues)
-    for (const param in variables) {
-      tags[`graphql.variables.${param}`] = variables[param]
+    for (const [param, value] of Object.entries(variables)) {
+      tags[`graphql.variables.${param}`] = value
     }
   }