From 5925132bb26bd26ce632f9c5e8dab7e806cddd7f Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Mon, 27 Jul 2026 21:51:49 +0200
Subject: [PATCH 01/43] chore(eslint): update eslint-plugin-unicorn to 72
 (#9503)

Activate Node.js 18 compatible rules that remove redundant syntax and catch correctness issues.

1. Skip esbuild resolution for built-in modules without package paths.
2. Contain detached Cucumber finalizer rejections without changing the returned test promise.
3. Preserve datastream varint continuation bits at 0x80 boundaries.
4. Avoid buffering Electron traces when the trace channel has no subscribers.
5. Replace regex-based HTTP path splitting with a shared delimiter scan, reducing representative cost from 41.4 ns to 14.7 ns per call.
---
 .../generated-files.js                        |   2 +-
 .../generated-test-contract.js                |   4 +-
 .../manifest-scaffold.js                      |   3 +-
 .../runner-command.js                         |   2 +-
 .../scenarios/basic-reporting.js              |   2 +-
 .../scenarios/test-management.js              |   4 +-
 eslint.config.mjs                             | 108 ++++++--------
 package.json                                  |   2 +-
 packages/datadog-esbuild/index.js             |   6 +-
 packages/datadog-esbuild/src/utils.js         |   2 +-
 packages/datadog-esbuild/test/plugin.spec.js  |  30 ++++
 .../src/claude-agent-sdk.js                   |   8 +-
 .../datadog-instrumentations/src/cucumber.js  |  11 +-
 .../extract-package-and-module-path.js        |  10 ++
 .../src/helpers/register.js                   |   8 +-
 .../src/helpers/rewriter/index.js             |   1 +
 .../src/helpers/router-helper.js              |   2 +-
 .../src/http/client.js                        |   4 +-
 packages/datadog-instrumentations/src/jest.js |  22 ++-
 .../src/mocha/common.js                       |   4 +-
 .../src/moleculer/client.js                   |   2 +-
 .../src/playwright.js                         |   2 +-
 packages/datadog-instrumentations/src/rhea.js |   2 +-
 .../test/helpers/register.spec.js             |  15 ++
 .../datadog-plugin-aerospike/src/index.js     |   4 +-
 packages/datadog-plugin-amqplib/src/client.js |   2 +-
 .../datadog-plugin-amqplib/src/producer.js    |   2 +-
 .../src/services/eventbridge.js               |   4 +-
 .../src/services/stepfunctions.js             |   4 +-
 .../src/producer.js                           |   4 +-
 .../src/producer.js                           |   8 +-
 .../datadog-plugin-bullmq/src/producer.js     |   6 +-
 .../datadog-plugin-child_process/src/index.js |   6 +-
 .../src/scrub-cmd-params.js                   |  11 +-
 .../datadog-plugin-fastify/src/tracing.js     |   2 +-
 packages/datadog-plugin-fs/src/index.js       |   4 -
 .../datadog-plugin-graphql/src/execute.js     |   1 +
 .../src/tools/signature.js                    |   2 +-
 packages/datadog-plugin-http/src/client.js    |   3 +-
 packages/datadog-plugin-jest/src/index.js     |   5 +-
 .../datadog-plugin-langchain/src/tokens.js    |   4 +-
 packages/datadog-plugin-prisma/src/index.js   |   6 +-
 packages/datadog-plugin-rhea/src/producer.js  |   2 +-
 packages/datadog-plugin-undici/src/index.js   |   3 +-
 packages/datadog-webpack/index.js             |   4 +-
 .../src/appsec/downstream_requests.js         |   2 +-
 .../iast/analyzers/hardcoded-base-analyzer.js |   2 +-
 .../analyzers/hardcoded-password-analyzer.js  |   2 +-
 .../iast/analyzers/sql-injection-analyzer.js  |   2 +-
 .../taint-tracking/taint-tracking-impl.js     |   4 +-
 .../iast/vulnerabilities-formatter/utils.js   |   2 +-
 .../src/appsec/iast/vulnerability-reporter.js |   4 +-
 .../dd-trace/src/appsec/sdk/track_event.js    |   2 +-
 .../dd-trace/src/appsec/waf/waf_manager.js    |   2 +-
 .../exporters/ci-visibility-exporter.js       |   4 +-
 .../exporters/git/git_metadata.js             |   3 +-
 .../src/ci-visibility/requests/request.js     |   6 +-
 packages/dd-trace/src/datastreams/encoding.js |   7 +-
 .../debugger/devtools_client/probe_sampler.js |   5 +-
 .../src/debugger/devtools_client/send.js      |   3 +-
 .../devtools_client/snapshot/index.js         |   4 +-
 .../devtools_client/snapshot/redaction.js     |  18 ++-
 .../dd-trace/src/encode/tags-processors.js    |   4 +-
 packages/dd-trace/src/exporters/common/url.js |   8 +-
 .../dd-trace/src/exporters/electron/index.js  |   5 +-
 .../dd-trace/src/external-logger/src/index.js |   3 +-
 packages/dd-trace/src/flare/index.js          |   4 +-
 packages/dd-trace/src/id.js                   |   2 +-
 .../src/llmobs/plugins/anthropic/index.js     |   2 +-
 .../src/llmobs/plugins/genai/index.js         |   2 +-
 .../plugins/langchain/handlers/index.js       |   2 +-
 packages/dd-trace/src/llmobs/sdk.js           |   6 +-
 packages/dd-trace/src/llmobs/tagger.js        |   3 +-
 packages/dd-trace/src/noop/proxy.js           |   4 +-
 .../opentelemetry/metrics/otlp_transformer.js |   2 +-
 .../metrics/periodic_metric_reader.js         |   3 +-
 packages/dd-trace/src/opentracing/span.js     |   2 +-
 .../dd-trace/src/opentracing/span_context.js  |   2 +-
 packages/dd-trace/src/plugins/plugin.js       |   2 +-
 packages/dd-trace/src/plugins/tracing.js      |   1 +
 packages/dd-trace/src/plugins/util/ci.js      |   4 +-
 .../src/plugins/util/http-otel-semantics.js   |   2 +-
 packages/dd-trace/src/plugins/util/test.js    |  13 +-
 packages/dd-trace/src/priority_sampler.js     |   9 +-
 .../src/profiling/profilers/poisson.js        |   2 +-
 .../src/profiling/profilers/shared.js         |   4 +-
 packages/dd-trace/src/util.js                 |  16 +++
 .../test/datastreams/encoding.spec.js         |  35 +++++
 .../test/exporters/electron/exporter.spec.js  |   3 +-
 .../dd-trace/test/plugins/util/test.spec.js   |  13 ++
 packages/dd-trace/test/util.spec.js           |  29 +++-
 scripts/agentless-stress-test.js              |   6 +-
 scripts/generate-config-types.js              |   2 +-
 scripts/release/changelog.spec.js             |   2 +-
 scripts/release/proposal.js                   |   3 +-
 scripts/verify-exercised-tests.js             |   1 +
 scripts/verify-workflow-job-names.js          |   4 +-
 yarn.lock                                     | 136 +++++++++++++++---
 98 files changed, 497 insertions(+), 259 deletions(-)

diff --git a/ci/test-optimization-validation/generated-files.js b/ci/test-optimization-validation/generated-files.js
index 1433416e8f..a8d0e5af6b 100644
--- a/ci/test-optimization-validation/generated-files.js
+++ b/ci/test-optimization-validation/generated-files.js
@@ -132,7 +132,7 @@ function getMissingDirectories (root, directory) {
 function cleanupCreatedDirectories (root) {
   const outcome = { removed: 0, retained: 0 }
   const resolvedRoot = path.resolve(root)
-  const directories = [...createdGeneratedDirectories.entries()]
+  const directories = [...createdGeneratedDirectories]
     .filter(([directory]) => isPathInside(resolvedRoot, directory))
     .sort(([left], [right]) => right.length - left.length)
 
diff --git a/ci/test-optimization-validation/generated-test-contract.js b/ci/test-optimization-validation/generated-test-contract.js
index 8db9b1400c..da6fcaf405 100644
--- a/ci/test-optimization-validation/generated-test-contract.js
+++ b/ci/test-optimization-validation/generated-test-contract.js
@@ -192,9 +192,7 @@ function getGeneratedTestContractError (framework) {
     if (!cleanupPaths.has(path.normalize(stepsFile))) {
       return 'must include the isolated Cucumber step definitions in cleanupPaths.'
     }
-  }
-
-  if (framework.framework === 'playwright') {
+  } else if (framework.framework === 'playwright') {
     const configPath = playwrightAdapter.getGeneratedConfigPath(strategy.testDirectory)
     const config = files.find(file => path.normalize(file.path) === path.normalize(configPath))
     if (config?.contentLines?.join('\n') !== playwrightAdapter.getGeneratedConfigContent()) {
diff --git a/ci/test-optimization-validation/manifest-scaffold.js b/ci/test-optimization-validation/manifest-scaffold.js
index 272f6b7ac8..33cbdc4aa3 100644
--- a/ci/test-optimization-validation/manifest-scaffold.js
+++ b/ci/test-optimization-validation/manifest-scaffold.js
@@ -477,8 +477,7 @@ function buildGeneratedTestStrategy ({ framework, projectRoot, representative })
     const stepsFile = cucumber.getGeneratedStepsPath(testDirectory)
     files.push({ path: stepsFile, contentLines: cucumber.getGeneratedStepsContent().split('\n') })
     cleanupPaths.push(stepsFile)
-  }
-  if (framework === 'playwright') {
+  } else if (framework === 'playwright') {
     const configFile = playwright.getGeneratedConfigPath(testDirectory)
     files.push({ path: configFile, contentLines: playwright.getGeneratedConfigContent().split('\n') })
     cleanupPaths.push(configFile)
diff --git a/ci/test-optimization-validation/runner-command.js b/ci/test-optimization-validation/runner-command.js
index 55517766c0..5e29341762 100644
--- a/ci/test-optimization-validation/runner-command.js
+++ b/ci/test-optimization-validation/runner-command.js
@@ -211,7 +211,7 @@ function getRunnerArgs (framework, testFile, generated) {
  */
 function getRunnerEnv (framework) {
   return {
-    ...(framework.validation.environment || {}),
+    ...framework.validation.environment,
     ...(framework.framework === 'cucumber' ? { CUCUMBER_PUBLISH_QUIET: 'true' } : {}),
   }
 }
diff --git a/ci/test-optimization-validation/scenarios/basic-reporting.js b/ci/test-optimization-validation/scenarios/basic-reporting.js
index fa19cfccf3..fabe2a6566 100644
--- a/ci/test-optimization-validation/scenarios/basic-reporting.js
+++ b/ci/test-optimization-validation/scenarios/basic-reporting.js
@@ -58,7 +58,7 @@ async function runBasicReporting ({ framework, out, options }) {
       selector,
       settingsLoadedFromCache: run.offline.inputs.settings?.status === 'loaded',
     }
-    evidence.foundationalReportingEstablished = evidence.foundationalReportingEstablished && selector.verified
+    evidence.foundationalReportingEstablished &&= selector.verified
 
     if (run.result.timedOut) {
       return inconclusive(
diff --git a/ci/test-optimization-validation/scenarios/test-management.js b/ci/test-optimization-validation/scenarios/test-management.js
index d2bdde91d8..8c98ee8452 100644
--- a/ci/test-optimization-validation/scenarios/test-management.js
+++ b/ci/test-optimization-validation/scenarios/test-management.js
@@ -149,7 +149,7 @@ function buildQuarantinedResponse (framework, scenario, discoveredIdentities = [
   for (const identity of identities) {
     for (const suite of getSuiteCandidates(identity, scenario)) {
       for (const name of getNameCandidates(identity)) {
-        suites[suite] = suites[suite] || { tests: {} }
+        suites[suite] ||= { tests: {} }
         suites[suite].tests[name] = {
           properties: {
             quarantined: true,
@@ -210,7 +210,7 @@ function summarizeManagedTests (testManagementTests) {
     }
     summary.set(displaySuite, testNames)
   }
-  return [...summary.entries()].slice(0, 5).map(([suite, tests]) => ({
+  return [...summary].slice(0, 5).map(([suite, tests]) => ({
     suite,
     tests: [...tests].slice(0, 5),
   }))
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 4a869ca1b0..af77ab3c79 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -586,60 +586,57 @@ export default [
       ...eslintPluginUnicorn.configs.recommended.rules,
 
       // Overriding recommended unicorn rules.
-      // Rules not listed here are left at the `recommended` default. The v65→v68 bump
-      // turned ~130 rules on in `recommended`; the entries below are the ones that fire
-      // on our source and are intentionally kept off (counts are from the v68 run).
-      'unicorn/catch-error-name': ['off', { name: 'err' }], // Many errors
+      // Rules not listed here are left at the `recommended` default. The entries below
+      // document deliberate exceptions. Volume markers stay coarse so they do not drift:
+      // `few` is under ten sites, `many` is tens, `lots` is hundreds or more.
+      'unicorn/catch-error-name': ['off', { name: 'err' }], // lots
       'unicorn/expiring-todo-comments': 'off',
-      'unicorn/filename-case': ['off', { case: 'kebabCase' }], // Many errors
-      'unicorn/name-replacements': 'off', // Many errors | naming churn (split out of prevent-abbreviations)
-      'unicorn/prevent-abbreviations': 'off', // Many errors
+      'unicorn/filename-case': ['off', { case: 'kebabCase' }], // lots
+      'unicorn/name-replacements': 'off', // lots | naming churn (split out of prevent-abbreviations)
+      'unicorn/prevent-abbreviations': 'off', // Its replacements moved to name-replacements
 
       // These rules require a newer Node.js version than we support
       'unicorn/no-array-reverse': 'off', // Node.js 20
       'unicorn/no-array-sort': 'off', // Node.js 20
+      'unicorn/prefer-abort-signal-any': 'off', // Node.js 18.17
       'unicorn/prefer-dispose': 'off', // Explicit resource management (newer Node.js)
+      'unicorn/prefer-group-by': 'off', // Node.js 21
+      'unicorn/prefer-iterator-helpers': 'off', // Iterator helpers (Node.js 22)
       'unicorn/prefer-iterator-to-array': 'off', // Iterator helpers (Node.js 22)
       'unicorn/prefer-iterator-to-array-at-end': 'off', // Iterator helpers (Node.js 22)
-      'unicorn/prefer-promise-with-resolvers': 'off', // 6 errors | Promise.withResolvers (Node.js 22)
+      'unicorn/prefer-promise-try': 'off', // Promise.try (Node.js 24)
+      'unicorn/prefer-promise-with-resolvers': 'off', // few | Promise.withResolvers (Node.js 22)
+      'unicorn/prefer-set-methods': 'off', // Set methods (Node.js 22)
       'unicorn/prefer-temporal': 'off', // Temporal is not stable on supported Node.js
       'unicorn/prefer-uint8array-base64': 'off', // Uint8Array base64 (Node.js 22)
 
       // These rules could potentially be evaluated again at a much later point
-      'unicorn/class-reference-in-static-methods': 'off', // 6 errors
-      'unicorn/consistent-class-member-order': 'off', // 55 errors | ordering churn
-      'unicorn/consistent-conditional-object-spread': 'off', // 3 errors
-      'unicorn/consistent-optional-chaining': 'off', // 3 errors
+      'unicorn/class-reference-in-static-methods': 'off', // few
+      'unicorn/consistent-class-member-order': 'off', // many | ordering churn
+      'unicorn/consistent-conditional-object-spread': 'off', // few
       'unicorn/explicit-length-check': 'off', // Not a big advantage
       'unicorn/explicit-timer-delay': 'off', // Covered by our own timer lint rules
       'unicorn/no-array-callback-reference': 'off',
-      'unicorn/no-computed-property-existence-check': 'off', // 160 errors | needs an audit
-      'unicorn/no-declarations-before-early-exit': 'off', // 62 errors
-      'unicorn/no-duplicate-if-branches': 'off', // 1 error | may surface real bugs
-      'unicorn/no-duplicate-logical-operands': 'off', // 2 errors | may surface real bugs
-      'unicorn/no-error-property-assignment': 'off', // 6 errors
+      'unicorn/no-computed-property-existence-check': 'off', // lots | needs an audit
+      'unicorn/no-declarations-before-early-exit': 'off', // many
+      'unicorn/no-error-property-assignment': 'off', // few | all preserve upstream error metadata
       'unicorn/no-for-loop': 'off', // Activate if this is resolved https://github.com/sindresorhus/eslint-plugin-unicorn/issues/2664
-      'unicorn/no-incorrect-template-string-interpolation': 'off', // 3 errors | audit for real bugs first
-      'unicorn/no-invalid-argument-count': 'off', // 98 errors | high false-positive risk, worth a focused pass
-      'unicorn/no-loop-iterable-mutation': 'off', // 2 errors | may surface real bugs
-      'unicorn/no-nonstandard-builtin-properties': 'off', // 34 errors | needs an audit
+      'unicorn/no-nonstandard-builtin-properties': 'off', // many | needs an audit
       'unicorn/no-this-assignment': 'off', // This would need some further refactoring and the benefit is small
-      'unicorn/no-undeclared-class-members': 'off', // 272 errors | requires declaring every field
-      'unicorn/no-unreadable-array-destructuring': 'off', // 4 errors | not autofixable, needs manual rewrite
-      'unicorn/no-unreadable-for-of-expression': 'off', // 32 errors
-      'unicorn/no-unreadable-object-destructuring': 'off', // 57 errors
-      'unicorn/no-unsafe-string-replacement': 'off', // 6 errors
-      'unicorn/no-useless-recursion': 'off', // 2 errors
+      'unicorn/no-undeclared-class-members': 'off', // lots | requires declaring every field
+      'unicorn/no-unreadable-array-destructuring': 'off', // few | not autofixable, needs manual rewrite
+      'unicorn/no-unreadable-for-of-expression': 'off', // many
+      'unicorn/no-unreadable-object-destructuring': 'off', // many
+      'unicorn/no-unsafe-string-replacement': 'off', // many | replacement callbacks reduce readability
+      'unicorn/no-useless-recursion': 'off', // few | iterative rewrites add substantial nesting
       'unicorn/prefer-code-point': 'off', // Should be activated, but needs a refactor of some code
-      'unicorn/prefer-early-return': 'off', // 67 errors | tension with our positive-`if` style
-      'unicorn/prefer-hoisting-branch-code': 'off', // 2 errors | reshapes branch bodies
-      'unicorn/prefer-minimal-ternary': 'off', // 24 errors
-      'unicorn/prefer-number-is-safe-integer': 'off', // 17 errors
-      'unicorn/prefer-object-iterable-methods': 'off', // 56 errors
+      'unicorn/prefer-early-return': 'off', // many | tension with our positive-`if` style
+      'unicorn/prefer-number-is-safe-integer': 'off', // many
+      'unicorn/prefer-object-iterable-methods': 'off', // many
       'unicorn/prefer-queue-microtask': 'off', // process.nextTick semantics differ
-      'unicorn/prefer-smaller-scope': 'off', // 3 errors
-      'unicorn/prefer-split-limit': 'off', // 23 errors
-      'unicorn/require-array-sort-compare': 'off', // 8 errors | may surface real default-sort bugs
+      'unicorn/prefer-simple-condition-first': 'off', // lots | needs a short-circuit behavior audit
+      'unicorn/prefer-then-catch': 'off', // many | broadens rejection boundaries
+      'unicorn/require-array-sort-compare': 'off', // many | many intentional lexicographic sorts
 
       // The following rules should not be activated!
       'unicorn/consistent-boolean-name': 'off', // Would rename public API and config booleans
@@ -649,6 +646,8 @@ export default [
       'unicorn/no-array-splice': 'off', // toSpliced copies the whole array (perf)
       'unicorn/no-break-in-nested-loop': 'off', // Conflicts with our performance-oriented loops
       'unicorn/no-global-object-property-assignment': 'off', // We use globalThis[Symbol.for('dd-trace')]
+      'unicorn/no-negated-array-predicate': 'off', // Predicate inversion is harder to read and creates churn
+      'unicorn/no-negated-comparison': 'off', // Opposite comparisons do not preserve NaN handling
       'unicorn/no-nested-ternary': 'off', // Not really an issue in the code and the benefit is small
       'unicorn/no-new-array': 'off', // new Array is often used for performance reasons
       'unicorn/no-null': 'off', // We do not control external APIs and it is hard to differentiate these
@@ -659,47 +658,32 @@ export default [
       'unicorn/operator-assignment': 'off', // Covered by core operator-assignment
       'unicorn/prefer-array-last-methods': 'off', // Questionable benefit
       'unicorn/prefer-await': 'off', // We avoid async/await in production hot paths
+      'unicorn/prefer-dom-node-html-methods': 'off', // Browser compatibility and different serialization semantics
       'unicorn/prefer-event-target': 'off', // Benefit only outside of Node.js
       'unicorn/prefer-global-this': 'off', // Questionable benefit in Node.js alone
       'unicorn/prefer-includes-over-repeated-comparisons': 'off', // Bad for performance
       'unicorn/prefer-math-trunc': 'off', // Math.trunc is not a 1-to-1 replacement for most of our usage
+      'unicorn/prefer-minimal-ternary': 'off', // Conflicts with our restricted-syntax rule on require(cond ? a : b)
       'unicorn/prefer-module': 'off', // We use CJS
       'unicorn/prefer-node-protocol': 'off', // May not be used due to guardrails
       'unicorn/prefer-number-coercion': 'off', // Number() is not a 1-to-1 replacement for parseInt/parseFloat
       'unicorn/prefer-private-class-fields': 'off', // Many `_underscore` fields cross module boundaries
-      'unicorn/prefer-reflect-apply': 'off', // Questionable benefit and more than 500 matches
+      'unicorn/prefer-reflect-apply': 'off', // lots | questionable benefit
       'unicorn/prefer-short-arrow-method': 'off', // Method shorthand is intentional; arrow properties change `this`
+      'unicorn/prefer-split-limit': 'off', // A limit is slower than getSegment; the rest read every segment
       'unicorn/prefer-switch': 'off', // Questionable benefit
       'unicorn/prefer-top-level-await': 'off', // Only useful when using ESM
       'unicorn/prefer-unicode-code-point-escapes': 'off', // Replaces the dropped no-hex-escape; questionable benefit
       'unicorn/switch-case-braces': 'off', // Questionable benefit
 
-      // Safe to enable in a follow-up: autofixable and aligned with our style. Kept off
-      // here only to keep this version bump free of source churn (counts from the v68 run).
-      'unicorn/logical-assignment-operators': 'off', // 42 errors | matches our ??=/||= usage
-      'unicorn/no-confusing-array-splice': 'off', // 1 error
-      'unicorn/no-for-each': 'off', // 10 errors | we already prefer for-of in production
-      'unicorn/no-negated-array-predicate': 'off', // 2 errors
-      'unicorn/no-negated-comparison': 'off', // 1 error
-      'unicorn/no-subtraction-comparison': 'off', // 2 errors
-      'unicorn/no-unnecessary-boolean-comparison': 'off', // 6 errors
-      'unicorn/no-unnecessary-global-this': 'off', // 4 errors
-      'unicorn/no-unnecessary-splice': 'off', // 2 errors
-      'unicorn/no-useless-concat': 'off', // 4 errors
-      'unicorn/no-useless-continue': 'off', // 1 error
-      'unicorn/no-useless-delete-check': 'off', // 1 error
-      'unicorn/no-useless-fallback-in-spread': 'off', // 5 errors
-      'unicorn/no-useless-override': 'off', // 1 error
-      'unicorn/no-useless-template-literals': 'off', // 13 errors
-      'unicorn/prefer-array-from-map': 'off', // 6 errors
-      'unicorn/prefer-boolean-return': 'off', // 1 error
-      'unicorn/prefer-continue': 'off', // 52 errors
-      'unicorn/prefer-direct-iteration': 'off', // 5 errors
-      'unicorn/prefer-else-if': 'off', // 6 errors
-      'unicorn/prefer-global-number-constants': 'off', // 3 errors
-      'unicorn/prefer-logical-operator-over-ternary': 'off', // 3 errors
-      'unicorn/prefer-ternary': 'off', // 16 errors
-      'unicorn/prefer-unary-minus': 'off', // 1 error
+      // These remaining rules need focused rewrites before activation.
+      'unicorn/no-confusing-array-splice': 'off', // few
+      'unicorn/no-for-each': 'off', // many | we already prefer for-of in production
+      'unicorn/no-unnecessary-global-this': 'off', // few | explicit globals are clearer
+      'unicorn/no-useless-continue': 'off', // few
+      'unicorn/prefer-array-from-map': 'off', // few | loops avoid callback allocation
+      'unicorn/prefer-continue': 'off', // many
+      'unicorn/prefer-ternary': 'off', // many
     },
   },
   {
diff --git a/package.json b/package.json
index 80df4d6843..ba973aabe5 100644
--- a/package.json
+++ b/package.json
@@ -213,7 +213,7 @@
     "eslint-plugin-n": "^18.2.1",
     "eslint-plugin-promise": "^7.3.0",
     "eslint-plugin-sonarjs": "^4.2.0",
-    "eslint-plugin-unicorn": "^68.0.0",
+    "eslint-plugin-unicorn": "^72.0.0",
     "express": "^5.1.0",
     "glob": "^10.4.5",
     "globals": "^17.7.0",
diff --git a/packages/datadog-esbuild/index.js b/packages/datadog-esbuild/index.js
index 675f6d5abc..e819ce7f70 100644
--- a/packages/datadog-esbuild/index.js
+++ b/packages/datadog-esbuild/index.js
@@ -265,10 +265,12 @@ ${build.initialOptions.banner.js}`
         }
       }
       // The file namespace is used when requiring files from disk in userland
+      if (extracted.pkg === null) return
+
       let pathToPackageJson
       try {
         // we can't use require.resolve('pkg/package.json') as ESM modules don't make the file available
-        pathToPackageJson = require.resolve(`${extracted.pkg}`, { paths: [args.resolveDir] })
+        pathToPackageJson = require.resolve(extracted.pkg, { paths: [args.resolveDir] })
         pathToPackageJson = extractPackageAndModulePath(pathToPackageJson).pkgJson
       } catch (err) {
         if (err.code === 'MODULE_NOT_FOUND') {
@@ -340,7 +342,7 @@ ${build.initialOptions.banner.js}`
 
       if (data.isESM) {
         if (args.path.endsWith(ESM_INTERCEPTED_SUFFIX)) {
-          args.path = args.path.slice(0, -1 * ESM_INTERCEPTED_SUFFIX.length)
+          args.path = args.path.slice(0, -ESM_INTERCEPTED_SUFFIX.length)
 
           if (data.internal) {
             args.path = args.path.slice(INTERNAL_ESM_INTERCEPTED_PREFIX.length)
diff --git a/packages/datadog-esbuild/src/utils.js b/packages/datadog-esbuild/src/utils.js
index 9289e88e11..b61db16959 100644
--- a/packages/datadog-esbuild/src/utils.js
+++ b/packages/datadog-esbuild/src/utils.js
@@ -174,7 +174,7 @@ async function processModule ({ path, internal = false, context, excludeDefault
   for (const n of exportNames) {
     if (n === 'default' && excludeDefault) continue
 
-    if (isStarExportLine(n) === true) {
+    if (isStarExportLine(n)) {
       // export * from 'wherever'
       const [, modFile] = n.split('* from ')
 
diff --git a/packages/datadog-esbuild/test/plugin.spec.js b/packages/datadog-esbuild/test/plugin.spec.js
index cf3cb48a35..a405a407f8 100644
--- a/packages/datadog-esbuild/test/plugin.spec.js
+++ b/packages/datadog-esbuild/test/plugin.spec.js
@@ -17,7 +17,37 @@ function captureOptionalPeerOnLoad () {
   return onLoad
 }
 
+function captureOnResolve () {
+  let onResolve
+  ddPlugin.setup({
+    initialOptions: {},
+    /**
+     * @param {object} options
+     * @param {Function} callback
+     */
+    onResolve (options, callback) {
+      onResolve = callback
+    },
+    onLoad () {},
+  })
+  return onResolve
+}
+
 describe('datadog-esbuild plugin', () => {
+  it('ignores builtins without a package path', () => {
+    const onResolve = captureOnResolve()
+
+    const result = onResolve({
+      path: 'fs',
+      resolveDir: process.cwd(),
+      kind: 'require-call',
+      namespace: 'file',
+      importer: '/app/index.js',
+    })
+
+    assert.strictEqual(result, undefined)
+  })
+
   describe('optional peer bundling', () => {
     it('rewrites the installed peer load in require-provider into a literal require', () => {
       const onLoad = captureOptionalPeerOnLoad()
diff --git a/packages/datadog-instrumentations/src/claude-agent-sdk.js b/packages/datadog-instrumentations/src/claude-agent-sdk.js
index b512c3794d..0b64f3112e 100644
--- a/packages/datadog-instrumentations/src/claude-agent-sdk.js
+++ b/packages/datadog-instrumentations/src/claude-agent-sdk.js
@@ -54,7 +54,7 @@ function buildTracerHooks (sessionCtx) {
     sessionCtx.cwd = input.cwd
     sessionCtx.transcriptPath = input.transcript_path
     sessionCtx.agentType = input.agent_type
-    sessionCtx.permissionMode = sessionCtx.permissionMode || input.permission_mode
+    sessionCtx.permissionMode ||= input.permission_mode
     return {}
   }
 
@@ -64,8 +64,8 @@ function buildTracerHooks (sessionCtx) {
   }
 
   function onUserPromptSubmit (input) {
-    sessionCtx.sessionId = sessionCtx.sessionId || input.session_id
-    sessionCtx.prompt = sessionCtx.prompt || input.prompt
+    sessionCtx.sessionId ||= input.session_id
+    sessionCtx.prompt ||= input.prompt
     return {}
   }
 
@@ -254,7 +254,7 @@ function createStreamLookup (chunks) {
     scanLocalLifecycle(chunks, startIndex, toolUseId, localLifecycle)
     if (localLifecycle.toolResultIndex !== undefined) return localLifecycle
 
-    streamIndex = streamIndex || buildStreamIndex(chunks)
+    streamIndex ||= buildStreamIndex(chunks)
     const indexedLifecycle = streamIndex.get(toolUseId)
     return {
       taskStartedChunk: localLifecycle.taskStartedChunk || indexedLifecycle?.taskStartedChunk,
diff --git a/packages/datadog-instrumentations/src/cucumber.js b/packages/datadog-instrumentations/src/cucumber.js
index e15928078d..0971c18e02 100644
--- a/packages/datadog-instrumentations/src/cucumber.js
+++ b/packages/datadog-instrumentations/src/cucumber.js
@@ -6,6 +6,7 @@ const { createCoverageMap } = require('../../../vendor/dist/istanbul-lib-coverag
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
+const { getSegment } = require('../../dd-trace/src/util')
 const {
   getCoveredFilesFromCoverage,
   getExecutableFilesFromCoverage,
@@ -342,7 +343,7 @@ function handleParallelTestCaseFinished (pickle, worstTestStepResult) {
   }
 
   const testFileAbsolutePath = pickle.uri
-  const finished = pickleResultByFile[testFileAbsolutePath] || (pickleResultByFile[testFileAbsolutePath] = [])
+  const finished = (pickleResultByFile[testFileAbsolutePath] ||= [])
 
   if (isEarlyFlakeDetectionEnabled && isNew) {
     const testFullname = `${pickle.uri}:${pickle.name}`
@@ -555,8 +556,7 @@ function getErrorFromCucumberResult (cucumberResult) {
     return
   }
 
-  const [message] = cucumberResult.message.split('\n')
-  const error = new Error(message)
+  const error = new Error(getSegment(cucumberResult.message, '\n', 0))
   if (cucumberResult.exception) {
     error.type = cucumberResult.exception.type
   }
@@ -793,7 +793,7 @@ function wrapRun (pl, isLatestVersion, version) {
       testFnCh.runStores(ctx, () => {
         promise = run.apply(this, args)
       })
-      promise.finally(async () => {
+      const finalize = async () => {
         if (!canAwaitRetries) {
           this.eventBroadcaster.removeListener('envelope', onEnvelope)
         }
@@ -966,6 +966,9 @@ function wrapRun (pl, isLatestVersion, version) {
           ...attemptCtx.currentStore,
           finalStatus,
         })
+      }
+      promise.then(finalize, finalize).catch(error => {
+        log.error('Cucumber test finalization error', error)
       })
       return promise
     } catch (err) {
diff --git a/packages/datadog-instrumentations/src/helpers/extract-package-and-module-path.js b/packages/datadog-instrumentations/src/helpers/extract-package-and-module-path.js
index 0c79beebbf..b1b688560e 100644
--- a/packages/datadog-instrumentations/src/helpers/extract-package-and-module-path.js
+++ b/packages/datadog-instrumentations/src/helpers/extract-package-and-module-path.js
@@ -2,11 +2,21 @@
 
 const NM = 'node_modules/'
 
+/**
+ * @typedef {object} PackageAndModulePath
+ * @property {string|null} pkg
+ * @property {string|null} path
+ * @property {string} [pkgJson]
+ */
+
 /**
  * For a given full path to a module,
  *   return the package name it belongs to and the local path to the module
  *   input: '/foo/node_modules/@co/stuff/foo/bar/baz.js'
  *   output: { pkg: '@co/stuff', path: 'foo/bar/baz.js',  pkgJson: '/foo/node_modules/@co/stuff/package.json' }
+ *
+ * @param {string} fullPath
+ * @returns {PackageAndModulePath}
  */
 module.exports = function extractPackageAndModulePath (fullPath) {
   const nm = fullPath.lastIndexOf(NM)
diff --git a/packages/datadog-instrumentations/src/helpers/register.js b/packages/datadog-instrumentations/src/helpers/register.js
index bbf2a56526..db0b876674 100644
--- a/packages/datadog-instrumentations/src/helpers/register.js
+++ b/packages/datadog-instrumentations/src/helpers/register.js
@@ -57,19 +57,23 @@ const alreadyLoggedIncompatibleIntegrations = new Set()
 // Always disable prefixed and unprefixed node modules if one is disabled.
 if (disabledInstrumentations.size) {
   const builtinsSet = new Set(builtinModules)
+  const disabledBuiltinCounterparts = []
   for (const name of disabledInstrumentations) {
     const hasPrefix = name.startsWith('node:')
     if (hasPrefix || builtinsSet.has(name)) {
       if (hasPrefix) {
         const unprefixedName = name.slice(5)
         if (!disabledInstrumentations.has(unprefixedName)) {
-          disabledInstrumentations.add(unprefixedName)
+          disabledBuiltinCounterparts.push(unprefixedName)
         }
       } else if (!disabledInstrumentations.has(`node:${name}`)) {
-        disabledInstrumentations.add(`node:${name}`)
+        disabledBuiltinCounterparts.push(`node:${name}`)
       }
     }
   }
+  for (const name of disabledBuiltinCounterparts) {
+    disabledInstrumentations.add(name)
+  }
   builtinsSet.clear()
 }
 
diff --git a/packages/datadog-instrumentations/src/helpers/rewriter/index.js b/packages/datadog-instrumentations/src/helpers/rewriter/index.js
index aab0046ccf..8cc736ff6f 100644
--- a/packages/datadog-instrumentations/src/helpers/rewriter/index.js
+++ b/packages/datadog-instrumentations/src/helpers/rewriter/index.js
@@ -39,6 +39,7 @@ for (const matcher of [matcherCjs, matcherEsm]) {
 
 // Keep the marker split: source-map scanners can read a contiguous token in
 // string literals as this file's own inline map.
+// eslint-disable-next-line unicorn/no-useless-concat -- Keep the source-map marker non-contiguous.
 const SOURCE_MAP_PREFIX = '//# sourceMapping' + 'URL=data:application/json;base64,'
 
 function rewrite (content, filename, format) {
diff --git a/packages/datadog-instrumentations/src/helpers/router-helper.js b/packages/datadog-instrumentations/src/helpers/router-helper.js
index 173e4ebdbd..73e2d6781a 100644
--- a/packages/datadog-instrumentations/src/helpers/router-helper.js
+++ b/packages/datadog-instrumentations/src/helpers/router-helper.js
@@ -88,7 +88,7 @@ function collectRoutesFromRouter (router, prefix) {
 function normalizeRoutePaths (path) {
   if (path == null) return []
 
-  if (Array.isArray(path) === false) {
+  if (!Array.isArray(path)) {
     const normalized = normalizeRoutePath(path)
     return [normalized]
   }
diff --git a/packages/datadog-instrumentations/src/http/client.js b/packages/datadog-instrumentations/src/http/client.js
index c266c84479..48d98980f6 100644
--- a/packages/datadog-instrumentations/src/http/client.js
+++ b/packages/datadog-instrumentations/src/http/client.js
@@ -89,9 +89,7 @@ function setupResponseInstrumentation (ctx, res) {
   const collectChunk = chunk => {
     if (!bodyChunks || !chunk) return
 
-    if (typeof chunk === 'string') {
-      bodyChunks.push(chunk)
-    } else if (Buffer.isBuffer(chunk)) {
+    if (typeof chunk === 'string' || Buffer.isBuffer(chunk)) {
       bodyChunks.push(chunk)
     } else {
       // Handle Uint8Array or other array-like types
diff --git a/packages/datadog-instrumentations/src/jest.js b/packages/datadog-instrumentations/src/jest.js
index 0cd20675b4..d683e9c630 100644
--- a/packages/datadog-instrumentations/src/jest.js
+++ b/packages/datadog-instrumentations/src/jest.js
@@ -96,7 +96,7 @@ const DD_JEST_HANDLE_TEST_EVENT_WRAPPED = Symbol('dd-trace:jest:handle-test-even
 const DD_JEST_HANDLE_TEST_EVENT_DATADOG = Symbol('dd-trace:jest:handle-test-event-datadog')
 const DD_JEST_CONCURRENT_TEST_ORIGINAL = Symbol('dd-trace:jest:concurrent-test-original')
 const isJestWorker = !!getEnvironmentVariable('JEST_WORKER_ID')
-const jestSessionState = globalThis[JEST_SESSION_STATE] || (globalThis[JEST_SESSION_STATE] = {})
+const jestSessionState = (globalThis[JEST_SESSION_STATE] ||= {})
 
 // https://github.com/jestjs/jest/blob/41f842a46bb2691f828c3a5f27fc1d6290495b82/packages/jest-circus/src/types.ts#L9C8-L9C54
 const RETRY_TIMES = Symbol.for('RETRY_TIMES')
@@ -1192,9 +1192,9 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         ctx.testParameters = testParameters
         ctx.frameworkVersion = jestVersion
         ctx.isNew = isNewTest
-        ctx.isEfdRetry = ctx.isEfdRetry || numEfdRetry > 0
+        ctx.isEfdRetry ||= numEfdRetry > 0
         ctx.isAttemptToFix = isAttemptToFix
-        ctx.isAttemptToFixRetry = ctx.isAttemptToFixRetry || numOfAttemptsToFixRetries > 0
+        ctx.isAttemptToFixRetry ||= numOfAttemptsToFixRetries > 0
         ctx.isJestRetry = isJestRetry
         ctx.isDisabled = isDisabled
         ctx.isQuarantined = isQuarantined
@@ -1361,8 +1361,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             }
           }
         }
-      }
-      if (event.name === 'test_done') {
+      } else if (event.name === 'test_done') {
         const originalError = event.test?.errors?.[0]
         let status = 'pass'
         if (event.test.errors && event.test.errors.length) {
@@ -1565,8 +1564,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         if (ctx.concurrentTestState) {
           ctx.currentStore = undefined
         }
-      }
-      if (event.name === 'run_finish') {
+      } else if (event.name === 'run_finish') {
         for (const [test, errors] of atrSuppressedErrors) {
           // Do not restore errors for non-ATF quarantined tests — they should stay suppressed
           // so Jest doesn't see the failure (prevents --bail from stopping the run).
@@ -1595,8 +1593,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         attemptToFixRetriedTestsStatuses.clear()
         testsToBeRetried.clear()
         testSuiteDatadogEnvironments.delete(this.testSuiteAbsolutePath)
-      }
-      if (event.name === 'test_skip' || event.name === 'test_todo') {
+      } else if (event.name === 'test_skip' || event.name === 'test_todo') {
         const testName = getJestTestName(event.test)
         testSkippedCh.publish({
           test: {
@@ -2298,12 +2295,11 @@ function getCliWrapper (isNewJestVersion) {
           } = skippableSuitesResponse || await getChannelPromise(skippableSuitesCh)
           if (err) {
             skippableSuitesCoverage = {}
-            skippedSuitesCoverage = {}
           } else {
             skippableSuites = receivedSkippableSuites
             skippableSuitesCoverage = receivedSkippableSuitesCoverage || {}
-            skippedSuitesCoverage = {}
           }
+          skippedSuitesCoverage = {}
         } catch (err) {
           log.error('Jest test-suite skippable error', err)
         }
@@ -3037,9 +3033,7 @@ function wrapJestObject (jestObject, suiteFilePath) {
 
   shimmer.wrap(jestObject, 'mock', mock => function (moduleName) {
     // If the library is mocked with `jest.mock`, we don't want to bypass jest's own require engine
-    if (LIBRARIES_BYPASSING_JEST_REQUIRE_ENGINE.has(moduleName)) {
-      LIBRARIES_BYPASSING_JEST_REQUIRE_ENGINE.delete(moduleName)
-    }
+    LIBRARIES_BYPASSING_JEST_REQUIRE_ENGINE.delete(moduleName)
     recordMockedFile(suiteFilePath, moduleName)
     return mock.apply(this, arguments)
   })
diff --git a/packages/datadog-instrumentations/src/mocha/common.js b/packages/datadog-instrumentations/src/mocha/common.js
index 975e5c1cff..6e77efc44a 100644
--- a/packages/datadog-instrumentations/src/mocha/common.js
+++ b/packages/datadog-instrumentations/src/mocha/common.js
@@ -41,11 +41,9 @@ addHook({
 }, (Suite) => {
   shimmer.wrap(Suite.prototype, 'addTest', addTest => function (test) {
     const callSites = getCallSites()
-    let startLine
     const testCallSite = callSites.find(site => site.getFileName() === test.file)
     if (testCallSite) {
-      startLine = testCallSite.getLineNumber()
-      testToStartLine.set(test, startLine)
+      testToStartLine.set(test, testCallSite.getLineNumber())
     }
     return addTest.apply(this, arguments)
   })
diff --git a/packages/datadog-instrumentations/src/moleculer/client.js b/packages/datadog-instrumentations/src/moleculer/client.js
index eb0c0d72fc..9d31bb2bc6 100644
--- a/packages/datadog-instrumentations/src/moleculer/client.js
+++ b/packages/datadog-instrumentations/src/moleculer/client.js
@@ -10,7 +10,7 @@ const errorChannel = channel('apm:moleculer:call:error')
 function wrapCall (call) {
   return function (actionName, params, opts) {
     opts = arguments[2] = opts || {}
-    opts.meta = opts.meta || {}
+    opts.meta ||= {}
 
     arguments.length = Math.max(3, arguments.length)
 
diff --git a/packages/datadog-instrumentations/src/playwright.js b/packages/datadog-instrumentations/src/playwright.js
index 8d153b083e..84a2f285e6 100644
--- a/packages/datadog-instrumentations/src/playwright.js
+++ b/packages/datadog-instrumentations/src/playwright.js
@@ -1350,7 +1350,7 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
       let totalFailedTestCount = 0
       let totalPureQuarantinedFailedTestCount = 0
 
-      for (const [fqn, testStatuses] of testsToTestStatuses.entries()) {
+      for (const [fqn, testStatuses] of testsToTestStatuses) {
         // Only count as failed if the final status (after retries) is 'fail'
         const lastStatus = testStatuses.at(-1)
         if (lastStatus === 'fail') {
diff --git a/packages/datadog-instrumentations/src/rhea.js b/packages/datadog-instrumentations/src/rhea.js
index 135b381866..2efb910eb2 100644
--- a/packages/datadog-instrumentations/src/rhea.js
+++ b/packages/datadog-instrumentations/src/rhea.js
@@ -222,7 +222,7 @@ function beforeFinish (delivery, state) {
 }
 
 function getStateFromData (stateData) {
-  if (stateData && stateData.descriptor && stateData.descriptor) {
+  if (stateData?.descriptor) {
     switch (stateData.descriptor.value) {
       case 0x24: return 'accepted'
       case 0x25: return 'rejected'
diff --git a/packages/datadog-instrumentations/test/helpers/register.spec.js b/packages/datadog-instrumentations/test/helpers/register.spec.js
index 56c0f5afea..489fcfee6f 100644
--- a/packages/datadog-instrumentations/test/helpers/register.spec.js
+++ b/packages/datadog-instrumentations/test/helpers/register.spec.js
@@ -82,4 +82,19 @@ describe('register', () => {
     sinon.assert.notCalled(hooksMock['@confluentinc/kafka-javascript'].fn)
     sinon.assert.notCalled(hooksMock['mongodb-core'].fn)
   })
+
+  for (const disabledName of ['fs', 'node:fs']) {
+    it(`should disable both builtin hook names when ${disabledName} is disabled`, () => {
+      hooksMock.fs = { fn: sinon.stub() }
+      hooksMock['node:fs'] = { fn: sinon.stub() }
+
+      loadRegisterWithEnv({ DD_TRACE_DISABLED_INSTRUMENTATIONS: disabledName })
+
+      const registeredNames = []
+      for (const [names] of HookMock.args) {
+        registeredNames.push(names[0])
+      }
+      assert.deepStrictEqual(registeredNames.sort(), ['@confluentinc/kafka-javascript', 'mongodb-core'])
+    })
+  }
 })
diff --git a/packages/datadog-plugin-aerospike/src/index.js b/packages/datadog-plugin-aerospike/src/index.js
index d7f70f574b..d0676f6709 100644
--- a/packages/datadog-plugin-aerospike/src/index.js
+++ b/packages/datadog-plugin-aerospike/src/index.js
@@ -67,9 +67,7 @@ function getMeta (resourceName, commandArgs) {
     const [ns, set, bin, exp, index] = commandArgs
 
     // The `ext` argument was added to IndexCreate in 6.3.0
-    meta = commandArgs.length > 8
-      ? getMetaForIndex(ns, set, bin, index)
-      : getMetaForIndex(ns, set, bin, exp)
+    meta = getMetaForIndex(ns, set, bin, commandArgs.length > 8 ? index : exp)
   } else if (resourceName === 'Query') {
     const { ns, set } = commandArgs[2]
     meta = getMetaForQuery({ ns, set })
diff --git a/packages/datadog-plugin-amqplib/src/client.js b/packages/datadog-plugin-amqplib/src/client.js
index 943cfd0f31..0985d6389b 100644
--- a/packages/datadog-plugin-amqplib/src/client.js
+++ b/packages/datadog-plugin-amqplib/src/client.js
@@ -33,7 +33,7 @@ class AmqplibClientPlugin extends ClientPlugin {
       },
     }, ctx)
 
-    fields.headers = fields.headers || {}
+    fields.headers ||= {}
 
     this.tracer.inject(span, TEXT_MAP, fields.headers)
 
diff --git a/packages/datadog-plugin-amqplib/src/producer.js b/packages/datadog-plugin-amqplib/src/producer.js
index e902c0e852..75ee015d48 100644
--- a/packages/datadog-plugin-amqplib/src/producer.js
+++ b/packages/datadog-plugin-amqplib/src/producer.js
@@ -52,7 +52,7 @@ class AmqplibProducerPlugin extends ProducerPlugin {
       },
     }, ctx)
 
-    fields.headers = fields.headers || {}
+    fields.headers ||= {}
 
     this.tracer.inject(span, TEXT_MAP, fields.headers)
 
diff --git a/packages/datadog-plugin-aws-sdk/src/services/eventbridge.js b/packages/datadog-plugin-aws-sdk/src/services/eventbridge.js
index 471d8f109c..e9e6b2b879 100644
--- a/packages/datadog-plugin-aws-sdk/src/services/eventbridge.js
+++ b/packages/datadog-plugin-aws-sdk/src/services/eventbridge.js
@@ -39,9 +39,9 @@ class EventBridge extends BaseAwsSdkPlugin {
     const rulename = params.Name ?? ''
     return {
       'resource.name': operation ? `${operation} ${params.source}` : params.source,
-      'aws.eventbridge.source': `${params.source}`,
+      'aws.eventbridge.source': params.source,
       'messaging.system': 'aws_eventbridge',
-      rulename: `${rulename}`,
+      rulename,
     }
   }
 
diff --git a/packages/datadog-plugin-aws-sdk/src/services/stepfunctions.js b/packages/datadog-plugin-aws-sdk/src/services/stepfunctions.js
index 283ccd22be..28a5a6a844 100644
--- a/packages/datadog-plugin-aws-sdk/src/services/stepfunctions.js
+++ b/packages/datadog-plugin-aws-sdk/src/services/stepfunctions.js
@@ -29,9 +29,9 @@ class Stepfunctions extends BaseAwsSdkPlugin {
 
   generateTags (params, operation, response) {
     if (!params) return
-    const tags = { 'resource.name': params.name ? `${operation} ${params.name}` : `${operation}` }
+    const tags = { 'resource.name': params.name ? `${operation} ${params.name}` : operation }
     if (operation === 'startExecution' || operation === 'startSyncExecution') {
-      tags.statemachinearn = `${params.stateMachineArn}`
+      tags.statemachinearn = params.stateMachineArn
     }
     return tags
   }
diff --git a/packages/datadog-plugin-azure-event-hubs/src/producer.js b/packages/datadog-plugin-azure-event-hubs/src/producer.js
index 4c17ff6867..22ad0b1528 100644
--- a/packages/datadog-plugin-azure-event-hubs/src/producer.js
+++ b/packages/datadog-plugin-azure-event-hubs/src/producer.js
@@ -46,9 +46,7 @@ class AzureEventHubsProducerPlugin extends ProducerPlugin {
         }
         injectTraceContext(this.tracer, span, ctx.eventData)
       }
-    }
-
-    if (ctx.functionName === 'sendBatch') {
+    } else if (ctx.functionName === 'sendBatch') {
       const eventData = ctx.eventData
       const eventDataLength = eventData.length || eventData._context.connection._eventsCount
       span.setTag('messaging.operation', 'send')
diff --git a/packages/datadog-plugin-azure-service-bus/src/producer.js b/packages/datadog-plugin-azure-service-bus/src/producer.js
index 83f8a1a3b0..32085fc1c9 100644
--- a/packages/datadog-plugin-azure-service-bus/src/producer.js
+++ b/packages/datadog-plugin-azure-service-bus/src/producer.js
@@ -45,9 +45,11 @@ class AzureServiceBusProducerPlugin extends ProducerPlugin {
         }
         injectTraceContext(this.tracer, span, ctx.msg)
       }
-    }
-
-    if (ctx.functionName === 'send' || ctx.functionName === 'sendBatch' || ctx.functionName === 'scheduleMessages') {
+    } else if (
+      ctx.functionName === 'send' ||
+      ctx.functionName === 'sendBatch' ||
+      ctx.functionName === 'scheduleMessages'
+    ) {
       const messages = ctx.msg
       const isBatch = messages.constructor?.name === 'ServiceBusMessageBatchImpl'
       if (isBatch) {
diff --git a/packages/datadog-plugin-bullmq/src/producer.js b/packages/datadog-plugin-bullmq/src/producer.js
index 529620a713..96c63d948d 100644
--- a/packages/datadog-plugin-bullmq/src/producer.js
+++ b/packages/datadog-plugin-bullmq/src/producer.js
@@ -222,7 +222,7 @@ class QueueAddBulkPlugin extends BaseBullmqProducerPlugin {
     for (let i = 0; i < jobs.length; i++) {
       const job = jobs[i]
       if (!job) continue
-      job.opts = job.opts || {}
+      job.opts ||= {}
       cache[i] = this._injectIntoOpts(span, job.opts)
     }
     ctx._ddMetadata = cache
@@ -274,7 +274,7 @@ class FlowProducerAddPlugin extends BaseBullmqProducerPlugin {
   injectTraceContext (span, ctx) {
     const flow = ctx.arguments?.[0]
     if (!flow) return
-    flow.opts = flow.opts || {}
+    flow.opts ||= {}
     ctx._ddMetadata = this._injectIntoOpts(span, flow.opts)
   }
 
@@ -283,7 +283,7 @@ class FlowProducerAddPlugin extends BaseBullmqProducerPlugin {
     if (!flow) {
       return { queueName: 'bullmq', payloadSize: 0, optsTarget: undefined }
     }
-    flow.opts = flow.opts || {}
+    flow.opts ||= {}
     return {
       queueName: flow.queueName || 'bullmq',
       payloadSize: flow.data ? getMessageSize(flow.data) : 0,
diff --git a/packages/datadog-plugin-child_process/src/index.js b/packages/datadog-plugin-child_process/src/index.js
index 44ae3d7c2f..8036a0fecd 100644
--- a/packages/datadog-plugin-child_process/src/index.js
+++ b/packages/datadog-plugin-child_process/src/index.js
@@ -52,7 +52,7 @@ class ChildProcessPlugin extends TracingPlugin {
     }
 
     if (truncated) {
-      meta['cmd.truncated'] = `${truncated}`
+      meta['cmd.truncated'] = 'true'
     }
 
     this.startSpan('command_execution', {
@@ -81,7 +81,7 @@ class ChildProcessPlugin extends TracingPlugin {
 
     const span = ctx.currentStore?.span || this.activeSpan
 
-    span?.setTag('cmd.exit_code', `${exitCode}`)
+    span?.setTag('cmd.exit_code', String(exitCode))
     span?.finish()
 
     return ctx.parentStore
@@ -112,7 +112,7 @@ class ChildProcessPlugin extends TracingPlugin {
 
     const span = ctx.currentStore?.span || this.activeSpan
 
-    span?.setTag('cmd.exit_code', `${exitCode}`)
+    span?.setTag('cmd.exit_code', String(exitCode))
     span?.finish()
 
     return ctx.parentStore
diff --git a/packages/datadog-plugin-child_process/src/scrub-cmd-params.js b/packages/datadog-plugin-child_process/src/scrub-cmd-params.js
index 29f3b62aa7..0ee58361ec 100644
--- a/packages/datadog-plugin-child_process/src/scrub-cmd-params.js
+++ b/packages/datadog-plugin-child_process/src/scrub-cmd-params.js
@@ -14,18 +14,15 @@ const envVarRegex = new RegExp(ENV_PATTERN)
 const REDACTED = '?'
 
 function extractVarNames (expression) {
-  const varNames = new Set()
+  const varNames = {}
   let match
 
   while ((match = VARNAMES_REGEX.exec(expression))) {
-    varNames.add(match[1])
+    const name = match[1]
+    varNames[name] = `$${name}`
   }
 
-  const varNamesObject = {}
-  for (const varName of varNames.keys()) {
-    varNamesObject[varName] = `$${varName}`
-  }
-  return varNamesObject
+  return varNames
 }
 
 function getTokensByExpression (expressionTokens) {
diff --git a/packages/datadog-plugin-fastify/src/tracing.js b/packages/datadog-plugin-fastify/src/tracing.js
index debe8cf61b..bf6656e2f3 100644
--- a/packages/datadog-plugin-fastify/src/tracing.js
+++ b/packages/datadog-plugin-fastify/src/tracing.js
@@ -27,7 +27,7 @@ class FastifyTracingPlugin extends RouterPlugin {
 }
 
 function getParentStore (ctx) {
-  ctx.parentStore = ctx.parentStore ?? storage('legacy').getStore()
+  ctx.parentStore ??= storage('legacy').getStore()
   return ctx.parentStore
 }
 
diff --git a/packages/datadog-plugin-fs/src/index.js b/packages/datadog-plugin-fs/src/index.js
index c7d720669f..bbf6a620f0 100644
--- a/packages/datadog-plugin-fs/src/index.js
+++ b/packages/datadog-plugin-fs/src/index.js
@@ -7,10 +7,6 @@ class FsPlugin extends TracingPlugin {
   static operation = 'operation'
   static experimental = true
 
-  configure (...args) {
-    return super.configure(...args)
-  }
-
   bindStart (ctx) {
     if (!this.activeSpan) return { noop: true }
 
diff --git a/packages/datadog-plugin-graphql/src/execute.js b/packages/datadog-plugin-graphql/src/execute.js
index 438c8de828..5e54fcee30 100644
--- a/packages/datadog-plugin-graphql/src/execute.js
+++ b/packages/datadog-plugin-graphql/src/execute.js
@@ -495,6 +495,7 @@ function wrapResolve (resolve) {
     // run in the parent store, not field.currentStore: the first sibling's
     // synchronous resolver already finished the shared graphql.resolve span, so
     // re-entering its store would parent user spans to a closed span.
+    // eslint-disable-next-line unicorn/prefer-else-if -- Keep sibling early return outside first-field setup.
     if (!isFirst) {
       return callInAsyncScope(resolve, this, arguments, rootCtx.abortController, field.parentStore, (err) => {
         if (updateFieldCh.hasSubscribers) {
diff --git a/packages/datadog-plugin-graphql/src/tools/signature.js b/packages/datadog-plugin-graphql/src/tools/signature.js
index e36bda9d2f..01015d0ba5 100644
--- a/packages/datadog-plugin-graphql/src/tools/signature.js
+++ b/packages/datadog-plugin-graphql/src/tools/signature.js
@@ -11,7 +11,7 @@ const transforms = require('./transforms')
 const cache = new WeakMap()
 
 function defaultEngineReportingSignature (ast, operationName) {
-  const key = operationName == null ? '' : operationName
+  const key = operationName ?? ''
   let inner = cache.get(ast)
   if (inner !== undefined) {
     const cached = inner.get(key)
diff --git a/packages/datadog-plugin-http/src/client.js b/packages/datadog-plugin-http/src/client.js
index 46f143915c..13f2b7a9af 100644
--- a/packages/datadog-plugin-http/src/client.js
+++ b/packages/datadog-plugin-http/src/client.js
@@ -10,6 +10,7 @@ const HTTP_HEADERS = formats.HTTP_HEADERS
 const urlFilter = require('../../dd-trace/src/plugins/util/urlfilter')
 const { buildClientHttpUrl } = require('../../dd-trace/src/plugins/util/url')
 const log = require('../../dd-trace/src/log')
+const { stripQueryAndFragment } = require('../../dd-trace/src/util')
 const { CLIENT_PORT_KEY, COMPONENT, ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants')
 
 const HTTP_STATUS_CODE = tags.HTTP_STATUS_CODE
@@ -32,7 +33,7 @@ class HttpClientPlugin extends ClientPlugin {
     // A URL object (e.g. from the fetch integration) carries the query in
     // `options.search`, not `options.path`; keep it so url.full retains the query.
     const pathname = options.path || `${options.pathname || ''}${options.search || ''}`
-    const path = pathname ? pathname.split(/[?#]/)[0] : '/'
+    const path = pathname ? stripQueryAndFragment(pathname) : '/'
     const uri = `${base}${path}`
 
     const allowed = this.config.filter(uri)
diff --git a/packages/datadog-plugin-jest/src/index.js b/packages/datadog-plugin-jest/src/index.js
index 9b0d7e5f32..069e1bc0dd 100644
--- a/packages/datadog-plugin-jest/src/index.js
+++ b/packages/datadog-plugin-jest/src/index.js
@@ -237,9 +237,8 @@ class JestPlugin extends CiPlugin {
 
       const testSuiteMetadata = {
         ...getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite, 'jest'),
-        // requestErrorTags from test env options may be undefined
-        ...(requestErrorTags !== undefined && requestErrorTags !== null ? requestErrorTags : {}),
-        ...(itrSkippingEnabledTags !== undefined && itrSkippingEnabledTags !== null ? itrSkippingEnabledTags : {}),
+        ...requestErrorTags,
+        ...itrSkippingEnabledTags,
       }
 
       if (_ddUnskippable) {
diff --git a/packages/datadog-plugin-langchain/src/tokens.js b/packages/datadog-plugin-langchain/src/tokens.js
index 856115e4b3..5c66b0d4b6 100644
--- a/packages/datadog-plugin-langchain/src/tokens.js
+++ b/packages/datadog-plugin-langchain/src/tokens.js
@@ -9,7 +9,7 @@ function getTokensFromLlmOutput (result) {
   const { llmOutput } = result
   if (!llmOutput) return tokens
 
-  const tokenUsage = llmOutput.tokenUsage || llmOutput.usage_metadata || llmOutput.usage_metadata
+  const tokenUsage = llmOutput.tokenUsage || llmOutput.usage_metadata
   if (!tokenUsage) return tokens
 
   for (const tokenNames of [['input', 'prompt'], ['output', 'completion'], ['total']]) {
@@ -25,7 +25,7 @@ function getTokensFromLlmOutput (result) {
   }
 
   // assign total_tokens again in case it was improperly set the first time, or was not on tokenUsage
-  tokens.total = tokens.total || tokens.input + tokens.output
+  tokens.total ||= tokens.input + tokens.output
 
   return tokens
 }
diff --git a/packages/datadog-plugin-prisma/src/index.js b/packages/datadog-plugin-prisma/src/index.js
index 313851bf27..96572e3c9d 100644
--- a/packages/datadog-plugin-prisma/src/index.js
+++ b/packages/datadog-plugin-prisma/src/index.js
@@ -125,9 +125,13 @@ class PrismaPlugin extends DatabasePlugin {
   }
 }
 
+/**
+ * @param {string} resource
+ * @param {{ name?: string, model?: string, method?: string }} [attributes]
+ */
 function formatResourceName (resource, attributes) {
   if (attributes?.name) {
-    return `${attributes.name}`.trim()
+    return attributes.name.trim()
   }
   if (attributes?.model && attributes.method) {
     return `${attributes.model}.${attributes.method}`.trim()
diff --git a/packages/datadog-plugin-rhea/src/producer.js b/packages/datadog-plugin-rhea/src/producer.js
index 70ca0058d5..e5bbccebbc 100644
--- a/packages/datadog-plugin-rhea/src/producer.js
+++ b/packages/datadog-plugin-rhea/src/producer.js
@@ -37,7 +37,7 @@ class RheaProducerPlugin extends ProducerPlugin {
 
 function addDeliveryAnnotations (msg, tracer, span) {
   if (msg) {
-    msg.delivery_annotations = msg.delivery_annotations || {}
+    msg.delivery_annotations ||= {}
 
     tracer.inject(span, 'text_map', msg.delivery_annotations)
 
diff --git a/packages/datadog-plugin-undici/src/index.js b/packages/datadog-plugin-undici/src/index.js
index cb164b28a2..90f50f077e 100644
--- a/packages/datadog-plugin-undici/src/index.js
+++ b/packages/datadog-plugin-undici/src/index.js
@@ -7,6 +7,7 @@ const formats = require('../../../ext/formats')
 const HTTP_HEADERS = formats.HTTP_HEADERS
 const log = require('../../dd-trace/src/log')
 const { buildClientHttpUrl } = require('../../dd-trace/src/plugins/util/url')
+const { stripQueryAndFragment } = require('../../dd-trace/src/util')
 const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 
 const {
@@ -62,7 +63,7 @@ class UndiciPlugin extends HttpClientPlugin {
 
     const host = port ? `${hostname}:${port}` : hostname
     const base = `${protocol}//${host}`
-    const pathname = path.split(/[?#]/)[0]
+    const pathname = stripQueryAndFragment(path)
     const uri = `${base}${pathname}`
 
     const allowed = this.config.filter(uri)
diff --git a/packages/datadog-webpack/index.js b/packages/datadog-webpack/index.js
index 18e06db5cf..728a29b670 100644
--- a/packages/datadog-webpack/index.js
+++ b/packages/datadog-webpack/index.js
@@ -141,7 +141,7 @@ class DatadogWebpackPlugin {
         // (#8980); absent peers stay opaque, so a build that does not opt into the feature does
         // not follow their dependency chain (#8635).
         if (matchesOptionalPeerFile(normalizedResource)) {
-          createData.loaders = createData.loaders || []
+          createData.loaders ||= []
           createData.loaders.push({ loader: require.resolve('./src/optional-peer-loader') })
           log.debug('INLINE: optional-peer loader applied to %s', normalizedResource)
           return
@@ -188,7 +188,7 @@ class DatadogWebpackPlugin {
         const version = packageJson.version
         const pkgPath = request === pkg ? pkg : `${pkg}/${modulePath}`
 
-        createData.loaders = createData.loaders || []
+        createData.loaders ||= []
         createData.loaders.unshift({
           loader: require.resolve('./src/loader'),
           options: { pkg, version, path: pkgPath },
diff --git a/packages/dd-trace/src/appsec/downstream_requests.js b/packages/dd-trace/src/appsec/downstream_requests.js
index 893bb55a9f..a2b50ad1c5 100644
--- a/packages/dd-trace/src/appsec/downstream_requests.js
+++ b/packages/dd-trace/src/appsec/downstream_requests.js
@@ -307,7 +307,7 @@ function parseBody (body, contentType) {
       const formBody = Buffer.isBuffer(body) ? body.toString('utf8') : String(body)
       const params = new URLSearchParams(formBody)
       const result = {}
-      for (const [key, value] of params.entries()) {
+      for (const [key, value] of params) {
         if (key in result) {
           const existing = result[key]
           if (Array.isArray(existing)) {
diff --git a/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-base-analyzer.js b/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-base-analyzer.js
index 79e7a8dbcd..6cb6f9f554 100644
--- a/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-base-analyzer.js
+++ b/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-base-analyzer.js
@@ -56,7 +56,7 @@ class HardcodedBaseAnalyzer extends Analyzer {
   }
 
   _getEvidence (value) {
-    return { value: `${value.data}` }
+    return { value: value.data }
   }
 
   _getLocation (value) {
diff --git a/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-password-analyzer.js b/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-password-analyzer.js
index 509b292291..34eb922382 100644
--- a/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-password-analyzer.js
+++ b/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-password-analyzer.js
@@ -11,7 +11,7 @@ class HardcodedPasswordAnalyzer extends HardcodedBaseAnalyzer {
   }
 
   _getEvidence (value) {
-    return { value: `${value.ident}` }
+    return { value: value.ident }
   }
 }
 
diff --git a/packages/dd-trace/src/appsec/iast/analyzers/sql-injection-analyzer.js b/packages/dd-trace/src/appsec/iast/analyzers/sql-injection-analyzer.js
index 2f2f5434b1..9c88f74344 100644
--- a/packages/dd-trace/src/appsec/iast/analyzers/sql-injection-analyzer.js
+++ b/packages/dd-trace/src/appsec/iast/analyzers/sql-injection-analyzer.js
@@ -74,7 +74,7 @@ class SqlInjectionAnalyzer extends StoredInjectionAnalyzer {
   }
 
   analyze (value, store, dialect) {
-    store = store || storage('legacy').getStore()
+    store ||= storage('legacy').getStore()
     if (!(store && store.sqlAnalyzed)) {
       super.analyze(value, store, dialect)
     }
diff --git a/packages/dd-trace/src/appsec/iast/taint-tracking/taint-tracking-impl.js b/packages/dd-trace/src/appsec/iast/taint-tracking/taint-tracking-impl.js
index 15d70e3db6..70ea25a731 100644
--- a/packages/dd-trace/src/appsec/iast/taint-tracking/taint-tracking-impl.js
+++ b/packages/dd-trace/src/appsec/iast/taint-tracking/taint-tracking-impl.js
@@ -215,9 +215,7 @@ function getTaintTrackingImpl (telemetryVerbosity, dummy = false) {
   if (dummy) return TaintTrackingNoop
 
   // with Verbosity.DEBUG every invocation of a TaintedUtils method increases the EXECUTED_PROPAGATION metric
-  return isDebugAllowed(telemetryVerbosity)
-    ? createImplWith(getContextDebug)
-    : createImplWith(getContextDefault)
+  return createImplWith(isDebugAllowed(telemetryVerbosity) ? getContextDebug : getContextDefault)
 }
 
 function getTaintTrackingNoop () {
diff --git a/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/utils.js b/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/utils.js
index 882da0e028..736f127740 100644
--- a/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/utils.js
+++ b/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/utils.js
@@ -35,7 +35,7 @@ function stringifyWithRanges (obj, objRanges, loadSensitiveRanges = false) {
   let value
   const ranges = []
   const sensitiveRanges = []
-  objRanges = objRanges || {}
+  objRanges ||= {}
 
   if (objRanges || loadSensitiveRanges) {
     const cloneObj = Array.isArray(obj) ? [] : {}
diff --git a/packages/dd-trace/src/appsec/iast/vulnerability-reporter.js b/packages/dd-trace/src/appsec/iast/vulnerability-reporter.js
index 34de46a5a8..22beee3ca1 100644
--- a/packages/dd-trace/src/appsec/iast/vulnerability-reporter.js
+++ b/packages/dd-trace/src/appsec/iast/vulnerability-reporter.js
@@ -21,7 +21,7 @@ let stackTraceMaxDepth
 let maxStackTraces
 
 function canAddVulnerability (vulnerability) {
-  const hasRequiredFields = vulnerability?.evidence && vulnerability?.type && vulnerability?.location
+  const hasRequiredFields = vulnerability?.evidence && vulnerability.type && vulnerability.location
   if (!hasRequiredFields) return false
 
   const isDuplicated = deduplicationEnabled && isDuplicatedVulnerability(vulnerability)
@@ -64,7 +64,7 @@ function addVulnerability (iastContext, vulnerability, callSiteFrames) {
   }
 
   if (iastContext?.rootSpan) {
-    iastContext[VULNERABILITIES_KEY] = iastContext[VULNERABILITIES_KEY] || []
+    iastContext[VULNERABILITIES_KEY] ||= []
     iastContext[VULNERABILITIES_KEY].push(vulnerability)
   } else {
     sendVulnerabilities([vulnerability], span)
diff --git a/packages/dd-trace/src/appsec/sdk/track_event.js b/packages/dd-trace/src/appsec/sdk/track_event.js
index 10388a51ae..cbd7685d34 100644
--- a/packages/dd-trace/src/appsec/sdk/track_event.js
+++ b/packages/dd-trace/src/appsec/sdk/track_event.js
@@ -160,7 +160,7 @@ function flattenFields (fields, depth = 0) {
 
     if (value && typeof value === 'object') {
       const { result: flatValue, truncated: inheritTruncated } = flattenFields(value, depth + 1)
-      truncated = truncated || inheritTruncated
+      truncated ||= inheritTruncated
 
       if (flatValue) {
         for (const flatKey of Object.keys(flatValue)) {
diff --git a/packages/dd-trace/src/appsec/waf/waf_manager.js b/packages/dd-trace/src/appsec/waf/waf_manager.js
index f1379b2d46..1620661df1 100644
--- a/packages/dd-trace/src/appsec/waf/waf_manager.js
+++ b/packages/dd-trace/src/appsec/waf/waf_manager.js
@@ -39,7 +39,7 @@ class WAFManager {
       const { obfuscatorKeyRegex, obfuscatorValueRegex } = this.config
       return new DDWAF(rules, WAFManager.defaultWafConfigPath, { obfuscatorKeyRegex, obfuscatorValueRegex })
     } catch (err) {
-      this.ddwafVersion = this.ddwafVersion || 'unknown'
+      this.ddwafVersion ||= 'unknown'
       Reporter.reportWafInit(this.ddwafVersion, 'unknown')
 
       log.error('[ASM] AppSec could not load native package. In-app WAF features will not be available.', err)
diff --git a/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js b/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js
index 0893ab8d1d..a502df8990 100644
--- a/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js
+++ b/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js
@@ -15,6 +15,7 @@ const { uploadCoverageReport: uploadCoverageReportRequest } = require('../reques
 const { uploadTestScreenshot: uploadTestScreenshotRequest } = require('../requests/upload-test-screenshot')
 const { parsers } = require('../../config/parsers')
 const log = require('../../log')
+const { getSegment } = require('../../util')
 const BufferingExporter = require('../../exporters/common/buffering-exporter')
 const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../../plugins/util/tags')
 const { sendGitMetadata: sendGitMetadataRequest } = require('./git/git_metadata')
@@ -28,8 +29,7 @@ function getTestConfigurationTags (tags) {
   }
   return Object.keys(tags).reduce((acc, key) => {
     if (key.startsWith('test.configuration.')) {
-      const [, configKey] = key.split('test.configuration.')
-      acc[configKey] = tags[key]
+      acc[getSegment(key, 'test.configuration.', 1)] = tags[key]
     }
     return acc
   }, {})
diff --git a/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js b/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js
index 4fcde1070d..987c39ba3c 100644
--- a/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js
+++ b/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js
@@ -8,6 +8,7 @@ const FormData = require('../../../exporters/common/form-data')
 const request = require('../../../exporters/common/request')
 
 const log = require('../../../log')
+const { getSegment } = require('../../../util')
 const {
   getLatestCommits,
   getRepositoryUrl,
@@ -145,7 +146,7 @@ function uploadPackFile ({ url, isEvpProxy, evpProxyPrefix, packFileToUpload, re
   try {
     const packFileContent = fs.readFileSync(packFileToUpload)
     // The original filename includes a random prefix, so we remove it here
-    const [, filename] = path.basename(packFileToUpload).split('-')
+    const filename = getSegment(path.basename(packFileToUpload), '-', 1)
     form.append('packfile', packFileContent, {
       filename,
       contentType: 'application/octet-stream',
diff --git a/packages/dd-trace/src/ci-visibility/requests/request.js b/packages/dd-trace/src/ci-visibility/requests/request.js
index ef6e6e699a..bd3b194e7f 100644
--- a/packages/dd-trace/src/ci-visibility/requests/request.js
+++ b/packages/dd-trace/src/ci-visibility/requests/request.js
@@ -42,7 +42,7 @@ function request (data, options, callback) {
     if (url.protocol === 'unix:') {
       opts.socketPath = url.pathname
     } else {
-      opts.path = opts.path ?? url.path
+      opts.path ??= url.path
       opts.protocol = url.protocol
       opts.hostname = url.hostname
       opts.port = url.port
@@ -100,9 +100,9 @@ function request (data, options, callback) {
           if (res.statusCode === 429 && !hasRetried) {
             const resetHeader = res.headers['x-ratelimit-reset']
             const resetTs = (resetHeader === null || resetHeader === undefined)
-              ? Number.NaN
+              ? NaN
               : Number.parseInt(resetHeader, 10)
-            const waitMs = Number.isFinite(resetTs) ? Math.max(0, resetTs * 1000 - Date.now()) : Number.NaN
+            const waitMs = Number.isFinite(resetTs) ? Math.max(0, resetTs * 1000 - Date.now()) : NaN
 
             if (Number.isFinite(waitMs) && waitMs <= RATE_LIMIT_MAX_WAIT_MS) {
               hasRetried = true
diff --git a/packages/dd-trace/src/datastreams/encoding.js b/packages/dd-trace/src/datastreams/encoding.js
index e91b184dd4..e9eab5d67b 100644
--- a/packages/dd-trace/src/datastreams/encoding.js
+++ b/packages/dd-trace/src/datastreams/encoding.js
@@ -40,7 +40,7 @@ function encodeVarintInto (target, offset, value) {
   let i = offset
   const limit = offset + maxVarLen64 - 1
   // if first byte is 1, the number is negative in javascript, but we want to interpret it as positive
-  while ((high !== 0 || low < 0 || low > 0x80) && i < limit) {
+  while ((high !== 0 || low < 0 || low > 0x7F) && i < limit) {
     target[i] = (low & 0x7F) | 0x80
     low >>>= 7
     low |= (high & 0x7F) << 25
@@ -88,7 +88,7 @@ function decodeUvarint64 (
         low |= n << s
       }
       if (s > 0) {
-        high |= s - 32 > 0 ? n << (s - 32) : n >> (32 - s)
+        high |= s > 32 ? n << (s - 32) : n >> (32 - s)
       }
       return [low, high, bytes]
     }
@@ -96,8 +96,7 @@ function decodeUvarint64 (
       low |= (n & 0x7F) << s
     }
     if (s > 0) {
-      high |=
-        s - 32 > 0 ? (n & 0x7F) << (s - 32) : (n & 0x7F) >> (32 - s)
+      high |= s > 32 ? (n & 0x7F) << (s - 32) : (n & 0x7F) >> (32 - s)
     }
     s += 7
   }
diff --git a/packages/dd-trace/src/debugger/devtools_client/probe_sampler.js b/packages/dd-trace/src/debugger/devtools_client/probe_sampler.js
index 001d05efca..bc447a56e0 100644
--- a/packages/dd-trace/src/debugger/devtools_client/probe_sampler.js
+++ b/packages/dd-trace/src/debugger/devtools_client/probe_sampler.js
@@ -36,10 +36,7 @@ function getRemoveProbeExpression (id) {
  * @returns {string}
  */
 function compileBreakpointCondition (probes) {
-  const probeConditions = []
-  for (const probe of probes) {
-    probeConditions.push(compileProbeCondition(probe))
-  }
+  const probeConditions = probes.map(compileProbeCondition)
 
   // NOTE: $dd_sampler is read from the realm-local `globalThis` where it was installed (the main
   // realm). A probe whose code runs in a different V8 realm (e.g. a `vm.createContext` script with a
diff --git a/packages/dd-trace/src/debugger/devtools_client/send.js b/packages/dd-trace/src/debugger/devtools_client/send.js
index ec4aeead80..460af4f268 100644
--- a/packages/dd-trace/src/debugger/devtools_client/send.js
+++ b/packages/dd-trace/src/debugger/devtools_client/send.js
@@ -67,14 +67,13 @@ function send (message, logger, dd, snapshot, processTags) {
 
     if (pruned) {
       json = pruned
-      size = Buffer.byteLength(json)
     } else {
       // Fallback if pruning fails
       const line = Object.keys(snapshot.captures.lines)[0]
       snapshot.captures.lines[line] = { pruned: true }
       json = JSON.stringify(payload)
-      size = Buffer.byteLength(json)
     }
+    size = Buffer.byteLength(json)
   }
 
   jsonBuffer.write(json, size)
diff --git a/packages/dd-trace/src/debugger/devtools_client/snapshot/index.js b/packages/dd-trace/src/debugger/devtools_client/snapshot/index.js
index ac0c5824ad..938331d792 100644
--- a/packages/dd-trace/src/debugger/devtools_client/snapshot/index.js
+++ b/packages/dd-trace/src/debugger/devtools_client/snapshot/index.js
@@ -61,7 +61,7 @@ async function getLocalStateForCallFrame (callFrame, limits, deadlineNs = BIGINT
   // Delay calling `processRawState` so caller can resume the main thread before processing `rawState`
   return {
     processLocalState () {
-      processedState = processedState ?? processRawState(rawState, maxLength)
+      processedState ??= processRawState(rawState, maxLength)
       return processedState
     },
     fatalErrors: ctx.fatalErrors,
@@ -155,7 +155,7 @@ async function evaluateCaptureExpressions (callFrame, expressions, deadlineNs =
           fatalErrors.push(...ctx.fatalErrors)
         }
 
-        if (ctx.deadlineReached === true) {
+        if (ctx.deadlineReached) {
           // Add the current expression (properties may be incomplete due to timeout)
           rawResults.push({ name, remoteObject: result, maxLength })
           // Add stub entries for remaining uncaptured expressions
diff --git a/packages/dd-trace/src/debugger/devtools_client/snapshot/redaction.js b/packages/dd-trace/src/debugger/devtools_client/snapshot/redaction.js
index 020f94150a..af573a69f9 100644
--- a/packages/dd-trace/src/debugger/devtools_client/snapshot/redaction.js
+++ b/packages/dd-trace/src/debugger/devtools_client/snapshot/redaction.js
@@ -97,10 +97,24 @@ const REDACTED_IDENTIFIERS = new Set(
     'XSRF-TOKEN',
     ...config.dynamicInstrumentation.redactedIdentifiers,
   ]
-    .map((name) => normalizeName(name))
-    .filter((name) => excludedIdentifiers.has(name) === false)
+    .map(normalizeIdentifier)
+    .filter(isIncludedIdentifier)
 )
 
+/**
+ * @param {string} name
+ */
+function normalizeIdentifier (name) {
+  return normalizeName(name)
+}
+
+/**
+ * @param {string} name
+ */
+function isIncludedIdentifier (name) {
+  return !excludedIdentifiers.has(name)
+}
+
 function normalizeName (name, isSymbol) {
   if (isSymbol) name = name.slice(7, -1) // Remove `Symbol(` and `)`
   return name.toLowerCase().replaceAll(/[-_@$.]/g, '')
diff --git a/packages/dd-trace/src/encode/tags-processors.js b/packages/dd-trace/src/encode/tags-processors.js
index 99c15ff747..22f7386033 100644
--- a/packages/dd-trace/src/encode/tags-processors.js
+++ b/packages/dd-trace/src/encode/tags-processors.js
@@ -60,11 +60,11 @@ function eventTimeNano (event) {
 }
 
 function normalizeSpan (span) {
-  span.service = span.service || DEFAULT_SERVICE_NAME
+  span.service ||= DEFAULT_SERVICE_NAME
   if (span.service.length > MAX_SERVICE_LENGTH) {
     span.service = span.service.slice(0, MAX_SERVICE_LENGTH)
   }
-  span.name = span.name || DEFAULT_SPAN_NAME
+  span.name ||= DEFAULT_SPAN_NAME
   if (span.name.length > MAX_NAME_LENGTH) {
     span.name = span.name.slice(0, MAX_NAME_LENGTH)
   }
diff --git a/packages/dd-trace/src/exporters/common/url.js b/packages/dd-trace/src/exporters/common/url.js
index 7bf2ab9b82..bd381c996d 100644
--- a/packages/dd-trace/src/exporters/common/url.js
+++ b/packages/dd-trace/src/exporters/common/url.js
@@ -32,11 +32,9 @@ function parseUrl (urlObjOrString) {
   // `urlToHttpOptions` returns `pathname` at runtime, but @types/node narrows it
   // to `ClientRequestArgs`, which omits it; cast so the named-pipe fold below can
   // read and rewrite it.
-  const url = /** @type {import('node:http').ClientRequestArgs & { pathname: string }} */ (
-    urlObjOrString !== null && typeof urlObjOrString === 'object'
-      ? urlToHttpOptions(urlObjOrString)
-      : urlToHttpOptions(new URL(urlObjOrString))
-  )
+  const url = /** @type {import('node:http').ClientRequestArgs & { pathname: string }} */ (urlToHttpOptions(
+    urlObjOrString !== null && typeof urlObjOrString === 'object' ? urlObjOrString : new URL(urlObjOrString)
+  ))
 
   if (url.protocol === 'unix:' && url.hostname === '.') {
     url.path = url.pathname = `//.${url.pathname}`
diff --git a/packages/dd-trace/src/exporters/electron/index.js b/packages/dd-trace/src/exporters/electron/index.js
index 813c0da2f0..88ef3e0276 100644
--- a/packages/dd-trace/src/exporters/electron/index.js
+++ b/packages/dd-trace/src/exporters/electron/index.js
@@ -16,6 +16,8 @@ class ElectronExporter {
   }
 
   export (spans) {
+    if (!traceChannel.hasSubscribers) return
+
     this.#traces.push(spans)
 
     const { flushInterval } = this._config
@@ -35,7 +37,8 @@ class ElectronExporter {
     clearTimeout(this.#timer)
     this.#timer = undefined
 
-    const traces = this.#traces.splice(0)
+    const traces = this.#traces
+    this.#traces = []
 
     if (traces.length > 0 && traceChannel.hasSubscribers) {
       const formattedTraces = traces.map(spans => spans.map(span => normalizeSpan(truncateSpan(span))))
diff --git a/packages/dd-trace/src/external-logger/src/index.js b/packages/dd-trace/src/external-logger/src/index.js
index c00e519f5e..cd3532a7bb 100644
--- a/packages/dd-trace/src/external-logger/src/index.js
+++ b/packages/dd-trace/src/external-logger/src/index.js
@@ -78,7 +78,6 @@ class ExternalLogger {
 
   // Flushes logs with optional callback for when the call is complete
   flush (cb = () => {}) {
-    let logs
     let numLogs
     let encodedLogs
 
@@ -88,7 +87,7 @@ class ExternalLogger {
     }
 
     try {
-      logs = this.queue
+      const logs = this.queue
       this.queue = []
 
       numLogs = logs.length
diff --git a/packages/dd-trace/src/flare/index.js b/packages/dd-trace/src/flare/index.js
index b270bbc8ce..584a861661 100644
--- a/packages/dd-trace/src/flare/index.js
+++ b/packages/dd-trace/src/flare/index.js
@@ -39,8 +39,8 @@ const flare = {
     logChannel?.unsubscribe(logger)
     logChannel = new LogChannel(logLevel)
     logChannel.subscribe(logger)
-    tracerLogs = tracerLogs || new FlareFile()
-    timer = timer || setTimeout(flare.cleanup, TIMEOUT)
+    tracerLogs ||= new FlareFile()
+    timer ||= setTimeout(flare.cleanup, TIMEOUT)
   },
 
   send (task) {
diff --git a/packages/dd-trace/src/id.js b/packages/dd-trace/src/id.js
index ff7bbc9d88..b0006e44ba 100644
--- a/packages/dd-trace/src/id.js
+++ b/packages/dd-trace/src/id.js
@@ -185,7 +185,7 @@ function toNumberString (buffer, radix) {
   let low = readInt32(buffer, buffer.length - 4)
   let str = ''
 
-  radix = radix || 10
+  radix ||= 10
 
   while (1) {
     const mod = (high % radix) * UINT_MAX + low
diff --git a/packages/dd-trace/src/llmobs/plugins/anthropic/index.js b/packages/dd-trace/src/llmobs/plugins/anthropic/index.js
index db2d652d45..1535859e44 100644
--- a/packages/dd-trace/src/llmobs/plugins/anthropic/index.js
+++ b/packages/dd-trace/src/llmobs/plugins/anthropic/index.js
@@ -93,7 +93,7 @@ class AnthropicLLMObsPlugin extends LLMObsPlugin {
 
             const { usage } = chunk
             if (usage) {
-              const responseUsage = response.usage ?? (response.usage = { input_tokens: 0, output_tokens: 0 })
+              const responseUsage = (response.usage ??= { input_tokens: 0, output_tokens: 0 })
               responseUsage.output_tokens = usage.output_tokens
 
               const cacheCreationTokens = usage.cache_creation_input_tokens
diff --git a/packages/dd-trace/src/llmobs/plugins/genai/index.js b/packages/dd-trace/src/llmobs/plugins/genai/index.js
index 69c5d63cab..12da7da905 100644
--- a/packages/dd-trace/src/llmobs/plugins/genai/index.js
+++ b/packages/dd-trace/src/llmobs/plugins/genai/index.js
@@ -24,7 +24,7 @@ class GenAiLLMObsPlugin extends LLMObsPlugin {
     // Subscribe to streaming chunk events
     this.addSub('apm:google:genai:request:chunk', ({ ctx, chunk, done }) => {
       ctx.isStreaming = true
-      ctx.chunks = ctx.chunks || []
+      ctx.chunks ||= []
 
       if (chunk) ctx.chunks.push(chunk)
       if (!done) return
diff --git a/packages/dd-trace/src/llmobs/plugins/langchain/handlers/index.js b/packages/dd-trace/src/llmobs/plugins/langchain/handlers/index.js
index 2438e9ed8e..fd10a858a7 100644
--- a/packages/dd-trace/src/llmobs/plugins/langchain/handlers/index.js
+++ b/packages/dd-trace/src/llmobs/plugins/langchain/handlers/index.js
@@ -36,7 +36,7 @@ class LangChainLLMObsHandler {
     const runIdBase = runId ? runId.split('-').slice(0, -1).join('-') : ''
 
     const responseMetadata = message.response_metadata || {}
-    usage = usage || responseMetadata.usage || responseMetadata.tokenUsage || {}
+    usage ||= responseMetadata.usage || responseMetadata.tokenUsage || {}
 
     const inputTokens = usage.promptTokens || usage.inputTokens || usage.prompt_tokens || usage.input_tokens || 0
     const outputTokens =
diff --git a/packages/dd-trace/src/llmobs/sdk.js b/packages/dd-trace/src/llmobs/sdk.js
index a93bcaf05a..0e2b2a1a19 100644
--- a/packages/dd-trace/src/llmobs/sdk.js
+++ b/packages/dd-trace/src/llmobs/sdk.js
@@ -318,14 +318,14 @@ class LLMObs extends NoopLLMObs {
       }
       throw e
     } finally {
-      if (autoinstrumented === false) {
+      if (!autoinstrumented) {
         telemetry.recordLLMObsAnnotate(span, err)
       }
     }
   }
 
   exportSpan (span) {
-    span = span || this._active()
+    span ||= this._active()
     let err = ''
     try {
       if (!span) {
@@ -426,7 +426,7 @@ class LLMObs extends NoopLLMObs {
         err = 'invalid_metric_value'
         throw new Error('value must be a boolean for a boolean metric')
       }
-      if (metricType === 'json' && !(typeof value === 'object' && value != null && !Array.isArray(value))) {
+      if (metricType === 'json' && (typeof value !== 'object' || value == null || Array.isArray(value))) {
         err = 'invalid_metric_value'
         throw new Error('value must be a JSON object for a json metric')
       }
diff --git a/packages/dd-trace/src/llmobs/tagger.js b/packages/dd-trace/src/llmobs/tagger.js
index a1ec7a1bb7..6873208ba1 100644
--- a/packages/dd-trace/src/llmobs/tagger.js
+++ b/packages/dd-trace/src/llmobs/tagger.js
@@ -158,8 +158,7 @@ class LLMObsTagger {
     if (modelName) this.tagModelName(span, modelName)
     if (modelProvider) this._setTag(span, MODEL_PROVIDER, modelProvider)
 
-    sessionId = sessionId ||
-      registry.get(parent)?.[SESSION_ID] ||
+    sessionId ||= registry.get(parent)?.[SESSION_ID] ||
       traceTags[SESSION_ID_TRACE_DEFAULT_KEY] ||
       traceTags[PROPAGATED_SESSION_ID_KEY]
     if (sessionId) this._setTag(span, SESSION_ID, sessionId)
diff --git a/packages/dd-trace/src/noop/proxy.js b/packages/dd-trace/src/noop/proxy.js
index 47969c1ea5..6f6feaa1d9 100644
--- a/packages/dd-trace/src/noop/proxy.js
+++ b/packages/dd-trace/src/noop/proxy.js
@@ -55,7 +55,7 @@ class NoopProxy {
 
     if (typeof fn !== 'function') return
 
-    options = options || {}
+    options ||= {}
 
     return this._tracer.trace(name, options, fn)
   }
@@ -68,7 +68,7 @@ class NoopProxy {
 
     if (typeof fn !== 'function') return fn
 
-    options = options || {}
+    options ||= {}
 
     return this._tracer.wrap(name, options, fn)
   }
diff --git a/packages/dd-trace/src/opentelemetry/metrics/otlp_transformer.js b/packages/dd-trace/src/opentelemetry/metrics/otlp_transformer.js
index c383d1e85a..a49e1e59cc 100644
--- a/packages/dd-trace/src/opentelemetry/metrics/otlp_transformer.js
+++ b/packages/dd-trace/src/opentelemetry/metrics/otlp_transformer.js
@@ -198,7 +198,7 @@ class OtlpTransformer extends OtlpTransformerBase {
     if (isJson) {
       dataPoint.startTimeUnixNano = String(dataPoint.startTimeUnixNano)
       dataPoint.timeUnixNano = String(dataPoint.timeUnixNano)
-      dataPoint.count = dataPoint.count || 0
+      dataPoint.count ||= 0
     }
 
     return dataPoint
diff --git a/packages/dd-trace/src/opentelemetry/metrics/periodic_metric_reader.js b/packages/dd-trace/src/opentelemetry/metrics/periodic_metric_reader.js
index a192969103..ccfd8ac151 100644
--- a/packages/dd-trace/src/opentelemetry/metrics/periodic_metric_reader.js
+++ b/packages/dd-trace/src/opentelemetry/metrics/periodic_metric_reader.js
@@ -253,7 +253,8 @@ class PeriodicMetricReader {
   #collectAndExport (callback = () => {}) {
     // Atomically drain measurements for export. New measurements can be recorded
     // during export without interfering with this batch.
-    const allMeasurements = this.#measurements.splice(0)
+    const allMeasurements = this.#measurements
+    this.#measurements = []
 
     for (const instrument of this.observableInstruments) {
       const observableMeasurements = instrument.collect()
diff --git a/packages/dd-trace/src/opentracing/span.js b/packages/dd-trace/src/opentracing/span.js
index b5f20d61b0..6cfee05656 100644
--- a/packages/dd-trace/src/opentracing/span.js
+++ b/packages/dd-trace/src/opentracing/span.js
@@ -440,7 +440,7 @@ class DatadogSpan {
       }
     }
 
-    spanContext._trace.ticks = spanContext._trace.ticks || now()
+    spanContext._trace.ticks ||= now()
     if (startTime) {
       spanContext._trace.startTime = startTime
     }
diff --git a/packages/dd-trace/src/opentracing/span_context.js b/packages/dd-trace/src/opentracing/span_context.js
index 28fdd29123..6daee283b4 100644
--- a/packages/dd-trace/src/opentracing/span_context.js
+++ b/packages/dd-trace/src/opentracing/span_context.js
@@ -8,7 +8,7 @@ const TRACE_ID_128 = '_dd.p.tid'
 
 class DatadogSpanContext {
   constructor (props) {
-    props = props || {}
+    props ||= {}
 
     this._traceId = props.traceId
     this._spanId = props.spanId
diff --git a/packages/dd-trace/src/plugins/plugin.js b/packages/dd-trace/src/plugins/plugin.js
index 6a117dde41..d5e75fb67d 100644
--- a/packages/dd-trace/src/plugins/plugin.js
+++ b/packages/dd-trace/src/plugins/plugin.js
@@ -103,7 +103,7 @@ module.exports = class Plugin {
    * @returns {void}
    */
   enter (span, store) {
-    store = store || legacyStorage.getStore()
+    store ||= legacyStorage.getStore()
     legacyStorage.enterWith({ ...store, span })
   }
 
diff --git a/packages/dd-trace/src/plugins/tracing.js b/packages/dd-trace/src/plugins/tracing.js
index 0f4e2dd349..aee18b069a 100644
--- a/packages/dd-trace/src/plugins/tracing.js
+++ b/packages/dd-trace/src/plugins/tracing.js
@@ -265,6 +265,7 @@ class TracingPlugin extends Plugin {
     analyticsSampler.sample(span, config.measured)
 
     // TODO: Remove this after migration to TracingChannel is done.
+    // eslint-disable-next-line unicorn/no-unnecessary-boolean-comparison -- Context objects use the other branch.
     if (enterOrCtx === true) {
       legacyStorage.enterWith({ ...store, span })
     } else if (enterOrCtx) {
diff --git a/packages/dd-trace/src/plugins/util/ci.js b/packages/dd-trace/src/plugins/util/ci.js
index ef7cf9f377..ac957e6237 100644
--- a/packages/dd-trace/src/plugins/util/ci.js
+++ b/packages/dd-trace/src/plugins/util/ci.js
@@ -316,10 +316,8 @@ module.exports = {
       }
 
       if (NODE_LABELS) {
-        let nodeLabels
         try {
-          nodeLabels = JSON.stringify(NODE_LABELS.split(' '))
-          tags[CI_NODE_LABELS] = nodeLabels
+          tags[CI_NODE_LABELS] = JSON.stringify(NODE_LABELS.split(' '))
         } catch {
           // ignore errors
         }
diff --git a/packages/dd-trace/src/plugins/util/http-otel-semantics.js b/packages/dd-trace/src/plugins/util/http-otel-semantics.js
index e139affd16..690ba3b607 100644
--- a/packages/dd-trace/src/plugins/util/http-otel-semantics.js
+++ b/packages/dd-trace/src/plugins/util/http-otel-semantics.js
@@ -258,7 +258,7 @@ function applyHttpOtelSemantics (formattedSpan) {
   // type): server spans are errors on 5xx only (4xx MUST be left unset per the
   // spec); client spans on any status >= 400.
   if (status !== undefined && newMeta[ERROR_TYPE] === undefined) {
-    const isError = kind === 'server' ? statusCode >= 500 : statusCode >= 400
+    const isError = statusCode >= (kind === 'server' ? 500 : 400)
     if (isError) {
       newMeta[ERROR_TYPE] = status
       formattedSpan.error = 1
diff --git a/packages/dd-trace/src/plugins/util/test.js b/packages/dd-trace/src/plugins/util/test.js
index 3345540218..21d6365e08 100644
--- a/packages/dd-trace/src/plugins/util/test.js
+++ b/packages/dd-trace/src/plugins/util/test.js
@@ -941,8 +941,7 @@ function getCodeOwnersFileEntries (rootDir) {
   const lines = codeOwnersContent.split('\n')
 
   for (const line of lines) {
-    const [content] = line.split('#')
-    const trimmed = content.trim()
+    const trimmed = getSegment(line, '#', 0).trim()
     if (trimmed === '') continue
     const [pattern, ...owners] = trimmed.split(/\s+/)
     entries.push(setCodeOwnersPatternRegex({ pattern, owners }))
@@ -988,9 +987,7 @@ function codeOwnersPatternToRegexSource (pattern) {
 
     if (character === '\\') {
       const escapedCharacter = pattern[i + 1]
-      source += escapedCharacter === undefined
-        ? escapeRegexCharacter(character)
-        : escapeRegexCharacter(escapedCharacter)
+      source += escapeRegexCharacter(escapedCharacter ?? character)
       i++
     } else if (character === '*') {
       if (pattern[i + 1] === '*') {
@@ -1184,7 +1181,7 @@ function getCoveredFilenamesFromCoverage (coverage) {
 }
 
 function getCoverageMap (coverage) {
-  if (coverage?.files && coverage?.fileCoverageFor) {
+  if (coverage?.files && coverage.fileCoverageFor) {
     return coverage
   }
   return istanbul.createCoverageMap(coverage)
@@ -1917,8 +1914,8 @@ function recordAttemptToFixExecution (attemptToFixExecutions, execution) {
   }
 
   result.executions++
-  result.isDisabled = result.isDisabled || !!isDisabled
-  result.isQuarantined = result.isQuarantined || !!isQuarantined
+  result.isDisabled ||= !!isDisabled
+  result.isQuarantined ||= !!isQuarantined
 
   if (status === 'fail') {
     result.failedCount++
diff --git a/packages/dd-trace/src/priority_sampler.js b/packages/dd-trace/src/priority_sampler.js
index c883158e77..c46e166e33 100644
--- a/packages/dd-trace/src/priority_sampler.js
+++ b/packages/dd-trace/src/priority_sampler.js
@@ -140,7 +140,7 @@ class PrioritySampler {
       samplers[key] = new Sampler(rates[key])
     }
 
-    samplers[DEFAULT_KEY] = samplers[DEFAULT_KEY] || defaultSampler
+    samplers[DEFAULT_KEY] ||= defaultSampler
 
     this._samplers = samplers
 
@@ -257,8 +257,11 @@ class PrioritySampler {
     context._trace[SAMPLING_RULE_DECISION] = rule.sampleRate
     context._trace.tags[SAMPLING_KNUTH_RATE] = formatKnuthRate(rule.sampleRate)
     context._sampling.mechanism = SAMPLING_MECHANISM_RULE
-    if (rule.provenance === 'customer') context._sampling.mechanism = SAMPLING_MECHANISM_REMOTE_USER
-    if (rule.provenance === 'dynamic') context._sampling.mechanism = SAMPLING_MECHANISM_REMOTE_DYNAMIC
+    if (rule.provenance === 'customer') {
+      context._sampling.mechanism = SAMPLING_MECHANISM_REMOTE_USER
+    } else if (rule.provenance === 'dynamic') {
+      context._sampling.mechanism = SAMPLING_MECHANISM_REMOTE_DYNAMIC
+    }
 
     return rule.sample(context) && this._isSampledByRateLimit(context)
       ? USER_KEEP
diff --git a/packages/dd-trace/src/profiling/profilers/poisson.js b/packages/dd-trace/src/profiling/profilers/poisson.js
index aad121b7ec..2adf3a1875 100644
--- a/packages/dd-trace/src/profiling/profilers/poisson.js
+++ b/packages/dd-trace/src/profiling/profilers/poisson.js
@@ -6,7 +6,7 @@ class PoissonProcessSamplingFilter {
   #samplingInterval
   #resetInterval
   #now
-  #lastNow = Number.NEGATIVE_INFINITY
+  #lastNow = -Infinity
   #samplingInstantCount = 0
 
   constructor ({ samplingInterval, now, resetInterval }) {
diff --git a/packages/dd-trace/src/profiling/profilers/shared.js b/packages/dd-trace/src/profiling/profilers/shared.js
index 9fbe37e066..916194099f 100644
--- a/packages/dd-trace/src/profiling/profilers/shared.js
+++ b/packages/dd-trace/src/profiling/profilers/shared.js
@@ -17,8 +17,8 @@ function getThreadLabels () {
   const nativeThreadId = pprof.getNativeThreadId()
   return {
     [THREAD_NAME_LABEL]: eventLoopThreadName,
-    [THREAD_ID_LABEL]: `${threadId}`,
-    [OS_THREAD_ID_LABEL]: `${nativeThreadId}`,
+    [THREAD_ID_LABEL]: threadId.toString(),
+    [OS_THREAD_ID_LABEL]: nativeThreadId.toString(),
   }
 }
 
diff --git a/packages/dd-trace/src/util.js b/packages/dd-trace/src/util.js
index 582bfafc06..cc7fbe4198 100644
--- a/packages/dd-trace/src/util.js
+++ b/packages/dd-trace/src/util.js
@@ -102,6 +102,21 @@ function getSegment (string, separator, index, fallback) {
   return end === -1 ? string.slice(start) : string.slice(start, end)
 }
 
+/**
+ * Return the path portion of a request target, dropping any query string and fragment.
+ * The two scans avoid the array and substring a `split(/[?#]/)` allocates per call.
+ *
+ * @param {string} target
+ */
+function stripQueryAndFragment (target) {
+  let cut = target.indexOf('?')
+  const fragment = target.indexOf('#')
+  if (cut === -1 || (fragment !== -1 && fragment < cut)) {
+    cut = fragment
+  }
+  return cut === -1 ? target : target.slice(0, cut)
+}
+
 function calculateDDBasePath (dirname) {
   const dirSteps = dirname.split(path.sep)
   const packagesIndex = dirSteps.lastIndexOf('packages')
@@ -136,6 +151,7 @@ module.exports = {
   isError,
   globMatch,
   getSegment,
+  stripQueryAndFragment,
   ddBasePath: globalThis.__DD_ESBUILD_BASEPATH || calculateDDBasePath(__dirname),
   normalizePluginEnvName,
   formatKnuthRate,
diff --git a/packages/dd-trace/test/datastreams/encoding.spec.js b/packages/dd-trace/test/datastreams/encoding.spec.js
index 19fba5176f..408c8853c2 100644
--- a/packages/dd-trace/test/datastreams/encoding.spec.js
+++ b/packages/dd-trace/test/datastreams/encoding.spec.js
@@ -37,6 +37,41 @@ describe('encoding', () => {
       assert.strictEqual(bytes2.length, 0)
     })
 
+    it('encoding then decoding should be a no op at the largest encodable magnitude', () => {
+      const n = Math.floor(Number.MAX_SAFE_INTEGER / 2)
+
+      const encoded = encodeVarint(n)
+      assert.deepStrictEqual([...encoded], [254, 255, 255, 255, 255, 255, 255, 15])
+      const [decoded, bytes] = decodeVarint(encoded)
+      assert.strictEqual(decoded, n)
+      assert.strictEqual(bytes.length, 0)
+
+      const encodedNegative = encodeVarint(-n)
+      assert.deepStrictEqual([...encodedNegative], [255, 255, 255, 255, 255, 255, 255, 15])
+      const [decodedNegative, negativeBytes] = decodeVarint(encodedNegative)
+      assert.strictEqual(decodedNegative, -n)
+      assert.strictEqual(negativeBytes.length, 0)
+    })
+
+    it('encoding then decoding should be a no op when a group shifts down to 0x80', () => {
+      // The zig-zag value shifts down to exactly 0x80 for `2 ** exponent` and the
+      // `2 ** (exponent - 7)` values above it. Math.floor(Number.MAX_SAFE_INTEGER / 2)
+      // spans seven 7-bit groups, so there are seven such bands.
+      for (let exponent = 6; exponent <= 48; exponent += 7) {
+        const base = 2 ** exponent
+        const bandTop = base + 2 ** Math.max(exponent - 7, 0) - 1
+
+        for (const n of new Set([base, bandTop, -base, -bandTop])) {
+          const encoded = encodeVarint(n)
+          const [decoded, bytes] = decodeVarint(encoded)
+          assert.strictEqual(decoded, n)
+          assert.strictEqual(bytes.length, 0)
+        }
+      }
+
+      assert.deepStrictEqual([...encodeVarint(2 ** 6)], [128, 1])
+    })
+
     it('encoding a number bigger than Max safe int fails.', () => {
       const n = Number.MAX_SAFE_INTEGER + 10
       const encoded = encodeVarint(n)
diff --git a/packages/dd-trace/test/exporters/electron/exporter.spec.js b/packages/dd-trace/test/exporters/electron/exporter.spec.js
index 185ba2449a..f63b5b3ba1 100644
--- a/packages/dd-trace/test/exporters/electron/exporter.spec.js
+++ b/packages/dd-trace/test/exporters/electron/exporter.spec.js
@@ -80,10 +80,11 @@ describe('ElectronExporter', () => {
       sinon.assert.notCalled(traceChannel.publish)
     })
 
-    it('should not publish when there are no subscribers', () => {
+    it('should not buffer when there are no subscribers', () => {
       traceChannel.hasSubscribers = false
 
       exporter.export([span])
+      traceChannel.hasSubscribers = true
       exporter.flush()
 
       sinon.assert.notCalled(traceChannel.publish)
diff --git a/packages/dd-trace/test/plugins/util/test.spec.js b/packages/dd-trace/test/plugins/util/test.spec.js
index df98f2c7c5..dde0a063a9 100644
--- a/packages/dd-trace/test/plugins/util/test.spec.js
+++ b/packages/dd-trace/test/plugins/util/test.spec.js
@@ -761,6 +761,11 @@ describe('getCodeOwnersForFilename', () => {
         matches: ['file1.js', 'packages/dd-trace/fileA.js'],
         misses: ['file10.js', 'packages/dd-trace/file/name.js'],
       },
+      {
+        pattern: String.raw`file\*.js`,
+        matches: ['file*.js', 'packages/dd-trace/file*.js'],
+        misses: ['file1.js', 'packages/dd-trace/fileA.js'],
+      },
     ]
 
     for (const { pattern, matches = [], misses = [] } of patternTests) {
@@ -777,6 +782,14 @@ describe('getCodeOwnersForFilename', () => {
     }
   })
 
+  it('treats a trailing backslash as a literal instead of throwing', () => {
+    const codeOwnersFileEntries = [
+      { pattern: 'docs\\', owners: ['@datadog-docs'] },
+    ]
+
+    assert.strictEqual(getCodeOwnersForFilename('docs/README.md', codeOwnersFileEntries), null)
+  })
+
   it('keeps CODEOWNERS matching case-sensitive', () => {
     const codeOwnersFileEntries = [
       { pattern: '/Docs/', owners: ['@datadog-docs'] },
diff --git a/packages/dd-trace/test/util.spec.js b/packages/dd-trace/test/util.spec.js
index 72e664613c..daeef948b3 100644
--- a/packages/dd-trace/test/util.spec.js
+++ b/packages/dd-trace/test/util.spec.js
@@ -5,7 +5,7 @@ const assert = require('node:assert/strict')
 const { describe, it } = require('mocha')
 
 require('./setup/core')
-const { isEmpty, isTrue, isFalse, globMatch, getSegment } = require('../src/util')
+const { isEmpty, isTrue, isFalse, globMatch, getSegment, stripQueryAndFragment } = require('../src/util')
 
 const TRUES = [
   1,
@@ -120,4 +120,31 @@ describe('util', () => {
       assert.strictEqual(getSegment('whole', '.', 0), 'whole')
     })
   })
+
+  describe('stripQueryAndFragment', () => {
+    const cases = [
+      '/api/v1/users',
+      '/api/v1/users?page=2&limit=50',
+      '/search?q=hello+world#results',
+      '/docs#section-3',
+      '/docs#section?not-a-query',
+      '/redirect?to=/other%3Fnested#frag',
+      '/?only-query',
+      '/#only-fragment',
+      '?leading-query',
+      '#leading-fragment',
+      '/',
+      '',
+    ]
+
+    it('matches splitting on the query and fragment delimiters', () => {
+      for (const target of cases) {
+        assert.strictEqual(
+          stripQueryAndFragment(target),
+          target.split(/[?#]/)[0],
+          `stripQueryAndFragment(${JSON.stringify(target)})`
+        )
+      }
+    })
+  })
 })
diff --git a/scripts/agentless-stress-test.js b/scripts/agentless-stress-test.js
index 181aee772b..6b043c56b6 100644
--- a/scripts/agentless-stress-test.js
+++ b/scripts/agentless-stress-test.js
@@ -21,9 +21,9 @@ if (!process.env.DD_API_KEY) {
 }
 
 process.env._DD_APM_TRACING_AGENTLESS_ENABLED = 'true'
-process.env.DD_TRACE_DEBUG = process.env.DD_TRACE_DEBUG || 'false'
-process.env.DD_ENV = process.env.DD_ENV || 'agentless-stress-test'
-process.env.DD_SERVICE = process.env.DD_SERVICE || 'agentless-stress-test'
+process.env.DD_TRACE_DEBUG ||= 'false'
+process.env.DD_ENV ||= 'agentless-stress-test'
+process.env.DD_SERVICE ||= 'agentless-stress-test'
 process.env.DD_TRACE_FLUSH_INTERVAL = '2000'
 
 const tracer = require('../packages/dd-trace').init()
diff --git a/scripts/generate-config-types.js b/scripts/generate-config-types.js
index 6376b8c86e..235a07a1f6 100644
--- a/scripts/generate-config-types.js
+++ b/scripts/generate-config-types.js
@@ -260,7 +260,7 @@ function generateEnvVarConfigTypes (supportedConfigurations) {
     }
   }
 
-  const body = [...envVarTypes.entries()]
+  const body = [...envVarTypes]
     .sort(([left], [right]) => left.localeCompare(right))
     .map(([name, type]) => `  ${renderPropertyName(name)}: ${type};`)
     .join('\n')
diff --git a/scripts/release/changelog.spec.js b/scripts/release/changelog.spec.js
index 75934f7b6e..cc6c7376cb 100644
--- a/scripts/release/changelog.spec.js
+++ b/scripts/release/changelog.spec.js
@@ -95,7 +95,7 @@ describe('release changelog', () => {
       '- **AppSec:** Avoid the possibility of sensitive data going to the telemetry logs backend ' +
         `via WAF strings ${prLink(3884)}`,
       '- **AppSec:** Treat cleared shared memory as no-config rather than an error in AppSec helper ' +
-        `${prLink(3876)}`,
+        prLink(3876),
       `- **General:** Encoder JSON number type fix ${prLink(38_799)}`,
       '- **LLM Observability:** Revert "Fan array-valued user tags out into one wire entry per element ' +
         `(${prLink(8689)})" ${prLink(8790)}`,
diff --git a/scripts/release/proposal.js b/scripts/release/proposal.js
index 6cef054ca9..da73e83c82 100644
--- a/scripts/release/proposal.js
+++ b/scripts/release/proposal.js
@@ -112,10 +112,11 @@ try {
   // the capped commits actually included in the proposal, not deferred ones.
   // Excludes changes that are listed in the dedicated breaking changes section.
   const notesShas = capture(`${notesDiffCmd} --format=sha --reverse v${releaseLine}.x ${upperBoundRef}`)
-    .split('\n').filter(Boolean)
+    .split('\n')
   const contributorBySha = getContributorsBySha(`v${releaseLine}.x`, upperBoundSha)
   const notesEntries = []
   for (const sha of notesShas) {
+    if (!sha) continue
     notesEntries.push({
       sha,
       subject: capture(`git show -s --format=%s ${sha}`),
diff --git a/scripts/verify-exercised-tests.js b/scripts/verify-exercised-tests.js
index 0b72d6e440..ca71b6f974 100644
--- a/scripts/verify-exercised-tests.js
+++ b/scripts/verify-exercised-tests.js
@@ -1112,6 +1112,7 @@ function main () {
   const packageJsonPath = path.join(repoRoot, 'package.json')
   const pluginsVar = '$' + '{PLUGINS}'
   const bracePluginsVar = '{' + pluginsVar + '}'
+  // eslint-disable-next-line unicorn/no-useless-concat -- Keep the GitHub expression marker non-contiguous.
   const ghaExprStart = '$' + '{{'
 
   /** @type {{ scripts?: Record<string, string> }} */
diff --git a/scripts/verify-workflow-job-names.js b/scripts/verify-workflow-job-names.js
index 77b4b3ba4b..f95eff3716 100644
--- a/scripts/verify-workflow-job-names.js
+++ b/scripts/verify-workflow-job-names.js
@@ -141,7 +141,7 @@ for (const jobRecord of allJobRecords) {
   workflowNameToWorkflowFiles.set(jobRecord.workflowName, workflowFileSet)
 }
 
-const workflowNameEntries = [...workflowNameToWorkflowFiles.entries()]
+const workflowNameEntries = [...workflowNameToWorkflowFiles]
 workflowNameEntries.sort((first, second) => first[0].localeCompare(second[0]))
 
 for (const [workflowName, workflowFileSet] of workflowNameEntries) {
@@ -168,7 +168,7 @@ for (const jobRecord of allJobRecords) {
   checkNameToJobRecords.set(jobRecord.checkName, jobRecordList)
 }
 
-const duplicateCheckNameGroups = [...checkNameToJobRecords.entries()].filter(([, jobRecordList]) => {
+const duplicateCheckNameGroups = [...checkNameToJobRecords].filter(([, jobRecordList]) => {
   return jobRecordList.length > 1
 })
 duplicateCheckNameGroups.sort((first, second) => {
diff --git a/yarn.lock b/yarn.lock
index e2cddd5d37..c12784fd98 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -378,6 +378,14 @@
   dependencies:
     "@types/json-schema" "^7.0.15"
 
+"@eslint/css-tree@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@eslint/css-tree/-/css-tree-4.0.4.tgz#5400c64acf00468d262b5b08c938a3fa8f6a73c4"
+  integrity sha512-nxMparyhqVWQvadx9x8dIfubfIPOE+X2b2waua8fzdnM9vdp9rgVtwEZlG0TmCwEUz/d/f40fzvO/eqBwdxz0A==
+  dependencies:
+    mdn-data "2.28.1"
+    source-map-js "^1.2.1"
+
 "@eslint/eslintrc@^3.3.5":
   version "3.3.5"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.3.5.tgz#c131793cfc1a7b96f24a83e0a8bbd4b881558c60"
@@ -1453,7 +1461,7 @@ browser-stdout@^1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
 
-browserslist@^4.24.0, browserslist@^4.28.1, browserslist@^4.28.2:
+browserslist@^4.24.0, browserslist@^4.28.1, browserslist@^4.28.4:
   version "4.28.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.7.tgz#409046517fccd2e51cdc20f077454b7141184028"
   integrity sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw==
@@ -1722,6 +1730,11 @@ content-type@^2.0.0:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-2.0.0.tgz#2fb3ede69dffa0af78ca7c4ce7589680638b56df"
   integrity sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==
 
+convert-hrtime@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/convert-hrtime/-/convert-hrtime-5.0.0.tgz#f2131236d4598b95de856926a67100a0a97e9fa3"
+  integrity sha512-lOETlkIeYSJWcbbcvjRKGxVMXJR+8+OQb/mTPbA4ObPMytYIsUbuOE0Jzy60hjARYszq1id0j8KgVhC+WGZVTg==
+
 convert-source-map@^1.7.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
@@ -1884,6 +1897,11 @@ enhanced-resolve@^5.17.1:
     graceful-fs "^4.2.4"
     tapable "^2.3.0"
 
+entities@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
 es-define-property@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
@@ -2050,27 +2068,31 @@ eslint-plugin-sonarjs@^4.2.0:
     typescript ">=5 <6.1.0"
     yaml "^2.9.0"
 
-eslint-plugin-unicorn@^68.0.0:
-  version "68.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-68.0.0.tgz#2d9f9a3035609a65a17ee227ac414b23a631e14e"
-  integrity sha512-mHYWvX948Q4H3bGc39bsNMxD/leOuNI+Iws9NVsoSz5VA7EGP86wnz7mZ/SPSvRhefT8L4hd8DHfDuGC+lIoCQ==
+eslint-plugin-unicorn@^72.0.0:
+  version "72.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-72.0.0.tgz#3d8caf428fd84c02457e6f152128fd1944ce19a9"
+  integrity sha512-hqO6ksoOHO+ZhdseTuKRVQbx9U7PRO/cv8qAR1mctwzdVO2hYud8uS9luAhp43RJgziYgHAph8eHyipT8GL0ng==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.29.7"
     "@eslint-community/eslint-utils" "^4.9.1"
-    browserslist "^4.28.2"
+    "@eslint/css-tree" "^4.0.4"
+    browserslist "^4.28.4"
     change-case "^5.4.4"
     ci-info "^4.4.0"
     core-js-compat "^3.49.0"
     detect-indent "^7.0.2"
+    entities "^4.5.0"
     find-up-simple "^1.0.1"
-    globals "^17.6.0"
+    globals "^17.7.0"
     indent-string "^5.0.0"
     is-builtin-module "^5.0.0"
-    jsesc "^3.1.0"
+    is-identifier "^1.1.0"
     pluralize "^8.0.0"
-    regjsparser "^0.13.1"
-    semver "^7.8.4"
+    quote-js-string "^0.1.0"
+    regjsparser "^0.13.2"
+    reserved-identifiers "^1.2.0"
+    semver "^7.8.5"
     strip-indent "^4.1.1"
+    yaml "^2.9.0"
 
 eslint-scope@^9.1.2:
   version "9.1.2"
@@ -2376,6 +2398,11 @@ function-bind@^1.1.2:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
+function-timeout@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/function-timeout/-/function-timeout-1.0.2.tgz#e5a7b6ffa523756ff20e1231bbe37b5f373aadd5"
+  integrity sha512-939eZS4gJ3htTHAldmyyuzlrD58P03fHG49v2JfFXbV6OhvZKRC9j2yAtdHw/zrp2zXHuv05zMIy40F0ge7spA==
+
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
@@ -2470,7 +2497,7 @@ globals@^15.11.0, globals@^15.14.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-15.15.0.tgz#7c4761299d41c32b075715a4ce1ede7897ff72a8"
   integrity sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==
 
-globals@^17.6.0, globals@^17.7.0:
+globals@^17.7.0:
   version "17.7.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-17.7.0.tgz#553d55090b4dde8209ec2da42580d6e7e7d8b10d"
   integrity sha512-Czmyns5dUsq4seFBR/Kdydhmo8y9kC79hiSkPn0YcGtNnYWnrgt0vjrSjx9tspoDGWm2CMarffRuLjM4xUz8xg==
@@ -2581,6 +2608,13 @@ iconv-lite@^0.7.2, iconv-lite@~0.7.0:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
+identifier-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/identifier-regex/-/identifier-regex-1.1.0.tgz#042abfaf28db15223436661f3b9ec882649f6ef0"
+  integrity sha512-SLX4H/vtcYlYnL7XqnuJKHU7Z8517TgsW9nmQiGOgMCjQ8V/deLYu6bEmbGoXe7WMMhc9+EUGyFFneHja8KabA==
+  dependencies:
+    reserved-identifiers "^1.0.0"
+
 ignore@^5.2.0, ignore@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
@@ -2669,6 +2703,14 @@ is-glob@^4.0.0, is-glob@^4.0.3:
   dependencies:
     is-extglob "^2.1.1"
 
+is-identifier@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-identifier/-/is-identifier-1.1.0.tgz#6b406e15a429f7196f6496e09f8333bcb4b2db1b"
+  integrity sha512-NhOds0mDx9lJu+1lBRO0xbwFo5nobA7GCk/0e5xjr6+6XugX985+0OyGX35BNrTkPAsdLcIKg02HUQJOK8D8kw==
+  dependencies:
+    identifier-regex "^1.1.0"
+    super-regex "^1.1.0"
+
 is-node-process@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/is-node-process/-/is-node-process-1.2.0.tgz#ea02a1b90ddb3934a19aea414e88edef7e11d134"
@@ -2824,7 +2866,7 @@ jsdoc-type-pratt-parser@~7.2.0:
   resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-7.2.0.tgz#0a29c27bd4e01e85e4617625e34e797be1486a9b"
   integrity sha512-dh140MMgjyg3JhJZY/+iEzW+NO5xR2gpbDFKHqotCmexElVntw7GjWjt511+C/Ef02RU5TKYrJo/Xlzk+OLaTw==
 
-jsesc@^3.0.2, jsesc@^3.1.0, jsesc@~3.1.0:
+jsesc@^3.0.2, jsesc@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d"
   integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==
@@ -2955,6 +2997,15 @@ lru-cache@^7.14.0:
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
   integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
 
+make-asynchronous@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/make-asynchronous/-/make-asynchronous-1.1.0.tgz#6225f7f1ccaab9acaac5e2fcd0b075afefff19aa"
+  integrity sha512-ayF7iT+44LXdxJLTrTd3TLQpFDDvPCBxXxbv+pMUSuHA5Q8zyAfwkRP6aHHwNVFBUFWtxAHqwNJxF8vMZLAbVg==
+  dependencies:
+    p-event "^6.0.0"
+    type-fest "^4.6.0"
+    web-worker "^1.5.0"
+
 make-dir@^3.0.0, make-dir@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -2983,6 +3034,11 @@ md5@^2.3.0:
     crypt "0.0.2"
     is-buffer "~1.1.6"
 
+mdn-data@2.28.1:
+  version "2.28.1"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.28.1.tgz#798ed0511d4097c22b091718435059fdb0a64ad9"
+  integrity sha512-U9w+PzSZ00Z5m9rZ5ARVFL5xOfuCHdKYi/1RRwDCJsboFgJDNT3zT6PIPD7mZQYaQLhsZM3GfDRgSMRHhSmVng==
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -3325,6 +3381,13 @@ oxc-parser@^0.132.0:
     "@oxc-parser/binding-win32-ia32-msvc" "0.132.0"
     "@oxc-parser/binding-win32-x64-msvc" "0.132.0"
 
+p-event@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/p-event/-/p-event-6.0.1.tgz#8f62a1e3616d4bc01fce3abda127e0383ef4715b"
+  integrity sha512-Q6Bekk5wpzW5qIyUP4gdMEujObYstZl6DMMOSenwBvV0BlE5LkDwkjs5yHbZmdCEq2o4RJx4tE1vwxFVf2FG1w==
+  dependencies:
+    p-timeout "^6.1.2"
+
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -3367,6 +3430,11 @@ p-map@^3.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
+p-timeout@^6.1.2:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-6.1.4.tgz#418e1f4dd833fa96a2e3f532547dd2abdb08dbc2"
+  integrity sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==
+
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -3540,6 +3608,11 @@ qs@^6.14.0, qs@^6.15.2:
   dependencies:
     side-channel "^1.1.0"
 
+quote-js-string@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/quote-js-string/-/quote-js-string-0.1.0.tgz#812aef957a2dfb31d32f0d9e9662fe558bc9842b"
+  integrity sha512-Y3NoRtprEEZQD8RfxMCfS0ZTqc4e+i18OrXEXAvpM6TfC/3y+0L5rNbZiSnbBBEkDfFzbpd8o+cE8q3/anjMGA==
+
 randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -3604,7 +3677,7 @@ regexp-ast-analysis@^0.7.0:
     "@eslint-community/regexpp" "^4.8.0"
     refa "^0.12.1"
 
-regjsparser@^0.13.1:
+regjsparser@^0.13.2:
   version "0.13.2"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.13.2.tgz#f654734b5c588b22ba3e21693b30523417180808"
   integrity sha512-NgRBy2Nx/bE+9F27nVHnqcN5HjyLmecqsqx2PJHu3/IEtADD4WuxuXIVExD5PoSDFVrl78dOonfcOe5O+5nbzQ==
@@ -3628,7 +3701,7 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-reserved-identifiers@^1.0.0:
+reserved-identifiers@^1.0.0, reserved-identifiers@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/reserved-identifiers/-/reserved-identifiers-1.2.0.tgz#d2982cd698e317dd3dced1ee1c52412dbd64fc64"
   integrity sha512-yE7KUfFvaBFzGPs5H3Ops1RevfUEsDc5Iz65rOwWg4lE8HJSYtle77uul3+573457oHvBKuHYDl/xqUkKpEEdw==
@@ -3715,7 +3788,7 @@ semver@^6.0.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.5.0, semver@^7.5.3, semver@^7.5.4, semver@^7.6.3, semver@^7.7.2, semver@^7.8.4, semver@^7.8.5:
+semver@^7.5.0, semver@^7.5.3, semver@^7.5.4, semver@^7.6.3, semver@^7.7.2, semver@^7.8.5:
   version "7.8.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.8.5.tgz#39b646037dd50c14fb451e7e4cac58ed8b863f69"
   integrity sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==
@@ -3841,6 +3914,11 @@ sinon@^22.0.0:
     "@sinonjs/samsam" "^10.0.2"
     diff "^9.0.0"
 
+source-map-js@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
+  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
+
 source-map-support@^0.5.21:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
@@ -4006,6 +4084,15 @@ strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
+super-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/super-regex/-/super-regex-1.1.0.tgz#14b69b6374f7b3338db52ecd511dae97c27acf75"
+  integrity sha512-WHkws2ZflZe41zj6AolvvmaTrWds/VuyeYr9iPVv/oQeaIoVxMKaushfFWpOGDT+GuBrM/sVqF8KUCYQlSSTdQ==
+  dependencies:
+    function-timeout "^1.0.1"
+    make-asynchronous "^1.0.1"
+    time-span "^5.1.0"
+
 supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
@@ -4055,6 +4142,13 @@ tiktoken@^1.0.21:
   resolved "https://registry.yarnpkg.com/tiktoken/-/tiktoken-1.0.22.tgz#a6c674839228bb88f32dfe646dff47193762f7d3"
   integrity sha512-PKvy1rVF1RibfF3JlXBSP0Jrcw2uq3yXdgcEXtKTYn3QJ/cBRBHDnrJ5jHky+MENZ6DIPwNUGWpkVx+7joCpNA==
 
+time-span@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/time-span/-/time-span-5.1.0.tgz#80c76cf5a0ca28e0842d3f10a4e99034ce94b90d"
+  integrity sha512-75voc/9G4rDIJleOo4jPvN4/YC4GRZrY8yy1uU4lwrB3XEQbWve8zXoO5No4eFrGcTAMYyoY67p8jRQdtA1HbA==
+  dependencies:
+    convert-hrtime "^5.0.0"
+
 to-valid-identifier@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/to-valid-identifier/-/to-valid-identifier-1.0.0.tgz#27337955333c3c517feb60bea533cf27ce54b79f"
@@ -4115,6 +4209,11 @@ type-fest@^0.8.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
+type-fest@^4.6.0:
+  version "4.41.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-4.41.0.tgz#6ae1c8e5731273c2bf1f58ad39cbae2c91a46c58"
+  integrity sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==
+
 type-is@^1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -4243,6 +4342,11 @@ vary@^1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
+web-worker@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/web-worker/-/web-worker-1.5.0.tgz#71b2b0fbcc4293e8f0aa4f6b8a3ffebff733dcc5"
+  integrity sha512-RiMReJrTAiA+mBjGONMnjVDP2u3p9R1vkcGz6gDIrOMT3oGuYwX2WRMYI9ipkphSuE5XKEhydbhNEJh4NY9mlw==
+
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"

From ef0ee0b58bd11bcf4a6dd20f195f61d2662d253f Mon Sep 17 00:00:00 2001
From: Brian Marks <bm1549@users.noreply.github.com>
Date: Mon, 27 Jul 2026 16:14:06 -0400
Subject: [PATCH 02/43] feat(startup-log): report OTLP export status (#9517)

Add three boolean fields to the DATADOG TRACER CONFIGURATION startup log
indicating whether the tracer exports each telemetry signal over OTLP:

- otlp_traces_export_enabled  (OTEL_TRACES_EXPORTER === 'otlp', excluding
  Test Optimization mode, which keeps test spans on the citestcycle endpoint)
- otlp_metrics_export_enabled (DD_METRICS_OTEL_ENABLED)
- otlp_logs_export_enabled    (DD_LOGS_OTEL_ENABLED)

The snake_case keys are chosen for cross-language startup-log consistency.
---
 packages/dd-trace/src/startup-log.js       |  3 +
 packages/dd-trace/test/startup-log.spec.js | 75 +++++++++++++++++++++-
 2 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/packages/dd-trace/src/startup-log.js b/packages/dd-trace/src/startup-log.js
index 7e74e3d508..52fafff7f5 100644
--- a/packages/dd-trace/src/startup-log.js
+++ b/packages/dd-trace/src/startup-log.js
@@ -108,6 +108,9 @@ function configInfo () {
     profiling_enabled: profilingEnabled === 'true' || profilingEnabled === 'auto',
     appsec_enabled: config.appsec.enabled,
     data_streams_enabled: !!config.dsmEnabled,
+    otlp_traces_export_enabled: config.OTEL_TRACES_EXPORTER === 'otlp' && !config.isCiVisibility,
+    otlp_metrics_export_enabled: !!config.DD_METRICS_OTEL_ENABLED,
+    otlp_logs_export_enabled: !!config.DD_LOGS_OTEL_ENABLED,
   }
 }
 
diff --git a/packages/dd-trace/test/startup-log.spec.js b/packages/dd-trace/test/startup-log.spec.js
index aa0df80865..47f6a0b732 100644
--- a/packages/dd-trace/test/startup-log.spec.js
+++ b/packages/dd-trace/test/startup-log.spec.js
@@ -3,7 +3,7 @@
 const assert = require('node:assert')
 const os = require('node:os')
 
-const { describe, it, before, afterEach } = require('mocha')
+const { describe, it, before, beforeEach, afterEach } = require('mocha')
 const sinon = require('sinon')
 
 require('./setup/core')
@@ -80,6 +80,9 @@ describe('startup logging', () => {
     assert.strictEqual(logObj.debug, true)
     assert.strictEqual(logObj.appsec_enabled, true)
     assert.strictEqual(logObj.data_streams_enabled, true)
+    assert.strictEqual('otlp_traces_export_enabled' in logObj, true)
+    assert.strictEqual('otlp_metrics_export_enabled' in logObj, true)
+    assert.strictEqual('otlp_logs_export_enabled' in logObj, true)
   })
 
   it('logIntegrations should output loaded integrations', () => {
@@ -121,6 +124,9 @@ describe('startup logging', () => {
       integrations_loaded: ['http', 'fs', 'semver'],
       appsec_enabled: true,
       data_streams_enabled: true,
+      otlp_traces_export_enabled: false,
+      otlp_metrics_export_enabled: false,
+      otlp_logs_export_enabled: false,
     })
   })
 })
@@ -314,3 +320,70 @@ describe('profiling_enabled', () => {
     })
   })
 })
+
+describe('otlp export flags', () => {
+  function clearOtlpEnv () {
+    delete process.env.OTEL_TRACES_EXPORTER
+    delete process.env.OTEL_METRICS_EXPORTER
+    delete process.env.OTEL_LOGS_EXPORTER
+    delete process.env.DD_METRICS_OTEL_ENABLED
+    delete process.env.DD_LOGS_OTEL_ENABLED
+  }
+
+  // Datadog-instrumented dev shells export the OTEL_*_EXPORTER selectors: a leaked
+  // OTEL_TRACES_EXPORTER=otlp corrupts the default-state assertion, and OTEL_METRICS_EXPORTER=none
+  // makes config force DD_METRICS_OTEL_ENABLED back to false, breaking the metrics positive case.
+  beforeEach(clearOtlpEnv)
+  afterEach(clearOtlpEnv)
+
+  function startupLogObj (configOptions) {
+    sinon.stub(console, 'warn')
+    delete require.cache[require.resolve('../src/startup-log')]
+    const {
+      setStartupLogConfig,
+      startupLog,
+    } = require('../src/startup-log')
+    process.env.DD_TRACE_STARTUP_LOGS = 'true'
+    setStartupLogConfig(getConfigFresh(configOptions))
+    startupLog()
+    /* eslint-disable-next-line no-console */
+    const warnStub = /** @type {sinon.SinonStub} */ (console.warn)
+    const logObj = JSON.parse(warnStub.firstCall.args[0].replace('DATADOG TRACER CONFIGURATION - ', ''))
+    warnStub.restore()
+    return logObj
+  }
+
+  it('should default to false when no OTLP env vars are set', () => {
+    const logObj = startupLogObj()
+    assert.strictEqual(logObj.otlp_traces_export_enabled, false)
+    assert.strictEqual(logObj.otlp_metrics_export_enabled, false)
+    assert.strictEqual(logObj.otlp_logs_export_enabled, false)
+  })
+
+  it('otlp_traces_export_enabled should be true when OTEL_TRACES_EXPORTER is otlp', () => {
+    process.env.OTEL_TRACES_EXPORTER = 'otlp'
+    assert.strictEqual(startupLogObj().otlp_traces_export_enabled, true)
+  })
+
+  it('otlp_traces_export_enabled should be false when OTEL_TRACES_EXPORTER is none', () => {
+    process.env.OTEL_TRACES_EXPORTER = 'none'
+    assert.strictEqual(startupLogObj().otlp_traces_export_enabled, false)
+  })
+
+  it('otlp_traces_export_enabled should be false in Test Optimization mode even when exporter is otlp', () => {
+    // Test Optimization keeps test spans on the citestcycle endpoint, so the OTLP
+    // trace exporter is not used regardless of OTEL_TRACES_EXPORTER (see opentracing/tracer.js).
+    process.env.OTEL_TRACES_EXPORTER = 'otlp'
+    assert.strictEqual(startupLogObj({ isCiVisibility: true }).otlp_traces_export_enabled, false)
+  })
+
+  it('otlp_metrics_export_enabled should be true when DD_METRICS_OTEL_ENABLED is true', () => {
+    process.env.DD_METRICS_OTEL_ENABLED = 'true'
+    assert.strictEqual(startupLogObj().otlp_metrics_export_enabled, true)
+  })
+
+  it('otlp_logs_export_enabled should be true when DD_LOGS_OTEL_ENABLED is true', () => {
+    process.env.DD_LOGS_OTEL_ENABLED = 'true'
+    assert.strictEqual(startupLogObj().otlp_logs_export_enabled, true)
+  })
+})

From 4d5ba6cd20faffce41b518e1f2e739ab6914511f Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Mon, 27 Jul 2026 23:18:48 +0200
Subject: [PATCH 03/43] ci(scripts): speed up verify-exercised-tests and close
 detection gaps (#9542)

* test(scripts): cover verify-exercised-tests detection

The checker's failure branches are unpinned, so a rework can narrow what it
detects while still exiting 0 on a healthy tree. This adds fixture checkouts
that drive each branch.

`main` takes the repository root as an optional argument so a fixture can stand
in for the script's own checkout.

* ci(scripts): answer test-file globs from one repository walk

verify-exercised-tests expanded its script globs with 227 separate `globSync`
traversals of the same tree. Walking once and matching the patterns in memory
cuts the run from 312 ms to 178 ms, medians of ten interleaved runs on one
checkout.

Matching has to stay identical to the walk it replaces, so the index compiles
patterns with the options `glob` derives internally. Its spec cross-checks
every result against `globSync`, over hand-written pattern shapes and over the
glob corpus this repository's own package.json produces.

Answering with too few files would let an unexercised spec pass unseen, so the
index refuses instead: an unreadable directory warns, and a `..` segment, which
needs a real tree to resolve against, throws. Literal path segments are compared
case-sensitively on every platform, the rule `glob` applies on Linux, so a
result no longer depends on whether the developer's filesystem folds case.

* ci(scripts): resolve workflow steps into one ordered event stream

Two ways a suite could go unverified survived the checker, both because a job's
steps were never modeled as one ordered, per-leg-resolved sequence.

1. A coverage upload placed before the suite it collects passed the check, because
   uploads were tracked as a per-job boolean and position never entered it. Five
   composite actions run a suite and upload its report, so the order that decides
   whether a report survives usually lives inside the action, not in the workflow.
2. `SPEC: ${{ matrix.spec }}` reached the glob unresolved, degrading `${SPEC:-*}`
   to `*` and making every spec in a directory look exercised by every matrix leg.
   Resolving it per leg surfaces
   packages/datadog-plugin-aws-sdk/test/base-inject-field.spec.js, which no leg
   selects; the serverless matrix gains the entry that runs it.

One traversal now yields the `run` and `upload` events a step contributes. The
second traversal that answered only "does this job upload?" is gone, and with it
the missing `using: composite` guard that made it throw on a JavaScript or Docker
action. Such an action is reported now, so an upload hidden inside one cannot read
as "this job never uploads".
---
 .github/CODEOWNERS                      |   3 +
 .github/workflows/serverless.yml        |   1 +
 package.json                            |   1 +
 scripts/helpers/test-file-index.js      | 288 ++++++++++++++
 scripts/helpers/test-file-index.spec.js | 366 +++++++++++++++++
 scripts/verify-exercised-tests.js       | 474 ++++++++++------------
 scripts/verify-exercised-tests.spec.mjs | 498 ++++++++++++++++++++++++
 7 files changed, 1370 insertions(+), 261 deletions(-)
 create mode 100644 scripts/helpers/test-file-index.js
 create mode 100644 scripts/helpers/test-file-index.spec.js
 create mode 100644 scripts/verify-exercised-tests.spec.mjs

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6d95dfeda7..8635221094 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -279,7 +279,10 @@
 
 /scripts/generate-config-types.js @DataDog/apm-sdk-capabilities-js
 /scripts/generate-supported-integrations.js @DataDog/apm-sdk-capabilities-js
+/scripts/helpers/test-file-index.js @DataDog/apm-sdk-capabilities-js
+/scripts/helpers/test-file-index.spec.js @DataDog/apm-sdk-capabilities-js
 /scripts/verify-exercised-tests.js @DataDog/apm-sdk-capabilities-js
+/scripts/verify-exercised-tests.spec.mjs @DataDog/apm-sdk-capabilities-js
 /supported_versions_output.json @DataDog/apm-sdk-capabilities-js
 /supported_versions_table.csv @DataDog/apm-sdk-capabilities-js
 
diff --git a/.github/workflows/serverless.yml b/.github/workflows/serverless.yml
index 63831a2223..6bc8ecc696 100644
--- a/.github/workflows/serverless.yml
+++ b/.github/workflows/serverless.yml
@@ -52,6 +52,7 @@ jobs:
         spec:
           - client
           - aws-sdk
+          - base-inject-field
           - bedrockruntime
           - dynamodb
           - eventbridge
diff --git a/package.json b/package.json
index ba973aabe5..bd9c64f8d8 100644
--- a/package.json
+++ b/package.json
@@ -222,6 +222,7 @@
     "istanbul-lib-report": "^3.0.0",
     "istanbul-reports": "^3.0.2",
     "jszip": "^3.10.1",
+    "minimatch": "^10.2.5",
     "mocha": "^11.7.6",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
diff --git a/scripts/helpers/test-file-index.js b/scripts/helpers/test-file-index.js
new file mode 100644
index 0000000000..b5801dd19f
--- /dev/null
+++ b/scripts/helpers/test-file-index.js
@@ -0,0 +1,288 @@
+'use strict'
+
+const fs = require('node:fs')
+const path = require('node:path')
+
+const { Glob } = require('glob')
+const { Minimatch } = require('minimatch')
+
+const TEST_FILE_GLOB = '**/*.@(spec|test).@(js|mjs|cjs)'
+
+// Case-insensitive because `glob` matches case-insensitively on darwin and win32. Indexing a
+// `FOO.SPEC.JS` that a case-sensitive platform would reject is harmless: the pattern matcher
+// applies that platform's own rules and drops it again.
+const TEST_FILE_NAME = /\.(?:spec|test)\.(?:js|mjs|cjs)$/i
+
+// Any character that can start a wildcard, brace, class, or extglob. Over-reporting only shortens
+// the literal prefix, which widens the candidate set and can never drop a match.
+const PATTERN_MAGIC = /[*?[\]{}()!+@\\]/
+
+// `glob` walks `..` on the real filesystem before matching. The index has no tree to walk, so it
+// would answer such a pattern with too few files and report exercised specs as unexercised.
+const PARENT_SEGMENT = /(?:^|\/)\.\.(?:\/|$)/
+
+/**
+ * @param {string} repoRoot
+ * @returns {string[]}
+ */
+function walkTestFiles (repoRoot) {
+  /** @type {string[]} */
+  const found = []
+  /** @type {string[]} */
+  const pending = ['']
+
+  while (pending.length) {
+    const relativeDir = pending.pop()
+
+    /** @type {import('node:fs').Dirent[]} */
+    let entries
+    try {
+      entries = fs.readdirSync(path.join(repoRoot, relativeDir), { withFileTypes: true })
+    } catch (error) {
+      // `glob` skips unreadable directories without a word. Staying silent here would shrink the
+      // index instead, and an unexercised spec below that directory would pass the check unseen.
+      process.stderr.write(`test-file-index: skipped unreadable ${relativeDir || '.'} (${error.code})\n`)
+      continue
+    }
+
+    for (const entry of entries) {
+      const { name } = entry
+
+      // `glob` runs with `dot: false`, so a dot entry can never satisfy TEST_FILE_GLOB. Every
+      // consumer of this index also ignores `node_modules`, so descending into it is dead work.
+      if (name.startsWith('.') || name === 'node_modules') continue
+
+      const relativePath = relativeDir ? `${relativeDir}/${name}` : name
+
+      if (entry.isDirectory()) {
+        pending.push(relativePath)
+      } else if (TEST_FILE_NAME.test(name)) {
+        // Symlinks are kept: `nodir: true` filters directories, not links to files.
+        found.push(relativePath)
+      }
+    }
+  }
+
+  return found
+}
+
+/**
+ * Drops `.` and empty path segments the way `glob` does while building its pattern. `minimatch`
+ * on a bare string keeps them and would then compare one segment too many.
+ *
+ * @param {string} pattern
+ * @returns {string}
+ */
+function normalizePattern (pattern) {
+  if (!pattern.includes('./') && !pattern.includes('//')) return pattern
+
+  const segments = pattern.split('/')
+  const kept = []
+
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i]
+    // A leading empty segment marks an absolute pattern and a trailing one a directory-only
+    // pattern; both change what matches, so only interior blanks are collapsed.
+    if (segment === '.' || (segment === '' && i !== 0 && i !== segments.length - 1)) continue
+    kept.push(segment)
+  }
+
+  return kept.join('/')
+}
+
+/**
+ * Longest leading directory path of `pattern` that contains no wildcard.
+ *
+ * @param {string} pattern
+ * @returns {string}
+ */
+function literalPrefix (pattern) {
+  const magic = pattern.search(PATTERN_MAGIC)
+  const literal = magic === -1 ? pattern : pattern.slice(0, magic)
+  const lastSlash = literal.lastIndexOf('/')
+  return lastSlash === -1 ? '' : literal.slice(0, lastSlash + 1)
+}
+
+/**
+ * In-memory stand-in for repeated `globSync` walks over the repository's test files.
+ *
+ * The repository is traversed once; every later pattern is answered from the resulting list. Only
+ * paths named like a test file are indexed, so a pattern that also selects non-test files reports
+ * just the test-file subset.
+ *
+ * Results have to stay identical to the `globSync` walk they replace; `test-file-index.spec.js`
+ * pins that against `glob` itself, including the repository's own pattern corpus.
+ */
+class TestFileIndex {
+  /** @type {string[]} */
+  files
+
+  /** @type {boolean} */
+  #nocase
+
+  /** @type {NodeJS.Platform} */
+  #platform
+
+  /** @type {Map<string, InstanceType<typeof Minimatch>>} */
+  #matchers = new Map()
+
+  /** @type {Map<string, InstanceType<typeof Minimatch>>} */
+  #ignoreMatchers = new Map()
+
+  /** @type {Map<string, { files: string[], folded: string[] }>} */
+  #scopes = new Map()
+
+  /** @type {Map<string, string[]>} */
+  #candidates = new Map()
+
+  /**
+   * @param {string[]} files Sorted repository-relative POSIX paths.
+   * @param {{ nocase: boolean, platform: NodeJS.Platform }} options
+   */
+  constructor (files, { nocase, platform }) {
+    this.files = files
+    this.#nocase = nocase
+    this.#platform = platform
+  }
+
+  /**
+   * A literal path segment is compared case-sensitively on every platform, which is what `glob`
+   * does on Linux. On a case-insensitive filesystem `glob` instead resolves `foo/BAR.spec.js` to
+   * the differently-spelled file on disk; reproducing that would make the result depend on the
+   * developer's machine, so the index keeps the Linux rule everywhere.
+   *
+   * @param {string} pattern
+   * @param {string[]} [ignoreGlobs]
+   * @throws {Error} If `pattern` contains a `..` segment, which the index cannot resolve.
+   * @returns {string[]} Matching paths, in the index's sort order.
+   */
+  match (pattern, ignoreGlobs = []) {
+    if (PARENT_SEGMENT.test(pattern)) {
+      throw new Error(`test-file-index cannot resolve the '..' segment in pattern '${pattern}'`)
+    }
+
+    const normalized = normalizePattern(pattern)
+    const scope = this.#scope(ignoreGlobs)
+    const matcher = this.#matcher(normalized)
+
+    /** @type {string[]} */
+    const matched = []
+    for (const file of this.#candidatesFor(scope, ignoreGlobs, normalized)) {
+      // eslint-disable-next-line unicorn/prefer-regexp-test -- Minimatch#match, not String#match.
+      if (matcher.match(file)) matched.push(file)
+    }
+
+    return matched
+  }
+
+  /**
+   * @param {string[]} ignoreGlobs
+   * @returns {{ files: string[], folded: string[] }}
+   */
+  #scope (ignoreGlobs) {
+    const key = ignoreGlobs.join('\0')
+
+    let scope = this.#scopes.get(key)
+    if (scope === undefined) {
+      const matchers = ignoreGlobs.map(glob => this.#ignoreMatcher(glob))
+      const files = matchers.length === 0
+        ? this.files
+        : this.files.filter(file => !matchers.some(matcher => matcher.match(file) || matcher.match(`${file}/`)))
+
+      scope = { files, folded: this.#nocase ? files.map(file => file.toLowerCase()) : files }
+      this.#scopes.set(key, scope)
+    }
+
+    return scope
+  }
+
+  /**
+   * @param {{ files: string[], folded: string[] }} scope
+   * @param {string[]} ignoreGlobs
+   * @param {string} pattern
+   * @returns {string[]}
+   */
+  #candidatesFor (scope, ignoreGlobs, pattern) {
+    const prefix = literalPrefix(pattern)
+    if (prefix === '') return scope.files
+
+    const key = `${ignoreGlobs.join('\0')}\0${prefix}`
+
+    let candidates = this.#candidates.get(key)
+    if (candidates === undefined) {
+      const wanted = this.#nocase ? prefix.toLowerCase() : prefix
+
+      candidates = []
+      for (let i = 0; i < scope.files.length; i++) {
+        if (scope.folded[i].startsWith(wanted)) candidates.push(scope.files[i])
+      }
+
+      this.#candidates.set(key, candidates)
+    }
+
+    return candidates
+  }
+
+  /**
+   * @param {string} pattern
+   * @returns {InstanceType<typeof Minimatch>}
+   */
+  #matcher (pattern) {
+    let matcher = this.#matchers.get(pattern)
+    if (matcher === undefined) {
+      matcher = new Minimatch(pattern, {
+        dot: false,
+        nocase: this.#nocase,
+        nocaseMagicOnly: this.#platform === 'darwin' || this.#platform === 'win32',
+        nocomment: true,
+        nonegate: true,
+        optimizationLevel: 2,
+        platform: this.#platform,
+        windowsPathsNoEscape: true,
+      })
+      this.#matchers.set(pattern, matcher)
+    }
+
+    return matcher
+  }
+
+  /**
+   * @param {string} glob
+   * @returns {InstanceType<typeof Minimatch>}
+   */
+  #ignoreMatcher (glob) {
+    let matcher = this.#ignoreMatchers.get(glob)
+    if (matcher === undefined) {
+      // Mirrors the options `glob`'s Ignore class builds; notably `dot: true`, so `**/.git/**`
+      // still matches paths that the main pattern would skip.
+      matcher = new Minimatch(glob, {
+        dot: true,
+        nocase: this.#nocase,
+        nocomment: true,
+        nonegate: true,
+        optimizationLevel: 2,
+        platform: this.#platform,
+      })
+      this.#ignoreMatchers.set(glob, matcher)
+    }
+
+    return matcher
+  }
+}
+
+/**
+ * @param {string} repoRoot
+ * @returns {TestFileIndex}
+ */
+function createTestFileIndex (repoRoot) {
+  // `glob` decides case sensitivity from the platform's filesystem; read it back rather than
+  // re-deriving it here, so the index cannot drift from the walker it replaces.
+  const probe = new Glob(TEST_FILE_GLOB, { cwd: repoRoot, windowsPathsNoEscape: true })
+
+  const files = walkTestFiles(repoRoot)
+  files.sort((a, b) => a.localeCompare(b, 'en'))
+
+  return new TestFileIndex(files, { nocase: probe.nocase, platform: probe.platform })
+}
+
+module.exports = { TEST_FILE_GLOB, TestFileIndex, createTestFileIndex }
diff --git a/scripts/helpers/test-file-index.spec.js b/scripts/helpers/test-file-index.spec.js
new file mode 100644
index 0000000000..339e3a8be6
--- /dev/null
+++ b/scripts/helpers/test-file-index.spec.js
@@ -0,0 +1,366 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+const fs = require('node:fs')
+const os = require('node:os')
+const path = require('node:path')
+
+const { globSync } = require('glob')
+
+const { TEST_FILE_GLOB, TestFileIndex, createTestFileIndex } = require('./test-file-index')
+
+const REPO_ROOT = path.resolve(__dirname, '..', '..')
+
+const DEFAULT_IGNORE_GLOBS = [
+  '**/node_modules/**',
+  '**/coverage/**',
+  '**/.git/**',
+  '**/.nyc_output/**',
+  '**/.junit-tmp/**',
+  'vendor/dist/**',
+]
+const NODE_MODULES_ONLY = ['**/node_modules/**']
+
+const FIXTURE_FILES = [
+  'a.spec.js',
+  'b.test.js',
+  'c.spec.mjs',
+  'd.test.mjs',
+  'e.spec.cjs',
+  'f.test.cjs',
+  'plain.js',
+  'notspec.js',
+  'wrong.spec.jsx',
+  'wrong.spec.ts',
+  '.hidden.spec.js',
+  '.hiddendir/inner.spec.js',
+  'node_modules/pkg/dep.spec.js',
+  'nested/node_modules/deep/dep.spec.js',
+  'packages/alpha/test/one.spec.js',
+  'packages/alpha/test/deep/two.spec.js',
+  'packages/beta/test/three.spec.js',
+  'packages/beta/test/integration-test/four.spec.js',
+  'packages/datadog-plugin-http/test/index.spec.js',
+  'packages/datadog-plugin-redis/test/index.spec.js',
+  'vendor/dist/bundled.spec.js',
+  'coverage/report.spec.js',
+  'sub/dir/with.dots.in.name.spec.js',
+  'sub/dir/UPPER.SPEC.JS',
+  'integration-tests/one.spec.js',
+  'integration-tests/nested/two.spec.js',
+]
+
+const FIXTURE_PATTERNS = [
+  TEST_FILE_GLOB,
+  '**/*.spec.js',
+  '**/*.test.js',
+  '*.spec.js',
+  'packages/*/test/*.spec.js',
+  'packages/*/test/**/*.spec.js',
+  'packages/**/*.spec.js',
+  'packages/alpha/test/one.spec.js',
+  'packages/alpha/test/**/*.@(spec|test).@(js|mjs|cjs)',
+  'packages/datadog-plugin-@(http|redis)/test/**/*.spec.js',
+  'packages/datadog-plugin-@(http)/test/**/*.spec.js',
+  'packages/datadog-plugin-*/test/**/*.spec.js',
+  'packages/{alpha,beta}/test/**/*.spec.js',
+  'packages/{alpha}/test/**/*.spec.js',
+  'integration-tests/*.spec.js',
+  'integration-tests/**/*.spec.js',
+  'sub/dir/*.spec.js',
+  'sub/dir/with.dots.in.name.spec.js',
+  'vendor/dist/*.spec.js',
+  'coverage/*.spec.js',
+  '**/node_modules/**/*.spec.js',
+  '.hiddendir/*.spec.js',
+  'does/not/exist/*.spec.js',
+  'packages/*/test/**/**.spec.js',
+  '**/*.@(spec|test).@(js|mjs|cjs)',
+  '**/*.{spec,test}.js',
+  'packages/?????/test/*.spec.js',
+  'packages/[ab]*/test/*.spec.js',
+  './packages/alpha/test/*.spec.js',
+  './/packages/alpha/test/*.spec.js',
+  '././packages/alpha/test/*.spec.js',
+  'packages/./alpha/test/*.spec.js',
+  'packages/alpha/test/',
+  '',
+]
+
+/**
+ * @param {string} root
+ * @param {string[]} files
+ */
+function writeFixture (root, files) {
+  for (const file of files) {
+    const full = path.join(root, file)
+    fs.mkdirSync(path.dirname(full), { recursive: true })
+    fs.writeFileSync(full, '')
+  }
+}
+
+/**
+ * The index deliberately holds only test-named files outside `node_modules`. Expectations are
+ * intersected with that same set so a pattern selecting other files is compared fairly.
+ *
+ * @param {string} root
+ * @returns {Set<string>}
+ */
+function indexableFiles (root) {
+  return new Set(globSync(TEST_FILE_GLOB, {
+    cwd: root,
+    nodir: true,
+    windowsPathsNoEscape: true,
+    ignore: NODE_MODULES_ONLY,
+  }))
+}
+
+/**
+ * @param {string} root
+ * @param {Set<string>} indexable
+ * @param {string} pattern
+ * @param {string[]} [ignore]
+ * @returns {string[]}
+ */
+function globExpectation (root, indexable, pattern, ignore) {
+  return globSync(pattern, { cwd: root, nodir: true, windowsPathsNoEscape: true, ignore })
+    .filter(file => indexable.has(file))
+    .sort((a, b) => a.localeCompare(b, 'en'))
+}
+
+/**
+ * @param {Record<string, string>} scripts
+ * @returns {string[]}
+ */
+function globTokensFromScripts (scripts) {
+  const tokens = new Set()
+
+  for (const command of Object.values(scripts)) {
+    if (typeof command !== 'string') continue
+
+    for (const raw of command.split(/\s+/)) {
+      const unquoted = raw.replaceAll(/^["']+|["']+$/g, '')
+      if (!unquoted.includes('/') || !/[*?[\]{}()]/.test(unquoted)) continue
+
+      tokens.add(unquoted.replaceAll(/\$\{[^}]+\}/g, '*').replaceAll(/\$[A-Za-z_][A-Za-z0-9_]*/g, '*'))
+    }
+  }
+
+  return [...tokens]
+}
+
+describe('test-file-index', () => {
+  /** @type {string} */
+  let root
+  /** @type {ReturnType<typeof createTestFileIndex>} */
+  let index
+  /** @type {Set<string>} */
+  let indexable
+
+  before(() => {
+    root = fs.mkdtempSync(path.join(os.tmpdir(), 'dd-test-file-index-'))
+    writeFixture(root, FIXTURE_FILES)
+    fs.symlinkSync(path.join(root, 'packages', 'alpha', 'test'), path.join(root, 'linked-tests'), 'dir')
+
+    index = createTestFileIndex(root)
+    indexable = indexableFiles(root)
+  })
+
+  after(() => {
+    fs.rmSync(root, { recursive: true, force: true })
+  })
+
+  describe('inventory', () => {
+    it('indexes every supported test-file extension', () => {
+      assert.deepStrictEqual(
+        index.files.filter(file => !file.includes('/')),
+        ['a.spec.js', 'b.test.js', 'c.spec.mjs', 'd.test.mjs', 'e.spec.cjs', 'f.test.cjs']
+      )
+    })
+
+    it('excludes files that are not named like a test', () => {
+      for (const file of ['plain.js', 'notspec.js', 'wrong.spec.jsx', 'wrong.spec.ts']) {
+        assert.ok(!index.files.includes(file), `${file} should not be indexed`)
+      }
+    })
+
+    it('excludes node_modules at any depth', () => {
+      for (const file of index.files) {
+        assert.ok(!file.includes('node_modules/'), `${file} should not be indexed`)
+      }
+    })
+
+    it('excludes dot files and dot directories', () => {
+      for (const file of index.files) {
+        assert.ok(!file.split('/').some(segment => segment.startsWith('.')), `${file} should not be indexed`)
+      }
+    })
+
+    it('does not descend into symlinked directories', () => {
+      assert.ok(!index.files.some(file => file.startsWith('linked-tests/')))
+    })
+
+    it('returns sorted repository-relative POSIX paths', () => {
+      assert.deepStrictEqual(index.files, [...index.files].sort((a, b) => a.localeCompare(b, 'en')))
+      assert.ok(index.files.every(file => !file.startsWith('/') && !file.includes('\\')))
+    })
+
+    it('indexes an empty directory as no files', () => {
+      const empty = fs.mkdtempSync(path.join(os.tmpdir(), 'dd-test-file-index-empty-'))
+      try {
+        assert.deepStrictEqual(createTestFileIndex(empty).files, [])
+      } finally {
+        fs.rmSync(empty, { recursive: true, force: true })
+      }
+    })
+
+    it('warns instead of silently shrinking the index when a directory cannot be read', () => {
+      const { write } = process.stderr
+      /** @type {string[]} */
+      const warnings = []
+      process.stderr.write = chunk => warnings.push(String(chunk))
+
+      try {
+        assert.deepStrictEqual(createTestFileIndex(path.join(os.tmpdir(), 'dd-test-file-index-missing')).files, [])
+      } finally {
+        process.stderr.write = write
+      }
+
+      assert.deepStrictEqual(warnings, ['test-file-index: skipped unreadable . (ENOENT)\n'])
+    })
+  })
+
+  describe('matching', () => {
+    for (const pattern of FIXTURE_PATTERNS) {
+      it(`matches globSync for ${pattern}`, () => {
+        assert.deepStrictEqual(index.match(pattern), globExpectation(root, indexable, pattern))
+      })
+    }
+
+    for (const pattern of FIXTURE_PATTERNS) {
+      it(`matches globSync for ${pattern} under the default ignore list`, () => {
+        assert.deepStrictEqual(
+          index.match(pattern, DEFAULT_IGNORE_GLOBS),
+          globExpectation(root, indexable, pattern, DEFAULT_IGNORE_GLOBS)
+        )
+      })
+    }
+
+    it('matches globSync for every glob token in the real package.json', () => {
+      const { scripts } = require(path.join(REPO_ROOT, 'package.json'))
+      const repoIndex = createTestFileIndex(REPO_ROOT)
+      const repoIndexable = indexableFiles(REPO_ROOT)
+      const patterns = globTokensFromScripts(scripts)
+
+      assert.ok(patterns.length > 20, `expected a representative corpus, got ${patterns.length}`)
+
+      for (const pattern of patterns) {
+        assert.deepStrictEqual(
+          repoIndex.match(pattern, DEFAULT_IGNORE_GLOBS),
+          globExpectation(REPO_ROOT, repoIndexable, pattern, DEFAULT_IGNORE_GLOBS),
+          `pattern ${pattern} diverged from globSync`
+        )
+      }
+    })
+
+    it('matches globSync for the repository-wide test glob', () => {
+      const repoIndex = createTestFileIndex(REPO_ROOT)
+
+      assert.deepStrictEqual(
+        repoIndex.match(TEST_FILE_GLOB, DEFAULT_IGNORE_GLOBS),
+        globSync(TEST_FILE_GLOB, {
+          cwd: REPO_ROOT,
+          nodir: true,
+          windowsPathsNoEscape: true,
+          ignore: DEFAULT_IGNORE_GLOBS,
+        }).sort((a, b) => a.localeCompare(b, 'en'))
+      )
+    })
+  })
+
+  describe('ignore lists', () => {
+    it('drops paths excluded by the default ignore list', () => {
+      const matched = index.match('**/*.spec.js', DEFAULT_IGNORE_GLOBS)
+
+      assert.ok(!matched.includes('vendor/dist/bundled.spec.js'))
+      assert.ok(!matched.includes('coverage/report.spec.js'))
+      assert.ok(matched.includes('packages/alpha/test/one.spec.js'))
+    })
+
+    it('keeps paths a narrower ignore list allows', () => {
+      const matched = index.match('**/*.spec.js', NODE_MODULES_ONLY)
+
+      assert.ok(matched.includes('vendor/dist/bundled.spec.js'))
+      assert.ok(matched.includes('coverage/report.spec.js'))
+    })
+
+    it('treats an empty ignore list as no filtering', () => {
+      assert.deepStrictEqual(index.match('**/*.spec.js'), index.match('**/*.spec.js', []))
+    })
+
+    it('keeps results for the same pattern independent per ignore list', () => {
+      const wide = index.match('**/*.spec.js', NODE_MODULES_ONLY)
+      const narrow = index.match('**/*.spec.js', DEFAULT_IGNORE_GLOBS)
+
+      assert.ok(wide.length > narrow.length)
+      assert.deepStrictEqual(index.match('**/*.spec.js', NODE_MODULES_ONLY), wide)
+    })
+  })
+
+  describe('platform semantics', () => {
+    // `glob` reads case sensitivity off the filesystem, so a run on one platform never exercises
+    // the other's rules. Both are pinned here, independent of the host this suite runs on.
+    const files = ['sub/dir/lower.spec.js', 'sub/dir/UPPER.SPEC.JS']
+    const platforms = [
+      { platform: 'darwin', nocase: true },
+      { platform: 'win32', nocase: true },
+      { platform: 'linux', nocase: false },
+    ]
+    const caseInsensitivePlatforms = platforms.filter(entry => entry.nocase)
+
+    it('matches a wildcard segment case-insensitively where the filesystem is', () => {
+      for (const { platform } of caseInsensitivePlatforms) {
+        assert.deepStrictEqual(new TestFileIndex(files, { nocase: true, platform }).match('sub/dir/*.spec.js'),
+          files, `platform ${platform}`)
+      }
+    })
+
+    it('matches a wildcard segment case-sensitively on linux', () => {
+      const index = new TestFileIndex(files, { nocase: false, platform: 'linux' })
+      assert.deepStrictEqual(index.match('sub/dir/*.spec.js'), ['sub/dir/lower.spec.js'])
+    })
+
+    it('rejects a literal segment whose case differs, on every platform', () => {
+      for (const { platform, nocase } of platforms) {
+        assert.deepStrictEqual(new TestFileIndex(files, { nocase, platform }).match('sub/dir/upper.spec.js'),
+          [], `platform ${platform}`)
+      }
+    })
+
+    it('throws on a pattern it cannot resolve rather than matching too few files', () => {
+      const index = new TestFileIndex(files, { nocase: false, platform: 'linux' })
+      const expected = { message: /cannot resolve the '\.\.' segment/ }
+
+      assert.throws(() => index.match('packages/../sub/dir/lower.spec.js'), expected)
+      assert.throws(() => index.match('../sub/*.spec.js'), expected)
+      assert.throws(() => index.match('sub/..'), expected)
+      assert.deepStrictEqual(index.match('sub/dir/with..dots.spec.js'), [])
+    })
+  })
+
+  describe('repeated queries', () => {
+    it('returns equal results when a pattern is matched twice', () => {
+      for (const pattern of ['**/*.spec.js', 'packages/*/test/**/*.spec.js', 'does/not/exist/*.spec.js']) {
+        assert.deepStrictEqual(index.match(pattern, DEFAULT_IGNORE_GLOBS), index.match(pattern, DEFAULT_IGNORE_GLOBS))
+      }
+    })
+
+    it('does not leak matches between patterns sharing a literal prefix', () => {
+      const one = index.match('packages/alpha/test/one.spec.js')
+      const deep = index.match('packages/alpha/test/deep/*.spec.js')
+
+      assert.deepStrictEqual(one, ['packages/alpha/test/one.spec.js'])
+      assert.deepStrictEqual(deep, ['packages/alpha/test/deep/two.spec.js'])
+    })
+  })
+})
diff --git a/scripts/verify-exercised-tests.js b/scripts/verify-exercised-tests.js
index ca71b6f974..64fac64292 100644
--- a/scripts/verify-exercised-tests.js
+++ b/scripts/verify-exercised-tests.js
@@ -6,8 +6,13 @@ const path = require('node:path')
 const { globSync } = require('glob')
 const YAML = require('yaml')
 
+const { TEST_FILE_GLOB, createTestFileIndex } = require('./helpers/test-file-index')
+
+/** @typedef {import('./helpers/test-file-index').TestFileIndex} TestFileIndex */
+
+const NODE_MODULES_IGNORE_GLOBS = ['**/node_modules/**']
 const DEFAULT_IGNORE_GLOBS = [
-  '**/node_modules/**',
+  ...NODE_MODULES_IGNORE_GLOBS,
   '**/coverage/**',
   '**/.git/**',
   '**/.nyc_output/**',
@@ -15,12 +20,6 @@ const DEFAULT_IGNORE_GLOBS = [
   'vendor/dist/**',
 ]
 
-const GLOB_CACHE_MAX = 2000
-/** @type {Map<string, string[]>} */
-const globCache = new Map()
-let globCacheHits = 0
-let globCacheMisses = 0
-
 const COVERAGE_ACTIONS = new Set([
   './.github/actions/coverage',
   './.github/actions/upload-coverage-artifact',
@@ -30,36 +29,6 @@ const COVERAGE_COLLECTORS = new Set([
   'scripts/c8-ci.js',
 ])
 
-/**
- * @param {string} pattern
- * @param {{cwd: string, nodir: boolean, windowsPathsNoEscape: boolean, ignore?: string[]}} opts
- * @returns {string[]}
- */
-function globSyncCached (pattern, opts) {
-  const ignoreKey = Array.isArray(opts.ignore) ? opts.ignore.join('\n') : ''
-  const key = `${opts.cwd}\0${pattern}\0${opts.nodir ? 1 : 0}\0${opts.windowsPathsNoEscape ? 1 : 0}\0${ignoreKey}`
-
-  const cached = globCache.get(key)
-  if (cached) {
-    globCacheHits++
-    // Basic LRU: refresh insertion order.
-    globCache.delete(key)
-    globCache.set(key, cached)
-    return cached
-  }
-
-  globCacheMisses++
-  const res = globSync(pattern, opts)
-
-  globCache.set(key, res)
-  if (globCache.size > GLOB_CACHE_MAX) {
-    const first = globCache.keys().next().value
-    if (first !== undefined) globCache.delete(first)
-  }
-
-  return res
-}
-
 /**
  * @param {string} s
  * @returns {string}
@@ -350,30 +319,23 @@ function parseExportAssignments (run) {
 }
 
 /**
- * @param {string} repoRoot
+ * @param {TestFileIndex} index
  * @returns {string[]}
  */
-function findTestFiles (repoRoot) {
-  const commonGlobOpts = { cwd: repoRoot, nodir: true, windowsPathsNoEscape: true, ignore: DEFAULT_IGNORE_GLOBS }
-
+function findTestFiles (index) {
   // Collect every test-file naming convention used in the repo so an unrun spec
   // can never slip through untracked. Kept deliberately wide (js/mjs/cjs) even
   // where no file currently uses an extension, so a future one is caught.
-  const files = globSyncCached('**/*.@(spec|test).@(js|mjs|cjs)', commonGlobOpts)
-
-  files.sort((a, b) => a.localeCompare(b, 'en'))
-  return files
+  return index.match(TEST_FILE_GLOB, DEFAULT_IGNORE_GLOBS)
 }
 
 /**
- * @param {string} repoRoot
+ * @param {TestFileIndex} index
  * @param {Record<string, string>} scripts
  * @param {Record<string, string|undefined>} [env]
  * @returns {{ globs: string[], matchedFiles: Set<string> }}
  */
-function expandScriptGlobs (repoRoot, scripts, env = {}) {
-  const ignore = DEFAULT_IGNORE_GLOBS
-
+function expandScriptGlobs (index, scripts, env = {}) {
   /** @type {string[]} */
   const allGlobs = []
   const matchedFiles = new Set()
@@ -392,7 +354,7 @@ function expandScriptGlobs (repoRoot, scripts, env = {}) {
 
       let expanded
       try {
-        expanded = globSyncCached(normalized, { cwd: repoRoot, nodir: true, windowsPathsNoEscape: true, ignore })
+        expanded = index.match(normalized, DEFAULT_IGNORE_GLOBS)
       } catch {
         // If a pattern can't be parsed by glob, skip expanding it. It still counts as an extracted glob.
         continue
@@ -466,14 +428,14 @@ function extractScriptInvocations (run, knownScripts) {
 
 /**
  * Expand a script and any nested `npm run`/`yarn <script>` calls into matched files.
- * @param {string} repoRoot
+ * @param {TestFileIndex} index
  * @param {Record<string, string>} scripts
  * @param {Set<string>} knownScripts
  * @param {string} scriptName
  * @param {Record<string, string|undefined>} env
  * @returns {{ files: Set<string>, globs: string[], visited: string[] }}
  */
-function expandInvokedScript (repoRoot, scripts, knownScripts, scriptName, env) {
+function expandInvokedScript (index, scripts, knownScripts, scriptName, env) {
   /** @type {string[]} */
   const visited = []
   /** @type {string[]} */
@@ -484,8 +446,6 @@ function expandInvokedScript (repoRoot, scripts, knownScripts, scriptName, env)
   const queue = [scriptName]
   const seen = new Set()
 
-  const ignore = DEFAULT_IGNORE_GLOBS
-
   while (queue.length) {
     const name = queue.shift()
     if (!name || seen.has(name)) continue
@@ -503,7 +463,7 @@ function expandInvokedScript (repoRoot, scripts, knownScripts, scriptName, env)
       allGlobs.push(normalized)
       let expanded
       try {
-        expanded = globSyncCached(normalized, { cwd: repoRoot, nodir: true, windowsPathsNoEscape: true, ignore })
+        expanded = index.match(normalized, DEFAULT_IGNORE_GLOBS)
       } catch {
         continue
       }
@@ -523,7 +483,7 @@ function expandInvokedScript (repoRoot, scripts, knownScripts, scriptName, env)
  * @returns {string[]}
  */
 function findWorkflowFiles (repoRoot) {
-  const files = globSyncCached('.github/workflows/*.{yml,yaml}', {
+  const files = globSync('.github/workflows/*.{yml,yaml}', {
     cwd: repoRoot,
     nodir: true,
     windowsPathsNoEscape: true,
@@ -601,70 +561,75 @@ function isUsesStep (step) {
 }
 
 /**
+ * @typedef {{ kind: 'run', run: string, env: Record<string, string> }
+ *   | { kind: 'upload' }
+ *   | { kind: 'opaque', action: string }} StepEvent
+ */
+
+/**
+ * Ordered events a step contributes, descending into local composite actions.
+ *
+ * Commands and uploads share one timeline because five of this repository's composite actions run a
+ * suite and upload its report, so their relative order exists only inside the action. A second
+ * traversal answering just "does this upload?" drifted from this one and lost the composite guard.
+ *
+ * @param {unknown} stepValue
  * @param {string} repoRoot
- * @param {string} uses
- * @param {Record<string, string|undefined>} env
+ * @param {Record<string, string>} env
  * @param {Set<string>} visiting
- * @returns {{ run: string, env: Record<string, string|undefined> }[]}
+ * @returns {StepEvent[]}
  */
-function expandLocalCompositeActionRuns (repoRoot, uses, env, visiting) {
-  const actionFile = resolveLocalActionFile(repoRoot, uses)
-  if (!actionFile) return []
-  if (visiting.has(actionFile)) return []
-  visiting.add(actionFile)
+function collectStepEvents (stepValue, repoRoot, env, visiting) {
+  if (!isPlainObject(stepValue)) return []
+  const step = stepValue
 
-  const doc = parseYamlFile(repoRoot, actionFile)
-  if (!isPlainObject(doc)) return []
+  /** @type {Record<string, string>} */
+  const stepEnv = { ...env }
+  if (isPlainObject(step.env)) {
+    for (const [name, value] of Object.entries(step.env)) {
+      stepEnv[name] = typeof value === 'string' ? value : String(value)
+    }
+  }
 
-  const runs = doc.runs
-  if (!isPlainObject(runs) || runs.using !== 'composite') return []
-  const steps = Array.isArray(runs.steps) ? runs.steps : []
+  if (isRunStep(step)) {
+    return [{ kind: 'run', run: step.run, env: applyInlineAssignments(step.run, stepEnv) }]
+  }
 
-  /** @type {{ run: string, env: Record<string, string|undefined> }[]} */
-  const out = []
+  if (!isUsesStep(step)) return []
+  if (COVERAGE_ACTIONS.has(step.uses)) return [{ kind: 'upload' }]
+
+  // Third-party retry wrappers run their `with.command` like an inline `run:`. Without unwrapping
+  // it, the joint check below cannot see that `instrumentation-http` exercises
+  // `test:instrumentations:ci` with `PLUGINS=http`.
+  if (/^nick-fields\/retry@/.test(step.uses)) {
+    const command = isPlainObject(step.with) && typeof step.with.command === 'string'
+      ? step.with.command
+      : undefined
+    if (command === undefined) return []
+    return [{ kind: 'run', run: command, env: applyInlineAssignments(command, stepEnv) }]
+  }
 
-  for (const s of steps) {
-    if (isRunStep(s)) {
-      /** @type {Record<string, string|undefined>} */
-      const stepEnv = { ...env }
-      if (isPlainObject(s.env)) {
-        for (const [k, v] of Object.entries(s.env)) stepEnv[k] = typeof v === 'string' ? v : String(v)
-      }
+  const actionFile = resolveLocalActionFile(repoRoot, step.uses)
+  if (actionFile === null || visiting.has(actionFile)) return []
 
-      // Inline env in composite run: export and prefix assignments.
-      const exports = parseExportAssignments(s.run)
-      for (const [k, v] of Object.entries(exports)) stepEnv[k] = v
+  const doc = parseYamlFile(repoRoot, actionFile)
+  const runs = isPlainObject(doc) ? doc.runs : undefined
 
-      const idxYarn = s.run.indexOf('yarn ')
-      const idxNpm = s.run.indexOf('npm ')
-      let idx = idxNpm
-      if (idxYarn !== -1) {
-        idx = idxNpm === -1 ? idxYarn : Math.min(idxYarn, idxNpm)
-      }
-      if (idx > 0) {
-        const prefix = s.run.slice(0, idx)
-        const assigns = parseInlineAssignments(prefix)
-        for (const [k, v] of Object.entries(assigns)) stepEnv[k] = v
-      }
+  // A JavaScript or Docker action exposes no steps to read. Reporting it beats letting an upload
+  // hidden inside one read as "this job never uploads".
+  if (!isPlainObject(runs) || runs.using !== 'composite') return [{ kind: 'opaque', action: step.uses }]
 
-      out.push({ run: s.run, env: stepEnv })
-      continue
-    }
+  visiting.add(actionFile)
 
-    if (isUsesStep(s)) {
-      // Recurse into local composite actions.
-      /** @type {Record<string, string|undefined>} */
-      const nextEnv = { ...env }
-      if (isPlainObject(s.env)) {
-        for (const [k, v] of Object.entries(s.env)) nextEnv[k] = typeof v === 'string' ? v : String(v)
-      }
-      const nested = expandLocalCompositeActionRuns(repoRoot, s.uses, nextEnv, visiting)
-      for (const n of nested) out.push(n)
-    }
+  /** @type {StepEvent[]} */
+  const events = []
+  const steps = Array.isArray(runs.steps) ? runs.steps : []
+  for (const nested of steps) {
+    for (const event of collectStepEvents(nested, repoRoot, stepEnv, visiting)) events.push(event)
   }
 
   visiting.delete(actionFile)
-  return out
+  return events
 }
 
 /**
@@ -720,34 +685,6 @@ function commandProducesCoverage (command, knownScripts, coverageScripts) {
     .some(invocation => coverageScripts.has(invocation.script))
 }
 
-/**
- * @param {string} repoRoot
- * @param {string} uses
- * @param {Set<string>} visiting
- * @returns {boolean}
- */
-function localActionUploadsCoverage (repoRoot, uses, visiting) {
-  if (COVERAGE_ACTIONS.has(uses)) return true
-
-  const actionFile = resolveLocalActionFile(repoRoot, uses)
-  if (!actionFile || visiting.has(actionFile)) return false
-  visiting.add(actionFile)
-
-  const doc = parseYamlFile(repoRoot, actionFile)
-  const steps = doc.runs.steps
-  let uploadsCoverage = false
-
-  for (const step of steps) {
-    if (isUsesStep(step) && localActionUploadsCoverage(repoRoot, step.uses, visiting)) {
-      uploadsCoverage = true
-      break
-    }
-  }
-
-  visiting.delete(actionFile)
-  return uploadsCoverage
-}
-
 /**
  * Returns all combinations of matrix scalar/array values (ignores include/exclude).
  * @param {Record<string, unknown>} matrix
@@ -785,17 +722,65 @@ function expandMatrixExpressions (s, matrixValues) {
   })
 }
 
+/**
+ * Applies the environment a command sets for itself: `export X=1` lines, and `X=1 npm run …`
+ * prefixes.
+ *
+ * @param {string} command
+ * @param {Record<string, string>} env
+ * @returns {Record<string, string>}
+ */
+function applyInlineAssignments (command, env) {
+  const merged = { ...env, ...parseExportAssignments(command) }
+
+  const idxYarn = command.indexOf('yarn ')
+  const idxNpm = command.indexOf('npm ')
+  const idx = idxYarn === -1 ? idxNpm : (idxNpm === -1 ? idxYarn : Math.min(idxYarn, idxNpm))
+  if (idx > 0) Object.assign(merged, parseInlineAssignments(command.slice(0, idx)))
+
+  return merged
+}
+
+/**
+ * @param {Record<string, string>} env
+ * @param {Record<string, string>} matrixValues
+ * @returns {Record<string, string>}
+ */
+function expandMatrixExpressionsInEnv (env, matrixValues) {
+  /** @type {Record<string, string>} */
+  const expanded = {}
+  for (const [name, value] of Object.entries(env)) {
+    expanded[name] = expandMatrixExpressions(value, matrixValues)
+  }
+  return expanded
+}
+
+/**
+ * @typedef {{
+ *   workflowFile: string,
+ *   jobId: string,
+ *   run: string,
+ *   env: Record<string, string>,
+ *   sequence: number
+ * }} WorkflowRun
+ */
+
 /**
  * @param {string} repoRoot
  * @returns {{
- *   runs: { workflowFile: string, jobId: string, run: string, env: Record<string, string|undefined> }[],
- *   coverageUploadJobs: Set<string>
- * }}
+ *   runs: WorkflowRun[],
+ *   coverageUploadSequences: Map<string, number>,
+ *   opaqueActions: Map<string, Set<string>>
+ * }} `coverageUploadSequences` holds each job's last upload position on the same scale as
+ *   `WorkflowRun.sequence`.
  */
 function collectWorkflowRuns (repoRoot) {
-  /** @type {{ workflowFile: string, jobId: string, run: string, env: Record<string, string|undefined> }[]} */
+  /** @type {WorkflowRun[]} */
   const out = []
-  const coverageUploadJobs = new Set()
+  /** @type {Map<string, number>} */
+  const coverageUploadSequences = new Map()
+  /** @type {Map<string, Set<string>>} */
+  const opaqueActions = new Map()
 
   const files = findWorkflowFiles(repoRoot)
   for (const wf of files) {
@@ -815,85 +800,60 @@ function collectWorkflowRuns (repoRoot) {
         : {}
       const matrixCombinations = getMatrixCombinations(matrixData)
 
-      for (const stepVal of steps) {
-        const step = isPlainObject(stepVal) ? stepVal : {}
-        if (
-          typeof step.uses === 'string' &&
-          localActionUploadsCoverage(repoRoot, step.uses, new Set())
-        ) {
-          coverageUploadJobs.add(`${wf}#${jobId}`)
-        }
-
-        // Merge env. Values can be strings or non-strings; we only keep string-ish.
-        /** @type {Record<string, string|undefined>} */
-        const env = {}
-        for (const [k, v] of Object.entries(topEnv)) env[k] = typeof v === 'string' ? v : String(v)
-        for (const [k, v] of Object.entries(jobEnv)) env[k] = typeof v === 'string' ? v : String(v)
-        if (isPlainObject(step.env)) {
-          for (const [k, v] of Object.entries(step.env)) env[k] = typeof v === 'string' ? v : String(v)
+      // Values can be strings or non-strings; we only keep string-ish.
+      /** @type {Record<string, string>} */
+      const jobEnvironment = {}
+      for (const [k, v] of Object.entries(topEnv)) jobEnvironment[k] = typeof v === 'string' ? v : String(v)
+      for (const [k, v] of Object.entries(jobEnv)) jobEnvironment[k] = typeof v === 'string' ? v : String(v)
+
+      /** @type {StepEvent[]} */
+      const events = []
+      for (const stepValue of steps) {
+        for (const event of collectStepEvents(stepValue, repoRoot, jobEnvironment, new Set())) {
+          events.push(event)
         }
+      }
 
-        if (typeof step.run === 'string') {
-          // Expand matrix expressions and emit one entry per combination.
-          const seenRuns = new Set()
-          for (const combo of matrixCombinations) {
-            const run = expandMatrixExpressions(step.run, combo)
-            if (seenRuns.has(run)) continue
-            seenRuns.add(run)
-
-            const stepEnv = { ...env }
-
-            // Inline env in `run:` (export lines and prefix assignments before yarn/npm).
-            const exports = parseExportAssignments(run)
-            for (const [k, v] of Object.entries(exports)) stepEnv[k] = v
-
-            const idxYarn = run.indexOf('yarn ')
-            const idxNpm = run.indexOf('npm ')
-            const idx = idxYarn === -1 ? idxNpm : (idxNpm === -1 ? idxYarn : Math.min(idxYarn, idxNpm))
-            if (idx > 0) {
-              const prefix = run.slice(0, idx)
-              const assigns = parseInlineAssignments(prefix)
-              for (const [k, v] of Object.entries(assigns)) stepEnv[k] = v
-            }
+      const jobKey = `${wf}#${jobId}`
 
-            out.push({ workflowFile: wf, jobId, run, env: stepEnv })
-          }
+      for (const [sequence, event] of events.entries()) {
+        if (event.kind === 'upload') {
+          coverageUploadSequences.set(jobKey, sequence)
           continue
         }
 
-        if (typeof step.uses === 'string' && step.uses.startsWith('./')) {
-          const expanded = expandLocalCompositeActionRuns(repoRoot, step.uses, env, new Set())
-          for (const e of expanded) {
-            out.push({ workflowFile: wf, jobId, run: e.run, env: e.env })
+        if (event.kind === 'opaque') {
+          let actions = opaqueActions.get(jobKey)
+          if (actions === undefined) {
+            actions = new Set()
+            opaqueActions.set(jobKey, actions)
           }
+          actions.add(event.action)
+          continue
         }
 
-        // Third-party retry wrappers run their `with.command` like an inline `run:`.
-        // Without unwrapping it, the joint check below cannot see that `instrumentation-http`
-        // exercises `test:instrumentations:ci` with `PLUGINS=http`.
-        if (typeof step.uses === 'string' && /^nick-fields\/retry@/.test(step.uses)) {
-          const command = isPlainObject(step.with) && typeof step.with.command === 'string'
-            ? step.with.command
-            : null
-          if (command) {
-            const stepEnv = { ...env }
-            const exports = parseExportAssignments(command)
-            for (const [k, v] of Object.entries(exports)) stepEnv[k] = v
-            const idxYarn = command.indexOf('yarn ')
-            const idxNpm = command.indexOf('npm ')
-            const idx = idxYarn === -1 ? idxNpm : (idxNpm === -1 ? idxYarn : Math.min(idxYarn, idxNpm))
-            if (idx > 0) {
-              const assigns = parseInlineAssignments(command.slice(0, idx))
-              for (const [k, v] of Object.entries(assigns)) stepEnv[k] = v
-            }
-            out.push({ workflowFile: wf, jobId, run: command, env: stepEnv })
-          }
+        // Deduplicated per event, not per job: the same command at a later position carries a
+        // later sequence, which is what tells an upload apart from the suites it leaves behind.
+        const seen = new Set()
+
+        for (const combo of matrixCombinations) {
+          // A matrix leg reaches the glob through the environment as often as through the command
+          // (`SPEC: ${{ matrix.spec }}`). Leaving the expression unresolved degrades the pattern to
+          // `*`, and every spec in the directory then looks exercised by every leg.
+          const run = expandMatrixExpressions(event.run, combo)
+          const env = expandMatrixExpressionsInEnv(event.env, combo)
+
+          const key = `${run}\0${JSON.stringify(env)}`
+          if (seen.has(key)) continue
+          seen.add(key)
+
+          out.push({ workflowFile: wf, jobId, run, env, sequence })
         }
       }
     }
   }
 
-  return { runs: out, coverageUploadJobs }
+  return { runs: out, coverageUploadSequences, opaqueActions }
 }
 
 /**
@@ -901,7 +861,7 @@ function collectWorkflowRuns (repoRoot) {
  * @returns {Set<string>}
  */
 function listPluginPackages (repoRoot) {
-  const entries = globSyncCached('packages/datadog-plugin-*', {
+  const entries = globSync('packages/datadog-plugin-*', {
     cwd: repoRoot,
     nodir: false,
     windowsPathsNoEscape: true,
@@ -989,18 +949,11 @@ function getTraceCoreCategoriesFromScripts (scripts) {
 }
 
 /**
- * @param {string} repoRoot
+ * @param {TestFileIndex} index
  * @returns {Set<string>}
  */
-function findDdTraceTestCategories (repoRoot) {
-  const files = globSyncCached('packages/dd-trace/test/*/**/*.@(spec|test).@(js|mjs|cjs)', {
-    cwd: repoRoot,
-    nodir: true,
-    windowsPathsNoEscape: true,
-    ignore: [
-      '**/node_modules/**',
-    ],
-  })
+function findDdTraceTestCategories (index) {
+  const files = index.match('packages/dd-trace/test/*/**/*.@(spec|test).@(js|mjs|cjs)', NODE_MODULES_IGNORE_GLOBS)
 
   /** @type {Set<string>} */
   const out = new Set()
@@ -1017,21 +970,12 @@ function findDdTraceTestCategories (repoRoot) {
 }
 
 /**
- * @param {string} repoRoot
+ * @param {TestFileIndex} index
  * @param {string} category
  * @returns {string[]}
  */
-function listDdTraceCategorySpecFiles (repoRoot, category) {
-  const files = globSyncCached(`packages/dd-trace/test/${category}/**/*.@(spec|test).@(js|mjs|cjs)`, {
-    cwd: repoRoot,
-    nodir: true,
-    windowsPathsNoEscape: true,
-    ignore: [
-      '**/node_modules/**',
-    ],
-  })
-  files.sort((a, b) => a.localeCompare(b, 'en'))
-  return files
+function listDdTraceCategorySpecFiles (index, category) {
+  return index.match(`packages/dd-trace/test/${category}/**/*.@(spec|test).@(js|mjs|cjs)`, NODE_MODULES_IGNORE_GLOBS)
 }
 
 /**
@@ -1059,16 +1003,14 @@ function isCategoryCoveredByOtherScript (scriptPrefixes, category) {
 }
 
 /**
- * @param {string} repoRoot
+ * @param {TestFileIndex} index
  * @returns {Set<string>}
  */
-function buildAppsecPluginTestSet (repoRoot) {
-  const files = globSyncCached('packages/dd-trace/test/appsec/**/*.plugin.@(spec|test).@(js|mjs|cjs)', {
-    cwd: repoRoot,
-    nodir: true,
-    windowsPathsNoEscape: true,
-    ignore: DEFAULT_IGNORE_GLOBS,
-  })
+function buildAppsecPluginTestSet (index) {
+  const files = index.match(
+    'packages/dd-trace/test/appsec/**/*.plugin.@(spec|test).@(js|mjs|cjs)',
+    DEFAULT_IGNORE_GLOBS
+  )
 
   /** @type {Set<string>} */
   const out = new Set()
@@ -1082,16 +1024,14 @@ function buildAppsecPluginTestSet (repoRoot) {
 }
 
 /**
- * @param {string} repoRoot
+ * @param {TestFileIndex} index
  * @returns {Set<string>}
  */
-function buildLlmobsPluginTestSet (repoRoot) {
-  const files = globSyncCached('packages/dd-trace/test/llmobs/plugins/*/*.@(spec|test).@(js|mjs|cjs)', {
-    cwd: repoRoot,
-    nodir: true,
-    windowsPathsNoEscape: true,
-    ignore: DEFAULT_IGNORE_GLOBS,
-  })
+function buildLlmobsPluginTestSet (index) {
+  const files = index.match(
+    'packages/dd-trace/test/llmobs/plugins/*/*.@(spec|test).@(js|mjs|cjs)',
+    DEFAULT_IGNORE_GLOBS
+  )
 
   /** @type {Set<string>} */
   const out = new Set()
@@ -1105,10 +1045,13 @@ function buildLlmobsPluginTestSet (repoRoot) {
   return out
 }
 
-function main () {
+/**
+ * @param {string} [repoRootArg] Checkout to verify. Defaults to the repository this script lives in.
+ */
+function main (repoRootArg) {
   const startNs = process.hrtime.bigint()
 
-  const repoRoot = path.resolve(__dirname, '..')
+  const repoRoot = repoRootArg ? path.resolve(repoRootArg) : path.resolve(__dirname, '..')
   const packageJsonPath = path.join(repoRoot, 'package.json')
   const pluginsVar = '$' + '{PLUGINS}'
   const bracePluginsVar = '{' + pluginsVar + '}'
@@ -1146,8 +1089,9 @@ function main () {
     process.exit(1)
   }
 
-  const testFiles = findTestFiles(repoRoot)
-  const { globs, matchedFiles } = expandScriptGlobs(repoRoot, scripts)
+  const index = createTestFileIndex(repoRoot)
+  const testFiles = findTestFiles(index)
+  const { globs, matchedFiles } = expandScriptGlobs(index, scripts)
 
   /** @type {string[]} */
   const missing = []
@@ -1165,7 +1109,7 @@ function main () {
     process.exit(1)
   }
 
-  const { runs: workflowRuns, coverageUploadJobs } = collectWorkflowRuns(repoRoot)
+  const { runs: workflowRuns, coverageUploadSequences, opaqueActions } = collectWorkflowRuns(repoRoot)
 
   /** @type {{ workflowFile: string, jobId: string, script: string, env: Record<string, string|undefined> }[]} */
   const invoked = []
@@ -1181,16 +1125,25 @@ function main () {
     if (!uniqueErrors.has(msg)) uniqueErrors.add(msg)
   }
 
-  const coverageProducerJobs = new Set()
   const coverageScripts = findCoverageScripts(scripts, knownScripts)
   for (const run of workflowRuns) {
-    if (commandProducesCoverage(run.run, knownScripts, coverageScripts)) {
-      coverageProducerJobs.add(`${run.workflowFile}#${run.jobId}`)
+    if (!commandProducesCoverage(run.run, knownScripts, coverageScripts)) continue
+
+    const job = `${run.workflowFile}#${run.jobId}`
+    const uploadSequence = coverageUploadSequences.get(job)
+
+    if (uploadSequence === undefined) {
+      pushError(`${job}: generates coverage but does not upload it`)
+    } else if (run.sequence > uploadSequence) {
+      // The uploader has already collected the reports it will ever see, so this suite's report
+      // never leaves the runner even though the job looks like it uploads coverage.
+      pushError(`${job}: generates coverage after its last coverage upload`)
     }
   }
-  for (const job of coverageProducerJobs) {
-    if (!coverageUploadJobs.has(job)) {
-      pushError(`${job}: generates coverage but does not upload it`)
+
+  for (const [job, actions] of opaqueActions) {
+    for (const action of actions) {
+      pushError(`${job}: cannot inspect local action "${action}", which is not a composite action`)
     }
   }
 
@@ -1265,8 +1218,8 @@ function main () {
   const pluginPkgs = listPluginPackages(repoRoot)
   const versionsDeps = loadUpstreamPluginNames(repoRoot)
   const pluginExternals = loadUpstreamExternals(repoRoot)
-  const appsecPluginTests = buildAppsecPluginTestSet(repoRoot)
-  const llmobsPluginTests = buildLlmobsPluginTestSet(repoRoot)
+  const appsecPluginTests = buildAppsecPluginTestSet(index)
+  const llmobsPluginTests = buildLlmobsPluginTestSet(index)
 
   // Detect CI steps that will match no tests due to env/script mismatches.
   const testFileSet = new Set(testFiles)
@@ -1286,7 +1239,7 @@ function main () {
     // Only use literal PLUGINS for matching; expressions are unknown.
     if (env.PLUGINS && env.PLUGINS.includes(ghaExprStart)) env.PLUGINS = undefined
 
-    const { files, globs: invokedGlobs } = expandInvokedScript(repoRoot, scripts, knownScripts, i.script, env)
+    const { files, globs: invokedGlobs } = expandInvokedScript(index, scripts, knownScripts, i.script, env)
 
     // Only enforce "matches test files" when the (expanded) script actually contains globs.
     // Some scripts (e.g. `test:plugins:upstream`) run a suite runner and do not directly
@@ -1417,7 +1370,7 @@ function main () {
   let hasCategoryWarnings = false
   const traceCoreCats = getTraceCoreCategoriesFromScripts(scripts)
   if (traceCoreCats.size) {
-    const ddTraceCats = findDdTraceTestCategories(repoRoot)
+    const ddTraceCats = findDdTraceTestCategories(index)
     /** @type {string[]} */
     const missingFromTraceCore = []
 
@@ -1434,7 +1387,7 @@ function main () {
       // Only warn when the category is excluded from core AND we can't find any dedicated script
       // that appears to cover it. If it is covered elsewhere, it should not produce warnings.
       if (!covered) {
-        const files = listDdTraceCategorySpecFiles(repoRoot, cat)
+        const files = listDdTraceCategorySpecFiles(index, cat)
         const maxList = 25
         warnLines.push(`test:trace:core excludes "${cat}" (no dedicated test script found; files: ${files.length})`)
         for (let i = 0; i < files.length && i < maxList; i++) {
@@ -1473,9 +1426,8 @@ function main () {
 
   const durMs = Number(process.hrtime.bigint() - startNs) / 1e6
   process.stdout.write(`Runtime(ms): ${durMs.toFixed(1)}\n`)
-  process.stdout.write(`Glob cache: size=${globCache.size} hits=${globCacheHits} misses=${globCacheMisses}\n`)
 
   process.exit(hasCategoryWarnings ? 1 : 0)
 }
 
-main()
+main(process.argv[2])
diff --git a/scripts/verify-exercised-tests.spec.mjs b/scripts/verify-exercised-tests.spec.mjs
new file mode 100644
index 0000000000..b378d2917d
--- /dev/null
+++ b/scripts/verify-exercised-tests.spec.mjs
@@ -0,0 +1,498 @@
+import assert from 'node:assert/strict'
+import { spawnSync } from 'node:child_process'
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+import { describe, it } from 'mocha'
+
+const SCRIPT = fileURLToPath(new URL('verify-exercised-tests.js', import.meta.url))
+
+// Written split so the linter does not read these as unintended template literals.
+const PLUGINS_VAR = '$' + '{PLUGINS}'
+const SPEC_VAR = '$' + '{SPEC:-*}'
+const MATRIX_SPEC = '$' + '{{ matrix.spec }}'
+
+/**
+ * @typedef {{ run: string, env?: Record<string, string> } | { uses: string }} WorkflowStep
+ * @typedef {Array<string|WorkflowStep>} JobSteps
+ * @typedef {JobSteps | {
+ *   steps: JobSteps,
+ *   env?: Record<string, string>,
+ *   matrix?: Record<string, string[]>,
+ * }} WorkflowJob
+ * @typedef {{
+ *   scripts: Record<string, string>,
+ *   workflows: Record<string, Record<string, WorkflowJob>|string>,
+ *   files: string[],
+ *   actions: Record<string, JobSteps|string>,
+ * }} Fixture Workflows and actions accept raw YAML so malformed shapes stay expressible.
+ */
+
+/**
+ * Baseline checkout that satisfies every check. Each case below overrides one part of it, so a
+ * failing assertion points at the single mutation under test rather than at fixture drift.
+ *
+ * @type {Fixture}
+ */
+const PASSING = {
+  scripts: {
+    'test:unit:ci': 'mocha "packages/**/test/**/*.spec.js"',
+  },
+  workflows: {
+    'test.yml': { unit: ['npm run test:unit:ci'] },
+  },
+  files: ['packages/alpha/test/one.spec.js'],
+  actions: {},
+}
+
+/**
+ * @param {JobSteps} steps
+ * @param {string} indent
+ * @returns {string[]}
+ */
+function stepLines (steps, indent) {
+  const lines = []
+
+  for (const step of steps) {
+    const normalized = typeof step === 'string' ? { run: step } : step
+
+    if ('uses' in normalized) {
+      lines.push(`${indent}- uses: ${normalized.uses}`)
+      continue
+    }
+
+    lines.push(`${indent}- run: ${normalized.run}`)
+    if (normalized.env) {
+      lines.push(`${indent}  env:`)
+      for (const [name, value] of Object.entries(normalized.env)) {
+        lines.push(`${indent}    ${name}: ${value}`)
+      }
+    }
+  }
+
+  return lines
+}
+
+/**
+ * @param {Record<string, WorkflowJob>} jobs
+ * @returns {string}
+ */
+function workflowYaml (jobs) {
+  const lines = ['name: test', 'on: push', 'jobs:']
+
+  for (const [jobId, jobValue] of Object.entries(jobs)) {
+    const job = Array.isArray(jobValue) ? { steps: jobValue } : jobValue
+    lines.push(`  ${jobId}:`, '    runs-on: ubuntu-latest')
+
+    if ('matrix' in job && job.matrix) {
+      lines.push('    strategy:', '      matrix:')
+      for (const [name, values] of Object.entries(job.matrix)) {
+        lines.push(`        ${name}:`)
+        for (const value of values) lines.push(`          - ${value}`)
+      }
+    }
+
+    if ('env' in job && job.env) {
+      lines.push('    env:')
+      for (const [name, value] of Object.entries(job.env)) lines.push(`      ${name}: ${value}`)
+    }
+
+    lines.push('    steps:', ...stepLines(job.steps, ' '.repeat(6)))
+  }
+
+  return `${lines.join('\n')}\n`
+}
+
+/**
+ * @param {JobSteps|string} action Composite steps, or raw YAML for a non-composite action.
+ * @returns {string}
+ */
+function actionYaml (action) {
+  if (typeof action === 'string') return action
+
+  const lines = ['name: fixture', 'runs:', '  using: composite', '  steps:', ...stepLines(action, ' '.repeat(4))]
+
+  return `${lines.join('\n')}\n`
+}
+
+/**
+ * A single job whose glob narrows per matrix leg through the environment.
+ *
+ * @param {string[]} spec
+ * @returns {Record<string, Record<string, WorkflowJob>>}
+ */
+function matrixWorkflow (spec) {
+  return {
+    'test.yml': {
+      plugins: {
+        matrix: { spec },
+        env: { SPEC: MATRIX_SPEC },
+        steps: ['npm run test:plugins:ci'],
+      },
+    },
+  }
+}
+
+/**
+ * @param {Partial<Fixture>} overrides
+ * @returns {{ status: number|null, stdout: string, stderr: string }}
+ */
+function runVerifier (overrides = {}) {
+  const { scripts, workflows, files, actions } = { ...PASSING, ...overrides }
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), 'dd-verify-exercised-'))
+
+  try {
+    fs.writeFileSync(path.join(root, 'package.json'), JSON.stringify({ name: 'fixture', scripts }))
+
+    for (const [name, jobs] of Object.entries(workflows)) {
+      const file = path.join(root, '.github', 'workflows', name)
+      fs.mkdirSync(path.dirname(file), { recursive: true })
+      fs.writeFileSync(file, typeof jobs === 'string' ? jobs : workflowYaml(jobs))
+    }
+
+    for (const [directory, action] of Object.entries(actions)) {
+      const file = path.join(root, directory, 'action.yml')
+      fs.mkdirSync(path.dirname(file), { recursive: true })
+      fs.writeFileSync(file, actionYaml(action))
+    }
+
+    for (const file of files) {
+      const full = path.join(root, file)
+      fs.mkdirSync(path.dirname(full), { recursive: true })
+      fs.writeFileSync(full, '')
+    }
+
+    const { status, stdout, stderr } = spawnSync(process.execPath, [SCRIPT, root], { encoding: 'utf8' })
+    return { status, stdout, stderr }
+  } finally {
+    fs.rmSync(root, { recursive: true, force: true })
+  }
+}
+
+describe('verify-exercised-tests', () => {
+  it('verifies its own repository when no root is given', () => {
+    const { status, stdout } = spawnSync(process.execPath, [SCRIPT], { encoding: 'utf8' })
+
+    assert.strictEqual(status, 0)
+    assert.match(stdout, /All CI workflows reference valid scripts, and plugin setup looks consistent\./)
+  })
+
+  it('accepts a checkout where every test file is exercised', () => {
+    const { status, stdout } = runVerifier()
+
+    assert.strictEqual(status, 0)
+    assert.match(stdout, /All test files are covered by at least one package\.json script glob\./)
+    assert.match(stdout, /^Test files: 1$/m)
+  })
+
+  it('reports a test file no script glob selects', () => {
+    const { status, stderr } = runVerifier({
+      files: ['packages/alpha/test/one.spec.js', 'orphan/lonely.spec.js'],
+    })
+
+    assert.strictEqual(status, 1)
+    assert.match(stderr, /Test files not covered by any package\.json script glob\./)
+    assert.match(stderr, /^- orphan\/lonely\.spec\.js$/m)
+  })
+
+  it('reports every test-file extension the repository allows', () => {
+    const extensions = ['spec.js', 'spec.mjs', 'spec.cjs', 'test.js', 'test.mjs', 'test.cjs']
+    const { status, stderr } = runVerifier({
+      files: extensions.map(extension => `orphan/lonely.${extension}`),
+    })
+
+    assert.strictEqual(status, 1)
+    for (const extension of extensions) {
+      assert.match(stderr, new RegExp(String.raw`^- orphan/lonely\.${extension.replace('.', String.raw`\.`)}$`, 'm'))
+    }
+  })
+
+  it('reports an unquoted globstar that POSIX sh would collapse', () => {
+    const { status, stderr } = runVerifier({
+      scripts: { 'test:unit:ci': 'mocha packages/**/test/**/*.spec.js' },
+    })
+
+    assert.strictEqual(status, 1)
+    assert.match(stderr, /Unquoted `\*\*` globs detected in package\.json scripts/)
+    assert.match(stderr, /script "test:unit:ci" contains an unquoted "\*\*"/)
+  })
+
+  it('reports a :ci script no workflow invokes', () => {
+    const { status, stderr } = runVerifier({
+      scripts: {
+        ...PASSING.scripts,
+        'test:extra:ci': 'mocha "packages/**/test/**/*.spec.js"',
+      },
+    })
+
+    assert.strictEqual(status, 1)
+    assert.match(stderr, /script "test:extra:ci" is not invoked by any GitHub Actions workflow/)
+  })
+
+  it('reports a workflow invoking a script that does not exist', () => {
+    const { status, stderr } = runVerifier({
+      workflows: { 'test.yml': { unit: ['npm run test:unit:ci', 'npm run test:missing'] } },
+    })
+
+    assert.strictEqual(status, 1)
+    assert.match(stderr, /invokes missing script "test:missing"/)
+  })
+
+  it('reports a CI step whose script selects no test file', () => {
+    const { status, stderr } = runVerifier({
+      scripts: {
+        ...PASSING.scripts,
+        'test:empty:ci': 'mocha "nowhere/**/*.spec.js"',
+      },
+      workflows: { 'test.yml': { unit: ['npm run test:unit:ci', 'npm run test:empty:ci'] } },
+    })
+
+    assert.strictEqual(status, 1)
+    assert.match(stderr, /"test:empty:ci" would match 0 test files/)
+  })
+
+  it('reports a test file that a script glob covers but no CI job reaches', () => {
+    const { status, stderr } = runVerifier({
+      scripts: {
+        'test:unit:ci': 'mocha "packages/alpha/test/**/*.spec.js"',
+        'test:beta': 'mocha "packages/beta/test/**/*.spec.js"',
+      },
+      files: ['packages/alpha/test/one.spec.js', 'packages/beta/test/two.spec.js'],
+    })
+
+    assert.strictEqual(status, 1)
+    assert.match(stderr, /No CI workflow invocation expands a glob to exercise packages\/beta\/test\/two\.spec\.js/)
+  })
+
+  it('reports PLUGINS naming a plugin package that does not exist', () => {
+    const { status, stderr } = runVerifier({
+      scripts: {
+        ...PASSING.scripts,
+        'test:plugins:ci': `mocha "packages/datadog-plugin-@(${PLUGINS_VAR})/test/**/*.spec.js"`,
+      },
+      workflows: {
+        'test.yml': {
+          unit: ['npm run test:unit:ci', { run: 'npm run test:plugins:ci', env: { PLUGINS: 'nope' } }],
+        },
+      },
+      files: ['packages/datadog-plugin-http/test/index.spec.js'],
+    })
+
+    assert.strictEqual(status, 1)
+    assert.match(stderr, /PLUGINS includes "nope" but packages\/datadog-plugin-nope does not exist/)
+  })
+
+  it('accepts PLUGINS naming a plugin package that exists', () => {
+    const { status } = runVerifier({
+      scripts: {
+        'test:plugins:ci': `mocha "packages/datadog-plugin-@(${PLUGINS_VAR})/test/**/*.spec.js"`,
+      },
+      workflows: {
+        'test.yml': {
+          plugins: [{ run: 'npm run test:plugins:ci', env: { PLUGINS: 'http' } }],
+        },
+      },
+      files: ['packages/datadog-plugin-http/test/index.spec.js'],
+    })
+
+    assert.strictEqual(status, 0)
+  })
+
+  it('reports a job that generates coverage without uploading it', () => {
+    const { status, stderr } = runVerifier({
+      scripts: {
+        ...PASSING.scripts,
+        'test:cov:ci': 'node scripts/c8-ci.js test:unit:ci',
+      },
+      workflows: { 'test.yml': { unit: ['npm run test:cov:ci'] } },
+    })
+
+    assert.strictEqual(status, 1)
+    assert.match(stderr, /generates coverage but does not upload it/)
+  })
+
+  describe('coverage upload ordering', () => {
+    const scripts = { ...PASSING.scripts, 'test:cov:ci': 'node scripts/c8-ci.js test:unit:ci' }
+    const upload = { uses: './.github/actions/coverage' }
+
+    it('accepts a job that uploads after generating coverage', () => {
+      const { status } = runVerifier({
+        scripts,
+        workflows: { 'test.yml': { unit: ['npm run test:cov:ci', upload] } },
+      })
+
+      assert.strictEqual(status, 0)
+    })
+
+    it('reports a job that generates coverage after its last upload', () => {
+      const { status, stderr } = runVerifier({
+        scripts,
+        workflows: { 'test.yml': { unit: [upload, 'npm run test:cov:ci'] } },
+      })
+
+      assert.strictEqual(status, 1)
+      assert.match(stderr, /test\.yml#unit: generates coverage after its last coverage upload/)
+    })
+
+    it('accepts a later upload that still covers an earlier suite', () => {
+      const { status } = runVerifier({
+        scripts,
+        workflows: { 'test.yml': { unit: [upload, 'npm run test:cov:ci', upload] } },
+      })
+
+      assert.strictEqual(status, 0)
+    })
+
+    it('reports a suite repeated after the upload that already covered it', () => {
+      const { status, stderr } = runVerifier({
+        scripts,
+        workflows: { 'test.yml': { unit: ['npm run test:cov:ci', upload, 'npm run test:cov:ci'] } },
+      })
+
+      assert.strictEqual(status, 1)
+      assert.match(stderr, /generates coverage after its last coverage upload/)
+    })
+
+    it('reports the ordering inside a composite action', () => {
+      const { status, stderr } = runVerifier({
+        scripts,
+        actions: { '.github/actions/suite': [upload, { run: 'npm run test:cov:ci' }] },
+        workflows: { 'test.yml': { unit: [{ uses: './.github/actions/suite' }] } },
+      })
+
+      assert.strictEqual(status, 1)
+      assert.match(stderr, /generates coverage after its last coverage upload/)
+    })
+
+    it('accepts a composite action that uploads after its suite', () => {
+      const { status } = runVerifier({
+        scripts,
+        actions: { '.github/actions/suite': [{ run: 'npm run test:cov:ci' }, upload] },
+        workflows: { 'test.yml': { unit: [{ uses: './.github/actions/suite' }] } },
+      })
+
+      assert.strictEqual(status, 0)
+    })
+
+    it('walks past steps that carry neither a command nor an action', () => {
+      const { status } = runVerifier({
+        workflows: {
+          'test.yml': [
+            'name: test',
+            'on: push',
+            'env:',
+            '  DD_ENV: ci',
+            '  DD_TELEMETRY: false',
+            'jobs:',
+            '  unit:',
+            '    runs-on: ubuntu-latest',
+            '    env:',
+            '      DD_TRACE_DEBUG: true',
+            '    steps:',
+            '      -',
+            '      - name: no command here',
+            '      - uses: nick-fields/retry@v3',
+            '      - run: npm run test:unit:ci',
+          ].join('\n') + '\n',
+        },
+      })
+
+      assert.strictEqual(status, 0)
+    })
+
+    it('reports a local action whose steps it cannot read', () => {
+      const { status, stderr } = runVerifier({
+        actions: { '.github/actions/bundled': 'name: fixture\nruns:\n  using: node20\n  main: index.js\n' },
+        workflows: { 'test.yml': { unit: ['npm run test:unit:ci', { uses: './.github/actions/bundled' }] } },
+      })
+
+      assert.strictEqual(status, 1)
+      assert.match(stderr, /cannot inspect local action "\.\/\.github\/actions\/bundled", which is not a composite action/)
+    })
+
+    it('reports an action file it cannot read as a composite action', () => {
+      const { status, stderr } = runVerifier({
+        actions: { '.github/actions/empty': '' },
+        workflows: { 'test.yml': { unit: ['npm run test:unit:ci', { uses: './.github/actions/empty' }] } },
+      })
+
+      assert.strictEqual(status, 1)
+      assert.match(stderr, /cannot inspect local action "\.\/\.github\/actions\/empty"/)
+    })
+
+    it('accepts a composite action that declares no steps', () => {
+      const { status } = runVerifier({
+        actions: { '.github/actions/noop': 'name: fixture\nruns:\n  using: composite\n' },
+        workflows: { 'test.yml': { unit: ['npm run test:unit:ci', { uses: './.github/actions/noop' }] } },
+      })
+
+      assert.strictEqual(status, 0)
+    })
+  })
+
+  describe('matrix legs', () => {
+    // `SPEC` reaches the glob only through the environment, so an unresolved matrix expression
+    // widens the pattern to `*` and hides every spec no leg actually selects.
+    const scripts = {
+      'test:plugins:ci': `mocha "packages/datadog-plugin-alpha/test/**/${SPEC_VAR}*.spec.js"`,
+    }
+    const files = [
+      'packages/datadog-plugin-alpha/test/one.spec.js',
+      'packages/datadog-plugin-alpha/test/two.spec.js',
+    ]
+
+    it('reports a spec that no matrix leg selects', () => {
+      const { status, stderr } = runVerifier({ scripts, files, workflows: matrixWorkflow(['one']) })
+
+      assert.strictEqual(status, 1)
+      assert.match(stderr, /exercise packages\/datadog-plugin-alpha\/test\/two\.spec\.js/)
+    })
+
+    it('accepts specs that the matrix legs cover between them', () => {
+      const { status } = runVerifier({ scripts, files, workflows: matrixWorkflow(['one', 'two']) })
+
+      assert.strictEqual(status, 0)
+    })
+  })
+
+  it('warns about a dd-trace test category test:trace:core excludes', () => {
+    const { status, stdout } = runVerifier({
+      scripts: {
+        ...PASSING.scripts,
+        'test:trace:core': 'mocha "packages/dd-trace/test/{alpha}/**/*.spec.js"',
+      },
+      files: [
+        'packages/dd-trace/test/alpha/one.spec.js',
+        'packages/dd-trace/test/beta/two.spec.js',
+      ],
+    })
+
+    assert.strictEqual(status, 1)
+    assert.match(stdout, /test:trace:core excludes "beta"/)
+    assert.match(stdout, /^ {2}- packages\/dd-trace\/test\/beta\/two\.spec\.js$/m)
+  })
+
+  it('follows a script into the nested script it invokes', () => {
+    const { status } = runVerifier({
+      scripts: {
+        'test:unit:ci': 'npm run test:unit:inner',
+        'test:unit:inner': 'mocha "packages/**/test/**/*.spec.js"',
+      },
+    })
+
+    assert.strictEqual(status, 0)
+  })
+
+  it('ignores test files under node_modules', () => {
+    const { status } = runVerifier({
+      files: [
+        'packages/alpha/test/one.spec.js',
+        'packages/alpha/test/node_modules/fixture/ignored.spec.js',
+      ],
+    })
+
+    assert.strictEqual(status, 0)
+  })
+})

From f26e0e04b58c8d453c82a1637d7d16f7afda2fe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Antonio=20Fern=C3=A1ndez=20de=20Alba?=
 <juan.fernandezdealba@datadoghq.com>
Date: Tue, 28 Jul 2026 00:14:49 +0200
Subject: [PATCH 04/43] fix(instrumentation): wait for asyncEnd on promise
 settlement (#9538)

---
 .../src/helpers/rewriter/transforms.js        | 68 ++++++++++++-----
 .../src/playwright.js                         |  3 +-
 .../test/helpers/rewriter/index.spec.js       | 76 +++++++++++++++++--
 .../test/trace-promise-async-end.js           |  6 +-
 4 files changed, 127 insertions(+), 26 deletions(-)

diff --git a/packages/datadog-instrumentations/src/helpers/rewriter/transforms.js b/packages/datadog-instrumentations/src/helpers/rewriter/transforms.js
index b9c5b4c2ae..95cb988692 100644
--- a/packages/datadog-instrumentations/src/helpers/rewriter/transforms.js
+++ b/packages/datadog-instrumentations/src/helpers/rewriter/transforms.js
@@ -17,8 +17,8 @@ const { parse, query } = require('./compiler')
 module.exports = { waitForAsyncEnd }
 
 /**
- * Injects a wait for `ctx.asyncEndPromise` into a generated `tracePromise`
- * wrapper's native-Promise fulfillment handler.
+ * Injects settlement-specific asyncEnd waits into a generated `tracePromise`
+ * wrapper's native-Promise handlers.
  *
  * @param {object} _state
  * @param {import('estree').CallExpression} node
@@ -26,36 +26,68 @@ module.exports = { waitForAsyncEnd }
  */
 function waitForAsyncEnd (_state, node) {
   const onFulfilled = node.arguments[0]
-  const statements = onFulfilled?.body?.body
+  const onRejected = node.arguments[1]
 
-  if (!statements || query(onFulfilled.body, '[id.name=__apm$asyncEndPromise]').length > 0) {
+  if (!onFulfilled?.body || !onRejected?.body) {
     return
   }
 
-  const returnIndex = statements.findIndex(statement =>
-    statement.type === 'ReturnStatement' && statement.argument
+  injectAsyncEndCallbackWait(onFulfilled.body, 'ReturnStatement', 'resolveCallback')
+  injectAsyncEndCallbackWait(onRejected.body, 'ThrowStatement', 'rejectCallback')
+}
+
+/**
+ * Injects a settlement-specific callback wait before an exit.
+ *
+ * @param {import('estree').BlockStatement} body
+ * @param {'ReturnStatement'|'ThrowStatement'} exitType
+ * @param {'resolveCallback'|'rejectCallback'} callbackProperty
+ * @returns {void}
+ */
+function injectAsyncEndCallbackWait (body, exitType, callbackProperty) {
+  const callbackVariable = `__apm$${callbackProperty}`
+  if (query(body, `[id.name=${callbackVariable}]`).length > 0) {
+    return
+  }
+
+  const exitIndex = body.body.findIndex(statement =>
+    statement.type === exitType && statement.argument
   )
 
-  // The generated fulfillment handler always ends in a return; a miss means the
+  // The generated settlement handlers always end in a return or throw; a miss means the
   // upstream template changed and the caller's try/catch falls back to the
   // unwrapped source.
-  assert(returnIndex !== -1, 'waitForAsyncEnd: no return statement to wait on')
+  assert(exitIndex !== -1, `waitForAsyncEnd: no ${exitType} to wait on`)
 
+  // This runs inside tracePromise's native-Promise settlement handler. The
+  // Promise adapts subscriber callback completion to that existing chain.
   const waitStatements = parse(`
     function wrapper () {
-      const __apm$asyncEndPromise = __apm$ctx.asyncEndPromise;
-      if (__apm$asyncEndPromise && typeof __apm$asyncEndPromise.then === 'function') {
-        return __apm$asyncEndPromise.then(() => __apm$result, () => __apm$result);
+      const ${callbackVariable} = __apm$ctx.${callbackProperty};
+      if (typeof ${callbackVariable} === 'function') {
+        return new Promise(${callbackVariable}).then(() => __apm$result, () => __apm$result);
       }
     }
   `).body[0].body.body
 
-  // Resolve to whatever the fulfillment handler returns (its return argument),
-  // so a subscriber that reassigned `__apm$ctx.result` in `asyncEnd` still wins.
-  const returnArgument = statements[returnIndex].argument
-  const { arguments: onSettled } = waitStatements[1].consequent.body[0].argument
-  onSettled[0].body = clone(returnArgument)
-  onSettled[1].body = clone(returnArgument)
+  const exitArgument = body.body[exitIndex].argument
+  const callbackIf = waitStatements[1]
+  const { arguments: onCallbackSettled } = callbackIf.consequent.body[0].argument
+
+  if (exitType === 'ThrowStatement') {
+    for (const handler of onCallbackSettled) {
+      handler.body = {
+        type: 'BlockStatement',
+        body: [{
+          type: 'ThrowStatement',
+          argument: clone(exitArgument),
+        }],
+      }
+    }
+  } else {
+    onCallbackSettled[0].body = clone(exitArgument)
+    onCallbackSettled[1].body = clone(exitArgument)
+  }
 
-  statements.splice(returnIndex, 0, ...waitStatements)
+  body.body.splice(exitIndex, 0, ...waitStatements)
 }
diff --git a/packages/datadog-instrumentations/src/playwright.js b/packages/datadog-instrumentations/src/playwright.js
index 84a2f285e6..7d46ddec6f 100644
--- a/packages/datadog-instrumentations/src/playwright.js
+++ b/packages/datadog-instrumentations/src/playwright.js
@@ -1494,7 +1494,8 @@ createRootSuiteCh.subscribe({
 pageGotoCh.subscribe({
   asyncEnd (ctx) {
     // The Page.goto rewriter waits for this so tests closing immediately after navigation still get RUM tags.
-    ctx.asyncEndPromise = handlePageGoto(ctx.self)
+    const rumDetectionPromise = handlePageGoto(ctx.self)
+    ctx.resolveCallback = onDone => rumDetectionPromise.then(onDone, onDone)
   },
 })
 
diff --git a/packages/datadog-instrumentations/test/helpers/rewriter/index.spec.js b/packages/datadog-instrumentations/test/helpers/rewriter/index.spec.js
index bdb6593ace..474b1c12c0 100644
--- a/packages/datadog-instrumentations/test/helpers/rewriter/index.spec.js
+++ b/packages/datadog-instrumentations/test/helpers/rewriter/index.spec.js
@@ -562,19 +562,22 @@ describe('check-require-cache', () => {
     assert.ok(subs.start.called)
   })
 
-  it('should wait for an asyncEnd promise when configured', async () => {
+  it('should wait for the resolve callback only before resolving', async () => {
     const { test } = compileFile('trace-promise-async-end')
     const steps = []
 
     subs = {
       asyncEnd (ctx) {
         steps.push('asyncEnd')
-        ctx.asyncEndPromise = new Promise(resolve => {
+        ctx.resolveCallback = onDone => {
           setImmediate(() => {
-            steps.push('asyncEndPromise')
-            resolve()
+            steps.push('resolveCallback')
+            onDone()
           })
-        })
+        }
+        ctx.rejectCallback = () => {
+          assert.fail('reject callback called for a fulfilled promise')
+        }
       },
     }
 
@@ -593,7 +596,68 @@ describe('check-require-cache', () => {
     const result = await resultPromise
 
     assert.equal(result, 'result')
-    assert.deepStrictEqual(steps, ['asyncEnd', 'asyncEndPromise', 'resolved'])
+    assert.deepStrictEqual(steps, ['asyncEnd', 'resolveCallback', 'resolved'])
+  })
+
+  it('should wait for the reject callback only before preserving a rejection', async () => {
+    const { test } = compileFile('trace-promise-async-end')
+    const error = new Error('test rejection')
+    const steps = []
+
+    subs = {
+      asyncEnd (ctx) {
+        steps.push('asyncEnd')
+        ctx.resolveCallback = () => {
+          assert.fail('resolve callback called for a rejected promise')
+        }
+        ctx.rejectCallback = onDone => {
+          setImmediate(() => {
+            steps.push('rejectCallback')
+            onDone()
+          })
+        }
+      },
+    }
+
+    ch = tracingChannel('orchestrion:test:trace_promise_async_end')
+    ch.subscribe(subs)
+
+    const resultPromise = test(error)
+
+    await Promise.resolve()
+
+    assert.deepStrictEqual(steps, ['asyncEnd'])
+    await assert.rejects(resultPromise, actualError => {
+      steps.push('rejected')
+      return actualError === error
+    })
+    assert.deepStrictEqual(steps, ['asyncEnd', 'rejectCallback', 'rejected'])
+  })
+
+  it('should preserve promise settlement when its callback throws', async () => {
+    const { test } = compileFile('trace-promise-async-end')
+    const error = new Error('test rejection')
+
+    subs = {
+      asyncEnd (ctx) {
+        ctx.resolveCallback = () => {
+          throw new Error('resolve callback error')
+        }
+        ctx.rejectCallback = () => {
+          throw new Error('reject callback error')
+        }
+      },
+    }
+
+    ch = tracingChannel('orchestrion:test:trace_promise_async_end')
+    ch.subscribe(subs)
+
+    const [result] = await Promise.all([
+      test(),
+      assert.rejects(test(error), actualError => actualError === error),
+    ])
+
+    assert.equal(result, 'result')
   })
 
   it('should use import when rewriting esm modules', () => {
diff --git a/packages/datadog-instrumentations/test/helpers/rewriter/node_modules/test/trace-promise-async-end.js b/packages/datadog-instrumentations/test/helpers/rewriter/node_modules/test/trace-promise-async-end.js
index 32d089f101..9685f5d5cb 100644
--- a/packages/datadog-instrumentations/test/helpers/rewriter/node_modules/test/trace-promise-async-end.js
+++ b/packages/datadog-instrumentations/test/helpers/rewriter/node_modules/test/trace-promise-async-end.js
@@ -1,6 +1,10 @@
 'use strict'
 
-async function test () {
+async function test (error) {
+  if (error) {
+    throw error
+  }
+
   return 'result'
 }
 

From 4a571aee66f310e76b8c8cd9d9989e89c1e7d3ac Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Tue, 28 Jul 2026 01:21:36 +0200
Subject: [PATCH 05/43] chore(licenses): read dependencies directly from
 lockfiles (#9540)

Spawning Yarn and npm makes the license check pay their startup and dependency-tree construction costs on every lint run. Reading Yarn, npm, and Bun lockfiles directly reduced the representative end-to-end check from 285.8 ms to 32.1 ms.
---
 package.json                    |   2 +
 scripts/check_licenses.js       | 366 +++++++++++++---------
 scripts/check_licenses.spec.mjs | 530 ++++++++++++++++++++++++++++++++
 yarn.lock                       |   5 +
 4 files changed, 766 insertions(+), 137 deletions(-)
 create mode 100644 scripts/check_licenses.spec.mjs

diff --git a/package.json b/package.json
index bd9c64f8d8..6d987e347a 100644
--- a/package.json
+++ b/package.json
@@ -199,6 +199,7 @@
     "@types/node": "^18.19.106",
     "@types/sinon": "^22.0.0",
     "@vercel/nft": "^1.10.2",
+    "@yarnpkg/lockfile": "^1.1.0",
     "axios": "^1.18.1",
     "benchmark": "^2.1.4",
     "body-parser": "^2.3.0",
@@ -221,6 +222,7 @@
     "husky": "^9.1.7",
     "istanbul-lib-report": "^3.0.0",
     "istanbul-reports": "^3.0.2",
+    "jsonc-parser": "^3.3.1",
     "jszip": "^3.10.1",
     "minimatch": "^10.2.5",
     "mocha": "^11.7.6",
diff --git a/scripts/check_licenses.js b/scripts/check_licenses.js
index bf968514b8..c54f95b30f 100644
--- a/scripts/check_licenses.js
+++ b/scripts/check_licenses.js
@@ -1,199 +1,291 @@
 /* eslint-disable no-console */
 'use strict'
 
-const { createReadStream, existsSync } = require('node:fs')
+const { existsSync, readFileSync } = require('node:fs')
 const { join } = require('node:path')
-const readline = require('node:readline')
-const { execSync } = require('node:child_process')
-const { name: rootPackageName } = require('../package.json')
+
+const { parse: parseYarnLock } = require('@yarnpkg/lockfile')
+const { parse: parseJsonc, printParseErrorCode } = require('jsonc-parser')
+
+/**
+ * @typedef {object} DependencyManifest
+ * @property {string} [name]
+ * @property {Record<string, string>} [dependencies]
+ * @property {Record<string, string>} [optionalDependencies]
+ * @property {Record<string, string>} [peerDependencies]
+ * @property {string[]} [optionalPeers]
+ * @property {boolean} [dev]
+ * @property {boolean} [devOptional]
+ * @property {boolean} [link]
+ */
 
 /**
- * @typedef {object} NpmDependency
- * @property {string} [resolved]
- * @property {Record<string, NpmDependency>} [dependencies]
+ * @typedef {object} BunPackageContext
+ * @property {string} packagePath
+ * @property {BunPackageContext} [parent]
  */
 
-const filePath = join(__dirname, '..', 'LICENSE-3rdparty.csv')
-const aliasMap = getAliasMap()
-const deps = getProdDeps()
+/**
+ * @typedef {object} DependencyPattern
+ * @property {boolean} [allowMissing]
+ * @property {BunPackageContext} [context]
+ * @property {string} name
+ * @property {string} range
+ */
+
+const rootDirectory = process.cwd()
+const dependencies = getProductionDependencies(rootDirectory)
 const licenses = new Set()
-let isHeader = true
 
-const lineReader = readline.createInterface({
-  input: createReadStream(filePath),
-})
+addCsvComponents(licenses, join(rootDirectory, 'LICENSE-3rdparty.csv'), true)
+
+if (!checkLicenses(dependencies)) process.exitCode = 1
 
-lineReader.on('line', line => {
-  if (isHeader) {
-    isHeader = false
-    return
+/**
+ * @param {string} directory
+ */
+function getProductionDependencies (directory) {
+  const packageJson = require(join(directory, 'package.json'))
+  const dependencies = new Set([packageJson.name])
+  const bunLockPath = join(directory, 'bun.lock')
+
+  if (existsSync(bunLockPath)) {
+    addBunProductionDependencies(dependencies, bunLockPath, packageJson)
+  } else {
+    addYarnProductionDependencies(dependencies, directory, packageJson)
   }
+  addNpmProductionDependencies(dependencies, join(directory, 'vendor', 'package-lock.json'))
 
-  const trimmed = line.trim()
-  if (!trimmed) return // Skip empty lines
-  const columns = line.split(',')
-  const component = columns[0]
+  const vendoredDependenciesPath = join(directory, '.github', 'vendored-dependencies.csv')
+  if (existsSync(vendoredDependenciesPath)) addCsvComponents(dependencies, vendoredDependenciesPath, false)
 
-  // Strip quotes from the component name
-  licenses.add(component.replaceAll(/^"|"$/g, ''))
-})
+  return dependencies
+}
 
-lineReader.on('close', () => {
-  if (!checkLicenses(deps)) {
-    process.exit(1)
+/**
+ * @param {Set<string>} dependencies
+ * @param {string} directory
+ * @param {DependencyManifest} packageJson
+ */
+function addYarnProductionDependencies (dependencies, directory, packageJson) {
+  const { object: lock, type } = parseYarnLock(readFileSync(join(directory, 'yarn.lock'), 'utf8'))
+  if (type !== 'success') throw new Error(`Cannot parse yarn.lock: ${type}`)
+
+  /** @type {DependencyPattern[]} */
+  const patterns = []
+  const visited = new Set()
+  addDependencyPatterns(patterns, packageJson)
+
+  for (let i = 0; i < patterns.length; i++) {
+    const { name, range } = patterns[i]
+    const pattern = `${name}@${range}`
+    if (visited.has(pattern)) continue
+
+    const dependency = lock[pattern]
+    if (!dependency) throw new Error(`Missing yarn.lock entry for ${pattern}`)
+
+    visited.add(pattern)
+    dependencies.add(normalizeDependencyName(name, range))
+    addDependencyPatterns(patterns, dependency)
   }
-})
+}
 
-function getProdDeps () {
-  // Add root package (dd-trace) to the set of dependencies manually as it is not included in the yarn list output.
-  const deps = new Set([normalizeDepName(rootPackageName)])
+/**
+ * @param {Set<string>} dependencies
+ * @param {string} bunLockPath
+ * @param {DependencyManifest} packageJson
+ */
+function addBunProductionDependencies (dependencies, bunLockPath, packageJson) {
+  const parseErrors = []
+  const lock = parseJsonc(readFileSync(bunLockPath, 'utf8'), parseErrors, { allowTrailingComma: true })
+  if (parseErrors.length) {
+    const { error, offset } = parseErrors[0]
+    throw new Error(`Cannot parse bun.lock: ${printParseErrorCode(error)} at offset ${offset}`)
+  }
+  if (!lock || typeof lock !== 'object' || Array.isArray(lock)) {
+    throw new Error('bun.lock does not contain an object')
+  }
+
+  const { lockfileVersion, packages, workspaces } = lock
+  if (!Number.isInteger(lockfileVersion) || lockfileVersion < 0 || lockfileVersion > 2) {
+    throw new Error(`Unsupported bun.lock version: ${lockfileVersion}`)
+  }
+  if (!packages || typeof packages !== 'object' || Array.isArray(packages)) {
+    throw new Error('bun.lock does not contain package metadata')
+  }
+  const rootWorkspace = workspaces?.['']
+  if (!rootWorkspace || typeof rootWorkspace !== 'object' || Array.isArray(rootWorkspace)) {
+    throw new Error('bun.lock does not contain a root workspace')
+  }
 
-  addYarnProdDeps(deps, process.cwd())
-  addNpmProdDeps(deps, join(process.cwd(), 'vendor'))
+  /** @type {DependencyPattern[]} */
+  const patterns = []
+  const visited = new Set()
+  addDependencyPatterns(patterns, packageJson)
+
+  for (let i = 0; i < patterns.length; i++) {
+    const { allowMissing, context, name } = patterns[i]
+    const packagePath = getBunPackagePath(packages, name, context)
+    if (packagePath === undefined) {
+      if (allowMissing) continue
+      throw new Error(`Missing bun.lock entry for ${name}`)
+    }
+    if (visited.has(packagePath)) continue
 
-  // Add vendored dependencies
-  addVendoredDeps(deps)
+    const entry = packages[packagePath]
+    if (!Array.isArray(entry) || typeof entry[0] !== 'string') {
+      throw new TypeError(`Invalid bun.lock entry for ${packagePath}`)
+    }
 
-  return deps
-}
+    visited.add(packagePath)
+    const resolution = entry[0]
+    const versionIndex = resolution.indexOf('@', resolution.startsWith('@') ? 1 : 0)
+    if (versionIndex <= 0) throw new Error(`Invalid bun.lock resolution for ${packagePath}`)
+
+    const packageName = resolution.slice(0, versionIndex)
+    const source = resolution.slice(versionIndex + 1)
+    const childContext = { packagePath, parent: context }
+    if (source.startsWith('workspace:')) {
+      const workspace = workspaces[source.slice('workspace:'.length)]
+      if (!workspace || typeof workspace !== 'object' || Array.isArray(workspace)) {
+        throw new Error(`Missing bun.lock workspace for ${packagePath}`)
+      }
+
+      addDependencyPatterns(patterns, workspace, childContext, true)
+      continue
+    }
 
-function addYarnProdDeps (deps, cwd) {
-  // Use yarn to get full tree of production (non-dev) dependencies (format is ndjson)
-  const stdout = execSync('yarn list --production --json', {
-    encoding: 'utf8',
-    stdio: ['ignore', 'pipe', 'inherit'],
-    cwd,
-  })
-
-  for (const line of stdout.split('\n')) {
-    if (!line) continue
-    const parsed = JSON.parse(line)
-    if (parsed.type === 'tree' && Array.isArray(parsed.data?.trees)) {
-      collectFromTrees(parsed.data.trees, deps)
+    if (!source.startsWith('link:')) dependencies.add(packageName)
+    for (let entryIndex = 1; entryIndex < entry.length; entryIndex++) {
+      const manifest = entry[entryIndex]
+      if (typeof manifest === 'object' && manifest !== null && !Array.isArray(manifest)) {
+        addDependencyPatterns(patterns, manifest, childContext, true)
+        break
+      }
     }
   }
 }
 
-function addNpmProdDeps (deps, cwd) {
-  // Use npm to get full tree of production (non-dev) dependencies
-  const stdout = execSync('npm list --omit=dev --json --depth=10', {
-    encoding: 'utf8',
-    stdio: ['ignore', 'pipe', 'inherit'],
-    cwd,
-  })
-
-  const parsed = JSON.parse(stdout)
-
-  collectDependencies(deps, parsed)
+/**
+ * @param {Record<string, unknown>} packages
+ * @param {string} name
+ * @param {BunPackageContext} [context]
+ */
+function getBunPackagePath (packages, name, context) {
+  for (let current = context; current !== undefined; current = current.parent) {
+    const packagePath = `${current.packagePath}/${name}`
+    if (Object.hasOwn(packages, packagePath)) return packagePath
+  }
+  if (Object.hasOwn(packages, name)) return name
 }
 
 /**
- * @param {Set<string>} deps
- * @param {NpmDependency} obj
+ * @param {Set<string>} dependencies
+ * @param {string} packageLockPath
  */
-function collectDependencies (deps, obj) {
-  if (!obj.dependencies) return
+function addNpmProductionDependencies (dependencies, packageLockPath) {
+  const { packages } = require(packageLockPath)
+  if (!packages) throw new Error('package-lock.json does not contain package metadata')
 
-  for (const [dep, dependency] of Object.entries(obj.dependencies)) {
-    const { resolved } = dependency
-    // Get the actual dependency name even when aliased in the package.json
-    const name = resolved ? resolved.split('/-', 1)[0].split('npmjs.org/').reverse()[0] : dep
+  for (const [packagePath, dependency] of Object.entries(packages)) {
+    if (!packagePath || dependency.link || (dependency.dev && !dependency.devOptional)) continue
 
-    deps.add(name)
-
-    collectDependencies(deps, dependency)
+    dependencies.add(dependency.name ?? getNameFromPackagePath(packagePath))
   }
 }
 
-function collectFromTrees (trees, deps) {
-  for (const node of trees) {
-    if (typeof node?.name !== 'string') continue
-
-    // Remove version from the package name (e.g. `@protobufjs/pool@1.1.0` -> `@protobufjs/pool`)
-    deps.add(normalizeDepName(node.name.slice(0, node.name.lastIndexOf('@'))))
+/**
+ * @param {DependencyPattern[]} patterns
+ * @param {DependencyManifest} manifest
+ * @param {BunPackageContext} [context]
+ * @param {boolean} [includePeers]
+ */
+function addDependencyPatterns (patterns, manifest, context, includePeers = false) {
+  const optionalDependencies = manifest.optionalDependencies ?? {}
 
-    if (Array.isArray(node.children) && node.children.length) {
-      collectFromTrees(node.children, deps)
+  for (const [name, range] of Object.entries(manifest.dependencies ?? {})) {
+    if (!Object.hasOwn(optionalDependencies, name)) {
+      addDependencyPattern(patterns, name, range, context)
     }
   }
-}
-
-function addVendoredDeps (deps) {
-  const vendoredDepsPath = join(__dirname, '..', '.github', 'vendored-dependencies.csv')
-
-  // If the vendored dependencies file doesn't exist, skip
-  if (!existsSync(vendoredDepsPath)) {
-    return
+  for (const [name, range] of Object.entries(optionalDependencies)) {
+    addDependencyPattern(patterns, name, range, context)
   }
-
-  const fs = require('node:fs')
-  const content = fs.readFileSync(vendoredDepsPath, 'utf8')
-
-  for (const line of content.split('\n')) {
-    const trimmed = line.trim()
-    if (!trimmed) continue // Skip empty lines
-
-    const columns = line.split(',')
-    const component = columns[0]
-
-    // Strip quotes from the component name and add to deps
-    deps.add(normalizeDepName(component.replaceAll(/^"|"$/g, '')))
+  if (includePeers) {
+    for (const [name, range] of Object.entries(manifest.peerDependencies ?? {})) {
+      addDependencyPattern(patterns, name, range, context, manifest.optionalPeers?.includes(name))
+    }
   }
 }
 
-function getAliasMap () {
-  const rootPackagePath = join(__dirname, '..', 'package.json')
-  const vendorPackagePath = join(__dirname, '..', 'vendor', 'package.json')
-  const map = new Map()
+/**
+ * @param {DependencyPattern[]} patterns
+ * @param {string} name
+ * @param {string} range
+ * @param {BunPackageContext} [context]
+ * @param {boolean} [allowMissing]
+ */
+function addDependencyPattern (patterns, name, range, context, allowMissing = false) {
+  /** @type {DependencyPattern} */
+  const pattern = { name, range }
+  if (context !== undefined) pattern.context = context
+  if (allowMissing) pattern.allowMissing = true
+  patterns.push(pattern)
+}
 
-  collectAliasesFromPackageJson(rootPackagePath, map)
-  collectAliasesFromPackageJson(vendorPackagePath, map)
+/**
+ * @param {string} name
+ * @param {string} range
+ */
+function normalizeDependencyName (name, range) {
+  if (!range.startsWith('npm:')) return name
 
-  return map
+  const target = range.slice('npm:'.length)
+  const versionIndex = target.lastIndexOf('@')
+  return versionIndex > 0 ? target.slice(0, versionIndex) : target
 }
 
-function collectAliasesFromPackageJson (packagePath, map) {
-  if (!existsSync(packagePath)) return
-
-  const packageJson = require(packagePath)
-  const deps = packageJson?.dependencies ?? {}
-  const optionalDeps = packageJson?.optionalDependencies ?? {}
+/**
+ * @param {string} packagePath
+ */
+function getNameFromPackagePath (packagePath) {
+  const nodeModulesIndex = packagePath.lastIndexOf('node_modules/')
+  if (nodeModulesIndex === -1) throw new Error(`Cannot determine package name from ${packagePath}`)
 
-  collectAliasesFromDeps(deps, map)
-  collectAliasesFromDeps(optionalDeps, map)
+  return packagePath.slice(nodeModulesIndex + 'node_modules/'.length)
 }
 
-function collectAliasesFromDeps (deps, map) {
-  for (const [alias, spec] of Object.entries(deps)) {
-    if (typeof spec !== 'string' || !spec.startsWith('npm:')) continue
+/**
+ * @param {Set<string>} components
+ * @param {string} filePath
+ * @param {boolean} hasHeader
+ */
+function addCsvComponents (components, filePath, hasHeader) {
+  const lines = readFileSync(filePath, 'utf8').split('\n')
 
-    const rawTarget = spec.slice('npm:'.length)
-    const atIndex = rawTarget.lastIndexOf('@')
-    const target = atIndex > 0 ? rawTarget.slice(0, atIndex) : rawTarget
+  for (let i = hasHeader ? 1 : 0; i < lines.length; i++) {
+    if (!lines[i].trim()) continue
 
-    if (target) {
-      map.set(alias, target)
-    }
+    components.add(lines[i].split(',', 1)[0].replaceAll(/^"|"$/g, ''))
   }
 }
 
-function normalizeDepName (name) {
-  return aliasMap.get(name) ?? name
-}
-
-function checkLicenses (typeDeps) {
+/**
+ * @param {Set<string>} dependencies
+ */
+function checkLicenses (dependencies) {
   const missing = []
   const extraneous = []
 
-  for (const dep of typeDeps) {
-    if (!licenses.has(dep)) {
-      missing.push(dep)
+  for (const dependency of dependencies) {
+    if (!licenses.has(dependency)) {
+      missing.push(dependency)
     }
   }
 
-  for (const dep of licenses) {
-    if (!typeDeps.has(dep)) {
-      extraneous.push(dep)
+  for (const dependency of licenses) {
+    if (!dependencies.has(dependency)) {
+      extraneous.push(dependency)
     }
   }
 
diff --git a/scripts/check_licenses.spec.mjs b/scripts/check_licenses.spec.mjs
new file mode 100644
index 0000000000..0de99d8283
--- /dev/null
+++ b/scripts/check_licenses.spec.mjs
@@ -0,0 +1,530 @@
+import assert from 'node:assert/strict'
+import { spawnSync } from 'node:child_process'
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+import { afterEach, beforeEach, describe, it } from 'mocha'
+
+const repositoryDirectory = dirname(dirname(fileURLToPath(import.meta.url)))
+const checkerPath = join(repositoryDirectory, 'scripts', 'check_licenses.js')
+const expectedDependencies = [
+  '@scope/child',
+  'dev-optional',
+  'manually-vendored',
+  'optional-package',
+  'platform-only',
+  'regular',
+  'right-source',
+  'root-package',
+  'source-package',
+  'transitive-source',
+  'unversioned-target',
+  'vendor-peer',
+  'vendor-regular',
+  'vendor-source',
+]
+const validYarnLock = `# yarn lockfile v1
+
+"@scope/child@^1.0.0":
+  version "1.0.0"
+
+"aliased@npm:source-package@^2.0.0":
+  version "2.0.0"
+
+development@^1.0.0:
+  version "1.0.0"
+
+optional-package@^1.0.0:
+  version "1.0.0"
+  dependencies:
+    "@scope/child" "^1.0.0"
+
+"overridden@npm:right-source@2.0.0":
+  version "2.0.0"
+
+"overridden@npm:wrong-source@1.0.0":
+  version "1.0.0"
+
+platform-only@^1.0.0:
+  version "1.0.0"
+
+regular@^1.0.0:
+  version "1.0.0"
+  dependencies:
+    "@scope/child" "^1.0.0"
+    transitive-alias "npm:transitive-source@^1.0.0"
+  optionalDependencies:
+    platform-only "^1.0.0"
+
+"transitive-alias@npm:transitive-source@^1.0.0":
+  version "1.0.0"
+
+"unversioned-alias@npm:unversioned-target":
+  version "1.0.0"
+`
+const validPackageLock = {
+  name: 'vendor',
+  lockfileVersion: 3,
+  packages: {
+    '': {
+      dependencies: {
+        'vendor-alias': 'npm:vendor-source@1.0.0',
+        'vendor-regular': '1.0.0',
+      },
+      devDependencies: {
+        'vendor-development': '1.0.0',
+      },
+    },
+    'node_modules/dev-optional': {
+      devOptional: true,
+      version: '1.0.0',
+    },
+    'node_modules/vendor-alias': {
+      name: 'vendor-source',
+      version: '1.0.0',
+    },
+    'node_modules/vendor-development': {
+      dev: true,
+      version: '1.0.0',
+    },
+    'node_modules/vendor-link': {
+      link: true,
+      resolved: 'packages/vendor-target',
+    },
+    'node_modules/vendor-peer': {
+      peer: true,
+      version: '1.0.0',
+    },
+    'node_modules/vendor-regular': {
+      version: '1.0.0',
+    },
+  },
+}
+const validPackageJson = {
+  name: 'root-package',
+  dependencies: {
+    aliased: 'npm:source-package@^2.0.0',
+    overridden: 'npm:wrong-source@1.0.0',
+    regular: '^1.0.0',
+    'unversioned-alias': 'npm:unversioned-target',
+  },
+  devDependencies: {
+    development: '^1.0.0',
+  },
+  optionalDependencies: {
+    'optional-package': '^1.0.0',
+    overridden: 'npm:right-source@2.0.0',
+  },
+}
+const validBunPackageJson = {
+  ...validPackageJson,
+  dependencies: {
+    ...validPackageJson.dependencies,
+    'git-alias': 'github:example/source',
+    internal: 'workspace:*',
+    linked: 'link:../linked',
+  },
+}
+const bunExpectedDependencies = [
+  ...expectedDependencies,
+  'git-source',
+  'git-transitive',
+  'link-transitive',
+  'nested-only',
+  'nested-version',
+  'optional-peer',
+  'peer-package',
+  'top-level-only',
+  'workspace-transitive',
+]
+const validBunLock = `{
+  // Bun lockfiles are JSONC.
+  "lockfileVersion": 1,
+  "workspaces": {
+    "": {
+      "name": "root-package",
+      "dependencies": {
+        "aliased": "npm:source-package@^2.0.0",
+        "git-alias": "github:example/source",
+        "internal": "workspace:*",
+        "linked": "link:../linked",
+        "overridden": "npm:wrong-source@1.0.0",
+        "regular": "^1.0.0",
+        "unversioned-alias": "npm:unversioned-target",
+      },
+      "devDependencies": {
+        "development": "^1.0.0",
+      },
+      "optionalDependencies": {
+        "optional-package": "^1.0.0",
+        "overridden": "npm:right-source@2.0.0",
+      },
+    },
+    "packages/internal": {
+      "name": "internal",
+      "version": "1.0.0",
+      "dependencies": {
+        "workspace-transitive": "^1.0.0",
+      },
+    },
+  },
+  "packages": {
+    "@scope/child": ["@scope/child@1.0.0", "", {}, "sha512-child"],
+    "aliased": ["source-package@2.0.0", "", {
+      "dependencies": {
+        "transitive-alias": "npm:transitive-source@^1.0.0",
+      },
+    }, "sha512-source"],
+    "development": ["development@1.0.0", "", {}, "sha512-development"],
+    "git-alias": ["git-source@github:example/source#commit", {
+      "dependencies": {
+        "git-transitive": "^1.0.0",
+      },
+    }, "example-source-commit"],
+    "git-transitive": ["git-transitive@1.0.0", "", {}, "sha512-git-transitive"],
+    "internal": ["internal@workspace:packages/internal"],
+    "linked": ["linked@link:../linked", {
+      "dependencies": {
+        "link-transitive": "^1.0.0",
+      },
+    }],
+    "link-transitive": ["link-transitive@1.0.0", "", {}, "sha512-link-transitive"],
+    "nested-version": ["nested-version@1.0.0", "", {
+      "dependencies": {
+        "top-level-only": "^1.0.0",
+      },
+    }, "sha512-nested"],
+    "optional-package": ["optional-package@1.0.0", "", {
+      "dependencies": {
+        "@scope/child": "^1.0.0",
+        "nested-version": "^1.0.0",
+      },
+    }, "sha512-optional"],
+    "optional-peer": ["optional-peer@1.0.0", "", {}, "sha512-optional-peer"],
+    "overridden": ["right-source@2.0.0", "", {}, "sha512-overridden"],
+    "peer-package": ["peer-package@1.0.0", "", {}, "sha512-peer"],
+    "platform-only": ["platform-only@1.0.0", "", {}, "sha512-platform"],
+    "regular": ["regular@1.0.0", "", {
+      "dependencies": {
+        "@scope/child": "^1.0.0",
+        "nested-version": "^2.0.0",
+      },
+      "optionalDependencies": {
+        "platform-only": "^1.0.0",
+      },
+      "peerDependencies": {
+        "missing-optional-peer": "^1.0.0",
+        "optional-peer": "^1.0.0",
+        "peer-package": "^1.0.0",
+      },
+      "optionalPeers": [
+        "missing-optional-peer",
+        "optional-peer",
+      ],
+    }, "sha512-regular"],
+    "regular/nested-version": ["nested-version@2.0.0", "", {
+      "dependencies": {
+        "nested-only": "^1.0.0",
+      },
+    }, "sha512-nested"],
+    "nested-only": ["nested-only@1.0.0", "", {}, "sha512-nested-only"],
+    "top-level-only": ["top-level-only@1.0.0", "", {}, "sha512-top-level-only"],
+    "transitive-alias": ["transitive-source@1.0.0", "", {}, "sha512-transitive"],
+    "unversioned-alias": ["unversioned-target@1.0.0", "", {}, "sha512-unversioned"],
+    "workspace-transitive": ["workspace-transitive@1.0.0", "", {}, "sha512-workspace-transitive"],
+  },
+}`
+
+/**
+ * @typedef {object} FixtureOptions
+ * @property {string} [bunLock]
+ * @property {boolean} [includeVendoredDependencies]
+ * @property {string[]} [licenses]
+ * @property {object} [packageLock]
+ * @property {object} [packageJson]
+ * @property {string} [yarnLock]
+ */
+
+/**
+ * @param {string[]} dependencies
+ * @param {string} excluded
+ */
+function withoutDependency (dependencies, excluded) {
+  const remaining = []
+  for (const dependency of dependencies) {
+    if (dependency !== excluded) remaining.push(dependency)
+  }
+  return remaining
+}
+
+describe('check_licenses', () => {
+  /** @type {string} */
+  let fixtureDirectory
+
+  beforeEach(() => {
+    fixtureDirectory = mkdtempSync(join(tmpdir(), 'dd-trace-license-check-'))
+  })
+
+  afterEach(() => {
+    rmSync(fixtureDirectory, { force: true, recursive: true })
+  })
+
+  /**
+   * @param {FixtureOptions} [options]
+   */
+  function writeFixture ({
+    bunLock,
+    includeVendoredDependencies = true,
+    licenses = expectedDependencies,
+    packageLock = validPackageLock,
+    packageJson = validPackageJson,
+    yarnLock = validYarnLock,
+  } = {}) {
+    const vendorDirectory = join(fixtureDirectory, 'vendor')
+
+    mkdirSync(join(fixtureDirectory, '.github'), { recursive: true })
+    mkdirSync(vendorDirectory, { recursive: true })
+    if (includeVendoredDependencies) {
+      writeFileSync(join(fixtureDirectory, '.github', 'vendored-dependencies.csv'), '"manually-vendored","MIT"\n')
+    }
+    const licenseRows = ['"Component","License"']
+    for (const name of licenses) {
+      licenseRows.push(`"${name}","MIT"`)
+    }
+    licenseRows.push('')
+    writeFileSync(join(fixtureDirectory, 'LICENSE-3rdparty.csv'), licenseRows.join('\n'))
+    writeFileSync(join(fixtureDirectory, 'package.json'), JSON.stringify(packageJson))
+    writeFileSync(join(fixtureDirectory, 'yarn.lock'), yarnLock)
+    if (bunLock !== undefined) writeFileSync(join(fixtureDirectory, 'bun.lock'), bunLock)
+    writeFileSync(join(vendorDirectory, 'package-lock.json'), JSON.stringify(packageLock))
+    writeFileSync(join(vendorDirectory, 'package.json'), JSON.stringify({
+      dependencies: {
+        'vendor-alias': 'npm:vendor-source@1.0.0',
+        'vendor-regular': '1.0.0',
+      },
+    }))
+  }
+
+  function runChecker () {
+    return spawnSync(process.execPath, [checkerPath], {
+      cwd: fixtureDirectory,
+      encoding: 'utf8',
+    })
+  }
+
+  it('checks every production dependency from both lockfile formats', () => {
+    writeFixture()
+
+    const result = runChecker()
+
+    assert.strictEqual(result.status, 0, result.stderr)
+  })
+
+  it('prefers bun.lock when both root lockfile formats exist', () => {
+    writeFixture({
+      bunLock: validBunLock,
+      licenses: bunExpectedDependencies,
+      packageJson: validBunPackageJson,
+      yarnLock: 'not a yarn lockfile',
+    })
+
+    const result = runChecker()
+
+    assert.strictEqual(result.status, 0, result.stderr)
+  })
+
+  it('accepts every supported bun lockfile version', () => {
+    for (const version of [0, 2]) {
+      writeFixture({
+        bunLock: validBunLock.replace('"lockfileVersion": 1', `"lockfileVersion": ${version}`),
+        licenses: bunExpectedDependencies,
+        packageJson: validBunPackageJson,
+      })
+
+      const result = runChecker()
+
+      assert.strictEqual(result.status, 0, result.stderr)
+    }
+  })
+
+  it('reports missing and extraneous licenses', () => {
+    writeFixture({
+      licenses: [...withoutDependency(expectedDependencies, 'regular'), 'extraneous'],
+    })
+
+    const result = runChecker()
+
+    assert.strictEqual(result.status, 1)
+    assert.match(result.stderr, /Missing 3rd-party license for regular\./)
+    assert.match(result.stderr, /Extraneous 3rd-party license for extraneous\./)
+  })
+
+  it('checks repositories without manually vendored dependencies', () => {
+    writeFixture({
+      includeVendoredDependencies: false,
+      licenses: withoutDependency(expectedDependencies, 'manually-vendored'),
+    })
+
+    const result = runChecker()
+
+    assert.strictEqual(result.status, 0, result.stderr)
+  })
+
+  it('rejects an incomplete yarn lockfile', () => {
+    writeFixture({
+      yarnLock: validYarnLock.replace(`optional-package@^1.0.0:
+  version "1.0.0"
+  dependencies:
+    "@scope/child" "^1.0.0"
+
+`, ''),
+    })
+
+    const result = runChecker()
+
+    assert.notStrictEqual(result.status, 0)
+    assert.match(result.stderr, /optional-package@\^1\.0\.0/)
+  })
+
+  it('rejects a conflicted yarn lockfile', () => {
+    writeFixture({
+      yarnLock: `<<<<<<< HEAD
+${validYarnLock}=======
+${validYarnLock}>>>>>>> branch
+`,
+    })
+
+    const result = runChecker()
+
+    assert.notStrictEqual(result.status, 0)
+    assert.match(result.stderr, /Cannot parse yarn\.lock: merge/)
+  })
+
+  it('rejects an invalid bun lockfile', () => {
+    writeFixture({
+      bunLock: validBunLock.replace('"packages": {', '"packages": ['),
+      licenses: bunExpectedDependencies,
+      packageJson: validBunPackageJson,
+    })
+
+    const result = runChecker()
+
+    assert.notStrictEqual(result.status, 0)
+    assert.match(result.stderr, /Cannot parse bun\.lock/)
+  })
+
+  it('rejects invalid bun lockfile metadata', () => {
+    const invalidLocks = [
+      ['null', /bun\.lock does not contain an object/],
+      ['{"lockfileVersion":"1","packages":{},"workspaces":{"":{}}}', /Unsupported bun\.lock version: 1/],
+      ['{"lockfileVersion":-1,"packages":{},"workspaces":{"":{}}}', /Unsupported bun\.lock version: -1/],
+      ['{"lockfileVersion":3,"packages":{},"workspaces":{"":{}}}', /Unsupported bun\.lock version: 3/],
+      ['{"lockfileVersion":1,"workspaces":{"":{}}}', /bun\.lock does not contain package metadata/],
+      ['{"lockfileVersion":1,"packages":[],"workspaces":{"":{}}}', /bun\.lock does not contain package metadata/],
+      ['{"lockfileVersion":1,"packages":{}}', /bun\.lock does not contain a root workspace/],
+      ['{"lockfileVersion":1,"packages":{},"workspaces":[]}', /bun\.lock does not contain a root workspace/],
+      ['{"lockfileVersion":1,"packages":{},"workspaces":{"other":{}}}', /bun\.lock does not contain a root workspace/],
+    ]
+
+    for (const [bunLock, expectedError] of invalidLocks) {
+      writeFixture({ bunLock })
+
+      const result = runChecker()
+
+      assert.notStrictEqual(result.status, 0)
+      assert.match(result.stderr, expectedError)
+    }
+  })
+
+  it('rejects invalid bun package entries', () => {
+    const invalidEntries = [
+      [{ broken: {} }, /Invalid bun\.lock entry for broken/],
+      [{ broken: ['broken'] }, /Invalid bun\.lock resolution for broken/],
+      [{ broken: ['broken@workspace:packages/broken'] }, /Missing bun\.lock workspace for broken/],
+      [{
+        broken: ['broken@1.0.0', '', {
+          peerDependencies: {
+            peer: '^1.0.0',
+          },
+        }, 'sha512-broken'],
+      }, /Missing bun\.lock entry for peer/],
+    ]
+
+    for (const [packages, expectedError] of invalidEntries) {
+      writeFixture({
+        bunLock: JSON.stringify({
+          lockfileVersion: 1,
+          packages,
+          workspaces: {
+            '': {
+              dependencies: {
+                broken: '1.0.0',
+              },
+            },
+          },
+        }),
+        packageJson: {
+          name: 'root-package',
+          dependencies: {
+            broken: '1.0.0',
+          },
+        },
+      })
+
+      const result = runChecker()
+
+      assert.notStrictEqual(result.status, 0)
+      assert.match(result.stderr, expectedError)
+    }
+  })
+
+  it('rejects an incomplete bun lockfile', () => {
+    writeFixture({
+      bunLock: validBunLock.replace(
+        '    "workspace-transitive": ["workspace-transitive@1.0.0", "", {}, "sha512-workspace-transitive"],\n',
+        ''
+      ),
+      licenses: bunExpectedDependencies,
+      packageJson: validBunPackageJson,
+    })
+
+    const result = runChecker()
+
+    assert.notStrictEqual(result.status, 0)
+    assert.match(result.stderr, /Missing bun\.lock entry for workspace-transitive/)
+  })
+
+  it('rejects a package lockfile without package metadata', () => {
+    writeFixture({
+      packageLock: {
+        lockfileVersion: 1,
+      },
+    })
+
+    const result = runChecker()
+
+    assert.notStrictEqual(result.status, 0)
+    assert.match(result.stderr, /package-lock\.json does not contain package metadata/)
+  })
+
+  it('rejects unnamed packages outside node_modules', () => {
+    writeFixture({
+      packageLock: {
+        lockfileVersion: 3,
+        packages: {
+          '': {},
+          'packages/unnamed': {
+            version: '1.0.0',
+          },
+        },
+      },
+    })
+
+    const result = runChecker()
+
+    assert.notStrictEqual(result.status, 0)
+    assert.match(result.stderr, /Cannot determine package name from packages\/unnamed/)
+  })
+})
diff --git a/yarn.lock b/yarn.lock
index c12784fd98..14cbe602f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2901,6 +2901,11 @@ json5@^2.2.3:
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
+jsonc-parser@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.3.1.tgz#f2a524b4f7fd11e3d791e559977ad60b98b798b4"
+  integrity sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==
+
 jsx-ast-utils-x@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils-x/-/jsx-ast-utils-x-0.1.0.tgz#b0933d66a69e0aa1ae23f74fb87b079ec298652f"

From 9dad86a3354d5fdeaa89e951a5cc83a2a290696c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2026 01:26:11 +0000
Subject: [PATCH 06/43] chore(deps): bump the cloud-and-messaging group across
 1 directory with 11 updates (#9552)

Bumps the cloud-and-messaging group with 11 updates in the /packages/dd-trace/test/plugins/versions directory:

| Package | From | To |
| --- | --- | --- |
| [@aws-sdk/client-bedrock-runtime](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-bedrock-runtime) | `3.1094.0` | `3.1095.0` |
| [@aws-sdk/client-dynamodb](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-dynamodb) | `3.1094.0` | `3.1095.0` |
| [@aws-sdk/client-kinesis](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-kinesis) | `3.1094.0` | `3.1095.0` |
| [@aws-sdk/client-lambda](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-lambda) | `3.1094.0` | `3.1095.0` |
| [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-s3) | `3.1094.0` | `3.1095.0` |
| [@aws-sdk/client-sfn](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-sfn) | `3.1094.0` | `3.1095.0` |
| [@aws-sdk/client-sns](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-sns) | `3.1094.0` | `3.1095.0` |
| [@aws-sdk/client-sqs](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-sqs) | `3.1094.0` | `3.1095.0` |
| [@smithy/core](https://github.com/smithy-lang/smithy-typescript/tree/HEAD/packages/core) | `3.29.8` | `3.30.0` |
| [@smithy/smithy-client](https://github.com/smithy-lang/smithy-typescript/tree/HEAD/packages/smithy-client) | `4.14.13` | `4.14.14` |
| [bullmq](https://github.com/taskforcesh/bullmq) | `5.81.0` | `5.81.2` |



Updates `@aws-sdk/client-bedrock-runtime` from 3.1094.0 to 3.1095.0
- [Release notes](https://github.com/aws/aws-sdk-js-v3/releases)
- [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-bedrock-runtime/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.1095.0/clients/client-bedrock-runtime)

Updates `@aws-sdk/client-dynamodb` from 3.1094.0 to 3.1095.0
- [Release notes](https://github.com/aws/aws-sdk-js-v3/releases)
- [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-dynamodb/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.1095.0/clients/client-dynamodb)

Updates `@aws-sdk/client-kinesis` from 3.1094.0 to 3.1095.0
- [Release notes](https://github.com/aws/aws-sdk-js-v3/releases)
- [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-kinesis/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.1095.0/clients/client-kinesis)

Updates `@aws-sdk/client-lambda` from 3.1094.0 to 3.1095.0
- [Release notes](https://github.com/aws/aws-sdk-js-v3/releases)
- [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-lambda/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.1095.0/clients/client-lambda)

Updates `@aws-sdk/client-s3` from 3.1094.0 to 3.1095.0
- [Release notes](https://github.com/aws/aws-sdk-js-v3/releases)
- [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.1095.0/clients/client-s3)

Updates `@aws-sdk/client-sfn` from 3.1094.0 to 3.1095.0
- [Release notes](https://github.com/aws/aws-sdk-js-v3/releases)
- [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-sfn/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.1095.0/clients/client-sfn)

Updates `@aws-sdk/client-sns` from 3.1094.0 to 3.1095.0
- [Release notes](https://github.com/aws/aws-sdk-js-v3/releases)
- [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-sns/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.1095.0/clients/client-sns)

Updates `@aws-sdk/client-sqs` from 3.1094.0 to 3.1095.0
- [Release notes](https://github.com/aws/aws-sdk-js-v3/releases)
- [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-sqs/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.1095.0/clients/client-sqs)

Updates `@smithy/core` from 3.29.8 to 3.30.0
- [Release notes](https://github.com/smithy-lang/smithy-typescript/releases)
- [Changelog](https://github.com/smithy-lang/smithy-typescript/blob/main/packages/core/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-typescript/commits/@smithy/core@3.30.0/packages/core)

Updates `@smithy/smithy-client` from 4.14.13 to 4.14.14
- [Release notes](https://github.com/smithy-lang/smithy-typescript/releases)
- [Changelog](https://github.com/smithy-lang/smithy-typescript/blob/main/packages/smithy-client/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-typescript/commits/@smithy/smithy-client@4.14.14/packages/smithy-client)

Updates `bullmq` from 5.81.0 to 5.81.2
- [Release notes](https://github.com/taskforcesh/bullmq/releases)
- [Commits](https://github.com/taskforcesh/bullmq/compare/v5.81.0...v5.81.2)

---
updated-dependencies:
- dependency-name: "@aws-sdk/client-bedrock-runtime"
  dependency-version: 3.1095.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cloud-and-messaging
- dependency-name: "@aws-sdk/client-dynamodb"
  dependency-version: 3.1095.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cloud-and-messaging
- dependency-name: "@aws-sdk/client-kinesis"
  dependency-version: 3.1095.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cloud-and-messaging
- dependency-name: "@aws-sdk/client-lambda"
  dependency-version: 3.1095.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cloud-and-messaging
- dependency-name: "@aws-sdk/client-s3"
  dependency-version: 3.1095.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cloud-and-messaging
- dependency-name: "@aws-sdk/client-sfn"
  dependency-version: 3.1095.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cloud-and-messaging
- dependency-name: "@aws-sdk/client-sns"
  dependency-version: 3.1095.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cloud-and-messaging
- dependency-name: "@aws-sdk/client-sqs"
  dependency-version: 3.1095.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cloud-and-messaging
- dependency-name: "@smithy/core"
  dependency-version: 3.30.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cloud-and-messaging
- dependency-name: "@smithy/smithy-client"
  dependency-version: 4.14.14
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: cloud-and-messaging
- dependency-name: bullmq
  dependency-version: 5.81.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: cloud-and-messaging
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../test/plugins/versions/package.json        | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/dd-trace/test/plugins/versions/package.json b/packages/dd-trace/test/plugins/versions/package.json
index bac5fffcca..7ce2518124 100644
--- a/packages/dd-trace/test/plugins/versions/package.json
+++ b/packages/dd-trace/test/plugins/versions/package.json
@@ -15,14 +15,14 @@
     "@apollo/subgraph": "2.14.2",
     "@aws/durable-execution-sdk-js": "2.2.0",
     "@aws/durable-execution-sdk-js-testing": "1.1.3",
-    "@aws-sdk/client-bedrock-runtime": "3.1094.0",
-    "@aws-sdk/client-dynamodb": "3.1094.0",
-    "@aws-sdk/client-kinesis": "3.1094.0",
-    "@aws-sdk/client-lambda": "3.1094.0",
-    "@aws-sdk/client-s3": "3.1094.0",
-    "@aws-sdk/client-sfn": "3.1094.0",
-    "@aws-sdk/client-sns": "3.1094.0",
-    "@aws-sdk/client-sqs": "3.1094.0",
+    "@aws-sdk/client-bedrock-runtime": "3.1095.0",
+    "@aws-sdk/client-dynamodb": "3.1095.0",
+    "@aws-sdk/client-kinesis": "3.1095.0",
+    "@aws-sdk/client-lambda": "3.1095.0",
+    "@aws-sdk/client-s3": "3.1095.0",
+    "@aws-sdk/client-sfn": "3.1095.0",
+    "@aws-sdk/client-sns": "3.1095.0",
+    "@aws-sdk/client-sqs": "3.1095.0",
     "@aws-sdk/node-http-handler": "3.374.0",
     "@aws-sdk/smithy-client": "3.374.0",
     "@azure/cosmos": "4.10.0",
@@ -85,8 +85,8 @@
     "@prisma/adapter-pg": "7.8.0",
     "@prisma/client": "7.8.0",
     "@redis/client": "6.1.0",
-    "@smithy/core": "3.29.8",
-    "@smithy/smithy-client": "4.14.13",
+    "@smithy/core": "3.30.0",
+    "@smithy/smithy-client": "4.14.14",
     "@types/node": "26.1.1",
     "@vitest/coverage-istanbul": "4.1.9",
     "@vitest/coverage-v8": "4.1.9",
@@ -107,7 +107,7 @@
     "bluebird": "3.7.2",
     "body-parser": "2.3.0",
     "bson": "7.3.1",
-    "bullmq": "5.81.0",
+    "bullmq": "5.81.2",
     "bunyan": "2.0.5",
     "cassandra-driver": "4.9.0",
     "collections": "5.1.13",

From 07d978dd92e6aae2050332616285f2b57ad3ca53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Antonio=20Fern=C3=A1ndez=20de=20Alba?=
 <juan.fernandezdealba@datadoghq.com>
Date: Tue, 28 Jul 2026 09:06:55 +0200
Subject: [PATCH 07/43] feat(test-optimization): support WebdriverIO with Mocha
 (#9520)

---
 .github/CODEOWNERS                            |   1 +
 .github/workflows/test-optimization.yml       |  27 +
 .../webdriverio/fixtures/delay.e2e.js         |  16 +
 .../webdriverio/fixtures/fail.e2e.js          |   9 +
 .../webdriverio/fixtures/first.e2e.js         |  14 +
 .../webdriverio/fixtures/hook-fail.e2e.js     |   9 +
 .../webdriverio/fixtures/load-fail.e2e.js     |   3 +
 .../webdriverio/fixtures/retry.e2e.js         |  18 +
 .../fixtures/runner-env-preload.js            |   3 +
 .../webdriverio/fixtures/runner-env.e2e.js    |  16 +
 .../webdriverio/fixtures/second.e2e.js        |  14 +
 .../fixtures/spec-file-retry.e2e.js           |  25 +
 .../webdriverio/fixtures/tdd.e2e.js           |  14 +
 .../webdriverio/fixtures/wdio.conf.js         | 132 +++
 .../webdriverio/webdriverio.spec.js           | 487 ++++++++++++
 package.json                                  |   2 +
 .../src/helpers/hooks.js                      |   1 +
 .../rewriter/instrumentations/index.js        |   1 +
 .../rewriter/instrumentations/webdriverio.js  |  44 +
 .../src/mocha/webdriverio-protocol.js         |   9 +
 .../src/mocha/worker.js                       | 368 ++++++++-
 .../src/webdriverio.js                        | 681 ++++++++++++++++
 .../test/fixtures/mocha-regular-worker.js     |  46 ++
 .../@wdio/local-runner/package.json           |   5 +
 .../webdriverio-disconnected-worker.js        | 122 +++
 .../fixtures/webdriverio-local-runner.mjs     |  13 +
 .../test/webdriverio.spec.js                  | 750 ++++++++++++++++++
 packages/datadog-plugin-mocha/src/index.js    |  21 +-
 packages/dd-trace/src/plugins/ci_plugin.js    |  84 +-
 packages/dd-trace/src/plugins/index.js        |   1 +
 packages/dd-trace/src/plugins/util/test.js    |  20 +-
 .../test/ci-visibility/ci-plugin.spec.js      |  50 ++
 .../test/plugins/versions/package.json        |   3 +
 33 files changed, 2950 insertions(+), 59 deletions(-)
 create mode 100644 integration-tests/webdriverio/fixtures/delay.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/fail.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/first.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/hook-fail.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/load-fail.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/retry.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/runner-env-preload.js
 create mode 100644 integration-tests/webdriverio/fixtures/runner-env.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/second.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/spec-file-retry.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/tdd.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/wdio.conf.js
 create mode 100644 integration-tests/webdriverio/webdriverio.spec.js
 create mode 100644 packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/webdriverio.js
 create mode 100644 packages/datadog-instrumentations/src/mocha/webdriverio-protocol.js
 create mode 100644 packages/datadog-instrumentations/src/webdriverio.js
 create mode 100644 packages/datadog-instrumentations/test/fixtures/mocha-regular-worker.js
 create mode 100644 packages/datadog-instrumentations/test/fixtures/node_modules/@wdio/local-runner/package.json
 create mode 100644 packages/datadog-instrumentations/test/fixtures/webdriverio-disconnected-worker.js
 create mode 100644 packages/datadog-instrumentations/test/fixtures/webdriverio-local-runner.mjs
 create mode 100644 packages/datadog-instrumentations/test/webdriverio.spec.js

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8635221094..ecc7380028 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -149,6 +149,7 @@
 /integration-tests/mocha/ @DataDog/ci-app-libraries
 /integration-tests/playwright/ @DataDog/ci-app-libraries
 /integration-tests/vitest/ @DataDog/ci-app-libraries
+/integration-tests/webdriverio/ @DataDog/ci-app-libraries
 /integration-tests/vitest.config.mjs @DataDog/ci-app-libraries
 /integration-tests/vitest.second-project.config.mjs @DataDog/ci-app-libraries
 /integration-tests/vitest.typecheck.config.mjs @DataDog/ci-app-libraries
diff --git a/.github/workflows/test-optimization.yml b/.github/workflows/test-optimization.yml
index 3ce3678890..dc8c599d8b 100644
--- a/.github/workflows/test-optimization.yml
+++ b/.github/workflows/test-optimization.yml
@@ -202,6 +202,33 @@ jobs:
         with:
           flags: test-optimization-mocha-${{ matrix.version }}-${{ matrix.mocha-version }}
 
+  integration-webdriverio:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - node-version: oldest
+            webdriverio-version: oldest
+          - node-version: latest
+            webdriverio-version: latest
+    name: integration-webdriverio (${{ matrix.webdriverio-version }}, node-${{ matrix.node-version }})
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: ./.github/actions/node
+        with:
+          version: ${{ matrix.node-version }}
+      - uses: ./.github/actions/install
+      - run: npm run test:instrumentations
+        env:
+          PLUGINS: webdriverio
+      - run: npm run test:integration:webdriverio:coverage
+        env:
+          WEBDRIVERIO_VERSION: ${{ matrix.webdriverio-version }}
+      - uses: ./.github/actions/coverage
+        with:
+          flags: test-optimization-webdriverio-${{ matrix.node-version }}-${{ matrix.webdriverio-version }}
+
   integration-jest:
     strategy:
       fail-fast: false
diff --git a/integration-tests/webdriverio/fixtures/delay.e2e.js b/integration-tests/webdriverio/fixtures/delay.e2e.js
new file mode 100644
index 0000000000..1a09b24f99
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/delay.e2e.js
@@ -0,0 +1,16 @@
+'use strict'
+
+const tracer = require('dd-trace')
+
+const assert = require('node:assert/strict')
+
+describe('WebdriverIO delayed root suite', () => {
+  it('waits for the user and Test Optimization configuration', () => {
+    const activeSpan = tracer.scope().active()
+
+    assert.ok(activeSpan)
+    activeSpan.setTag('test.webdriverio.worker', 'delay')
+  })
+})
+
+setTimeout(run, 1_000)
diff --git a/integration-tests/webdriverio/fixtures/fail.e2e.js b/integration-tests/webdriverio/fixtures/fail.e2e.js
new file mode 100644
index 0000000000..76057b6945
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/fail.e2e.js
@@ -0,0 +1,9 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+
+describe('WebdriverIO failing worker', () => {
+  it('fails before the next grouped spec', () => {
+    assert.fail('expected WebdriverIO integration failure')
+  })
+})
diff --git a/integration-tests/webdriverio/fixtures/first.e2e.js b/integration-tests/webdriverio/fixtures/first.e2e.js
new file mode 100644
index 0000000000..a21ea0b265
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/first.e2e.js
@@ -0,0 +1,14 @@
+'use strict'
+
+const tracer = require('dd-trace')
+
+const assert = require('node:assert/strict')
+
+describe('WebdriverIO first worker', () => {
+  it('runs with an active Test Optimization span', () => {
+    const activeSpan = tracer.scope().active()
+
+    assert.ok(activeSpan)
+    activeSpan.setTag('test.webdriverio.worker', 'first')
+  })
+})
diff --git a/integration-tests/webdriverio/fixtures/hook-fail.e2e.js b/integration-tests/webdriverio/fixtures/hook-fail.e2e.js
new file mode 100644
index 0000000000..6daa199119
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/hook-fail.e2e.js
@@ -0,0 +1,9 @@
+'use strict'
+
+describe('WebdriverIO hook failure', () => {
+  before(() => {
+    throw new Error('expected WebdriverIO hook failure')
+  })
+
+  it('does not run', () => {})
+})
diff --git a/integration-tests/webdriverio/fixtures/load-fail.e2e.js b/integration-tests/webdriverio/fixtures/load-fail.e2e.js
new file mode 100644
index 0000000000..fef4ed6b50
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/load-fail.e2e.js
@@ -0,0 +1,3 @@
+'use strict'
+
+throw new Error('expected WebdriverIO spec load failure')
diff --git a/integration-tests/webdriverio/fixtures/retry.e2e.js b/integration-tests/webdriverio/fixtures/retry.e2e.js
new file mode 100644
index 0000000000..264c6e3b0d
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/retry.e2e.js
@@ -0,0 +1,18 @@
+'use strict'
+
+const tracer = require('dd-trace')
+
+const assert = require('node:assert/strict')
+
+let attempt = 0
+
+describe('WebdriverIO Mocha retries', () => {
+  it('reports every Mocha attempt', () => {
+    const activeSpan = tracer.scope().active()
+
+    assert.ok(activeSpan)
+    activeSpan.setTag('test.webdriverio.worker', 'retry')
+    attempt++
+    assert.strictEqual(attempt, 2)
+  })
+})
diff --git a/integration-tests/webdriverio/fixtures/runner-env-preload.js b/integration-tests/webdriverio/fixtures/runner-env-preload.js
new file mode 100644
index 0000000000..feb4722834
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/runner-env-preload.js
@@ -0,0 +1,3 @@
+'use strict'
+
+globalThis.webdriverioRunnerEnvPreloaded = true
diff --git a/integration-tests/webdriverio/fixtures/runner-env.e2e.js b/integration-tests/webdriverio/fixtures/runner-env.e2e.js
new file mode 100644
index 0000000000..3ec46ea951
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/runner-env.e2e.js
@@ -0,0 +1,16 @@
+'use strict'
+
+const tracer = require('dd-trace')
+
+const assert = require('node:assert/strict')
+
+describe('WebdriverIO runner environment', () => {
+  it('preserves the launcher and worker NODE_OPTIONS', () => {
+    assert.strictEqual(globalThis.webdriverioRunnerEnvPreloaded, true)
+
+    const activeSpan = tracer.scope().active()
+
+    assert.ok(activeSpan)
+    activeSpan.setTag('test.webdriverio.worker', 'runner-env-node-options')
+  })
+})
diff --git a/integration-tests/webdriverio/fixtures/second.e2e.js b/integration-tests/webdriverio/fixtures/second.e2e.js
new file mode 100644
index 0000000000..72774856ba
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/second.e2e.js
@@ -0,0 +1,14 @@
+'use strict'
+
+const tracer = require('dd-trace')
+
+const assert = require('node:assert/strict')
+
+describe('WebdriverIO second worker', () => {
+  it('runs with an active Test Optimization span', () => {
+    const activeSpan = tracer.scope().active()
+
+    assert.ok(activeSpan)
+    activeSpan.setTag('test.webdriverio.worker', 'second')
+  })
+})
diff --git a/integration-tests/webdriverio/fixtures/spec-file-retry.e2e.js b/integration-tests/webdriverio/fixtures/spec-file-retry.e2e.js
new file mode 100644
index 0000000000..eca5fd15e2
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/spec-file-retry.e2e.js
@@ -0,0 +1,25 @@
+'use strict'
+
+const tracer = require('dd-trace')
+
+const assert = require('node:assert/strict')
+const fs = require('node:fs')
+const path = require('node:path')
+
+const retryMarker = path.join(__dirname, '.webdriverio-spec-file-retry')
+
+describe('WebdriverIO spec file retries', () => {
+  it('reports the retried worker', () => {
+    const activeSpan = tracer.scope().active()
+
+    assert.ok(activeSpan)
+    activeSpan.setTag('test.webdriverio.worker', 'spec-file-retry')
+
+    if (!fs.existsSync(retryMarker)) {
+      fs.writeFileSync(retryMarker, '')
+      assert.fail('fail the first spec file execution')
+    }
+
+    fs.unlinkSync(retryMarker)
+  })
+})
diff --git a/integration-tests/webdriverio/fixtures/tdd.e2e.js b/integration-tests/webdriverio/fixtures/tdd.e2e.js
new file mode 100644
index 0000000000..82b2fefbaf
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/tdd.e2e.js
@@ -0,0 +1,14 @@
+'use strict'
+
+const tracer = require('dd-trace')
+
+const assert = require('node:assert/strict')
+
+suite('WebdriverIO TDD interface', () => {
+  test('reports a TDD test', () => {
+    const activeSpan = tracer.scope().active()
+
+    assert.ok(activeSpan)
+    activeSpan.setTag('test.webdriverio.worker', 'tdd')
+  })
+})
diff --git a/integration-tests/webdriverio/fixtures/wdio.conf.js b/integration-tests/webdriverio/fixtures/wdio.conf.js
new file mode 100644
index 0000000000..088102e9ca
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/wdio.conf.js
@@ -0,0 +1,132 @@
+'use strict'
+
+const scenario = process.env.WEBDRIVERIO_SCENARIO || 'parallel'
+
+const baseConfig = {
+  runner: 'local',
+  specs: [
+    './first.e2e.js',
+    './second.e2e.js',
+  ],
+  maxInstances: 2,
+  capabilities: [{
+    browserName: 'chrome',
+  }],
+  protocol: 'http',
+  hostname: '127.0.0.1',
+  port: Number(process.env.WEBDRIVER_PORT),
+  path: '/',
+  connectionRetryCount: 0,
+  services: [],
+  framework: 'mocha',
+  reporters: [],
+  mochaOpts: {
+    ui: 'bdd',
+    timeout: 10_000,
+  },
+}
+
+const scenarioConfig = {
+  bail: {
+    maxInstances: 1,
+    mochaOpts: {
+      bail: true,
+    },
+    specs: [[
+      './fail.e2e.js',
+      './second.e2e.js',
+    ]],
+  },
+  preFrameworkFailure: {
+    maxInstances: 1,
+    reporters: ['webdriverio-missing-reporter'],
+    specs: ['./first.e2e.js'],
+  },
+  delay: {
+    maxInstances: 1,
+    mochaOpts: {
+      delay: true,
+    },
+    specs: ['./delay.e2e.js'],
+  },
+  grep: {
+    maxInstances: 1,
+    mochaOpts: {
+      grep: 'first worker',
+    },
+    specs: [[
+      './first.e2e.js',
+      './second.e2e.js',
+    ]],
+  },
+  grouped: {
+    maxInstances: 1,
+    specs: [[
+      './first.e2e.js',
+      './second.e2e.js',
+    ]],
+  },
+  hookFailure: {
+    maxInstances: 1,
+    specs: [[
+      './hook-fail.e2e.js',
+      './first.e2e.js',
+    ]],
+  },
+  loadFailure: {
+    maxInstances: 1,
+    specs: ['./load-fail.e2e.js'],
+  },
+  multipleCapabilities: {
+    capabilities: [
+      { browserName: 'chrome' },
+      { browserName: 'firefox' },
+    ],
+    specs: ['./first.e2e.js'],
+  },
+  parallel: {},
+  retries: {
+    maxInstances: 1,
+    mochaOpts: {
+      retries: 1,
+    },
+    specs: ['./retry.e2e.js'],
+  },
+  runnerEnvNodeOptions: {
+    maxInstances: 1,
+    runnerEnv: {
+      NODE_OPTIONS: '--require ./runner-env-preload.js',
+    },
+    specs: ['./runner-env.e2e.js'],
+  },
+  serial: {
+    maxInstances: 1,
+  },
+  specFileRetries: {
+    maxInstances: 1,
+    specFileRetries: 1,
+    specFileRetriesDelay: 0,
+    specs: ['./spec-file-retry.e2e.js'],
+  },
+  tdd: {
+    maxInstances: 1,
+    mochaOpts: {
+      ui: 'tdd',
+    },
+    specs: ['./tdd.e2e.js'],
+  },
+}
+
+const selectedScenario = scenarioConfig[scenario]
+if (!selectedScenario) {
+  throw new Error(`Unknown WebdriverIO integration scenario: ${scenario}`)
+}
+
+exports.config = {
+  ...baseConfig,
+  ...selectedScenario,
+  mochaOpts: {
+    ...baseConfig.mochaOpts,
+    ...selectedScenario.mochaOpts,
+  },
+}
diff --git a/integration-tests/webdriverio/webdriverio.spec.js b/integration-tests/webdriverio/webdriverio.spec.js
new file mode 100644
index 0000000000..903de914f2
--- /dev/null
+++ b/integration-tests/webdriverio/webdriverio.spec.js
@@ -0,0 +1,487 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+const { exec } = require('node:child_process')
+const { once } = require('node:events')
+const http = require('node:http')
+
+const {
+  getCiVisAgentlessConfig,
+  sandboxCwd,
+  useSandbox,
+} = require('../helpers')
+const { FakeCiVisIntake } = require('../ci-visibility-intake')
+const {
+  MOCHA_IS_PARALLEL,
+  TEST_CODE_COVERAGE_ENABLED,
+  TEST_EARLY_FLAKE_ENABLED,
+  TEST_FRAMEWORK,
+  TEST_FRAMEWORK_ADAPTER,
+  TEST_FRAMEWORK_VERSION,
+  TEST_IS_RETRY,
+  TEST_ITR_SKIPPING_ENABLED,
+  TEST_MANAGEMENT_ENABLED,
+  TEST_MODULE,
+  TEST_STATUS,
+  TEST_SUITE,
+  TEST_TYPE,
+} = require('../../packages/dd-trace/src/plugins/util/test')
+
+const OLDEST_WEBDRIVERIO_VERSION = '9.0.0'
+const requestedVersion = process.env.WEBDRIVERIO_VERSION
+const versions = requestedVersion
+  ? [requestedVersion === 'oldest' ? OLDEST_WEBDRIVERIO_VERSION : requestedVersion]
+  : [OLDEST_WEBDRIVERIO_VERSION, 'latest']
+
+const advancedSettings = {
+  code_coverage: true,
+  tests_skipping: true,
+  itr_enabled: true,
+  require_git: false,
+  early_flake_detection: {
+    enabled: true,
+    slow_test_retries: {
+      '5s': 5,
+    },
+  },
+  flaky_test_retries_enabled: true,
+  di_enabled: true,
+  known_tests_enabled: true,
+  test_management: {
+    enabled: true,
+    attempt_to_fix_retries: 5,
+  },
+  impacted_tests_enabled: true,
+  coverage_report_upload_enabled: true,
+}
+
+const advancedRequestPaths = [
+  '/api/v2/ci/libraries/tests',
+  '/api/v2/ci/tests/skippable',
+  '/api/v2/test/libraries/test-management/tests',
+]
+
+/**
+ * Starts the minimal W3C WebDriver endpoint required by WebdriverIO workers.
+ *
+ * @returns {Promise<{port: number, server: import('node:http').Server, getSessionCount: () => number}>}
+ */
+function startWebDriverServer () {
+  let sessionCount = 0
+  const server = http.createServer((request, response) => {
+    request.resume()
+    request.once('end', () => {
+      const isNewSession = request.method === 'POST' && request.url === '/session'
+      let value = null
+
+      if (isNewSession) {
+        sessionCount++
+        value = {
+          sessionId: `webdriverio-${sessionCount}`,
+          capabilities: {
+            browserName: 'chrome',
+            browserVersion: 'test',
+            platformName: process.platform,
+          },
+        }
+      } else if (request.method === 'GET' && request.url === '/status') {
+        value = { ready: true, message: '' }
+      }
+
+      response.writeHead(200, { 'content-type': 'application/json' })
+      response.end(JSON.stringify({ value }))
+    })
+  })
+
+  return new Promise((resolve, reject) => {
+    server.once('error', reject)
+    server.listen(0, '127.0.0.1', () => {
+      server.removeListener('error', reject)
+      const address = server.address()
+
+      if (!address || typeof address === 'string') {
+        reject(new Error('WebDriver server did not bind to a TCP port'))
+        return
+      }
+
+      resolve({
+        port: address.port,
+        server,
+        getSessionCount: () => sessionCount,
+      })
+    })
+  })
+}
+
+/**
+ * Stops an HTTP server if it is listening.
+ *
+ * @param {import('node:http').Server|undefined} server
+ * @returns {Promise<void>}
+ */
+function stopServer (server) {
+  if (!server?.listening) {
+    return Promise.resolve()
+  }
+  return new Promise(resolve => server.close(resolve))
+}
+
+/**
+ * Asserts every child event belongs to the coordinator-owned session and module.
+ *
+ * @param {object} session
+ * @param {object} module
+ * @param {object[]} suites
+ * @param {object[]} tests
+ * @returns {void}
+ */
+function assertEventHierarchy (session, module, suites, tests) {
+  const sessionId = session.test_session_id.toString(10)
+  const moduleId = module.test_module_id.toString(10)
+
+  assert.strictEqual(module.test_session_id.toString(10), sessionId)
+
+  for (const event of [...suites, ...tests]) {
+    assert.strictEqual(event.test_session_id.toString(10), sessionId)
+    assert.strictEqual(event.test_module_id.toString(10), moduleId)
+  }
+
+  const suiteIds = new Set(suites.map(suite => suite.test_suite_id.toString(10)))
+  for (const test of tests) {
+    assert.ok(suiteIds.has(test.test_suite_id.toString(10)))
+  }
+}
+
+/**
+ * Asserts each repeated suite execution owns exactly one test event.
+ *
+ * @param {object[]} suites
+ * @param {object[]} tests
+ * @returns {void}
+ */
+function assertOneTestPerSuiteExecution (suites, tests) {
+  assert.deepStrictEqual(
+    tests.map(test => test.test_suite_id.toString(10)).sort(),
+    suites.map(suite => suite.test_suite_id.toString(10)).sort()
+  )
+}
+
+/**
+ * Extracts events and verifies the WebdriverIO run stayed in basic-reporting mode.
+ *
+ * @param {object[]} payloads
+ * @param {string} requestedVersion
+ * @returns {{session: object, module: object, suites: object[], tests: object[]}}
+ */
+function getBasicReportingEvents (payloads, requestedVersion) {
+  const settingsRequests = payloads.filter(({ url }) =>
+    url.endsWith('/api/v2/libraries/tests/services/setting'))
+  const advancedRequests = payloads.filter(({ url }) =>
+    advancedRequestPaths.some(path => url.endsWith(path)))
+  const cyclePayloads = payloads.filter(({ url }) => url.endsWith('/api/v2/citestcycle'))
+  const events = cyclePayloads.flatMap(({ payload }) => payload.events)
+  const sessions = events.filter(event => event.type === 'test_session_end').map(event => event.content)
+  const modules = events.filter(event => event.type === 'test_module_end').map(event => event.content)
+  const suites = events.filter(event => event.type === 'test_suite_end').map(event => event.content)
+  const tests = events.filter(event => event.type === 'test').map(event => event.content)
+
+  assert.strictEqual(settingsRequests.length, 1)
+  assert.strictEqual(advancedRequests.length, 0)
+  assert.strictEqual(sessions.length, 1, JSON.stringify({
+    events: events.map(event => ({
+      name: event.content?.name,
+      spanType: event.content?.meta?.['span.type'],
+      type: event.type,
+    })),
+    urls: payloads.map(({ url }) => url),
+  }))
+  assert.strictEqual(modules.length, 1)
+  assert.strictEqual(sessions[0].meta[TEST_ITR_SKIPPING_ENABLED], 'false')
+  assert.strictEqual(sessions[0].meta[TEST_CODE_COVERAGE_ENABLED], 'false')
+  assert.strictEqual(sessions[0].meta[TEST_EARLY_FLAKE_ENABLED], undefined)
+  assert.strictEqual(sessions[0].meta[TEST_MANAGEMENT_ENABLED], undefined)
+
+  const metadata = cyclePayloads.flatMap(({ payload }) => payload.metadata || [])
+  assert.ok(metadata.length > 0)
+  for (const metadataEntry of metadata) {
+    const capabilities = Object.keys(metadataEntry.test || {})
+      .filter(tag => tag.startsWith('_dd.library_capabilities.'))
+    assert.deepStrictEqual(capabilities, [])
+  }
+
+  for (const event of [sessions[0], modules[0], ...suites, ...tests]) {
+    assert.strictEqual(event.meta[TEST_FRAMEWORK], 'webdriverio')
+    assert.strictEqual(event.meta[TEST_MODULE], 'webdriverio')
+    assert.strictEqual(event.meta[TEST_TYPE], 'browser')
+    assert.ok(event.meta[TEST_FRAMEWORK_VERSION])
+    if (requestedVersion !== 'latest') {
+      assert.strictEqual(event.meta[TEST_FRAMEWORK_VERSION], requestedVersion)
+    }
+  }
+  for (const event of [...suites, ...tests]) {
+    assert.strictEqual(event.meta[TEST_FRAMEWORK_ADAPTER], 'mocha')
+  }
+  assertEventHierarchy(sessions[0], modules[0], suites, tests)
+
+  return {
+    session: sessions[0],
+    module: modules[0],
+    suites,
+    tests,
+  }
+}
+
+for (const version of versions) {
+  describe(`webdriverio@${version}`, function () {
+    this.timeout(60_000)
+
+    let childProcess
+    let cwd
+    let receiver
+    let testOutput = ''
+    let webDriver
+
+    useSandbox([
+      `@wdio/cli@${version}`,
+      `@wdio/local-runner@${version}`,
+      `@wdio/mocha-framework@${version}`,
+    ], true, ['./integration-tests/webdriverio/fixtures/*'])
+
+    before(async function () {
+      cwd = sandboxCwd()
+      webDriver = await startWebDriverServer()
+    })
+
+    after(async function () {
+      await stopServer(webDriver?.server)
+    })
+
+    beforeEach(async function () {
+      receiver = await new FakeCiVisIntake().start()
+      receiver.setSettings(advancedSettings)
+    })
+
+    afterEach(async function () {
+      childProcess?.kill()
+      testOutput = ''
+      await receiver.stop()
+    })
+
+    /**
+     * Runs one WebdriverIO configuration scenario.
+     *
+     * @param {string} scenario
+     * @param {number} expectedWebDriverSessions
+     * @param {(events: ReturnType<typeof getBasicReportingEvents>) => void} assertEvents
+     * @param {number} [expectedExitCode]
+     * @returns {Promise<void>}
+     */
+    async function runScenario (scenario, expectedWebDriverSessions, assertEvents, expectedExitCode = 0) {
+      const initialWebDriverSessionCount = webDriver.getSessionCount()
+      childProcess = exec('./node_modules/.bin/wdio run ./wdio.conf.js', {
+        cwd,
+        env: {
+          ...getCiVisAgentlessConfig(receiver.port),
+          NODE_OPTIONS: '-r dd-trace/ci/init --import dd-trace/register.js',
+          DD_TEST_SESSION_NAME: 'webdriverio-integration-test',
+          WEBDRIVERIO_SCENARIO: scenario,
+          WEBDRIVER_PORT: String(webDriver.port),
+        },
+      })
+      childProcess.stdout?.on('data', chunk => {
+        testOutput += chunk.toString()
+      })
+      childProcess.stderr?.on('data', chunk => {
+        testOutput += chunk.toString()
+      })
+
+      const payloadsPromise = receiver.gatherPayloadsUntilChildExit(
+        childProcess,
+        undefined,
+        payloads => assertEvents(getBasicReportingEvents(payloads, version)),
+        { hardTimeout: 45_000 }
+      )
+
+      let exitCode
+      try {
+        [[exitCode]] = await Promise.all([
+          once(childProcess, 'exit'),
+          payloadsPromise,
+        ])
+      } catch (error) {
+        error.message += `\n${testOutput}`
+        throw error
+      }
+
+      assert.strictEqual(exitCode, expectedExitCode, testOutput)
+      assert.strictEqual(
+        webDriver.getSessionCount() - initialWebDriverSessionCount,
+        expectedWebDriverSessions
+      )
+    }
+
+    it('reports parallel workers as one basic-reporting session', async () => {
+      await runScenario('parallel', 2, ({ session, suites, tests }) => {
+        assert.strictEqual(suites.length, 2)
+        assert.strictEqual(tests.length, 2)
+        assert.strictEqual(session.meta[MOCHA_IS_PARALLEL], 'true')
+        assert.strictEqual(session.meta[TEST_STATUS], 'pass')
+        assert.deepStrictEqual(
+          suites.map(suite => suite.meta[TEST_SUITE]).sort(),
+          ['first.e2e.js', 'second.e2e.js']
+        )
+        assert.deepStrictEqual(
+          tests.map(test => test.meta['test.webdriverio.worker']).sort(),
+          ['first', 'second']
+        )
+        assert.strictEqual(new Set(tests.map(test => test.metrics.process_id)).size, 2)
+      })
+    })
+
+    it('reports failures before Mocha loads', async () => {
+      await runScenario('preFrameworkFailure', 0, ({ session, suites, tests }) => {
+        assert.strictEqual(session.meta[TEST_STATUS], 'fail')
+        assert.strictEqual(suites.length, 0)
+        assert.strictEqual(tests.length, 0)
+      }, 1)
+    })
+
+    it('reports specs that fail while loading', async () => {
+      await runScenario('loadFailure', 1, ({ session, suites, tests }) => {
+        assert.strictEqual(session.meta[TEST_STATUS], 'fail')
+        assert.strictEqual(suites.length, 1)
+        assert.strictEqual(suites[0].meta[TEST_STATUS], 'fail')
+        assert.strictEqual(suites[0].meta[TEST_SUITE], 'load-fail.e2e.js')
+        assert.strictEqual(tests.length, 0)
+      }, 1)
+    })
+
+    it('reports sequential workers as one session', async () => {
+      await runScenario('serial', 2, ({ session, suites, tests }) => {
+        assert.strictEqual(suites.length, 2)
+        assert.strictEqual(tests.length, 2)
+        assert.strictEqual(session.meta[MOCHA_IS_PARALLEL], undefined)
+        assert.strictEqual(new Set(tests.map(test => test.metrics.process_id)).size, 2)
+      })
+    })
+
+    it('reports grouped specs from one worker', async () => {
+      await runScenario('grouped', 1, ({ suites, tests }) => {
+        assert.strictEqual(suites.length, 2)
+        assert.strictEqual(tests.length, 2)
+        assert.strictEqual(new Set(tests.map(test => test.metrics.process_id)).size, 1)
+      })
+    })
+
+    it('attributes a hook-only failure to its grouped spec', async () => {
+      await runScenario('hookFailure', 1, ({ session, suites, tests }) => {
+        assert.strictEqual(session.meta[TEST_STATUS], 'fail')
+        assert.strictEqual(suites.length, 2)
+        assert.strictEqual(tests.length, 1)
+        assert.deepStrictEqual(
+          suites.map(suite => [suite.meta[TEST_SUITE], suite.meta[TEST_STATUS]]).sort(),
+          [
+            ['first.e2e.js', 'pass'],
+            ['hook-fail.e2e.js', 'fail'],
+          ]
+        )
+      }, 1)
+    })
+
+    it('marks a spec filtered by mochaOpts.grep as skipped', async () => {
+      await runScenario('grep', 1, ({ suites, tests }) => {
+        assert.strictEqual(suites.length, 2)
+        assert.strictEqual(tests.length, 1)
+        assert.deepStrictEqual(
+          suites.map(suite => [suite.meta[TEST_SUITE], suite.meta[TEST_STATUS]]).sort(),
+          [
+            ['first.e2e.js', 'pass'],
+            ['second.e2e.js', 'skip'],
+          ]
+        )
+      })
+    })
+
+    it('reports mochaOpts.bail without leaving grouped suites open', async () => {
+      await runScenario('bail', 1, ({ session, suites, tests }) => {
+        assert.strictEqual(session.meta[TEST_STATUS], 'fail')
+        assert.strictEqual(suites.length, 2)
+        assert.strictEqual(tests.length, 1)
+        assert.deepStrictEqual(
+          suites.map(suite => [suite.meta[TEST_SUITE], suite.meta[TEST_STATUS]]).sort(),
+          [
+            ['fail.e2e.js', 'fail'],
+            ['second.e2e.js', 'skip'],
+          ]
+        )
+      }, 1)
+    })
+
+    it('coordinates mochaOpts.delay with configuration loading', async () => {
+      await runScenario('delay', 1, ({ suites, tests }) => {
+        assert.strictEqual(suites.length, 1)
+        assert.strictEqual(tests.length, 1)
+        assert.strictEqual(tests[0].meta['test.webdriverio.worker'], 'delay')
+      })
+    })
+
+    it('reports native Mocha retries', async () => {
+      await runScenario('retries', 1, ({ session, suites, tests }) => {
+        assert.strictEqual(session.meta[TEST_STATUS], 'pass')
+        assert.strictEqual(suites.length, 1)
+        assert.strictEqual(suites[0].meta[TEST_STATUS], 'pass')
+        assert.strictEqual(tests.length, 2)
+        assert.deepStrictEqual(tests.map(test => test.meta[TEST_STATUS]).sort(), ['fail', 'pass'])
+        assert.strictEqual(tests.filter(test => test.meta[TEST_IS_RETRY] === 'true').length, 1)
+      })
+    })
+
+    it('preserves tracer preload with runnerEnv.NODE_OPTIONS', async () => {
+      await runScenario('runnerEnvNodeOptions', 1, ({ suites, tests }) => {
+        assert.strictEqual(suites.length, 1)
+        assert.strictEqual(tests.length, 1)
+        assert.strictEqual(tests[0].meta['test.webdriverio.worker'], 'runner-env-node-options')
+      })
+    })
+
+    it('supports the Mocha TDD interface', async () => {
+      await runScenario('tdd', 1, ({ suites, tests }) => {
+        assert.strictEqual(suites.length, 1)
+        assert.strictEqual(tests.length, 1)
+        assert.strictEqual(tests[0].meta['test.webdriverio.worker'], 'tdd')
+      })
+    })
+
+    it('reports whole-spec retries in one session', async () => {
+      await runScenario('specFileRetries', 2, ({ session, suites, tests }) => {
+        assert.strictEqual(session.meta[TEST_STATUS], 'pass')
+        assert.strictEqual(session.meta[MOCHA_IS_PARALLEL], undefined)
+        assert.strictEqual(suites.length, 2)
+        assert.strictEqual(tests.length, 2)
+        assert.deepStrictEqual(tests.map(test => test.meta[TEST_STATUS]).sort(), ['fail', 'pass'])
+        assertOneTestPerSuiteExecution(suites, tests)
+
+        const suiteStatusById = new Map(suites.map(suite => [
+          suite.test_suite_id.toString(10),
+          suite.meta[TEST_STATUS],
+        ]))
+        for (const test of tests) {
+          assert.strictEqual(
+            test.meta[TEST_STATUS],
+            suiteStatusById.get(test.test_suite_id.toString(10))
+          )
+        }
+      })
+    })
+
+    it('reports multiple capabilities in one session', async () => {
+      await runScenario('multipleCapabilities', 2, ({ session, suites, tests }) => {
+        assert.strictEqual(suites.length, 2)
+        assert.strictEqual(tests.length, 2)
+        assert.strictEqual(session.meta[MOCHA_IS_PARALLEL], 'true')
+        assert.strictEqual(new Set(tests.map(test => test.metrics.process_id)).size, 2)
+        assertOneTestPerSuiteExecution(suites, tests)
+      })
+    })
+  })
+}
diff --git a/package.json b/package.json
index 6d987e347a..5511ecff30 100644
--- a/package.json
+++ b/package.json
@@ -96,6 +96,8 @@
     "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:webdriverio": "mocha --timeout 60000 \"integration-tests/webdriverio/*.spec.js\"",
+    "test:integration:webdriverio:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/webdriverio/*.spec.js\"",
     "test:integration:vitest": "mocha --timeout 60000 \"integration-tests/vitest/${SPEC:-vitest*}.spec.js\"",
     "test:integration:vitest:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/vitest/${SPEC:-vitest*}.spec.js\"",
     "test:integration:testopt": "mocha --timeout 120000 \"integration-tests/ci-visibility/*.spec.js\"",
diff --git a/packages/datadog-instrumentations/src/helpers/hooks.js b/packages/datadog-instrumentations/src/helpers/hooks.js
index f22a3b629d..7b2e2bfe52 100644
--- a/packages/datadog-instrumentations/src/helpers/hooks.js
+++ b/packages/datadog-instrumentations/src/helpers/hooks.js
@@ -58,6 +58,7 @@ module.exports = {
   '@smithy/core': () => require('../aws-sdk'),
   '@smithy/smithy-client': () => require('../aws-sdk'),
   '@vitest/runner': { esmFirst: true, fn: () => require('../vitest') },
+  '@wdio/local-runner': { esmFirst: true, fn: () => require('../webdriverio') },
   aerospike: () => require('../aerospike'),
   ai: () => require('../ai'),
   amqp10: () => require('../amqp10'),
diff --git a/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/index.js b/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/index.js
index e7f19fbb46..72f44da8ec 100644
--- a/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/index.js
+++ b/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/index.js
@@ -12,5 +12,6 @@ module.exports = [
   ...require('./modelcontextprotocol-sdk'),
   ...require('./openai-agents'),
   ...require('./playwright'),
+  ...require('./webdriverio'),
   ...require('./aws-durable-execution-sdk-js'),
 ]
diff --git a/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/webdriverio.js b/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/webdriverio.js
new file mode 100644
index 0000000000..cf73ac7412
--- /dev/null
+++ b/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/webdriverio.js
@@ -0,0 +1,44 @@
+'use strict'
+
+module.exports = [
+  {
+    module: {
+      name: '@wdio/local-runner',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    functionQuery: {
+      className: 'LocalRunner',
+      methodName: 'run',
+      kind: 'Async',
+    },
+    channelName: 'LocalRunner_run',
+  },
+  {
+    module: {
+      name: '@wdio/local-runner',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    functionQuery: {
+      className: 'LocalRunner',
+      methodName: 'shutdown',
+      kind: 'Async',
+    },
+    channelName: 'LocalRunner_shutdown',
+  },
+  {
+    module: {
+      name: '@wdio/local-runner',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    astQuery: 'VariableDeclarator[id.name="LocalRunner"] > ClassExpression > ClassBody > ' +
+      'MethodDefinition[key.name="shutdown"] ReturnStatement > ' +
+      'CallExpression[callee.object.name="promise"][callee.property.name="then"], ' +
+      'ClassDeclaration[id.name="LocalRunner"] > ClassBody > MethodDefinition[key.name="shutdown"] ReturnStatement > ' +
+      'CallExpression[callee.object.name="promise"][callee.property.name="then"]',
+    channelName: 'LocalRunner_shutdown',
+    transform: 'waitForAsyncEnd',
+  },
+]
diff --git a/packages/datadog-instrumentations/src/mocha/webdriverio-protocol.js b/packages/datadog-instrumentations/src/mocha/webdriverio-protocol.js
new file mode 100644
index 0000000000..93107d4b78
--- /dev/null
+++ b/packages/datadog-instrumentations/src/mocha/webdriverio-protocol.js
@@ -0,0 +1,9 @@
+'use strict'
+
+module.exports = {
+  CONFIGURATION_REQUEST: 'dd:test-optimization:webdriverio:configuration:request',
+  CONFIGURATION_RESPONSE: 'dd:test-optimization:webdriverio:configuration:response',
+  SUITE_FINISH: 'dd:test-optimization:webdriverio:test-suite:finish',
+  WORKER_READY: 'dd:test-optimization:webdriverio:worker:ready',
+  WEBDRIVERIO_WORKER_ENV: '_DD_TEST_OPTIMIZATION_WEBDRIVERIO_WORKER',
+}
diff --git a/packages/datadog-instrumentations/src/mocha/worker.js b/packages/datadog-instrumentations/src/mocha/worker.js
index e14c321922..84a2493e2d 100644
--- a/packages/datadog-instrumentations/src/mocha/worker.js
+++ b/packages/datadog-instrumentations/src/mocha/worker.js
@@ -2,6 +2,8 @@
 
 const { addHook, channel } = require('../helpers/instrument')
 const shimmer = require('../../../datadog-shimmer')
+const { getEnvironmentVariable } = require('../../../dd-trace/src/config/helper')
+const log = require('../../../dd-trace/src/log')
 const { DD_MAJOR } = require('../../../../version')
 
 const {
@@ -15,6 +17,13 @@ const {
   getRunTestsWrapper,
   patchFailedTestReplayHookUp,
 } = require('./utils')
+const {
+  CONFIGURATION_REQUEST,
+  CONFIGURATION_RESPONSE,
+  SUITE_FINISH,
+  WEBDRIVERIO_WORKER_ENV,
+  WORKER_READY,
+} = require('./webdriverio-protocol')
 require('./common')
 
 const MINIMUM_MOCHA_VERSION = DD_MAJOR >= 6 ? '>=8.0.0' : '>=5.2.0'
@@ -22,6 +31,255 @@ const MINIMUM_MOCHA_VERSION = DD_MAJOR >= 6 ? '>=8.0.0' : '>=5.2.0'
 const workerFinishCh = channel('ci:mocha:worker:finish')
 
 const config = {}
+const runnerToFiles = new WeakMap()
+const runnerToFailedHookFiles = new WeakMap()
+const isWebdriverioWorker = !!getEnvironmentVariable(WEBDRIVERIO_WORKER_ENV)
+let configurationRequestId = 0
+
+/**
+ * Sends a message to the WebdriverIO launcher without surfacing closed IPC channels.
+ *
+ * @param {object} message
+ * @param {() => void} [onError]
+ * @returns {void}
+ */
+function sendWebdriverioMessage (message, onError) {
+  if (!process.send || !process.connected) {
+    onError?.()
+    return
+  }
+
+  process.send(message, (error) => {
+    if (!error) {
+      return
+    }
+    log.error('WebdriverIO Test Optimization IPC error', error)
+    onError?.()
+  })
+}
+
+/**
+ * Applies configuration encoded as private Mocha options by its parallel runner.
+ *
+ * @param {object} options
+ * @returns {void}
+ */
+function applyMochaOptions (options) {
+  if (options._ddIsKnownTestsEnabled) {
+    config.isKnownTestsEnabled = true
+    config.isEarlyFlakeDetectionEnabled = options._ddIsEfdEnabled
+    config.knownTests = options._ddKnownTests
+    config.earlyFlakeDetectionNumRetries = options._ddEfdNumRetries
+    config.earlyFlakeDetectionSlowTestRetries = options._ddEfdSlowTestRetries ?? {}
+    delete options._ddIsEfdEnabled
+    delete options._ddKnownTests
+    delete options._ddEfdNumRetries
+    delete options._ddEfdSlowTestRetries
+    delete options._ddIsKnownTestsEnabled
+  }
+  if (options._ddIsImpactedTestsEnabled) {
+    config.isImpactedTestsEnabled = true
+    config.modifiedFiles = options._ddModifiedFiles
+    delete options._ddIsImpactedTestsEnabled
+    delete options._ddModifiedFiles
+  }
+  if (options._ddIsTestManagementTestsEnabled) {
+    config.isTestManagementTestsEnabled = true
+    config.testManagementAttemptToFixRetries = options._ddTestManagementAttemptToFixRetries
+    config.testManagementTests = options._ddTestManagementTests
+    delete options._ddIsTestManagementTestsEnabled
+    delete options._ddTestManagementAttemptToFixRetries
+    delete options._ddTestManagementTests
+  }
+  if (options._ddIsFlakyTestRetriesEnabled) {
+    config.isFlakyTestRetriesEnabled = true
+    config.flakyTestRetriesCount = options._ddFlakyTestRetriesCount
+    delete options._ddIsFlakyTestRetriesEnabled
+    delete options._ddFlakyTestRetriesCount
+  }
+  if (options._ddIsFailedTestReplayEnabled) {
+    config.isTestDynamicInstrumentationEnabled = true
+    config.isDiEnabled = true
+    delete options._ddIsFailedTestReplayEnabled
+  }
+}
+
+/**
+ * Removes files selected for suite-level skipping from an already loaded Mocha root suite.
+ *
+ * @param {object} runner
+ * @param {string[]} skippedFiles
+ * @returns {void}
+ */
+function filterSkippedFiles (runner, skippedFiles) {
+  if (!skippedFiles.length) {
+    return
+  }
+
+  const skippedFilesSet = new Set(skippedFiles)
+  runner.suite.suites = runner.suite.suites.filter(suite => !skippedFilesSet.has(suite.file))
+  runner.suite.tests = runner.suite.tests.filter(test => !skippedFilesSet.has(test.file))
+}
+
+/**
+ * Requests configuration from the WebdriverIO launcher before releasing Mocha's delayed root suite.
+ *
+ * @param {string} frameworkVersion
+ * @param {string[]} files
+ * @param {(response: object) => void} onDone
+ * @returns {void}
+ */
+function requestWebdriverioConfiguration (frameworkVersion, files, onDone) {
+  const requestId = `${process.pid}-${++configurationRequestId}`
+  let finished = false
+
+  /**
+   * Finishes the configuration request exactly once.
+   *
+   * @param {object} response
+   * @returns {void}
+   */
+  function finish (response) {
+    if (finished) {
+      return
+    }
+    finished = true
+    clearTimeout(timeout)
+    process.off('message', onMessage)
+    process.off('disconnect', onDisconnect)
+    onDone(response)
+  }
+
+  /**
+   * Receives the matching coordinator response.
+   *
+   * @param {object} message
+   * @returns {void}
+   */
+  function onMessage (message) {
+    if (message?.name === CONFIGURATION_RESPONSE && message.content?.requestId === requestId) {
+      finish(message.content)
+    }
+  }
+
+  /**
+   * Releases the runner if its parent disconnects.
+   *
+   * @returns {void}
+   */
+  function onDisconnect () {
+    finish({})
+  }
+
+  const timeout = setTimeout(() => finish({}), 30_000)
+  process.on('message', onMessage)
+  process.once('disconnect', onDisconnect)
+  sendWebdriverioMessage({
+    origin: 'datadog',
+    name: CONFIGURATION_REQUEST,
+    content: {
+      files,
+      frameworkVersion,
+      requestId,
+    },
+  }, () => finish({}))
+}
+
+/**
+ * Reports the Mocha version as soon as WebdriverIO loads its framework adapter.
+ *
+ * @param {string} frameworkVersion
+ * @returns {void}
+ */
+function reportWebdriverioWorkerReady (frameworkVersion) {
+  if (!isWebdriverioWorker) {
+    return
+  }
+
+  sendWebdriverioMessage({
+    origin: 'datadog',
+    name: WORKER_READY,
+    content: { frameworkVersion },
+  })
+}
+
+/**
+ * Computes a final result for every file loaded into one Mocha worker.
+ *
+ * @param {object} runner
+ * @returns {object[]}
+ */
+function getWebdriverioSuiteResults (runner) {
+  const resultsByFile = new Map()
+  const files = runnerToFiles.get(runner) || []
+
+  for (const file of files) {
+    resultsByFile.set(file, {
+      file,
+      hasPassingTest: false,
+      status: 'skip',
+    })
+  }
+
+  runner.suite.eachTest(test => {
+    const result = resultsByFile.get(test.file)
+    if (!result) {
+      return
+    }
+    if (test.state === 'failed' || test.timedOut || test._ddHookFailed) {
+      result.status = 'fail'
+    } else if (test.state === 'passed') {
+      result.hasPassingTest = true
+    }
+  })
+
+  for (const file of runnerToFailedHookFiles.get(runner) || []) {
+    const result = resultsByFile.get(file)
+    if (result) {
+      result.status = 'fail'
+    }
+  }
+
+  const results = []
+  let hasFailedSuite = false
+  for (const result of resultsByFile.values()) {
+    if (result.status === 'fail') {
+      hasFailedSuite = true
+    } else if (result.hasPassingTest) {
+      result.status = 'pass'
+    }
+    delete result.hasPassingTest
+    results.push(result)
+  }
+
+  if (runner.failures > 0 && !hasFailedSuite) {
+    for (const result of results) {
+      result.status = 'fail'
+    }
+  }
+
+  return results
+}
+
+/**
+ * Sends suite results to the WebdriverIO launcher.
+ *
+ * @param {object} runner
+ * @returns {void}
+ */
+function reportWebdriverioSuiteResults (runner) {
+  if (!isWebdriverioWorker) {
+    return
+  }
+
+  sendWebdriverioMessage({
+    origin: 'datadog',
+    name: SUITE_FINISH,
+    content: {
+      results: getWebdriverioSuiteResults(runner),
+    },
+  })
+}
 
 function isFailedTestReplayEnabled () {
   return config.isTestDynamicInstrumentationEnabled && config.isDiEnabled
@@ -31,46 +289,72 @@ addHook({
   name: 'mocha',
   versions: ['>=8.0.0'],
   file: 'lib/mocha.js',
-}, (Mocha) => {
+}, (Mocha, frameworkVersion) => {
+  reportWebdriverioWorkerReady(frameworkVersion)
+
   shimmer.wrap(Mocha.prototype, 'run', run => function (...args) {
-    if (this.options._ddIsKnownTestsEnabled) {
-      config.isKnownTestsEnabled = true
-      config.isEarlyFlakeDetectionEnabled = this.options._ddIsEfdEnabled
-      config.knownTests = this.options._ddKnownTests
-      config.earlyFlakeDetectionNumRetries = this.options._ddEfdNumRetries
-      config.earlyFlakeDetectionSlowTestRetries = this.options._ddEfdSlowTestRetries ?? {}
-      delete this.options._ddIsEfdEnabled
-      delete this.options._ddKnownTests
-      delete this.options._ddEfdNumRetries
-      delete this.options._ddEfdSlowTestRetries
-      delete this.options._ddIsKnownTestsEnabled
-    }
-    if (this.options._ddIsImpactedTestsEnabled) {
-      config.isImpactedTestsEnabled = true
-      config.modifiedFiles = this.options._ddModifiedFiles
-      delete this.options._ddIsImpactedTestsEnabled
-      delete this.options._ddModifiedFiles
-    }
-    if (this.options._ddIsTestManagementTestsEnabled) {
-      config.isTestManagementTestsEnabled = true
-      config.testManagementAttemptToFixRetries = this.options._ddTestManagementAttemptToFixRetries
-      config.testManagementTests = this.options._ddTestManagementTests
-      delete this.options._ddIsTestManagementTestsEnabled
-      delete this.options._ddTestManagementAttemptToFixRetries
-      delete this.options._ddTestManagementTests
+    applyMochaOptions(this.options)
+    if (!isWebdriverioWorker || !workerFinishCh.hasSubscribers) {
+      return run.apply(this, args)
     }
-    if (this.options._ddIsFlakyTestRetriesEnabled) {
-      config.isFlakyTestRetriesEnabled = true
-      config.flakyTestRetriesCount = this.options._ddFlakyTestRetriesCount
-      delete this.options._ddIsFlakyTestRetriesEnabled
-      delete this.options._ddFlakyTestRetriesCount
+
+    const isUserDelayed = this.options.delay
+    const rootSuite = this.suite
+    const rootSuiteRun = rootSuite.run
+    const hasOwnRootSuiteRun = Object.hasOwn(rootSuite, 'run')
+    let configurationReady = false
+    let userReady = !isUserDelayed
+
+    /**
+     * Restores the root suite method after both delayed-mode gates are open.
+     *
+     * @returns {void}
+     */
+    function restoreRootSuiteRun () {
+      if (hasOwnRootSuiteRun) {
+        rootSuite.run = rootSuiteRun
+      } else {
+        delete rootSuite.run
+      }
     }
-    if (this.options._ddIsFailedTestReplayEnabled) {
-      config.isTestDynamicInstrumentationEnabled = true
-      config.isDiEnabled = true
-      delete this.options._ddIsFailedTestReplayEnabled
+
+    if (isUserDelayed) {
+      rootSuite.run = function (...args) {
+        userReady = true
+        if (!configurationReady) {
+          return
+        }
+        restoreRootSuiteRun()
+        return rootSuiteRun.apply(this, args)
+      }
     }
-    return run.apply(this, args)
+
+    this.options.delay = true
+    const files = [...this.files]
+    const runner = run.apply(this, args)
+    runnerToFiles.set(runner, files)
+
+    requestWebdriverioConfiguration(frameworkVersion, files, ({
+      configuration,
+      skippedFiles = [],
+    }) => {
+      if (configuration) {
+        Object.assign(config, configuration)
+      }
+      filterSkippedFiles(runner, skippedFiles)
+      if (isFailedTestReplayEnabled()) {
+        patchFailedTestReplayHookUp(runner.constructor)
+      }
+      configurationReady = true
+      if (userReady) {
+        if (isUserDelayed) {
+          restoreRootSuiteRun()
+        }
+        rootSuite.run()
+      }
+    })
+
+    return runner
   })
 
   return Mocha
@@ -91,9 +375,10 @@ addHook({
     if (isFailedTestReplayEnabled()) {
       patchFailedTestReplayHookUp(Runner)
     }
-    // We flush when the worker ends with its test file (a mocha instance in a worker runs a single test file)
+    // Flush after the worker finishes its Mocha run, including grouped spec files.
     this.once('end', () => {
       workerFinishCh.publish()
+      reportWebdriverioSuiteResults(this)
     })
     this.on('test', getOnTestHandler(false))
 
@@ -104,6 +389,15 @@ addHook({
     // If the hook passes, 'hook end' will be emitted. Otherwise, 'fail' will be emitted
     this.on('hook end', getOnHookEndHandler(config))
 
+    if (isWebdriverioWorker) {
+      const failedHookFiles = new Set()
+      runnerToFailedHookFiles.set(this, failedHookFiles)
+      this.on('fail', runnable => {
+        if (runnable.type === 'hook' && runnable.file) {
+          failedHookFiles.add(runnable.file)
+        }
+      })
+    }
     this.on('fail', getOnFailHandler(false, config))
 
     this.on('pending', getOnPendingHandler())
diff --git a/packages/datadog-instrumentations/src/webdriverio.js b/packages/datadog-instrumentations/src/webdriverio.js
new file mode 100644
index 0000000000..c92a33a983
--- /dev/null
+++ b/packages/datadog-instrumentations/src/webdriverio.js
@@ -0,0 +1,681 @@
+'use strict'
+
+const { AsyncResource } = require('node:async_hooks')
+const { fileURLToPath } = require('node:url')
+
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
+const log = require('../../dd-trace/src/log')
+const {
+  MOCHA_WORKER_TRACE_PAYLOAD_CODE,
+  TEST_SUITE_EXECUTION_ID,
+} = require('../../dd-trace/src/plugins/util/test')
+const { addHook, channel, tracingChannel } = require('./helpers/instrument')
+const {
+  CONFIGURATION_REQUEST,
+  CONFIGURATION_RESPONSE,
+  SUITE_FINISH,
+  WEBDRIVERIO_WORKER_ENV,
+  WORKER_READY,
+} = require('./mocha/webdriverio-protocol')
+
+const testFinishCh = channel('ci:mocha:test:finish')
+const testSessionStartCh = channel('ci:mocha:session:start')
+const testSessionFinishCh = channel('ci:mocha:session:finish')
+const testSuiteStartCh = channel('ci:mocha:test-suite:start')
+const testSuiteFinishCh = channel('ci:mocha:test-suite:finish')
+const libraryConfigurationCh = channel('ci:mocha:library-configuration')
+const workerReportTraceCh = channel('ci:mocha:worker-report:trace')
+
+const localRunnerRunCh = tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_run')
+const localRunnerShutdownCh = tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_shutdown')
+
+const NODE_OPTIONS_SEPARATOR_RE = /\s/
+const TEST_FRAMEWORK = 'webdriverio'
+
+const loadCh = channel('dd-trace:instrumentation:load')
+if (loadCh.hasSubscribers) {
+  loadCh.publish({ name: '@wdio/local-runner' })
+}
+
+const coordinatorStates = new WeakMap()
+const localRunnerVersions = new WeakMap()
+
+addHook({
+  name: '@wdio/local-runner',
+  versions: ['>=9.0.0'],
+  file: 'build/index.js',
+  patchDefault: true,
+}, (LocalRunner, version) => {
+  localRunnerVersions.set(LocalRunner, version)
+  return LocalRunner
+})
+
+/**
+ * @typedef {object} WebdriverioRunnerConfig
+ * @property {string} framework
+ * @property {string|undefined} rootDir
+ * @property {NodeJS.ProcessEnv|undefined} runnerEnv
+ */
+
+/**
+ * @typedef {object} WebdriverioLocalRunner
+ * @property {WebdriverioRunnerConfig|undefined} config
+ * @property {WebdriverioRunnerConfig|undefined} _config
+ */
+
+/**
+ * @typedef {object} WorkerRecord
+ * @property {object} worker
+ * @property {string[]} specs
+ * @property {Map<string, WebdriverioSuiteContext>} suiteContexts
+ * @property {string} testSuiteExecutionId
+ * @property {boolean|undefined} hasTests
+ * @property {number|undefined} exitCode
+ * @property {number|undefined} retries
+ */
+
+/**
+ * @typedef {object} WebdriverioSuiteContext
+ * @property {object|undefined} currentStore
+ * @property {string|undefined} status
+ * @property {string} testSuiteAbsolutePath
+ * @property {string} testSuiteExecutionId
+ */
+
+/**
+ * @typedef {object} CoordinatorState
+ * @property {WebdriverioLocalRunner} localRunner
+ * @property {AsyncResource} asyncResource
+ * @property {object} configuration
+ * @property {boolean} initialized
+ * @property {boolean} initializing
+ * @property {Array<(configuration: object) => void>} initializationCallbacks
+ * @property {boolean} sessionStarted
+ * @property {boolean} finished
+ * @property {string|undefined} frameworkVersion
+ * @property {string} testFrameworkAdapter
+ * @property {number} activeWorkers
+ * @property {number} maxActiveWorkers
+ * @property {number} nextWorkerId
+ * @property {unknown} runError
+ * @property {Set<WorkerRecord>} workers
+ * @property {Map<object, string>} suiteStatuses
+ */
+
+/**
+ * Creates the basic-reporting configuration consumed by Mocha workers.
+ *
+ * Advanced Test Optimization features remain disabled until they have WebdriverIO-specific coverage.
+ *
+ * @returns {object}
+ */
+function createWorkerConfiguration () {
+  return {
+    earlyFlakeDetectionNumRetries: 0,
+    earlyFlakeDetectionSlowTestRetries: {},
+    flakyTestRetriesCount: 0,
+    isCodeCoverageEnabled: false,
+    isCoverageReportUploadEnabled: false,
+    isDiEnabled: false,
+    isEarlyFlakeDetectionEnabled: false,
+    isFlakyTestRetriesEnabled: false,
+    isImpactedTestsEnabled: false,
+    isItrEnabled: false,
+    isKnownTestsEnabled: false,
+    isSuitesSkippingEnabled: false,
+    isTestDynamicInstrumentationEnabled: false,
+    isTestManagementTestsEnabled: false,
+    knownTests: {},
+    modifiedFiles: [],
+    repositoryRoot: undefined,
+    testManagementAttemptToFixRetries: 0,
+    testManagementTests: {},
+  }
+}
+
+/**
+ * Gets the public runner configuration, or the private equivalent used by older releases.
+ *
+ * @param {WebdriverioLocalRunner} localRunner
+ * @returns {WebdriverioRunnerConfig|undefined}
+ */
+function getRunnerConfiguration (localRunner) {
+  return localRunner.config || localRunner._config
+}
+
+/**
+ * Gets or creates coordinator state for a WebdriverIO local runner.
+ *
+ * @param {WebdriverioLocalRunner} localRunner
+ * @returns {CoordinatorState}
+ */
+function getCoordinatorState (localRunner) {
+  let state = coordinatorStates.get(localRunner)
+  if (state) {
+    return state
+  }
+
+  state = {
+    localRunner,
+    asyncResource: new AsyncResource('dd-trace-webdriverio-coordinator'),
+    configuration: createWorkerConfiguration(),
+    initialized: false,
+    initializing: false,
+    initializationCallbacks: [],
+    sessionStarted: false,
+    finished: false,
+    frameworkVersion: localRunnerVersions.get(localRunner.constructor),
+    testFrameworkAdapter: getRunnerConfiguration(localRunner)?.framework,
+    activeWorkers: 0,
+    maxActiveWorkers: 0,
+    nextWorkerId: 0,
+    runError: undefined,
+    workers: new Set(),
+    suiteStatuses: new Map(),
+  }
+  coordinatorStates.set(localRunner, state)
+
+  return state
+}
+
+/**
+ * Normalizes a WebdriverIO spec identifier to a filesystem path.
+ *
+ * @param {string} file
+ * @returns {string}
+ */
+function normalizeFile (file) {
+  return file.startsWith('file://') ? fileURLToPath(file) : file
+}
+
+/**
+ * Checks whether worker NODE_OPTIONS contain the complete launcher options.
+ *
+ * @param {string|undefined} workerNodeOptions
+ * @param {string} launcherNodeOptions
+ * @returns {boolean}
+ */
+function includesNodeOptions (workerNodeOptions, launcherNodeOptions) {
+  if (!workerNodeOptions) {
+    return false
+  }
+
+  let index = workerNodeOptions.indexOf(launcherNodeOptions)
+  while (index !== -1) {
+    const endIndex = index + launcherNodeOptions.length
+    const startsAtBoundary = index === 0 || NODE_OPTIONS_SEPARATOR_RE.test(workerNodeOptions[index - 1])
+    const endsAtBoundary = endIndex === workerNodeOptions.length ||
+      NODE_OPTIONS_SEPARATOR_RE.test(workerNodeOptions[endIndex])
+
+    if (startsAtBoundary && endsAtBoundary) {
+      return true
+    }
+    index = workerNodeOptions.indexOf(launcherNodeOptions, index + 1)
+  }
+  return false
+}
+
+/**
+ * Starts the single Mocha session owned by the WebdriverIO launcher.
+ *
+ * @param {CoordinatorState} state
+ * @returns {void}
+ */
+function startSession (state) {
+  if (state.sessionStarted) {
+    return
+  }
+  const processArgv = process.argv.slice(2).join(' ')
+  const command = processArgv ? `wdio ${processArgv}` : 'wdio'
+  const rootDir = getRunnerConfiguration(state.localRunner)?.rootDir || process.cwd()
+
+  testSessionStartCh.publish({
+    command,
+    frameworkVersion: state.frameworkVersion,
+    rootDir,
+    testFramework: TEST_FRAMEWORK,
+    testFrameworkAdapter: state.testFrameworkAdapter,
+  })
+  state.sessionStarted = true
+}
+
+/**
+ * Completes coordinator initialization and releases waiting workers.
+ *
+ * @param {CoordinatorState} state
+ * @param {object|undefined} response
+ * @returns {void}
+ */
+function completeCoordinatorInitialization (state, response) {
+  if (state.initialized) {
+    return
+  }
+
+  state.configuration.repositoryRoot = response?.repositoryRoot
+  state.initialized = true
+  state.initializing = false
+  startSession(state)
+
+  const callbacks = state.initializationCallbacks
+  state.initializationCallbacks = []
+  for (const callback of callbacks) {
+    callback(state.configuration)
+  }
+}
+
+/**
+ * Requests settings once so the launcher owns initialization for every worker.
+ *
+ * Settings for advanced features are intentionally ignored while WebdriverIO support is basic-reporting only.
+ *
+ * @param {CoordinatorState} state
+ * @param {(configuration: object) => void} [onDone]
+ * @returns {void}
+ */
+function initializeCoordinator (state, onDone) {
+  if (state.initialized) {
+    onDone?.(state.configuration)
+    return
+  }
+  if (onDone) {
+    state.initializationCallbacks.push(onDone)
+  }
+  if (state.initializing) {
+    return
+  }
+
+  state.initializing = true
+  if (!libraryConfigurationCh.hasSubscribers) {
+    completeCoordinatorInitialization(state)
+    return
+  }
+
+  try {
+    libraryConfigurationCh.runStores({
+      basicReportingOnly: true,
+      frameworkVersion: state.frameworkVersion,
+      isParallel: state.maxActiveWorkers > 1,
+      onDone: response => state.asyncResource.runInAsyncScope(
+        completeCoordinatorInitialization,
+        undefined,
+        state,
+        response
+      ),
+    }, () => {})
+  } catch (error) {
+    log.error('WebdriverIO Test Optimization configuration error', error)
+    completeCoordinatorInitialization(state)
+  }
+}
+
+/**
+ * Starts basic-reporting suites for one worker.
+ *
+ * @param {WorkerRecord} workerRecord
+ * @param {string[]} files
+ * @returns {void}
+ */
+function startWorkerSuites (workerRecord, files) {
+  for (const rawFile of files) {
+    const file = normalizeFile(rawFile)
+    if (workerRecord.suiteContexts.has(file)) {
+      continue
+    }
+
+    const suiteContext = {
+      testSuiteAbsolutePath: file,
+      testSuiteExecutionId: workerRecord.testSuiteExecutionId,
+    }
+    testSuiteStartCh.runStores(suiteContext, () => {})
+    workerRecord.suiteContexts.set(file, suiteContext)
+  }
+}
+
+/**
+ * Finishes one suite if it is still active.
+ *
+ * @param {CoordinatorState} state
+ * @param {WorkerRecord} workerRecord
+ * @param {string} rawFile
+ * @param {string} status
+ * @returns {void}
+ */
+function finishWorkerSuite (state, workerRecord, rawFile, status) {
+  const file = normalizeFile(rawFile)
+  const suiteContext = workerRecord.suiteContexts.get(file)
+  if (!suiteContext || state.suiteStatuses.has(suiteContext)) {
+    return
+  }
+
+  state.suiteStatuses.set(suiteContext, status)
+  testSuiteFinishCh.publish({ status, ...suiteContext.currentStore })
+}
+
+/**
+ * Finishes every active suite belonging to a worker.
+ *
+ * @param {CoordinatorState} state
+ * @param {WorkerRecord} workerRecord
+ * @param {string} status
+ * @returns {void}
+ */
+function finishAllWorkerSuites (state, workerRecord, status) {
+  let hasFailedSuite = false
+  for (const suiteContext of workerRecord.suiteContexts.values()) {
+    if (suiteContext.status === 'fail') {
+      hasFailedSuite = true
+      break
+    }
+  }
+
+  for (const [file, suiteContext] of workerRecord.suiteContexts) {
+    let suiteStatus = suiteContext.status ?? status
+    if (status === 'fail' && !hasFailedSuite && suiteStatus === 'skip') {
+      suiteStatus = 'fail'
+    }
+    finishWorkerSuite(state, workerRecord, file, suiteStatus)
+  }
+}
+
+/**
+ * Sends a coordinator message to a WebdriverIO child process.
+ *
+ * @param {WorkerRecord} workerRecord
+ * @param {object} message
+ * @returns {void}
+ */
+function sendWorkerMessage (workerRecord, message) {
+  const childProcess = workerRecord.worker.childProcess
+  if (!childProcess?.connected) {
+    return
+  }
+
+  childProcess.send(message, (error) => {
+    if (error) {
+      log.error('WebdriverIO Test Optimization IPC error', error)
+    }
+  })
+}
+
+/**
+ * Handles a worker request for its Mocha execution configuration.
+ *
+ * @param {CoordinatorState} state
+ * @param {WorkerRecord} workerRecord
+ * @param {object} message
+ * @returns {void}
+ */
+function handleConfigurationRequest (state, workerRecord, message) {
+  const { files = [], requestId } = message.content || {}
+
+  initializeCoordinator(state, (configuration) => {
+    startWorkerSuites(workerRecord, files)
+    sendWorkerMessage(workerRecord, {
+      origin: 'datadog',
+      name: CONFIGURATION_RESPONSE,
+      content: {
+        configuration,
+        requestId,
+      },
+    })
+  })
+}
+
+/**
+ * Handles suite results reported by a Mocha worker.
+ *
+ * @param {WorkerRecord} workerRecord
+ * @param {object} message
+ * @returns {void}
+ */
+function handleSuiteResults (workerRecord, message) {
+  const { results = [] } = message.content || {}
+  for (const { file, status } of results) {
+    const suiteContext = workerRecord.suiteContexts.get(normalizeFile(file))
+    if (suiteContext) {
+      suiteContext.status = status
+    }
+  }
+}
+
+/**
+ * Handles all messages emitted by one WebdriverIO child process.
+ *
+ * @param {CoordinatorState} state
+ * @param {WorkerRecord} workerRecord
+ * @param {object|unknown[]} message
+ * @returns {void}
+ */
+function handleWorkerMessage (state, workerRecord, message) {
+  if (Array.isArray(message)) {
+    const [messageCode, payload] = message
+    if (messageCode === MOCHA_WORKER_TRACE_PAYLOAD_CODE) {
+      workerReportTraceCh.publish({
+        traces: payload,
+        [TEST_SUITE_EXECUTION_ID]: workerRecord.testSuiteExecutionId,
+      })
+    }
+    return
+  }
+
+  if (message.name === WORKER_READY) {
+    initializeCoordinator(state)
+    return
+  }
+  if (message.name === CONFIGURATION_REQUEST) {
+    handleConfigurationRequest(state, workerRecord, message)
+    return
+  }
+  if (message.name === SUITE_FINISH) {
+    handleSuiteResults(workerRecord, message)
+    return
+  }
+  if (message.name === 'testFrameworkInit') {
+    workerRecord.hasTests = message.content?.hasTests
+    if (!workerRecord.hasTests && state.frameworkVersion) {
+      initializeCoordinator(state, () => {
+        startWorkerSuites(workerRecord, workerRecord.specs)
+        finishAllWorkerSuites(state, workerRecord, 'skip')
+      })
+    }
+  }
+}
+
+/**
+ * Handles child-process exit and closes suites missing an explicit result.
+ *
+ * @param {CoordinatorState} state
+ * @param {WorkerRecord} workerRecord
+ * @param {object} exit
+ * @returns {void}
+ */
+function handleWorkerExit (state, workerRecord, exit) {
+  state.activeWorkers--
+  workerRecord.exitCode = exit.exitCode
+  workerRecord.retries = exit.retries
+  if (!state.sessionStarted) {
+    return
+  }
+
+  const status = workerRecord.hasTests === false ? 'skip' : exit.exitCode === 0 ? 'pass' : 'fail'
+  if (status === 'fail' && workerRecord.suiteContexts.size === 0) {
+    startWorkerSuites(workerRecord, workerRecord.specs)
+  }
+  finishAllWorkerSuites(state, workerRecord, status)
+}
+
+/**
+ * Registers a newly created WebdriverIO worker with the coordinator.
+ *
+ * @param {CoordinatorState} state
+ * @param {object} worker
+ * @param {string[]} specs
+ * @returns {void}
+ */
+function registerWorker (state, worker, specs) {
+  const normalizedSpecs = []
+  for (const spec of specs) {
+    normalizedSpecs.push(normalizeFile(spec))
+  }
+
+  const workerRecord = {
+    worker,
+    specs: normalizedSpecs,
+    suiteContexts: new Map(),
+    testSuiteExecutionId: String(++state.nextWorkerId),
+    hasTests: undefined,
+    exitCode: undefined,
+    retries: undefined,
+  }
+  state.activeWorkers++
+  if (state.activeWorkers > state.maxActiveWorkers) {
+    state.maxActiveWorkers = state.activeWorkers
+  }
+  state.workers.add(workerRecord)
+
+  worker.on('message', message => handleWorkerMessage(state, workerRecord, message))
+  worker.once('exit', exit => handleWorkerExit(state, workerRecord, exit))
+}
+
+/**
+ * Calculates the final status for the coordinated session.
+ *
+ * @param {CoordinatorState} state
+ * @returns {string}
+ */
+function getSessionStatus (state) {
+  let hasPassingSuite = false
+
+  for (const workerRecord of state.workers) {
+    if (workerRecord.exitCode !== undefined && workerRecord.exitCode !== 0) {
+      if (workerRecord.retries > 0) {
+        continue
+      }
+      return 'fail'
+    }
+    for (const suiteContext of workerRecord.suiteContexts.values()) {
+      const status = state.suiteStatuses.get(suiteContext)
+      if (status === 'fail') {
+        return 'fail'
+      }
+      if (status === 'pass') {
+        hasPassingSuite = true
+      }
+    }
+  }
+
+  return hasPassingSuite ? 'pass' : 'skip'
+}
+
+/**
+ * Finishes the single WebdriverIO-owned Mocha session.
+ *
+ * @param {CoordinatorState} state
+ * @param {unknown} error
+ * @param {() => void} onDone
+ * @returns {void}
+ */
+function finishCoordinator (state, error, onDone) {
+  if (state.finished) {
+    onDone()
+    return
+  }
+  if (!state.sessionStarted) {
+    if (!error && getSessionStatus(state) !== 'fail') {
+      onDone()
+      return
+    }
+    initializeCoordinator(state, () => finishCoordinator(state, error, onDone))
+    return
+  }
+  state.finished = true
+
+  for (const workerRecord of state.workers) {
+    const status = workerRecord.hasTests === false
+      ? 'skip'
+      : workerRecord.exitCode === 0 ? 'pass' : 'fail'
+    finishAllWorkerSuites(state, workerRecord, status)
+  }
+
+  if (!testSessionFinishCh.hasSubscribers) {
+    onDone()
+    return
+  }
+
+  testSessionFinishCh.publish({
+    status: error ? 'fail' : getSessionStatus(state),
+    error,
+    isParallel: state.maxActiveWorkers > 1,
+    onDone,
+  })
+}
+
+// dc-polyfill supports partial tracing-channel subscribers, unlike the Node.js type definition.
+// @ts-expect-error
+localRunnerRunCh.subscribe({
+  start (context) {
+    const runnerConfiguration = getRunnerConfiguration(context.self)
+    if (!testFinishCh.hasSubscribers || runnerConfiguration?.framework !== 'mocha') {
+      return
+    }
+
+    const state = getCoordinatorState(context.self)
+    const workerOptions = context.arguments?.[0]
+    let workerEnvironment = runnerConfiguration.runnerEnv || {}
+    const launcherNodeOptions = getEnvironmentVariable('NODE_OPTIONS')
+    const workerNodeOptions = workerEnvironment.NODE_OPTIONS
+
+    if (launcherNodeOptions && !includesNodeOptions(workerNodeOptions, launcherNodeOptions)) {
+      workerEnvironment = {
+        ...workerEnvironment,
+        NODE_OPTIONS: workerNodeOptions
+          ? `${launcherNodeOptions} ${workerNodeOptions}`
+          : launcherNodeOptions,
+      }
+    }
+
+    runnerConfiguration.runnerEnv = {
+      ...workerEnvironment,
+      MOCHA_WORKER_ID: 'webdriverio',
+      [WEBDRIVERIO_WORKER_ENV]: 'true',
+    }
+    context.ddCoordinatorState = state
+    context.ddWorkerSpecs = workerOptions?.specs || []
+  },
+  asyncEnd (context) {
+    const state = context.ddCoordinatorState
+    if (!state) {
+      return
+    }
+    if (context.error) {
+      state.runError ??= context.error
+      return
+    }
+    if (!context.result) {
+      return
+    }
+    registerWorker(state, context.result, context.ddWorkerSpecs)
+  },
+})
+
+// @ts-expect-error See the partial tracing-channel subscriber above.
+localRunnerShutdownCh.subscribe({
+  asyncEnd (context) {
+    const state = coordinatorStates.get(context.self)
+    if (!state) {
+      return
+    }
+
+    // Orchestrion uses the callback for the matching settlement path to delay LocalRunner.shutdown.
+    const waitForCoordinator = onDone => {
+      const error = context.error ?? state.runError
+      if (state.initializing) {
+        state.initializationCallbacks.push(() => finishCoordinator(state, error, onDone))
+      } else {
+        finishCoordinator(state, error, onDone)
+      }
+    }
+    context.resolveCallback = waitForCoordinator
+    context.rejectCallback = waitForCoordinator
+  },
+})
diff --git a/packages/datadog-instrumentations/test/fixtures/mocha-regular-worker.js b/packages/datadog-instrumentations/test/fixtures/mocha-regular-worker.js
new file mode 100644
index 0000000000..0a0e265cd9
--- /dev/null
+++ b/packages/datadog-instrumentations/test/fixtures/mocha-regular-worker.js
@@ -0,0 +1,46 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+const { EventEmitter } = require('node:events')
+
+const { channel } = require('../../src/helpers/instrument')
+const instrumentations = require('../../src/helpers/instrumentations')
+const { WEBDRIVERIO_WORKER_ENV } = require('../../src/mocha/webdriverio-protocol')
+
+delete process.env[WEBDRIVERIO_WORKER_ENV]
+
+const existingMochaHookCount = instrumentations.mocha?.length || 0
+require('../../src/mocha/worker')
+
+const runnerHook = instrumentations.mocha
+  .slice(existingMochaHookCount)
+  .find(({ file }) => file === 'lib/runner.js')
+
+assert.ok(runnerHook)
+
+const workerFinishCh = channel('ci:mocha:worker:finish')
+
+function onWorkerFinish () {}
+
+workerFinishCh.subscribe(onWorkerFinish)
+
+class FakeRunner extends EventEmitter {
+  constructor () {
+    super()
+    this.suite = {
+      eachTest () {},
+    }
+  }
+
+  runTests () {}
+
+  run () {}
+}
+
+runnerHook.hook(FakeRunner)
+const runner = new FakeRunner()
+runner.run()
+
+assert.strictEqual(runner.listenerCount('fail'), 1)
+
+workerFinishCh.unsubscribe(onWorkerFinish)
diff --git a/packages/datadog-instrumentations/test/fixtures/node_modules/@wdio/local-runner/package.json b/packages/datadog-instrumentations/test/fixtures/node_modules/@wdio/local-runner/package.json
new file mode 100644
index 0000000000..acb08d99a7
--- /dev/null
+++ b/packages/datadog-instrumentations/test/fixtures/node_modules/@wdio/local-runner/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "@wdio/local-runner",
+  "version": "9.30.0",
+  "type": "module"
+}
diff --git a/packages/datadog-instrumentations/test/fixtures/webdriverio-disconnected-worker.js b/packages/datadog-instrumentations/test/fixtures/webdriverio-disconnected-worker.js
new file mode 100644
index 0000000000..c363a83ce7
--- /dev/null
+++ b/packages/datadog-instrumentations/test/fixtures/webdriverio-disconnected-worker.js
@@ -0,0 +1,122 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+const { EventEmitter } = require('node:events')
+
+const { channel } = require('../../src/helpers/instrument')
+const instrumentations = require('../../src/helpers/instrumentations')
+const {
+  CONFIGURATION_REQUEST,
+  CONFIGURATION_RESPONSE,
+  WEBDRIVERIO_WORKER_ENV,
+} = require('../../src/mocha/webdriverio-protocol')
+
+process.env[WEBDRIVERIO_WORKER_ENV] = 'true'
+const existingMochaHookCount = instrumentations.mocha?.length || 0
+require('../../src/mocha/worker')
+
+const webdriverioMochaHooks = instrumentations.mocha.slice(existingMochaHookCount)
+const mochaHook = webdriverioMochaHooks.find(({ file }) => file === 'lib/mocha.js')
+const runnerHook = webdriverioMochaHooks.find(({ file }) => file === 'lib/runner.js')
+
+assert.ok(mochaHook)
+assert.ok(runnerHook)
+
+const workerFinishCh = channel('ci:mocha:worker:finish')
+
+function onWorkerFinish () {}
+
+workerFinishCh.subscribe(onWorkerFinish)
+
+/**
+ * Exercises worker-ready and suite-finish messages.
+ *
+ * @returns {void}
+ */
+function exerciseWorkerMessages () {
+  class FakeMocha {
+    constructor () {
+      this.files = []
+      this.options = {}
+      this.suite = {
+        run () {},
+      }
+    }
+
+    /**
+     * @returns {object}
+     */
+    run () {
+      return {}
+    }
+  }
+
+  class FakeRunner extends EventEmitter {
+    constructor () {
+      super()
+      this.failures = 0
+      this.suite = {
+        eachTest () {},
+      }
+    }
+
+    /**
+     * @returns {void}
+     */
+    runTests () {}
+
+    /**
+     * @returns {void}
+     */
+    run () {
+      this.emit('fail', { file: 'hook-fail.e2e.js', type: 'hook' })
+      this.emit('end')
+    }
+  }
+
+  mochaHook.hook(FakeMocha, '10.8.2')
+  runnerHook.hook(FakeRunner)
+  new FakeMocha().run()
+  new FakeRunner().run()
+}
+
+let sendCalls = 0
+process.connected = false
+process.send = () => {
+  sendCalls++
+  throw new Error('send called after disconnect')
+}
+
+exerciseWorkerMessages()
+assert.strictEqual(sendCalls, 0)
+
+process.connected = true
+process.send = (message, onDone) => {
+  sendCalls++
+  assert.ok(message)
+  assert.strictEqual(typeof onDone, 'function')
+  onDone(new Error('IPC channel closed during send'))
+}
+
+exerciseWorkerMessages()
+assert.strictEqual(sendCalls, 3)
+
+process.send = (message, onDone) => {
+  sendCalls++
+  assert.ok(message)
+  assert.strictEqual(typeof onDone, 'function')
+  onDone()
+  if (message.name === CONFIGURATION_REQUEST) {
+    process.emit('message', {
+      name: CONFIGURATION_RESPONSE,
+      content: {
+        requestId: message.content.requestId,
+      },
+    })
+  }
+}
+
+exerciseWorkerMessages()
+assert.strictEqual(sendCalls, 6)
+
+workerFinishCh.unsubscribe(onWorkerFinish)
diff --git a/packages/datadog-instrumentations/test/fixtures/webdriverio-local-runner.mjs b/packages/datadog-instrumentations/test/fixtures/webdriverio-local-runner.mjs
new file mode 100644
index 0000000000..b0259ffd30
--- /dev/null
+++ b/packages/datadog-instrumentations/test/fixtures/webdriverio-local-runner.mjs
@@ -0,0 +1,13 @@
+const LocalRunner = class {
+  async run (workerOptions) {
+    return workerOptions
+  }
+
+  async shutdown (error) {
+    if (error) {
+      throw error
+    }
+  }
+}
+
+export { LocalRunner }
diff --git a/packages/datadog-instrumentations/test/webdriverio.spec.js b/packages/datadog-instrumentations/test/webdriverio.spec.js
new file mode 100644
index 0000000000..d0f7e76229
--- /dev/null
+++ b/packages/datadog-instrumentations/test/webdriverio.spec.js
@@ -0,0 +1,750 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+const { execFile } = require('node:child_process')
+const { EventEmitter } = require('node:events')
+const fs = require('node:fs')
+const os = require('node:os')
+const path = require('node:path')
+const { pathToFileURL } = require('node:url')
+const { promisify } = require('node:util')
+
+const { channel, tracingChannel } = require('../src/helpers/instrument')
+const rewriter = require('../src/helpers/rewriter')
+const {
+  MOCHA_WORKER_TRACE_PAYLOAD_CODE,
+  TEST_SUITE_EXECUTION_ID,
+} = require('../../dd-trace/src/plugins/util/test')
+const {
+  CONFIGURATION_REQUEST,
+  CONFIGURATION_RESPONSE,
+  SUITE_FINISH,
+  WEBDRIVERIO_WORKER_ENV,
+  WORKER_READY,
+} = require('../src/mocha/webdriverio-protocol')
+
+const fixturePath = path.join(__dirname, 'fixtures', 'webdriverio-local-runner.mjs')
+const disconnectedWorkerFixturePath = path.join(__dirname, 'fixtures', 'webdriverio-disconnected-worker.js')
+const regularMochaWorkerFixturePath = path.join(__dirname, 'fixtures', 'mocha-regular-worker.js')
+const fixtureModulePath = path.join(
+  __dirname,
+  'fixtures',
+  'node_modules',
+  '@wdio',
+  'local-runner',
+  'build',
+  'index.js'
+)
+const execFileAsync = promisify(execFile)
+
+describe('webdriverio instrumentation', () => {
+  it('rewrites the ESM local runner and waits for coordinator shutdown', () => {
+    const source = fs.readFileSync(fixturePath, 'utf8')
+    const rewrittenSource = rewriter.rewrite(source, fixtureModulePath, 'module')
+
+    assert.notStrictEqual(rewrittenSource, source)
+    assert.match(rewrittenSource, /orchestrion:@wdio\/local-runner:LocalRunner_run/)
+    assert.match(rewrittenSource, /orchestrion:@wdio\/local-runner:LocalRunner_shutdown/)
+    assert.match(rewrittenSource, /__apm\$ctx\.resolveCallback/)
+    assert.match(rewrittenSource, /__apm\$ctx\.rejectCallback/)
+  })
+
+  it('waits for coordinator shutdown before preserving a LocalRunner.shutdown rejection', async () => {
+    const source = fs.readFileSync(fixturePath, 'utf8')
+    const rewrittenSource = rewriter.rewrite(source, fixtureModulePath, 'module')
+    const outputDirectory = fs.mkdtempSync(path.join(os.tmpdir(), 'dd-webdriverio-rewriter-'))
+    const outputPath = path.join(outputDirectory, 'index.mjs')
+    const shutdownCh = tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_shutdown')
+    const shutdownError = new Error('shutdown failed')
+    const steps = []
+    const subscriber = {
+      asyncEnd (context) {
+        steps.push('asyncEnd')
+        context.rejectCallback = onDone => {
+          setImmediate(() => {
+            steps.push('coordinator')
+            onDone()
+          })
+        }
+      },
+    }
+
+    fs.writeFileSync(outputPath, rewrittenSource)
+    shutdownCh.subscribe(subscriber)
+
+    try {
+      const { LocalRunner } = await import(pathToFileURL(outputPath))
+      const resultPromise = new LocalRunner().shutdown(shutdownError)
+
+      await Promise.resolve()
+
+      assert.deepStrictEqual(steps, ['asyncEnd'])
+      await assert.rejects(resultPromise, error => {
+        steps.push('rejected')
+        return error === shutdownError
+      })
+      assert.deepStrictEqual(steps, ['asyncEnd', 'coordinator', 'rejected'])
+    } finally {
+      shutdownCh.unsubscribe(subscriber)
+    }
+  })
+
+  it('propagates complete launcher NODE_OPTIONS to worker environments', () => {
+    const testFinishCh = channel('ci:mocha:test:finish')
+    const originalNodeOptions = process.env.NODE_OPTIONS
+    process.env.NODE_OPTIONS = '--require dd-trace/ci/init'
+
+    function onTestFinish () {}
+
+    testFinishCh.subscribe(onTestFinish)
+
+    try {
+      require('../src/webdriverio')
+
+      const cases = [
+        {
+          runnerEnv: undefined,
+          expectedNodeOptions: '--require dd-trace/ci/init',
+        },
+        {
+          runnerEnv: { NODE_OPTIONS: '--require dd-trace/ci/init-custom' },
+          expectedNodeOptions: '--require dd-trace/ci/init --require dd-trace/ci/init-custom',
+        },
+        {
+          runnerEnv: { NODE_OPTIONS: '--no-warnings --require dd-trace/ci/init' },
+          expectedNodeOptions: '--no-warnings --require dd-trace/ci/init',
+        },
+      ]
+
+      for (const { runnerEnv, expectedNodeOptions } of cases) {
+        const localRunner = {
+          config: {
+            framework: 'mocha',
+            runnerEnv,
+          },
+        }
+        const runContext = {
+          self: localRunner,
+          arguments: [{ specs: [] }],
+        }
+
+        tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_run').start.publish(runContext)
+
+        assert.deepStrictEqual(localRunner.config.runnerEnv, {
+          NODE_OPTIONS: expectedNodeOptions,
+          MOCHA_WORKER_ID: 'webdriverio',
+          [WEBDRIVERIO_WORKER_ENV]: 'true',
+        })
+      }
+    } finally {
+      testFinishCh.unsubscribe(onTestFinish)
+      if (originalNodeOptions === undefined) {
+        delete process.env.NODE_OPTIONS
+      } else {
+        process.env.NODE_OPTIONS = originalNodeOptions
+      }
+    }
+  })
+
+  it('does not send Mocha worker messages over disconnected IPC', async () => {
+    await execFileAsync(process.execPath, [disconnectedWorkerFixturePath])
+  })
+
+  it('does not track WebdriverIO hook failures in regular Mocha workers', async () => {
+    await execFileAsync(process.execPath, [regularMochaWorkerFixturePath])
+  })
+
+  it('coordinates two Mocha workers under one session', async () => {
+    const testFinishCh = channel('ci:mocha:test:finish')
+    const knownTestsCh = channel('ci:mocha:known-tests')
+    const libraryConfigurationCh = channel('ci:mocha:library-configuration')
+    const modifiedFilesCh = channel('ci:mocha:modified-files')
+    const skippableSuitesCh = channel('ci:mocha:test-suite:skippable')
+    const testSessionStartCh = channel('ci:mocha:session:start')
+    const testSessionFinishCh = channel('ci:mocha:session:finish')
+    const testSuiteStartCh = channel('ci:mocha:test-suite:start')
+    const testSuiteFinishCh = channel('ci:mocha:test-suite:finish')
+    const testManagementTestsCh = channel('ci:mocha:test-management-tests')
+    const workerReportTraceCh = channel('ci:mocha:worker-report:trace')
+
+    const sessionStarts = []
+    const sessionFinishes = []
+    const suiteStarts = []
+    const suiteFinishes = []
+    const workerTracePayloads = []
+    let advancedFeatureRequests = 0
+    let configurationRequests = 0
+    const originalNodeOptions = process.env.NODE_OPTIONS
+    process.env.NODE_OPTIONS = '--require dd-trace/ci/init'
+
+    function onTestFinish () {}
+    function onAdvancedFeatureRequest (request) {
+      advancedFeatureRequests++
+      request.onDone({})
+    }
+    function onLibraryConfiguration (request) {
+      configurationRequests++
+      request.onDone({
+        isTestDynamicInstrumentationEnabled: true,
+        libraryConfig: {
+          earlyFlakeDetectionNumRetries: 5,
+          earlyFlakeDetectionSlowTestRetries: { '5s': 5 },
+          flakyTestRetriesCount: 5,
+          isCodeCoverageEnabled: true,
+          isCoverageReportUploadEnabled: true,
+          isDiEnabled: true,
+          isEarlyFlakeDetectionEnabled: true,
+          isFlakyTestRetriesEnabled: true,
+          isImpactedTestsEnabled: true,
+          isItrEnabled: true,
+          isKnownTestsEnabled: true,
+          isSuitesSkippingEnabled: true,
+          isTestManagementEnabled: true,
+          testManagementAttemptToFixRetries: 5,
+        },
+        repositoryRoot: process.cwd(),
+      })
+    }
+    function onSessionStart (event) {
+      sessionStarts.push(event)
+    }
+    function onSessionFinish (event) {
+      sessionFinishes.push(event)
+      event.onDone()
+    }
+    function onSuiteStart (event) {
+      suiteStarts.push(event)
+    }
+    function onSuiteFinish (event) {
+      suiteFinishes.push(event)
+    }
+    function onWorkerTrace (event) {
+      workerTracePayloads.push(event)
+    }
+
+    testFinishCh.subscribe(onTestFinish)
+    knownTestsCh.subscribe(onAdvancedFeatureRequest)
+    libraryConfigurationCh.subscribe(onLibraryConfiguration)
+    modifiedFilesCh.subscribe(onAdvancedFeatureRequest)
+    skippableSuitesCh.subscribe(onAdvancedFeatureRequest)
+    testSessionStartCh.subscribe(onSessionStart)
+    testSessionFinishCh.subscribe(onSessionFinish)
+    testSuiteStartCh.subscribe(onSuiteStart)
+    testSuiteFinishCh.subscribe(onSuiteFinish)
+    testManagementTestsCh.subscribe(onAdvancedFeatureRequest)
+    workerReportTraceCh.subscribe(onWorkerTrace)
+
+    try {
+      require('../src/webdriverio')
+
+      const localRunner = {
+        _config: {
+          framework: 'mocha',
+          rootDir: process.cwd(),
+          runnerEnv: {
+            NODE_OPTIONS: '--no-warnings',
+            USER_ENV: 'preserved',
+          },
+        },
+      }
+      const firstFile = path.join(process.cwd(), 'first.spec.js')
+      const secondFile = path.join(process.cwd(), 'second.spec.js')
+      const firstWorker = createWorker()
+      const secondWorker = createWorker()
+
+      registerWorker(localRunner, firstWorker, firstFile)
+      registerWorker(localRunner, secondWorker, secondFile)
+
+      assert.deepStrictEqual(localRunner._config.runnerEnv, {
+        USER_ENV: 'preserved',
+        NODE_OPTIONS: '--require dd-trace/ci/init --no-warnings',
+        MOCHA_WORKER_ID: 'webdriverio',
+        [WEBDRIVERIO_WORKER_ENV]: 'true',
+      })
+
+      firstWorker.emit('message', {
+        name: WORKER_READY,
+        content: { frameworkVersion: '10.8.2' },
+      })
+      secondWorker.emit('message', {
+        name: WORKER_READY,
+        content: { frameworkVersion: '10.8.2' },
+      })
+      await new Promise(setImmediate)
+
+      requestConfiguration(firstWorker, firstFile, 'first-request')
+      requestConfiguration(secondWorker, secondFile, 'second-request')
+      await new Promise(setImmediate)
+
+      firstWorker.emit('message', [MOCHA_WORKER_TRACE_PAYLOAD_CODE, 'first-trace'])
+      secondWorker.emit('message', [MOCHA_WORKER_TRACE_PAYLOAD_CODE, 'second-trace'])
+
+      assert.strictEqual(firstWorker.sentMessages[0].name, CONFIGURATION_RESPONSE)
+      assert.strictEqual(firstWorker.sentMessages[0].content.requestId, 'first-request')
+      assert.strictEqual(secondWorker.sentMessages[0].name, CONFIGURATION_RESPONSE)
+      assert.strictEqual(secondWorker.sentMessages[0].content.requestId, 'second-request')
+      assert.deepStrictEqual(firstWorker.sentMessages[0].content.configuration, {
+        earlyFlakeDetectionNumRetries: 0,
+        earlyFlakeDetectionSlowTestRetries: {},
+        flakyTestRetriesCount: 0,
+        isCodeCoverageEnabled: false,
+        isCoverageReportUploadEnabled: false,
+        isDiEnabled: false,
+        isEarlyFlakeDetectionEnabled: false,
+        isFlakyTestRetriesEnabled: false,
+        isImpactedTestsEnabled: false,
+        isItrEnabled: false,
+        isKnownTestsEnabled: false,
+        isSuitesSkippingEnabled: false,
+        isTestDynamicInstrumentationEnabled: false,
+        isTestManagementTestsEnabled: false,
+        knownTests: {},
+        modifiedFiles: [],
+        repositoryRoot: process.cwd(),
+        testManagementAttemptToFixRetries: 0,
+        testManagementTests: {},
+      })
+
+      reportSuiteFinish(firstWorker, firstFile, 'fail')
+      reportSuiteFinish(secondWorker, secondFile)
+      firstWorker.emit('exit', { exitCode: 1, retries: 1 })
+      secondWorker.emit('exit', { exitCode: 0, retries: 0 })
+
+      await finishLocalRunner(localRunner)
+
+      assert.strictEqual(configurationRequests, 1)
+      assert.strictEqual(advancedFeatureRequests, 0)
+      assert.strictEqual(sessionStarts.length, 1)
+      assert.strictEqual(sessionStarts[0].testFramework, 'webdriverio')
+      assert.strictEqual(sessionStarts[0].testFrameworkAdapter, 'mocha')
+      assert.strictEqual(sessionFinishes.length, 1)
+      assert.strictEqual(sessionFinishes[0].status, 'pass')
+      assert.strictEqual(sessionFinishes[0].isParallel, true)
+      assert.strictEqual('isEarlyFlakeDetectionEnabled' in sessionFinishes[0], false)
+      assert.strictEqual('isSuitesSkipped' in sessionFinishes[0], false)
+      assert.strictEqual('isTestManagementEnabled' in sessionFinishes[0], false)
+      assert.deepStrictEqual(suiteStarts.map(({ testSuiteAbsolutePath }) => testSuiteAbsolutePath), [
+        firstFile,
+        secondFile,
+      ])
+      assert.strictEqual(new Set(suiteStarts.map(({ testSuiteExecutionId }) => testSuiteExecutionId)).size, 2)
+      assert.deepStrictEqual(workerTracePayloads, [
+        {
+          traces: 'first-trace',
+          [TEST_SUITE_EXECUTION_ID]: suiteStarts[0].testSuiteExecutionId,
+        },
+        {
+          traces: 'second-trace',
+          [TEST_SUITE_EXECUTION_ID]: suiteStarts[1].testSuiteExecutionId,
+        },
+      ])
+      assert.deepStrictEqual(suiteFinishes.map(({ status }) => status), ['fail', 'pass'])
+    } finally {
+      testFinishCh.unsubscribe(onTestFinish)
+      knownTestsCh.unsubscribe(onAdvancedFeatureRequest)
+      libraryConfigurationCh.unsubscribe(onLibraryConfiguration)
+      modifiedFilesCh.unsubscribe(onAdvancedFeatureRequest)
+      skippableSuitesCh.unsubscribe(onAdvancedFeatureRequest)
+      testSessionStartCh.unsubscribe(onSessionStart)
+      testSessionFinishCh.unsubscribe(onSessionFinish)
+      testSuiteStartCh.unsubscribe(onSuiteStart)
+      testSuiteFinishCh.unsubscribe(onSuiteFinish)
+      testManagementTestsCh.unsubscribe(onAdvancedFeatureRequest)
+      workerReportTraceCh.unsubscribe(onWorkerTrace)
+      if (originalNodeOptions === undefined) {
+        delete process.env.NODE_OPTIONS
+      } else {
+        process.env.NODE_OPTIONS = originalNodeOptions
+      }
+    }
+  })
+
+  it('fails a terminal worker exit without marking sequential workers as parallel', async () => {
+    const testFinishCh = channel('ci:mocha:test:finish')
+    const testSessionFinishCh = channel('ci:mocha:session:finish')
+    const sessionFinishes = []
+
+    function onTestFinish () {}
+    function onSessionFinish (event) {
+      sessionFinishes.push(event)
+      event.onDone()
+    }
+
+    testFinishCh.subscribe(onTestFinish)
+    testSessionFinishCh.subscribe(onSessionFinish)
+
+    try {
+      require('../src/webdriverio')
+
+      const localRunner = {
+        config: {
+          framework: 'mocha',
+          rootDir: process.cwd(),
+        },
+      }
+      const firstFile = path.join(process.cwd(), 'first.spec.js')
+      const secondFile = path.join(process.cwd(), 'second.spec.js')
+      const firstWorker = createWorker()
+      const secondWorker = createWorker()
+
+      registerWorker(localRunner, firstWorker, firstFile)
+      requestConfiguration(firstWorker, firstFile, 'first-request')
+      reportSuiteFinish(firstWorker, firstFile)
+      firstWorker.emit('exit', { exitCode: 0, retries: 0 })
+
+      registerWorker(localRunner, secondWorker, secondFile)
+      requestConfiguration(secondWorker, secondFile, 'second-request')
+      reportSuiteFinish(secondWorker, secondFile)
+      secondWorker.emit('exit', { exitCode: 1, retries: 0 })
+
+      await finishLocalRunner(localRunner)
+
+      assert.strictEqual(sessionFinishes.length, 1)
+      assert.strictEqual(sessionFinishes[0].status, 'fail')
+      assert.strictEqual(sessionFinishes[0].isParallel, false)
+    } finally {
+      testFinishCh.unsubscribe(onTestFinish)
+      testSessionFinishCh.unsubscribe(onSessionFinish)
+    }
+  })
+
+  it('reports a worker failure before Mocha loads', async () => {
+    const testFinishCh = channel('ci:mocha:test:finish')
+    const libraryConfigurationCh = channel('ci:mocha:library-configuration')
+    const testSessionStartCh = channel('ci:mocha:session:start')
+    const testSessionFinishCh = channel('ci:mocha:session:finish')
+    const sessionStarts = []
+    const sessionFinishes = []
+    let configurationRequests = 0
+
+    function onTestFinish () {}
+    function onLibraryConfiguration (request) {
+      configurationRequests++
+      setImmediate(() => request.onDone({ repositoryRoot: process.cwd() }))
+    }
+    function onSessionStart (event) {
+      sessionStarts.push(event)
+    }
+    function onSessionFinish (event) {
+      sessionFinishes.push(event)
+      event.onDone()
+    }
+
+    testFinishCh.subscribe(onTestFinish)
+    libraryConfigurationCh.subscribe(onLibraryConfiguration)
+    testSessionStartCh.subscribe(onSessionStart)
+    testSessionFinishCh.subscribe(onSessionFinish)
+
+    try {
+      require('../src/webdriverio')
+
+      const localRunner = {
+        config: {
+          framework: 'mocha',
+          rootDir: process.cwd(),
+        },
+      }
+      const worker = createWorker()
+
+      registerWorker(localRunner, worker, path.join(process.cwd(), 'first.spec.js'))
+      worker.emit('exit', { exitCode: 1, retries: 0 })
+
+      await finishLocalRunner(localRunner)
+
+      assert.strictEqual(configurationRequests, 1)
+      assert.strictEqual(sessionStarts.length, 1)
+      assert.strictEqual(sessionStarts[0].frameworkVersion, undefined)
+      assert.strictEqual(sessionFinishes.length, 1)
+      assert.strictEqual(sessionFinishes[0].status, 'fail')
+      assert.strictEqual(sessionFinishes[0].isParallel, false)
+    } finally {
+      testFinishCh.unsubscribe(onTestFinish)
+      libraryConfigurationCh.unsubscribe(onLibraryConfiguration)
+      testSessionStartCh.unsubscribe(onSessionStart)
+      testSessionFinishCh.unsubscribe(onSessionFinish)
+    }
+  })
+
+  it('reports a suite that fails after Mocha loads but before requesting configuration', async () => {
+    const testFinishCh = channel('ci:mocha:test:finish')
+    const testSessionFinishCh = channel('ci:mocha:session:finish')
+    const testSuiteStartCh = channel('ci:mocha:test-suite:start')
+    const testSuiteFinishCh = channel('ci:mocha:test-suite:finish')
+    const sessionFinishes = []
+    const suiteStarts = []
+    const suiteFinishes = []
+
+    function onTestFinish () {}
+    function onSessionFinish (event) {
+      sessionFinishes.push(event)
+      event.onDone()
+    }
+    function onSuiteStart (event) {
+      suiteStarts.push(event)
+    }
+    function onSuiteFinish (event) {
+      suiteFinishes.push(event)
+    }
+
+    testFinishCh.subscribe(onTestFinish)
+    testSessionFinishCh.subscribe(onSessionFinish)
+    testSuiteStartCh.subscribe(onSuiteStart)
+    testSuiteFinishCh.subscribe(onSuiteFinish)
+
+    try {
+      require('../src/webdriverio')
+
+      const localRunner = {
+        config: {
+          framework: 'mocha',
+          rootDir: process.cwd(),
+        },
+      }
+      const file = path.join(process.cwd(), 'load-fail.spec.js')
+      const worker = createWorker()
+
+      registerWorker(localRunner, worker, file)
+      worker.emit('message', {
+        name: WORKER_READY,
+        content: { frameworkVersion: '10.8.2' },
+      })
+      worker.emit('exit', { exitCode: 1, retries: 0 })
+
+      await finishLocalRunner(localRunner)
+
+      assert.strictEqual(sessionFinishes.length, 1)
+      assert.strictEqual(sessionFinishes[0].status, 'fail')
+      assert.deepStrictEqual(suiteStarts.map(event => event.testSuiteAbsolutePath), [file])
+      assert.deepStrictEqual(suiteFinishes.map(event => event.status), ['fail'])
+    } finally {
+      testFinishCh.unsubscribe(onTestFinish)
+      testSessionFinishCh.unsubscribe(onSessionFinish)
+      testSuiteStartCh.unsubscribe(onSuiteStart)
+      testSuiteFinishCh.unsubscribe(onSuiteFinish)
+    }
+  })
+
+  it('reports LocalRunner.run rejections before a worker exists', async () => {
+    const testFinishCh = channel('ci:mocha:test:finish')
+    const testSessionFinishCh = channel('ci:mocha:session:finish')
+    const sessionFinishes = []
+    const runError = new Error('worker spawn failed')
+
+    function onTestFinish () {}
+    function onSessionFinish (event) {
+      sessionFinishes.push(event)
+      event.onDone()
+    }
+
+    testFinishCh.subscribe(onTestFinish)
+    testSessionFinishCh.subscribe(onSessionFinish)
+
+    try {
+      require('../src/webdriverio')
+
+      const localRunner = {
+        config: {
+          framework: 'mocha',
+          rootDir: process.cwd(),
+        },
+      }
+      const runContext = {
+        self: localRunner,
+        arguments: [{ specs: [path.join(process.cwd(), 'first.spec.js')] }],
+      }
+      const runCh = tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_run')
+
+      runCh.start.publish(runContext)
+      runContext.error = runError
+      runCh.asyncEnd.publish(runContext)
+
+      await finishLocalRunner(localRunner)
+
+      assert.strictEqual(sessionFinishes.length, 1)
+      assert.strictEqual(sessionFinishes[0].status, 'fail')
+      assert.strictEqual(sessionFinishes[0].error, runError)
+      assert.strictEqual(sessionFinishes[0].isParallel, false)
+    } finally {
+      testFinishCh.unsubscribe(onTestFinish)
+      testSessionFinishCh.unsubscribe(onSessionFinish)
+    }
+  })
+
+  it('reports LocalRunner.shutdown rejections after coordinator completion', async () => {
+    const testFinishCh = channel('ci:mocha:test:finish')
+    const testSessionFinishCh = channel('ci:mocha:session:finish')
+    const sessionFinishes = []
+    const shutdownError = new Error('shutdown failed')
+
+    function onTestFinish () {}
+    function onSessionFinish (event) {
+      sessionFinishes.push(event)
+      event.onDone()
+    }
+
+    testFinishCh.subscribe(onTestFinish)
+    testSessionFinishCh.subscribe(onSessionFinish)
+
+    try {
+      require('../src/webdriverio')
+
+      const localRunner = {
+        config: {
+          framework: 'mocha',
+          rootDir: process.cwd(),
+        },
+      }
+      const runContext = {
+        self: localRunner,
+        arguments: [{ specs: [] }],
+      }
+
+      tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_run').start.publish(runContext)
+      await finishLocalRunner(localRunner, shutdownError)
+
+      assert.strictEqual(sessionFinishes.length, 1)
+      assert.strictEqual(sessionFinishes[0].status, 'fail')
+      assert.strictEqual(sessionFinishes[0].error, shutdownError)
+      assert.strictEqual(sessionFinishes[0].isParallel, false)
+    } finally {
+      testFinishCh.unsubscribe(onTestFinish)
+      testSessionFinishCh.unsubscribe(onSessionFinish)
+    }
+  })
+
+  it('waits for in-flight coordinator initialization during shutdown', async () => {
+    const testFinishCh = channel('ci:mocha:test:finish')
+    const libraryConfigurationCh = channel('ci:mocha:library-configuration')
+    const testSessionFinishCh = channel('ci:mocha:session:finish')
+    const sessionFinishes = []
+    let completeConfiguration
+
+    function onTestFinish () {}
+    function onLibraryConfiguration (request) {
+      completeConfiguration = request.onDone
+    }
+    function onSessionFinish (event) {
+      sessionFinishes.push(event)
+      event.onDone()
+    }
+
+    testFinishCh.subscribe(onTestFinish)
+    libraryConfigurationCh.subscribe(onLibraryConfiguration)
+    testSessionFinishCh.subscribe(onSessionFinish)
+
+    try {
+      require('../src/webdriverio')
+
+      const localRunner = {
+        config: {
+          framework: 'mocha',
+          rootDir: process.cwd(),
+        },
+      }
+      const worker = createWorker()
+
+      registerWorker(localRunner, worker, path.join(process.cwd(), 'first.spec.js'))
+      worker.emit('message', { name: WORKER_READY })
+
+      const shutdownPromise = finishLocalRunner(localRunner)
+
+      assert.strictEqual(sessionFinishes.length, 0)
+      completeConfiguration({ repositoryRoot: process.cwd() })
+      await shutdownPromise
+
+      assert.strictEqual(sessionFinishes.length, 1)
+      assert.strictEqual(sessionFinishes[0].status, 'skip')
+    } finally {
+      testFinishCh.unsubscribe(onTestFinish)
+      libraryConfigurationCh.unsubscribe(onLibraryConfiguration)
+      testSessionFinishCh.unsubscribe(onSessionFinish)
+    }
+  })
+})
+
+/**
+ * Creates a fake WebdriverIO worker instance.
+ *
+ * @returns {EventEmitter & {childProcess: object, sentMessages: object[]}}
+ */
+function createWorker () {
+  const worker = new EventEmitter()
+  worker.sentMessages = []
+  worker.childProcess = {
+    connected: true,
+    send (message, onDone) {
+      worker.sentMessages.push(message)
+      onDone?.()
+    },
+  }
+  return worker
+}
+
+/**
+ * Publishes the LocalRunner.run lifecycle for one worker.
+ *
+ * @param {object} localRunner
+ * @param {object} worker
+ * @param {string} file
+ * @returns {void}
+ */
+function registerWorker (localRunner, worker, file) {
+  const context = {
+    self: localRunner,
+    arguments: [{ specs: [file] }],
+  }
+  const runCh = tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_run')
+  runCh.start.publish(context)
+  context.result = worker
+  runCh.asyncEnd.publish(context)
+}
+
+/**
+ * Publishes LocalRunner.shutdown completion and waits for the coordinator callback.
+ *
+ * @param {object} localRunner
+ * @param {unknown} [error]
+ * @returns {Promise<void>}
+ */
+function finishLocalRunner (localRunner, error) {
+  const context = { self: localRunner, error }
+  tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_shutdown').asyncEnd.publish(context)
+  const callback = error ? context.rejectCallback : context.resolveCallback
+  return new Promise(callback)
+}
+
+/**
+ * Requests execution configuration from the coordinator.
+ *
+ * @param {EventEmitter} worker
+ * @param {string} file
+ * @param {string} requestId
+ * @returns {void}
+ */
+function requestConfiguration (worker, file, requestId) {
+  worker.emit('message', {
+    name: CONFIGURATION_REQUEST,
+    content: {
+      files: [file],
+      frameworkVersion: '10.8.2',
+      requestId,
+    },
+  })
+}
+
+/**
+ * Reports a suite result to the coordinator.
+ *
+ * @param {EventEmitter} worker
+ * @param {string} file
+ * @param {string} [status]
+ * @returns {void}
+ */
+function reportSuiteFinish (worker, file, status = 'pass') {
+  worker.emit('message', {
+    name: SUITE_FINISH,
+    content: {
+      results: [{ file, status }],
+    },
+  })
+}
diff --git a/packages/datadog-plugin-mocha/src/index.js b/packages/datadog-plugin-mocha/src/index.js
index 3275901d0f..b320c82fb9 100644
--- a/packages/datadog-plugin-mocha/src/index.js
+++ b/packages/datadog-plugin-mocha/src/index.js
@@ -34,6 +34,8 @@ const {
   TEST_IS_MODIFIED,
   TEST_FINAL_STATUS,
   TEST_HAS_DYNAMIC_NAME,
+  TEST_FRAMEWORK_ADAPTER,
+  getTestSuiteExecutionKey,
   isModifiedTest,
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
@@ -88,23 +90,33 @@ class MochaPlugin extends CiPlugin {
     })
 
     this.addBind('ci:mocha:test-suite:start', (ctx) => {
-      const { testSuiteAbsolutePath, isUnskippable, isForcedToRun, itrCorrelationId } = ctx
+      const {
+        testSuiteAbsolutePath,
+        testSuiteExecutionId,
+        isUnskippable,
+        isForcedToRun,
+        itrCorrelationId,
+      } = ctx
 
       // If the test module span is undefined, the plugin has not been initialized correctly and we bail out
       if (!this.testModuleSpan) {
         return
       }
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.sourceRoot)
+      const testFramework = this.testFramework || this.constructor.id
       const testSuiteMetadata = {
         ...getTestSuiteCommonTags(
           this.command,
           this.frameworkVersion,
           testSuite,
-          'mocha'
+          testFramework
         ),
         ...this.getSessionRequestErrorTags(),
         ...this.getSessionItrSkippingEnabledTags(),
       }
+      if (this.testFrameworkAdapter) {
+        testSuiteMetadata[TEST_FRAMEWORK_ADAPTER] = this.testFrameworkAdapter
+      }
       if (isUnskippable) {
         testSuiteMetadata[TEST_ITR_UNSKIPPABLE] = 'true'
         this.telemetry.count(TELEMETRY_ITR_UNSKIPPABLE, { testLevel: 'suite' })
@@ -144,8 +156,9 @@ class MochaPlugin extends CiPlugin {
       const store = storage('legacy').getStore()
       ctx.parentStore = store
       ctx.currentStore = { ...store, testSuiteSpan }
-      this._testSuiteSpansByTestSuite.set(testSuite, testSuiteSpan)
-      this._exportPendingWorkerTracesForTestSuite(testSuite)
+      const testSuiteKey = getTestSuiteExecutionKey(testSuite, testSuiteExecutionId)
+      this._testSuiteSpansByTestSuite.set(testSuiteKey, testSuiteSpan)
+      this._exportPendingWorkerTracesForTestSuite(testSuiteKey)
     })
 
     this.addSub('ci:mocha:test-suite:finish', ({ testSuiteSpan, status }) => {
diff --git a/packages/dd-trace/src/plugins/ci_plugin.js b/packages/dd-trace/src/plugins/ci_plugin.js
index 1fec03d941..44084e4a2b 100644
--- a/packages/dd-trace/src/plugins/ci_plugin.js
+++ b/packages/dd-trace/src/plugins/ci_plugin.js
@@ -48,12 +48,16 @@ const {
   CI_APP_ORIGIN,
   getTestSessionCommonTags,
   getTestModuleCommonTags,
+  TEST_FRAMEWORK,
+  TEST_FRAMEWORK_ADAPTER,
+  TEST_FRAMEWORK_VERSION,
   TEST_SUITE_ID,
   TEST_MODULE_ID,
   TEST_SESSION_ID,
   TEST_COMMAND,
   TEST_LEVELS_METADATA,
   TEST_MODULE,
+  TEST_TYPE,
   TEST_SESSION_NAME,
   getTestSuiteCommonTags,
   TEST_STATUS,
@@ -62,6 +66,8 @@ const {
   ITR_CORRELATION_ID,
   TEST_SOURCE_FILE,
   TEST_SUITE,
+  TEST_SUITE_EXECUTION_ID,
+  getTestSuiteExecutionKey,
   getFileAndLineNumberFromError,
   DI_ERROR_DEBUG_INFO_CAPTURED,
   DI_DEBUG_ERROR_PREFIX,
@@ -101,6 +107,7 @@ const FRAMEWORK_TO_TRIMMED_COMMAND = {
   cucumber: 'cucumber-js',
   playwright: 'playwright test',
   jest: 'jest',
+  webdriverio: 'wdio',
 }
 
 const WORKER_EXPORTER_TO_TEST_FRAMEWORK = {
@@ -131,7 +138,8 @@ function withTimeout (promise, timeoutMs) {
 }
 
 function setItrSkippingEnabledTagFromLibraryConfig (plugin, frameworkVersion) {
-  const libraryCapabilitiesTags = getDefaultLibraryCapabilitiesTags(plugin.constructor.id, frameworkVersion)
+  const testFramework = plugin.testFramework || plugin.constructor.id
+  const libraryCapabilitiesTags = getDefaultLibraryCapabilitiesTags(testFramework, frameworkVersion)
 
   if (!libraryCapabilitiesTags[DD_CAPABILITIES_TEST_IMPACT_ANALYSIS] ||
     !plugin.libraryConfig ||
@@ -170,16 +178,18 @@ module.exports = class CiPlugin extends Plugin {
     this.rootDir = process.cwd() // fallback in case :session:start events are not emitted
     this._testSuiteSpansByTestSuite = new Map()
     this._pendingWorkerTracesByTestSuite = new Map()
+    this._workerTraceExecutionIds = new WeakMap()
     this._pendingRequestErrorTags = []
 
     this.addSub(`ci:${this.constructor.id}:library-configuration`, (ctx) => {
-      const { onDone, frameworkVersion } = ctx
+      const { basicReportingOnly, onDone, frameworkVersion } = ctx
       ctx.currentStore = legacyStorage.getStore()
 
       if (!this.tracer._exporter || !this.tracer._exporter.getLibraryConfiguration) {
         return onDone({ err: new Error('Test optimization was not initialized correctly') })
       }
       this.tracer._exporter.getLibraryConfiguration(this.testConfiguration, (err, libraryConfig) => {
+        const effectiveLibraryConfig = err ? undefined : basicReportingOnly ? {} : libraryConfig
         if (err) {
           this.libraryConfig = undefined
           this.itrCorrelationId = undefined
@@ -187,7 +197,7 @@ module.exports = class CiPlugin extends Plugin {
           log.error('Library configuration could not be fetched. %s', err.message)
           this._addRequestErrorTag(DD_CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS, err)
         } else {
-          this.libraryConfig = libraryConfig
+          this.libraryConfig = effectiveLibraryConfig
           setItrSkippingEnabledTagFromLibraryConfig(this, frameworkVersion)
         }
 
@@ -201,7 +211,7 @@ module.exports = class CiPlugin extends Plugin {
         onDone({
           err,
           isTestDynamicInstrumentationEnabled: this.config.isTestDynamicInstrumentationEnabled,
-          libraryConfig,
+          libraryConfig: effectiveLibraryConfig,
           repositoryRoot: this.repositoryRoot,
           requestErrorTags: this._getCurrentRequestErrorTags(),
         })
@@ -234,19 +244,28 @@ module.exports = class CiPlugin extends Plugin {
       )
     })
 
-    this.addSub(`ci:${this.constructor.id}:session:start`, ({ command, frameworkVersion, rootDir }) => {
+    this.addSub(`ci:${this.constructor.id}:session:start`, ({
+      command,
+      frameworkVersion,
+      rootDir,
+      testFramework,
+      testFrameworkAdapter,
+    }) => {
+      const effectiveTestFramework = testFramework || this.constructor.id
       const childOf = getTestParentSpan(this.tracer)
-      const testSessionSpanMetadata = getTestSessionCommonTags(command, frameworkVersion, this.constructor.id)
-      const testModuleSpanMetadata = getTestModuleCommonTags(command, frameworkVersion, this.constructor.id)
+      const testSessionSpanMetadata = getTestSessionCommonTags(command, frameworkVersion, effectiveTestFramework)
+      const testModuleSpanMetadata = getTestModuleCommonTags(command, frameworkVersion, effectiveTestFramework)
 
       this.command = command
       this.frameworkVersion = frameworkVersion
+      this.testFramework = effectiveTestFramework
+      this.testFrameworkAdapter = testFrameworkAdapter
       // only for playwright
       this.rootDir = rootDir
 
       const testSessionName = getTestSessionName(
         this.config,
-        DD_MAJOR < 6 ? this.command : FRAMEWORK_TO_TRIMMED_COMMAND[this.constructor.id],
+        DD_MAJOR < 6 ? this.command : FRAMEWORK_TO_TRIMMED_COMMAND[effectiveTestFramework],
         this.testEnvironmentMetadata
       )
 
@@ -296,7 +315,7 @@ module.exports = class CiPlugin extends Plugin {
       const testCommand = this.command
       for (const testSuite of skippedSuites) {
         const testSuiteMetadata = {
-          ...getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite, this.constructor.id),
+          ...getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite, this.testFramework),
           ...getSessionRequestErrorTags(this.testSessionSpan),
           ...getSessionItrSkippingEnabledTags(this.testSessionSpan),
         }
@@ -392,10 +411,16 @@ module.exports = class CiPlugin extends Plugin {
       return onDone({ err: new Error('No modified tests could have been retrieved') })
     })
 
-    this.addSub(`ci:${this.constructor.id}:worker-report:trace`, traces => {
+    this.addSub(`ci:${this.constructor.id}:worker-report:trace`, payload => {
+      const { traces, [TEST_SUITE_EXECUTION_ID]: testSuiteExecutionId } = typeof payload === 'string'
+        ? { traces: payload }
+        : payload
       const formattedTraces = JSON.parse(traces)
 
       for (const trace of formattedTraces) {
+        if (testSuiteExecutionId) {
+          this._workerTraceExecutionIds.set(trace, testSuiteExecutionId)
+        }
         this._prepareWorkerTrace(trace)
         this._exportWorkerTraceOrBuffer(trace)
       }
@@ -409,7 +434,7 @@ module.exports = class CiPlugin extends Plugin {
   }
 
   get telemetry () {
-    const testFramework = this.constructor.id
+    const testFramework = this.testFramework || this.constructor.id
     const exporter = this.tracer?._exporter
     // TODO: only jest worker supported yet
     const isSupportedWorker = exporter && typeof exporter.exportTelemetry === 'function'
@@ -469,9 +494,14 @@ module.exports = class CiPlugin extends Plugin {
   /**
    * Returns library capability metadata tags for this test framework.
    * @param {string} frameworkVersion - The test framework version.
+   * @param {object} [ctx] - Diagnostic channel context.
+   * @param {boolean} [ctx.basicReportingOnly] - Whether advanced capabilities must be omitted.
    * @returns {Record<string, string|undefined>}
    */
-  getLibraryCapabilitiesTags (frameworkVersion) {
+  getLibraryCapabilitiesTags (frameworkVersion, ctx = {}) {
+    if (ctx.basicReportingOnly) {
+      return {}
+    }
     return getDefaultLibraryCapabilitiesTags(this.constructor.id, frameworkVersion)
   }
 
@@ -592,17 +622,34 @@ module.exports = class CiPlugin extends Plugin {
       // test session, test module and test suite ids. We have to update them in the main process.
       if (span.name !== 'cucumber.test' && span.name !== 'mocha.test') continue
 
+      const testFramework = this.testFramework || this.constructor.id
+      span.meta[TEST_FRAMEWORK] = testFramework
+      span.meta[TEST_MODULE] = testFramework
+      const testType = this.testSessionSpan?.context().getTag(TEST_TYPE)
+      if (testType) {
+        span.meta[TEST_TYPE] = testType
+      }
+      if (this.frameworkVersion) {
+        span.meta[TEST_FRAMEWORK_VERSION] = this.frameworkVersion
+      }
+      if (this.testFrameworkAdapter) {
+        span.meta[TEST_FRAMEWORK_ADAPTER] = this.testFrameworkAdapter
+      }
+
       const testSuite = span.meta[TEST_SUITE]
-      const testSuiteSpan = this._testSuiteSpansByTestSuite.get(testSuite)
-      if (!testSuiteSpan) return testSuite
+      const testSuiteExecutionId = this._workerTraceExecutionIds.get(trace)
+      const testSuiteKey = getTestSuiteExecutionKey(testSuite, testSuiteExecutionId)
+      const testSuiteSpan = this._testSuiteSpansByTestSuite.get(testSuiteKey)
+      if (!testSuiteSpan) return testSuiteKey
 
-      const testSuiteTags = getTestSuiteLevelVisibilityTags(testSuiteSpan, this.constructor.id)
+      const testSuiteTags = getTestSuiteLevelVisibilityTags(testSuiteSpan, testFramework)
       span.meta = {
         ...span.meta,
         ...testSuiteTags,
         ...getSessionRequestErrorTags(this.testSessionSpan),
       }
     }
+    this._workerTraceExecutionIds.delete(trace)
   }
 
   /**
@@ -769,11 +816,14 @@ module.exports = class CiPlugin extends Plugin {
         testName,
         testSuite,
         this.frameworkVersion,
-        this.constructor.id
+        this.testFramework || this.constructor.id
       ),
       [COMPONENT]: this.constructor.id,
       ...extraTags,
     }
+    if (this.testFrameworkAdapter) {
+      testTags[TEST_FRAMEWORK_ADAPTER] = this.testFrameworkAdapter
+    }
 
     const codeOwners = this.getCodeOwners(testTags)
     if (codeOwners) {
@@ -790,7 +840,7 @@ module.exports = class CiPlugin extends Plugin {
         [TEST_SUITE_ID]: testSuiteSpan.context().toSpanId(),
         [TEST_SESSION_ID]: testSuiteSpan.context().toTraceId(),
         [TEST_COMMAND]: testSuiteSpan.context().getTag(TEST_COMMAND),
-        [TEST_MODULE]: this.constructor.id,
+        [TEST_MODULE]: this.testFramework || this.constructor.id,
         ...getSessionRequestErrorTags(this.testSessionSpan),
       }
       if (testSuiteSpan.context()._parentId) {
diff --git a/packages/dd-trace/src/plugins/index.js b/packages/dd-trace/src/plugins/index.js
index 591df8171d..7d6fa6c12e 100644
--- a/packages/dd-trace/src/plugins/index.js
+++ b/packages/dd-trace/src/plugins/index.js
@@ -36,6 +36,7 @@ const plugins = {
   get '@smithy/core' () { return require('../../../datadog-plugin-aws-sdk/src') },
   get '@smithy/smithy-client' () { return require('../../../datadog-plugin-aws-sdk/src') },
   get '@vitest/runner' () { return require('../../../datadog-plugin-vitest/src') },
+  get '@wdio/local-runner' () { return require('../../../datadog-plugin-mocha/src') },
   get '@langchain/langgraph' () { return require('../../../datadog-plugin-langgraph/src') },
   get '@openai/agents' () { return require('../../../datadog-plugin-openai-agents/src') },
   get aerospike () { return require('../../../datadog-plugin-aerospike/src') },
diff --git a/packages/dd-trace/src/plugins/util/test.js b/packages/dd-trace/src/plugins/util/test.js
index 21d6365e08..5b18dfcdeb 100644
--- a/packages/dd-trace/src/plugins/util/test.js
+++ b/packages/dd-trace/src/plugins/util/test.js
@@ -89,10 +89,12 @@ const {
 const TEST_SESSION_NAME = 'test_session.name'
 
 const TEST_FRAMEWORK = 'test.framework'
+const TEST_FRAMEWORK_ADAPTER = 'test.framework_adapter'
 const TEST_FRAMEWORK_VERSION = 'test.framework_version'
 const TEST_TYPE = 'test.type'
 const TEST_NAME = 'test.name'
 const TEST_SUITE = 'test.suite'
+const TEST_SUITE_EXECUTION_ID = '_dd.test_suite_execution_id'
 const TEST_STATUS = 'test.status'
 const TEST_FINAL_STATUS = 'test.final_status'
 const TEST_PARAMETERS = 'test.parameters'
@@ -422,10 +424,22 @@ function addTestOptimizationRequest (requestPromises, responseNames, responseNam
   }
 }
 
+/**
+ * Builds the internal key used to correlate a worker test with one suite execution.
+ *
+ * @param {string} testSuite
+ * @param {string|undefined} testSuiteExecutionId
+ * @returns {string}
+ */
+function getTestSuiteExecutionKey (testSuite, testSuiteExecutionId) {
+  return testSuiteExecutionId ? `${testSuite}\0${testSuiteExecutionId}` : testSuite
+}
+
 module.exports = {
   TEST_CODE_OWNERS,
   TEST_SESSION_NAME,
   TEST_FRAMEWORK,
+  TEST_FRAMEWORK_ADAPTER,
   TEST_FRAMEWORK_VERSION,
   JEST_TEST_RUNNER,
   JEST_DISPLAY_NAME,
@@ -435,6 +449,8 @@ module.exports = {
   TEST_TYPE,
   TEST_NAME,
   TEST_SUITE,
+  TEST_SUITE_EXECUTION_ID,
+  getTestSuiteExecutionKey,
   TEST_STATUS,
   TEST_FINAL_STATUS,
   TEST_PARAMETERS,
@@ -800,7 +816,7 @@ function getTestLevelsMetadataTags (testEnvironmentMetadata) {
 }
 
 function getTestTypeFromFramework (testFramework) {
-  if (testFramework === 'playwright' || testFramework === 'cypress') {
+  if (testFramework === 'playwright' || testFramework === 'cypress' || testFramework === 'webdriverio') {
     return 'browser'
   }
   return 'test'
@@ -871,6 +887,7 @@ function getTestCommonTags (name, suite, version, testFramework) {
   return {
     [SPAN_TYPE]: 'test',
     [TEST_TYPE]: getTestTypeFromFramework(testFramework),
+    [TEST_FRAMEWORK]: testFramework,
     [SAMPLING_RULE_DECISION]: 1,
     [SAMPLING_PRIORITY]: AUTO_KEEP,
     [TEST_NAME]: name,
@@ -1098,6 +1115,7 @@ function getCodeOwnersForFilename (filename, entries) {
 
 function getTestLevelCommonTags (command, testFrameworkVersion, testFramework) {
   return {
+    [TEST_FRAMEWORK]: testFramework,
     [TEST_FRAMEWORK_VERSION]: testFrameworkVersion,
     [LIBRARY_VERSION]: ddTraceVersion,
     [TEST_TYPE]: getTestTypeFromFramework(testFramework),
diff --git a/packages/dd-trace/test/ci-visibility/ci-plugin.spec.js b/packages/dd-trace/test/ci-visibility/ci-plugin.spec.js
index 9aa8d186ca..299dc32752 100644
--- a/packages/dd-trace/test/ci-visibility/ci-plugin.spec.js
+++ b/packages/dd-trace/test/ci-visibility/ci-plugin.spec.js
@@ -157,6 +157,56 @@ describe('CiPlugin', () => {
     }
   })
 
+  it('disables advanced features for basic-reporting library configuration requests', () => {
+    const libraryConfig = {
+      isEarlyFlakeDetectionEnabled: true,
+      isFlakyTestRetriesEnabled: true,
+      isSuitesSkippingEnabled: true,
+      isTestManagementEnabled: true,
+    }
+    const getLibraryConfiguration = sinon.stub().callsArgWith(1, null, libraryConfig)
+    const addMetadataTags = sinon.stub()
+    const onDone = sinon.stub()
+    const plugin = createPlugin('jest_worker')
+    plugin.tracer._exporter = {
+      addMetadataTags,
+      getLibraryConfiguration,
+    }
+    plugin.configure({
+      enabled: true,
+      experimental: {
+        exporter: 'jest_worker',
+      },
+    })
+
+    dc.channel('ci:vitest:library-configuration').publish({
+      basicReportingOnly: true,
+      frameworkVersion: '1.0.0',
+      onDone,
+    })
+    plugin.configure(false)
+
+    assert.deepStrictEqual(plugin.libraryConfig, {})
+    assert.deepStrictEqual(plugin.getLibraryCapabilitiesTags('1.0.0', { basicReportingOnly: true }), {})
+    assert.deepStrictEqual(onDone.firstCall.args[0].libraryConfig, {})
+    assert.deepStrictEqual(addMetadataTags.firstCall.args[0], { test: {} })
+    sinon.assert.calledOnce(getLibraryConfiguration)
+    sinon.assert.calledOnce(onDone)
+  })
+
+  it('tags telemetry with the effective test framework', () => {
+    const exportTelemetry = sinon.stub()
+    const plugin = createPlugin('mocha')
+    plugin.tracer._exporter.exportTelemetry = exportTelemetry
+
+    plugin.telemetry.ciVisEvent('event_created', 'session')
+    plugin.testFramework = 'webdriverio'
+    plugin.telemetry.ciVisEvent('event_finished', 'session')
+
+    assert.strictEqual(exportTelemetry.firstCall.args[0].testFramework, 'vitest')
+    assert.strictEqual(exportTelemetry.secondCall.args[0].testFramework, 'webdriverio')
+  })
+
   it('starts the DI breakpoint-hit timeout when waiting, not when preparing', async () => {
     const plugin = createPlugin('jest_worker')
     const waitForDiOperation = sinon.stub(plugin, 'waitForDiOperation').resolves()
diff --git a/packages/dd-trace/test/plugins/versions/package.json b/packages/dd-trace/test/plugins/versions/package.json
index 7ce2518124..5ff7b24e30 100644
--- a/packages/dd-trace/test/plugins/versions/package.json
+++ b/packages/dd-trace/test/plugins/versions/package.json
@@ -92,6 +92,9 @@
     "@vitest/coverage-v8": "4.1.9",
     "@vitest/runner": "4.1.9",
     "@vscode/sqlite3": "5.1.12-vscode",
+    "@wdio/cli": "9.30.0",
+    "@wdio/local-runner": "9.30.0",
+    "@wdio/mocha-framework": "9.30.0",
     "aerospike": "6.7.1",
     "ai": "7.0.37",
     "amqp10": "3.6.0",

From c92492916b5acb787d1b2775142d681ac99cb6be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2026 08:31:38 +0000
Subject: [PATCH 08/43] chore(deps): bump the ai-and-llm group across 1
 directory with 6 updates (#9551)

Bumps the ai-and-llm group with 6 updates in the /packages/dd-trace/test/plugins/versions directory:

| Package | From | To |
| --- | --- | --- |
| [@ai-sdk/amazon-bedrock](https://github.com/vercel/ai/tree/HEAD/packages/amazon-bedrock) | `5.0.30` | `5.0.31` |
| [@ai-sdk/anthropic](https://github.com/vercel/ai/tree/HEAD/packages/anthropic) | `4.0.19` | `4.0.20` |
| [@ai-sdk/google](https://github.com/vercel/ai/tree/HEAD/packages/google) | `4.0.23` | `4.0.24` |
| [@anthropic-ai/sdk](https://github.com/anthropics/anthropic-sdk-typescript) | `0.114.0` | `0.115.0` |
| [@langchain/anthropic](https://github.com/langchain-ai/langchainjs) | `1.5.1` | `1.5.2` |
| [langchain](https://github.com/langchain-ai/langchainjs) | `1.5.3` | `1.5.4` |



Updates `@ai-sdk/amazon-bedrock` from 5.0.30 to 5.0.31
- [Release notes](https://github.com/vercel/ai/releases)
- [Changelog](https://github.com/vercel/ai/blob/main/packages/amazon-bedrock/CHANGELOG.md)
- [Commits](https://github.com/vercel/ai/commits/@ai-sdk/amazon-bedrock@5.0.31/packages/amazon-bedrock)

Updates `@ai-sdk/anthropic` from 4.0.19 to 4.0.20
- [Release notes](https://github.com/vercel/ai/releases)
- [Changelog](https://github.com/vercel/ai/blob/main/packages/anthropic/CHANGELOG.md)
- [Commits](https://github.com/vercel/ai/commits/@ai-sdk/anthropic@4.0.20/packages/anthropic)

Updates `@ai-sdk/google` from 4.0.23 to 4.0.24
- [Release notes](https://github.com/vercel/ai/releases)
- [Changelog](https://github.com/vercel/ai/blob/main/packages/google/CHANGELOG.md)
- [Commits](https://github.com/vercel/ai/commits/@ai-sdk/google@4.0.24/packages/google)

Updates `@anthropic-ai/sdk` from 0.114.0 to 0.115.0
- [Release notes](https://github.com/anthropics/anthropic-sdk-typescript/releases)
- [Changelog](https://github.com/anthropics/anthropic-sdk-typescript/blob/main/CHANGELOG.md)
- [Commits](https://github.com/anthropics/anthropic-sdk-typescript/compare/sdk-v0.114.0...sdk-v0.115.0)

Updates `@langchain/anthropic` from 1.5.1 to 1.5.2
- [Release notes](https://github.com/langchain-ai/langchainjs/releases)
- [Commits](https://github.com/langchain-ai/langchainjs/compare/@langchain/anthropic@1.5.1...@langchain/anthropic@1.5.2)

Updates `langchain` from 1.5.3 to 1.5.4
- [Release notes](https://github.com/langchain-ai/langchainjs/releases)
- [Commits](https://github.com/langchain-ai/langchainjs/compare/langchain@1.5.3...langchain@1.5.4)

---
updated-dependencies:
- dependency-name: "@ai-sdk/amazon-bedrock"
  dependency-version: 5.0.31
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ai-and-llm
- dependency-name: "@ai-sdk/anthropic"
  dependency-version: 4.0.20
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ai-and-llm
- dependency-name: "@ai-sdk/google"
  dependency-version: 4.0.24
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ai-and-llm
- dependency-name: "@anthropic-ai/sdk"
  dependency-version: 0.115.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ai-and-llm
- dependency-name: "@langchain/anthropic"
  dependency-version: 1.5.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ai-and-llm
- dependency-name: langchain
  dependency-version: 1.5.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ai-and-llm
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 packages/dd-trace/test/plugins/versions/package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/dd-trace/test/plugins/versions/package.json b/packages/dd-trace/test/plugins/versions/package.json
index 5ff7b24e30..e86879602c 100644
--- a/packages/dd-trace/test/plugins/versions/package.json
+++ b/packages/dd-trace/test/plugins/versions/package.json
@@ -4,12 +4,12 @@
   "license": "BSD-3-Clause",
   "private": true,
   "dependencies": {
-    "@ai-sdk/amazon-bedrock": "5.0.30",
-    "@ai-sdk/anthropic": "4.0.19",
-    "@ai-sdk/google": "4.0.23",
+    "@ai-sdk/amazon-bedrock": "5.0.31",
+    "@ai-sdk/anthropic": "4.0.20",
+    "@ai-sdk/google": "4.0.24",
     "@ai-sdk/openai": "4.0.20",
     "@anthropic-ai/claude-agent-sdk": "0.3.215",
-    "@anthropic-ai/sdk": "0.114.0",
+    "@anthropic-ai/sdk": "0.115.0",
     "@apollo/gateway": "2.14.2",
     "@apollo/server": "5.5.1",
     "@apollo/subgraph": "2.14.2",
@@ -55,7 +55,7 @@
     "@jest/test-sequencer": "30.4.1",
     "@jest/transform": "30.4.1",
     "@koa/router": "15.7.0",
-    "@langchain/anthropic": "1.5.1",
+    "@langchain/anthropic": "1.5.2",
     "@langchain/classic": "1.0.40",
     "@langchain/cohere": "1.1.0",
     "@langchain/core": "1.2.3",
@@ -159,7 +159,7 @@
     "koa-route": "4.0.1",
     "koa-router": "14.0.0",
     "koa-websocket": "7.0.0",
-    "langchain": "1.5.3",
+    "langchain": "1.5.4",
     "ldapjs": "3.0.7",
     "ldapjs-promise": "3.0.8",
     "light-my-request": "6.6.0",

From a6091214dab31d3ad71a0b241d3e0289426c8657 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2026 08:33:37 +0000
Subject: [PATCH 09/43] chore(deps): bump @smithy/smithy-client (#9550)

Bumps the test-versions group with 1 update in the /integration-tests/esbuild directory: [@smithy/smithy-client](https://github.com/smithy-lang/smithy-typescript/tree/HEAD/packages/smithy-client).


Updates `@smithy/smithy-client` from 4.14.13 to 4.14.14
- [Release notes](https://github.com/smithy-lang/smithy-typescript/releases)
- [Changelog](https://github.com/smithy-lang/smithy-typescript/blob/main/packages/smithy-client/CHANGELOG.md)
- [Commits](https://github.com/smithy-lang/smithy-typescript/commits/@smithy/smithy-client@4.14.14/packages/smithy-client)

---
updated-dependencies:
- dependency-name: "@smithy/smithy-client"
  dependency-version: 4.14.14
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: test-versions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 integration-tests/esbuild/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-tests/esbuild/package.json b/integration-tests/esbuild/package.json
index 3aebfa547e..bdfa32b18c 100644
--- a/integration-tests/esbuild/package.json
+++ b/integration-tests/esbuild/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "@apollo/server": "5.5.1",
     "@koa/router": "15.7.0",
-    "@smithy/smithy-client": "4.14.13",
+    "@smithy/smithy-client": "4.14.14",
     "aws-sdk": "2.1693.0",
     "axios": "1.18.1",
     "esbuild": "^0.28.0",

From 3badbb16d418ee5c1d3f7ba3b64409a4da0fa04d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2026 08:50:22 +0000
Subject: [PATCH 10/43] chore(deps): bump the test-versions group across 1
 directory with 11 updates (#9531)

Bumps the test-versions group with 11 updates in the /packages/dd-trace/test/plugins/versions directory:

| Package | From | To |
| --- | --- | --- |
| [@anthropic-ai/claude-agent-sdk](https://github.com/anthropics/claude-agent-sdk-typescript) | `0.3.215` | `0.3.220` |
| [@datadog/openfeature-node-server](https://github.com/DataDog/openfeature-js-client/tree/HEAD/packages/node-server) | `2.0.1` | `2.0.2` |
| [@opentelemetry/api-logs](https://github.com/open-telemetry/opentelemetry-js) | `0.220.0` | `0.221.0` |
| [@opentelemetry/exporter-jaeger](https://github.com/open-telemetry/opentelemetry-js) | `2.9.0` | `2.10.0` |
| [@opentelemetry/instrumentation](https://github.com/open-telemetry/opentelemetry-js) | `0.220.0` | `0.221.0` |
| [@opentelemetry/instrumentation-express](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/HEAD/packages/instrumentation-express) | `0.68.0` | `0.69.0` |
| [@opentelemetry/instrumentation-http](https://github.com/open-telemetry/opentelemetry-js) | `0.220.0` | `0.221.0` |
| [@opentelemetry/sdk-node](https://github.com/open-telemetry/opentelemetry-js) | `0.220.0` | `0.221.0` |
| [google-gax](https://github.com/googleapis/google-cloud-node/tree/HEAD/core/packages/gax) | `5.0.7` | `5.0.8` |
| [moleculer](https://github.com/moleculerjs/moleculer) | `0.15.0` | `0.15.1` |
| [pnpm](https://github.com/pnpm/pnpm/tree/HEAD/pnpm11/pnpm) | `11.15.1` | `11.17.0` |



Updates `@anthropic-ai/claude-agent-sdk` from 0.3.215 to 0.3.220
- [Release notes](https://github.com/anthropics/claude-agent-sdk-typescript/releases)
- [Changelog](https://github.com/anthropics/claude-agent-sdk-typescript/blob/main/CHANGELOG.md)
- [Commits](https://github.com/anthropics/claude-agent-sdk-typescript/compare/v0.3.215...v0.3.220)

Updates `@datadog/openfeature-node-server` from 2.0.1 to 2.0.2
- [Release notes](https://github.com/DataDog/openfeature-js-client/releases)
- [Changelog](https://github.com/DataDog/openfeature-js-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/DataDog/openfeature-js-client/commits/@datadog/openfeature-node-server@2.0.2/packages/node-server)

Updates `@opentelemetry/api-logs` from 0.220.0 to 0.221.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-js/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-js/compare/experimental/v0.220.0...experimental/v0.221.0)

Updates `@opentelemetry/exporter-jaeger` from 2.9.0 to 2.10.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-js/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-js/compare/v2.9.0...v2.10.0)

Updates `@opentelemetry/instrumentation` from 0.220.0 to 0.221.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-js/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-js/compare/experimental/v0.220.0...experimental/v0.221.0)

Updates `@opentelemetry/instrumentation-express` from 0.68.0 to 0.69.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-js-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/packages/instrumentation-express/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-js-contrib/commits/instrumentation-pg-v0.69.0/packages/instrumentation-express)

Updates `@opentelemetry/instrumentation-http` from 0.220.0 to 0.221.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-js/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-js/compare/experimental/v0.220.0...experimental/v0.221.0)

Updates `@opentelemetry/sdk-node` from 0.220.0 to 0.221.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-js/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-js/compare/experimental/v0.220.0...experimental/v0.221.0)

Updates `google-gax` from 5.0.7 to 5.0.8
- [Release notes](https://github.com/googleapis/google-cloud-node/releases)
- [Changelog](https://github.com/googleapis/google-cloud-node/blob/main/core/packages/gax/CHANGELOG.md)
- [Commits](https://github.com/googleapis/google-cloud-node/commits/google-gax-v5.0.8/core/packages/gax)

Updates `moleculer` from 0.15.0 to 0.15.1
- [Release notes](https://github.com/moleculerjs/moleculer/releases)
- [Changelog](https://github.com/moleculerjs/moleculer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moleculerjs/moleculer/compare/v0.15.0...v0.15.1)

Updates `pnpm` from 11.15.1 to 11.17.0
- [Release notes](https://github.com/pnpm/pnpm/releases)
- [Commits](https://github.com/pnpm/pnpm/commits/v11.17.0/pnpm11/pnpm)

---
updated-dependencies:
- dependency-name: "@anthropic-ai/claude-agent-sdk"
  dependency-version: 0.3.218
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: test-versions
- dependency-name: "@datadog/openfeature-node-server"
  dependency-version: 2.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: test-versions
- dependency-name: "@opentelemetry/api-logs"
  dependency-version: 0.221.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: test-versions
- dependency-name: "@opentelemetry/exporter-jaeger"
  dependency-version: 2.10.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: test-versions
- dependency-name: "@opentelemetry/instrumentation"
  dependency-version: 0.221.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: test-versions
- dependency-name: "@opentelemetry/instrumentation-express"
  dependency-version: 0.69.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: test-versions
- dependency-name: "@opentelemetry/instrumentation-http"
  dependency-version: 0.221.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: test-versions
- dependency-name: "@opentelemetry/sdk-node"
  dependency-version: 0.221.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: test-versions
- dependency-name: google-gax
  dependency-version: 5.0.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: test-versions
- dependency-name: moleculer
  dependency-version: 0.15.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: test-versions
- dependency-name: pnpm
  dependency-version: 11.17.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: test-versions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../test/plugins/versions/package.json        | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/dd-trace/test/plugins/versions/package.json b/packages/dd-trace/test/plugins/versions/package.json
index e86879602c..a291006a4f 100644
--- a/packages/dd-trace/test/plugins/versions/package.json
+++ b/packages/dd-trace/test/plugins/versions/package.json
@@ -8,7 +8,7 @@
     "@ai-sdk/anthropic": "4.0.20",
     "@ai-sdk/google": "4.0.24",
     "@ai-sdk/openai": "4.0.20",
-    "@anthropic-ai/claude-agent-sdk": "0.3.215",
+    "@anthropic-ai/claude-agent-sdk": "0.3.220",
     "@anthropic-ai/sdk": "0.115.0",
     "@apollo/gateway": "2.14.2",
     "@apollo/server": "5.5.1",
@@ -33,7 +33,7 @@
     "@babel/preset-typescript": "7.28.5",
     "@confluentinc/kafka-javascript": "1.10.0",
     "@cucumber/cucumber": "13.2.0",
-    "@datadog/openfeature-node-server": "2.0.1",
+    "@datadog/openfeature-node-server": "2.0.2",
     "@elastic/elasticsearch": "9.4.2",
     "@elastic/transport": "9.3.7",
     "@electron/packager": "20.0.0",
@@ -73,12 +73,12 @@
     "@openfeature/server-sdk": "1.22.0",
     "@opensearch-project/opensearch": "3.6.0",
     "@opentelemetry/api": "1.9.1",
-    "@opentelemetry/api-logs": "0.220.0",
-    "@opentelemetry/exporter-jaeger": "2.9.0",
-    "@opentelemetry/instrumentation": "0.220.0",
-    "@opentelemetry/instrumentation-express": "0.68.0",
-    "@opentelemetry/instrumentation-http": "0.220.0",
-    "@opentelemetry/sdk-node": "0.220.0",
+    "@opentelemetry/api-logs": "0.221.0",
+    "@opentelemetry/exporter-jaeger": "2.10.0",
+    "@opentelemetry/instrumentation": "0.221.0",
+    "@opentelemetry/instrumentation-express": "0.69.0",
+    "@opentelemetry/instrumentation-http": "0.221.0",
+    "@opentelemetry/sdk-node": "0.221.0",
     "@playwright/test": "1.61.0",
     "@prisma/adapter-mariadb": "7.8.0",
     "@prisma/adapter-mssql": "7.8.0",
@@ -133,7 +133,7 @@
     "find-my-way": "9.6.0",
     "fs": "0.0.1-security",
     "generic-pool": "3.9.0",
-    "google-gax": "5.0.7",
+    "google-gax": "5.0.8",
     "graphql": "16.14.2",
     "graphql-tag": "2.12.7",
     "graphql-tools": "9.0.33",
@@ -173,7 +173,7 @@
     "middie": "7.1.0",
     "mocha": "11.7.6",
     "mocha-each": "2.0.1",
-    "moleculer": "0.15.0",
+    "moleculer": "0.15.1",
     "mongodb": "7.5.0",
     "mongodb-core": "3.2.7",
     "mongoose": "9.7.4",
@@ -205,7 +205,7 @@
     "pino-pretty": "13.1.3",
     "playwright": "1.61.0",
     "playwright-core": "1.61.0",
-    "pnpm": "11.15.1",
+    "pnpm": "11.17.0",
     "prisma": "7.8.0",
     "promise": "8.3.0",
     "promise-js": "0.0.7",

From 6f73acd8e077bfded8126c47194fdacddc4409cd Mon Sep 17 00:00:00 2001
From: Leo Romanovsky <leo.romanovsky@datadoghq.com>
Date: Tue, 28 Jul 2026 05:08:47 -0600
Subject: [PATCH 11/43] chore(openfeature): update node server provider to
 2.0.2 (#9480)

* chore(openfeature): update node server provider to 2.0.1

* chore(openfeature): update node server provider to 2.0.2
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 5511ecff30..21eb2561b9 100644
--- a/package.json
+++ b/package.json
@@ -180,7 +180,7 @@
     "@datadog/native-appsec": "11.0.1",
     "@datadog/native-iast-taint-tracking": "4.2.0",
     "@datadog/native-metrics": "3.1.2",
-    "@datadog/openfeature-node-server": "2.0.0",
+    "@datadog/openfeature-node-server": "2.0.2",
     "@datadog/pprof": "5.17.0",
     "@datadog/wasm-js-rewriter": "5.0.1",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
diff --git a/yarn.lock b/yarn.lock
index 14cbe602f8..011076291e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -245,10 +245,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-1.0.2.tgz#bbe12dca5b4ef983a0d0af4b07b9bc90ea0ababa"
   integrity sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==
 
-"@datadog/flagging-core@1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@datadog/flagging-core/-/flagging-core-1.2.1.tgz#1bb2d1ecfd749033ed2570eccc8fb0697b8adfac"
-  integrity sha512-qeDkki9fFlqyoZBrn7tneT6pZ04EKKvf3xxisYw1a74zbJihvQui/ARUsjXCurRpzpFqGGTJw/oz+HnXaKhcdw==
+"@datadog/flagging-core@2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@datadog/flagging-core/-/flagging-core-2.0.2.tgz#333d7a5701306f7311861c1c0a3ce0be6138cc38"
+  integrity sha512-2+oWyqz/EMNXtsgyW3NtueFgL0TciWInyMg/6bEUZhfr7UgPzCQ88Nag9FGoPCig19F/tHXE5hLiQccjkRUMWQ==
   dependencies:
     spark-md5 "^3.0.2"
 
@@ -279,12 +279,12 @@
     node-addon-api "^6.1.0"
     node-gyp-build "^3.9.0"
 
-"@datadog/openfeature-node-server@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@datadog/openfeature-node-server/-/openfeature-node-server-2.0.0.tgz#94e787f0bb0b1b0c87e728ad760950c0ea5f3328"
-  integrity sha512-Ummu/Bd7ZJpCCNdFnZUt/JI+L1+8OMK53+MyIXbS7dCt4JXWWwelbpzSGqmC2jWbWQ/mTo4hEfnFw3kYOINbXA==
+"@datadog/openfeature-node-server@2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@datadog/openfeature-node-server/-/openfeature-node-server-2.0.2.tgz#304b93f12fe63619d5bb140023dfcecf56f38017"
+  integrity sha512-647eJuiOVzCEk50His94wjSlOgJCbHIJv4cAW425eW3GqQJC2Y73qGBYV1/s9oBsAmsUNa90tc+ETunfUH2hKQ==
   dependencies:
-    "@datadog/flagging-core" "1.2.1"
+    "@datadog/flagging-core" "2.0.2"
 
 "@datadog/pprof@5.17.0":
   version "5.17.0"

From 8ce40ff70fab5114baed458ed6eda676e8446c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriela=20Andrea=20Priegue=20Rodr=C3=ADguez?=
 <113037552+gbrandrea@users.noreply.github.com>
Date: Tue, 28 Jul 2026 13:43:21 +0200
Subject: [PATCH 12/43] feat(ci-visibility): add ci.pipeline.display_name tag
 for Buildkite (#9541)

---
 packages/dd-trace/src/plugins/util/ci.js                  | 3 +++
 packages/dd-trace/src/plugins/util/tags.js                | 2 ++
 packages/dd-trace/src/plugins/util/test.js                | 2 ++
 packages/dd-trace/test/plugins/util/ci-env/buildkite.json | 2 ++
 packages/dd-trace/test/plugins/util/test.spec.js          | 3 +++
 5 files changed, 12 insertions(+)

diff --git a/packages/dd-trace/src/plugins/util/ci.js b/packages/dd-trace/src/plugins/util/ci.js
index ac957e6237..1160ecae3d 100644
--- a/packages/dd-trace/src/plugins/util/ci.js
+++ b/packages/dd-trace/src/plugins/util/ci.js
@@ -18,6 +18,7 @@ const {
   GIT_REPOSITORY_URL,
   CI_PIPELINE_ID,
   CI_PIPELINE_NAME,
+  CI_PIPELINE_DISPLAY_NAME,
   CI_PIPELINE_NUMBER,
   CI_PIPELINE_URL,
   CI_PROVIDER_NAME,
@@ -697,6 +698,7 @@ module.exports = {
         BUILDKITE_TAG,
         BUILDKITE_BUILD_ID,
         BUILDKITE_PIPELINE_SLUG,
+        BUILDKITE_PIPELINE_NAME,
         BUILDKITE_BUILD_NUMBER,
         BUILDKITE_BUILD_URL,
         BUILDKITE_JOB_ID,
@@ -720,6 +722,7 @@ module.exports = {
         [CI_PROVIDER_NAME]: 'buildkite',
         [CI_PIPELINE_ID]: BUILDKITE_BUILD_ID,
         [CI_PIPELINE_NAME]: BUILDKITE_PIPELINE_SLUG,
+        [CI_PIPELINE_DISPLAY_NAME]: BUILDKITE_PIPELINE_NAME,
         [CI_PIPELINE_NUMBER]: BUILDKITE_BUILD_NUMBER,
         [CI_PIPELINE_URL]: BUILDKITE_BUILD_URL,
         [CI_JOB_URL]: `${BUILDKITE_BUILD_URL}#${BUILDKITE_JOB_ID}`,
diff --git a/packages/dd-trace/src/plugins/util/tags.js b/packages/dd-trace/src/plugins/util/tags.js
index f0ea40f7bd..f15128bcaf 100644
--- a/packages/dd-trace/src/plugins/util/tags.js
+++ b/packages/dd-trace/src/plugins/util/tags.js
@@ -26,6 +26,7 @@ const GIT_PULL_REQUEST_BASE_BRANCH = 'git.pull_request.base_branch'
 
 const CI_PIPELINE_ID = 'ci.pipeline.id'
 const CI_PIPELINE_NAME = 'ci.pipeline.name'
+const CI_PIPELINE_DISPLAY_NAME = 'ci.pipeline.display_name'
 const CI_PIPELINE_NUMBER = 'ci.pipeline.number'
 const CI_PIPELINE_URL = 'ci.pipeline.url'
 const CI_PROVIDER_NAME = 'ci.provider.name'
@@ -66,6 +67,7 @@ module.exports = {
   GIT_PULL_REQUEST_BASE_BRANCH,
   CI_PIPELINE_ID,
   CI_PIPELINE_NAME,
+  CI_PIPELINE_DISPLAY_NAME,
   CI_PIPELINE_NUMBER,
   CI_PIPELINE_URL,
   CI_PROVIDER_NAME,
diff --git a/packages/dd-trace/src/plugins/util/test.js b/packages/dd-trace/src/plugins/util/test.js
index 5b18dfcdeb..38adcdbc7d 100644
--- a/packages/dd-trace/src/plugins/util/test.js
+++ b/packages/dd-trace/src/plugins/util/test.js
@@ -45,6 +45,7 @@ const {
   CI_WORKSPACE_PATH,
   CI_PIPELINE_ID,
   CI_PIPELINE_NAME,
+  CI_PIPELINE_DISPLAY_NAME,
   CI_PIPELINE_NUMBER,
   CI_PIPELINE_URL,
   CI_JOB_NAME,
@@ -246,6 +247,7 @@ const TEST_LEVELS_METADATA_TAGS = [
   CI_NODE_NAME,
   CI_PIPELINE_ID,
   CI_PIPELINE_NAME,
+  CI_PIPELINE_DISPLAY_NAME,
   CI_PIPELINE_NUMBER,
   CI_PIPELINE_URL,
   CI_PROVIDER_NAME,
diff --git a/packages/dd-trace/test/plugins/util/ci-env/buildkite.json b/packages/dd-trace/test/plugins/util/ci-env/buildkite.json
index 8013574b20..ee83765f8e 100644
--- a/packages/dd-trace/test/plugins/util/ci-env/buildkite.json
+++ b/packages/dd-trace/test/plugins/util/ci-env/buildkite.json
@@ -12,6 +12,7 @@
       "BUILDKITE_COMMIT": "b9f0fb3fdbb94c9d24b2c75b49663122a529e123",
       "BUILDKITE_JOB_ID": "buildkite-job-id",
       "BUILDKITE_MESSAGE": "buildkite-git-commit-message",
+      "BUILDKITE_PIPELINE_NAME": "buildkite-pipeline-display-name",
       "BUILDKITE_PIPELINE_SLUG": "buildkite-pipeline-name",
       "BUILDKITE_PULL_REQUEST": "false",
       "BUILDKITE_PULL_REQUEST_BASE_BRANCH": "",
@@ -24,6 +25,7 @@
       "ci.job.url": "https://buildkite-build-url.com#buildkite-job-id",
       "ci.pipeline.id": "buildkite-pipeline-id",
       "ci.pipeline.name": "buildkite-pipeline-name",
+      "ci.pipeline.display_name": "buildkite-pipeline-display-name",
       "ci.pipeline.number": "buildkite-pipeline-number",
       "ci.pipeline.url": "https://buildkite-build-url.com",
       "ci.provider.name": "buildkite",
diff --git a/packages/dd-trace/test/plugins/util/test.spec.js b/packages/dd-trace/test/plugins/util/test.spec.js
index dde0a063a9..6d9ac805f4 100644
--- a/packages/dd-trace/test/plugins/util/test.spec.js
+++ b/packages/dd-trace/test/plugins/util/test.spec.js
@@ -54,6 +54,7 @@ const {
 
 const {
   CI_JOB_NAME,
+  CI_PIPELINE_DISPLAY_NAME,
   CI_PIPELINE_URL,
   CI_PROVIDER_NAME,
   GIT_COMMIT_SHA,
@@ -297,6 +298,7 @@ describe('getTestLevelsMetadataTags', () => {
   it('keeps only allowlisted CI and Git tags', () => {
     const testLevelsMetadataTags = getTestLevelsMetadataTags({
       [CI_JOB_NAME]: 'test',
+      [CI_PIPELINE_DISPLAY_NAME]: 'Pipeline Display Name',
       [CI_PIPELINE_URL]: 'https://github.com/DataDog/dd-trace-js/actions/runs/1',
       [CI_PROVIDER_NAME]: 'github',
       [GIT_COMMIT_SHA]: '1234567890abcdef',
@@ -308,6 +310,7 @@ describe('getTestLevelsMetadataTags', () => {
 
     assert.deepStrictEqual(testLevelsMetadataTags, {
       [CI_JOB_NAME]: 'test',
+      [CI_PIPELINE_DISPLAY_NAME]: 'Pipeline Display Name',
       [CI_PIPELINE_URL]: 'https://github.com/DataDog/dd-trace-js/actions/runs/1',
       [CI_PROVIDER_NAME]: 'github',
       [GIT_COMMIT_SHA]: '1234567890abcdef',

From c20bf90cd34dbaa5dcb5e84419adbc36c51d8e4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Antonio=20Fern=C3=A1ndez=20de=20Alba?=
 <juan.fernandezdealba@datadoghq.com>
Date: Tue, 28 Jul 2026 14:37:13 +0200
Subject: [PATCH 13/43] fix(test-optimization): hide WebdriverIO worker
 messages (#9561)

---
 .../webdriverio/webdriverio.spec.js           |  2 +
 .../src/mocha/webdriverio-protocol.js         | 12 ++++-
 .../src/mocha/worker.js                       |  3 +-
 .../src/webdriverio.js                        | 10 ++++
 .../webdriverio-disconnected-worker.js        | 14 +++--
 .../test/webdriverio.spec.js                  | 52 ++++++++++++++-----
 .../exporters/test-worker/webdriverio.js      | 26 ++++++++++
 .../exporters/test-worker/writer.js           | 10 +++-
 .../exporters/test-worker/exporter.spec.js    | 21 ++++++++
 9 files changed, 129 insertions(+), 21 deletions(-)
 create mode 100644 packages/dd-trace/src/ci-visibility/exporters/test-worker/webdriverio.js

diff --git a/integration-tests/webdriverio/webdriverio.spec.js b/integration-tests/webdriverio/webdriverio.spec.js
index 903de914f2..06886fb789 100644
--- a/integration-tests/webdriverio/webdriverio.spec.js
+++ b/integration-tests/webdriverio/webdriverio.spec.js
@@ -314,6 +314,8 @@ for (const version of versions) {
       }
 
       assert.strictEqual(exitCode, expectedExitCode, testOutput)
+      assert.doesNotMatch(testOutput, /dd:test-optimization:webdriverio:/)
+      assert.doesNotMatch(testOutput, /\bundefined undefined undefined\b/)
       assert.strictEqual(
         webDriver.getSessionCount() - initialWebDriverSessionCount,
         expectedWebDriverSessions
diff --git a/packages/datadog-instrumentations/src/mocha/webdriverio-protocol.js b/packages/datadog-instrumentations/src/mocha/webdriverio-protocol.js
index 93107d4b78..c7a7353b2f 100644
--- a/packages/datadog-instrumentations/src/mocha/webdriverio-protocol.js
+++ b/packages/datadog-instrumentations/src/mocha/webdriverio-protocol.js
@@ -1,9 +1,19 @@
 'use strict'
 
+const {
+  createWebdriverioWorkerMessage,
+  WEBDRIVERIO_WORKER_ENV,
+  WEBDRIVERIO_WORKER_EVENT,
+  WEBDRIVERIO_WORKER_ORIGIN,
+} = require('../../../dd-trace/src/ci-visibility/exporters/test-worker/webdriverio')
+
 module.exports = {
   CONFIGURATION_REQUEST: 'dd:test-optimization:webdriverio:configuration:request',
   CONFIGURATION_RESPONSE: 'dd:test-optimization:webdriverio:configuration:response',
+  createWebdriverioWorkerMessage,
   SUITE_FINISH: 'dd:test-optimization:webdriverio:test-suite:finish',
   WORKER_READY: 'dd:test-optimization:webdriverio:worker:ready',
-  WEBDRIVERIO_WORKER_ENV: '_DD_TEST_OPTIMIZATION_WEBDRIVERIO_WORKER',
+  WEBDRIVERIO_WORKER_ENV,
+  WEBDRIVERIO_WORKER_EVENT,
+  WEBDRIVERIO_WORKER_ORIGIN,
 }
diff --git a/packages/datadog-instrumentations/src/mocha/worker.js b/packages/datadog-instrumentations/src/mocha/worker.js
index 84a2493e2d..58ebc5d631 100644
--- a/packages/datadog-instrumentations/src/mocha/worker.js
+++ b/packages/datadog-instrumentations/src/mocha/worker.js
@@ -20,6 +20,7 @@ const {
 const {
   CONFIGURATION_REQUEST,
   CONFIGURATION_RESPONSE,
+  createWebdriverioWorkerMessage,
   SUITE_FINISH,
   WEBDRIVERIO_WORKER_ENV,
   WORKER_READY,
@@ -49,7 +50,7 @@ function sendWebdriverioMessage (message, onError) {
     return
   }
 
-  process.send(message, (error) => {
+  process.send(createWebdriverioWorkerMessage(message), (error) => {
     if (!error) {
       return
     }
diff --git a/packages/datadog-instrumentations/src/webdriverio.js b/packages/datadog-instrumentations/src/webdriverio.js
index c92a33a983..ca92df8c4d 100644
--- a/packages/datadog-instrumentations/src/webdriverio.js
+++ b/packages/datadog-instrumentations/src/webdriverio.js
@@ -15,6 +15,8 @@ const {
   CONFIGURATION_RESPONSE,
   SUITE_FINISH,
   WEBDRIVERIO_WORKER_ENV,
+  WEBDRIVERIO_WORKER_EVENT,
+  WEBDRIVERIO_WORKER_ORIGIN,
   WORKER_READY,
 } = require('./mocha/webdriverio-protocol')
 
@@ -447,6 +449,10 @@ function handleSuiteResults (workerRecord, message) {
  * @returns {void}
  */
 function handleWorkerMessage (state, workerRecord, message) {
+  if (message?.origin === WEBDRIVERIO_WORKER_ORIGIN && message.name === WEBDRIVERIO_WORKER_EVENT) {
+    message = message.args
+  }
+
   if (Array.isArray(message)) {
     const [messageCode, payload] = message
     if (messageCode === MOCHA_WORKER_TRACE_PAYLOAD_CODE) {
@@ -458,6 +464,10 @@ function handleWorkerMessage (state, workerRecord, message) {
     return
   }
 
+  if (!message || typeof message !== 'object') {
+    return
+  }
+
   if (message.name === WORKER_READY) {
     initializeCoordinator(state)
     return
diff --git a/packages/datadog-instrumentations/test/fixtures/webdriverio-disconnected-worker.js b/packages/datadog-instrumentations/test/fixtures/webdriverio-disconnected-worker.js
index c363a83ce7..b11abc941a 100644
--- a/packages/datadog-instrumentations/test/fixtures/webdriverio-disconnected-worker.js
+++ b/packages/datadog-instrumentations/test/fixtures/webdriverio-disconnected-worker.js
@@ -9,6 +9,8 @@ const {
   CONFIGURATION_REQUEST,
   CONFIGURATION_RESPONSE,
   WEBDRIVERIO_WORKER_ENV,
+  WEBDRIVERIO_WORKER_EVENT,
+  WEBDRIVERIO_WORKER_ORIGIN,
 } = require('../../src/mocha/webdriverio-protocol')
 
 process.env[WEBDRIVERIO_WORKER_ENV] = 'true'
@@ -93,7 +95,9 @@ assert.strictEqual(sendCalls, 0)
 process.connected = true
 process.send = (message, onDone) => {
   sendCalls++
-  assert.ok(message)
+  assert.strictEqual(message.origin, WEBDRIVERIO_WORKER_ORIGIN)
+  assert.strictEqual(message.name, WEBDRIVERIO_WORKER_EVENT)
+  assert.ok(message.args)
   assert.strictEqual(typeof onDone, 'function')
   onDone(new Error('IPC channel closed during send'))
 }
@@ -103,14 +107,16 @@ assert.strictEqual(sendCalls, 3)
 
 process.send = (message, onDone) => {
   sendCalls++
-  assert.ok(message)
+  assert.strictEqual(message.origin, WEBDRIVERIO_WORKER_ORIGIN)
+  assert.strictEqual(message.name, WEBDRIVERIO_WORKER_EVENT)
+  assert.ok(message.args)
   assert.strictEqual(typeof onDone, 'function')
   onDone()
-  if (message.name === CONFIGURATION_REQUEST) {
+  if (message.args.name === CONFIGURATION_REQUEST) {
     process.emit('message', {
       name: CONFIGURATION_RESPONSE,
       content: {
-        requestId: message.content.requestId,
+        requestId: message.args.content.requestId,
       },
     })
   }
diff --git a/packages/datadog-instrumentations/test/webdriverio.spec.js b/packages/datadog-instrumentations/test/webdriverio.spec.js
index d0f7e76229..f73b710a11 100644
--- a/packages/datadog-instrumentations/test/webdriverio.spec.js
+++ b/packages/datadog-instrumentations/test/webdriverio.spec.js
@@ -263,12 +263,20 @@ describe('webdriverio instrumentation', () => {
       })
 
       firstWorker.emit('message', {
-        name: WORKER_READY,
-        content: { frameworkVersion: '10.8.2' },
+        origin: 'datadog',
+        name: 'workerEvent',
+        args: {
+          name: WORKER_READY,
+          content: { frameworkVersion: '10.8.2' },
+        },
       })
       secondWorker.emit('message', {
-        name: WORKER_READY,
-        content: { frameworkVersion: '10.8.2' },
+        origin: 'datadog',
+        name: 'workerEvent',
+        args: {
+          name: WORKER_READY,
+          content: { frameworkVersion: '10.8.2' },
+        },
       })
       await new Promise(setImmediate)
 
@@ -276,8 +284,16 @@ describe('webdriverio instrumentation', () => {
       requestConfiguration(secondWorker, secondFile, 'second-request')
       await new Promise(setImmediate)
 
-      firstWorker.emit('message', [MOCHA_WORKER_TRACE_PAYLOAD_CODE, 'first-trace'])
-      secondWorker.emit('message', [MOCHA_WORKER_TRACE_PAYLOAD_CODE, 'second-trace'])
+      firstWorker.emit('message', {
+        origin: 'datadog',
+        name: 'workerEvent',
+        args: [MOCHA_WORKER_TRACE_PAYLOAD_CODE, 'first-trace'],
+      })
+      secondWorker.emit('message', {
+        origin: 'datadog',
+        name: 'workerEvent',
+        args: [MOCHA_WORKER_TRACE_PAYLOAD_CODE, 'second-trace'],
+      })
 
       assert.strictEqual(firstWorker.sentMessages[0].name, CONFIGURATION_RESPONSE)
       assert.strictEqual(firstWorker.sentMessages[0].content.requestId, 'first-request')
@@ -723,11 +739,15 @@ function finishLocalRunner (localRunner, error) {
  */
 function requestConfiguration (worker, file, requestId) {
   worker.emit('message', {
-    name: CONFIGURATION_REQUEST,
-    content: {
-      files: [file],
-      frameworkVersion: '10.8.2',
-      requestId,
+    origin: 'datadog',
+    name: 'workerEvent',
+    args: {
+      name: CONFIGURATION_REQUEST,
+      content: {
+        files: [file],
+        frameworkVersion: '10.8.2',
+        requestId,
+      },
     },
   })
 }
@@ -742,9 +762,13 @@ function requestConfiguration (worker, file, requestId) {
  */
 function reportSuiteFinish (worker, file, status = 'pass') {
   worker.emit('message', {
-    name: SUITE_FINISH,
-    content: {
-      results: [{ file, status }],
+    origin: 'datadog',
+    name: 'workerEvent',
+    args: {
+      name: SUITE_FINISH,
+      content: {
+        results: [{ file, status }],
+      },
     },
   })
 }
diff --git a/packages/dd-trace/src/ci-visibility/exporters/test-worker/webdriverio.js b/packages/dd-trace/src/ci-visibility/exporters/test-worker/webdriverio.js
new file mode 100644
index 0000000000..d34b1ce284
--- /dev/null
+++ b/packages/dd-trace/src/ci-visibility/exporters/test-worker/webdriverio.js
@@ -0,0 +1,26 @@
+'use strict'
+
+const WEBDRIVERIO_WORKER_ENV = '_DD_TEST_OPTIMIZATION_WEBDRIVERIO_WORKER'
+const WEBDRIVERIO_WORKER_EVENT = 'workerEvent'
+const WEBDRIVERIO_WORKER_ORIGIN = 'datadog'
+
+/**
+ * Wraps an internal worker payload in the event WebdriverIO reserves for worker messages.
+ *
+ * @param {unknown} args
+ * @returns {{args: unknown, name: string, origin: string}}
+ */
+function createWebdriverioWorkerMessage (args) {
+  return {
+    origin: WEBDRIVERIO_WORKER_ORIGIN,
+    name: WEBDRIVERIO_WORKER_EVENT,
+    args,
+  }
+}
+
+module.exports = {
+  createWebdriverioWorkerMessage,
+  WEBDRIVERIO_WORKER_ENV,
+  WEBDRIVERIO_WORKER_EVENT,
+  WEBDRIVERIO_WORKER_ORIGIN,
+}
diff --git a/packages/dd-trace/src/ci-visibility/exporters/test-worker/writer.js b/packages/dd-trace/src/ci-visibility/exporters/test-worker/writer.js
index 02379398e3..ba0451df00 100644
--- a/packages/dd-trace/src/ci-visibility/exporters/test-worker/writer.js
+++ b/packages/dd-trace/src/ci-visibility/exporters/test-worker/writer.js
@@ -2,6 +2,10 @@
 const { JSONEncoder } = require('../../encode/json-encoder')
 const { getEnvironmentVariable } = require('../../../config/helper')
 const log = require('../../../log')
+const {
+  createWebdriverioWorkerMessage,
+  WEBDRIVERIO_WORKER_ENV,
+} = require('./webdriverio')
 
 function getVitestWorkerPort () {
   const port = globalThis.__vitest_worker__?.ctx?.port
@@ -13,6 +17,7 @@ class Writer {
     this._encoder = new JSONEncoder()
     // Code used to identify the type of payload being sent to the main process
     this._interprocessCode = interprocessCode
+    this._isWebdriverioWorker = !!getEnvironmentVariable(WEBDRIVERIO_WORKER_ENV)
   }
 
   /**
@@ -43,9 +48,12 @@ class Writer {
     // Old because vitest@>=4 uses `DD_VITEST_WORKER` and reports arrays just like other frameworks
     // Before vitest@>=4, we need the `__tinypool_worker_message__` property, or tinypool will crash
     const isVitestWorkerOld = !!getEnvironmentVariable('TINYPOOL_WORKER_ID')
-    const payload = isVitestWorkerOld
+    let payload = isVitestWorkerOld
       ? { __tinypool_worker_message__: true, interprocessCode: this._interprocessCode, data }
       : [this._interprocessCode, data]
+    if (this._isWebdriverioWorker) {
+      payload = createWebdriverioWorkerMessage(payload)
+    }
 
     const vitestWorkerPort = getVitestWorkerPort()
     if (vitestWorkerPort) {
diff --git a/packages/dd-trace/test/ci-visibility/exporters/test-worker/exporter.spec.js b/packages/dd-trace/test/ci-visibility/exporters/test-worker/exporter.spec.js
index 1acc89806e..9d1ee8acf2 100644
--- a/packages/dd-trace/test/ci-visibility/exporters/test-worker/exporter.spec.js
+++ b/packages/dd-trace/test/ci-visibility/exporters/test-worker/exporter.spec.js
@@ -190,6 +190,27 @@ describe('CI Visibility Test Worker Exporter', () => {
     })
   })
 
+  context('when writing from a WebdriverIO worker', () => {
+    it('wraps traces in a filtered WebdriverIO worker event', () => {
+      const trace = [{ type: 'test' }]
+      const WebdriverioWriter = proxyquire('../../../../src/ci-visibility/exporters/test-worker/writer', {
+        '../../../config/helper': {
+          getEnvironmentVariable: name =>
+            name === '_DD_TEST_OPTIMIZATION_WEBDRIVERIO_WORKER' ? 'true' : undefined,
+        },
+      })
+      const writer = new WebdriverioWriter(MOCHA_WORKER_TRACE_PAYLOAD_CODE)
+      writer.append(trace)
+      writer.flush()
+
+      sinon.assert.calledWith(send, {
+        origin: 'datadog',
+        name: 'workerEvent',
+        args: [MOCHA_WORKER_TRACE_PAYLOAD_CODE, JSON.stringify([trace])],
+      })
+    })
+  })
+
   context('when the process is a playwright worker', () => {
     beforeEach(() => {
       process.env.DD_PLAYWRIGHT_WORKER = '1'

From a3cac9127f3b751630ebbeccca0fbd7ea17cbdd7 Mon Sep 17 00:00:00 2001
From: Ilyas Shabi <ilyas.shabi@datadoghq.com>
Date: Tue, 28 Jul 2026 17:00:19 +0200
Subject: [PATCH 14/43] fix(appsec): fix express ssrf flaky test (#9564)

* fix(appsec): fix express ssrf flaky test

* fixup
---
 .../appsec/rasp/ssrf.express.plugin.spec.js   | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/packages/dd-trace/test/appsec/rasp/ssrf.express.plugin.spec.js b/packages/dd-trace/test/appsec/rasp/ssrf.express.plugin.spec.js
index 1fb382e5c9..0f6adbf1e6 100644
--- a/packages/dd-trace/test/appsec/rasp/ssrf.express.plugin.spec.js
+++ b/packages/dd-trace/test/appsec/rasp/ssrf.express.plugin.spec.js
@@ -15,7 +15,7 @@ const { checkRaspExecutedAndNotThreat, checkRaspExecutedAndHasThreat } = require
 
 function noop () {}
 
-const UNRESOLVABLE_HOST = 'not-a-threat.invalid'
+const NON_ROUTABLE_HOST = '192.0.2.1'
 
 describe('RASP - ssrf', () => {
   withVersions('express', 'express', expressVersion => {
@@ -81,17 +81,18 @@ describe('RASP - ssrf', () => {
             const module = require(protocol)
 
             app = (req, res) => {
-              const clientRequest = module.get(`${protocol}://${req.query.host}`, function (incomingResponse) {
-                incomingResponse.resume()
+              const clientRequest = module.get(`${protocol}://${req.query.host}`)
+
+              clientRequest.on('error', noop)
+              setImmediate(() => {
+                clientRequest.destroy()
                 res.end('end')
               })
-
-              clientRequest.on('error', () => res.end('end'))
             }
 
             await Promise.all([
               checkRaspExecutedAndNotThreat(agent),
-              axios.get(`/?host=${UNRESOLVABLE_HOST}`),
+              axios.get(`/?host=${NON_ROUTABLE_HOST}`),
             ])
           })
 
@@ -148,13 +149,18 @@ describe('RASP - ssrf', () => {
 
           it('Should not detect threat', async () => {
             app = (req, res) => {
-              axiosToTest.get(`https://${req.query.host}`, { proxy: false })
+              const abortController = new AbortController()
+              axiosToTest.get(`https://${req.query.host}`, { proxy: false, signal: abortController.signal })
                 .catch(noop) // swallow network error
-                .then(() => res.end('end'))
+
+              setImmediate(() => {
+                abortController.abort()
+                res.end('end')
+              })
             }
 
             await Promise.all([
-              axios.get(`/?host=${UNRESOLVABLE_HOST}`),
+              axios.get(`/?host=${NON_ROUTABLE_HOST}`),
               checkRaspExecutedAndNotThreat(agent),
             ])
           })
@@ -202,13 +208,17 @@ describe('RASP - ssrf', () => {
 
           it('Should not detect threat', async () => {
             app = (req, res) => {
-              requestToTest.get(`https://${req.query.host}`, { proxy: false })
-                .on('response', () => res.end('end'))
-                .on('error', () => res.end('end'))
+              const clientRequest = requestToTest.get(`https://${req.query.host}`, { proxy: false })
+              clientRequest.on('error', noop)
+
+              setImmediate(() => {
+                clientRequest.abort()
+                res.end('end')
+              })
             }
 
             await Promise.all([
-              axios.get(`/?host=${UNRESOLVABLE_HOST}`),
+              axios.get(`/?host=${NON_ROUTABLE_HOST}`),
               checkRaspExecutedAndNotThreat(agent),
             ])
           })

From fcf59b7517fc04626b883033b81b12e45bb786ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2026 15:38:36 +0000
Subject: [PATCH 15/43] chore(deps): bump the testing-and-build group across 1
 directory with 22 updates (#9514)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump the testing-and-build group across 1 directory with 22 updates

Bumps the testing-and-build group with 22 updates in the /packages/dd-trace/test/plugins/versions directory:

| Package | From | To |
| --- | --- | --- |
| [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) | `7.29.0` | `8.0.1` |
| [@babel/preset-typescript](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-typescript) | `7.28.5` | `8.0.1` |
| [@electron/packager](https://github.com/electron/packager) | `20.0.0` | `20.0.4` |
| [@happy-dom/jest-environment](https://github.com/capricorn86/happy-dom) | `20.10.6` | `20.11.1` |
| [@playwright/test](https://github.com/microsoft/playwright) | `1.61.0` | `1.62.0` |
| [@vitest/coverage-istanbul](https://github.com/vitest-dev/vitest/tree/HEAD/packages/coverage-istanbul) | `4.1.9` | `4.1.10` |
| [@vitest/coverage-v8](https://github.com/vitest-dev/vitest/tree/HEAD/packages/coverage-v8) | `4.1.9` | `4.1.10` |
| [@vitest/runner](https://github.com/vitest-dev/vitest/tree/HEAD/packages/runner) | `4.1.9` | `4.1.10` |
| [cypress](https://github.com/cypress-io/cypress) | `15.16.0` | `15.19.0` |
| [electron](https://github.com/electron/electron) | `42.1.0` | `43.2.0` |
| [esbuild](https://github.com/evanw/esbuild) | `0.28.0` | `0.28.1` |
| [next](https://github.com/vercel/next.js) | `16.2.6` | `16.2.11` |
| [nock](https://github.com/nock/nock) | `14.0.15` | `14.0.16` |
| [playwright](https://github.com/microsoft/playwright) | `1.61.0` | `1.62.0` |
| [playwright-core](https://github.com/microsoft/playwright) | `1.61.0` | `1.62.0` |
| [react](https://github.com/react/react/tree/HEAD/packages/react) | `19.2.6` | `19.2.8` |
| [react-dom](https://github.com/react/react/tree/HEAD/packages/react-dom) | `19.2.6` | `19.2.8` |
| [selenium-webdriver](https://github.com/SeleniumHQ/selenium) | `4.44.0` | `4.46.0` |
| [sinon](https://github.com/sinonjs/sinon) | `22.0.0` | `22.1.0` |
| [typescript](https://github.com/microsoft/TypeScript) | `6.0.3` | `7.0.2` |
| [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) | `4.1.9` | `4.1.10` |
| [workerpool](https://github.com/josdejong/workerpool) | `10.0.2` | `10.0.3` |



Updates `@babel/core` from 7.29.0 to 8.0.1
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v8.0.1/packages/babel-core)

Updates `@babel/preset-typescript` from 7.28.5 to 8.0.1
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v8.0.1/packages/babel-preset-typescript)

Updates `@electron/packager` from 20.0.0 to 20.0.4
- [Release notes](https://github.com/electron/packager/releases)
- [Changelog](https://github.com/electron/packager/blob/main/NEWS.md)
- [Commits](https://github.com/electron/packager/compare/v20.0.0...v20.0.4)

Updates `@happy-dom/jest-environment` from 20.10.6 to 20.11.1
- [Release notes](https://github.com/capricorn86/happy-dom/releases)
- [Commits](https://github.com/capricorn86/happy-dom/compare/v20.10.6...v20.11.1)

Updates `@playwright/test` from 1.61.0 to 1.62.0
- [Release notes](https://github.com/microsoft/playwright/releases)
- [Commits](https://github.com/microsoft/playwright/compare/v1.61.0...v1.62.0)

Updates `@vitest/coverage-istanbul` from 4.1.9 to 4.1.10
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Changelog](https://github.com/vitest-dev/vitest/blob/main/docs/releases.md)
- [Commits](https://github.com/vitest-dev/vitest/commits/v4.1.10/packages/coverage-istanbul)

Updates `@vitest/coverage-v8` from 4.1.9 to 4.1.10
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Changelog](https://github.com/vitest-dev/vitest/blob/main/docs/releases.md)
- [Commits](https://github.com/vitest-dev/vitest/commits/v4.1.10/packages/coverage-v8)

Updates `@vitest/runner` from 4.1.9 to 4.1.10
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Commits](https://github.com/vitest-dev/vitest/commits/v4.1.10/packages/runner)

Updates `cypress` from 15.16.0 to 15.19.0
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v15.16.0...v15.19.0)

Updates `electron` from 42.1.0 to 43.2.0
- [Release notes](https://github.com/electron/electron/releases)
- [Commits](https://github.com/electron/electron/compare/v42.1.0...v43.2.0)

Updates `esbuild` from 0.28.0 to 0.28.1
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md)
- [Commits](https://github.com/evanw/esbuild/compare/v0.28.0...v0.28.1)

Updates `next` from 16.2.6 to 16.2.11
- [Release notes](https://github.com/vercel/next.js/releases)
- [Commits](https://github.com/vercel/next.js/compare/v16.2.6...v16.2.11)

Updates `nock` from 14.0.15 to 14.0.16
- [Release notes](https://github.com/nock/nock/releases)
- [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nock/nock/compare/v14.0.15...v14.0.16)

Updates `playwright` from 1.61.0 to 1.62.0
- [Release notes](https://github.com/microsoft/playwright/releases)
- [Commits](https://github.com/microsoft/playwright/compare/v1.61.0...v1.62.0)

Updates `playwright-core` from 1.61.0 to 1.62.0
- [Release notes](https://github.com/microsoft/playwright/releases)
- [Commits](https://github.com/microsoft/playwright/compare/v1.61.0...v1.62.0)

Updates `react` from 19.2.6 to 19.2.8
- [Release notes](https://github.com/react/react/releases)
- [Changelog](https://github.com/react/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/react/react/commits/v19.2.8/packages/react)

Updates `react-dom` from 19.2.6 to 19.2.8
- [Release notes](https://github.com/react/react/releases)
- [Changelog](https://github.com/react/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/react/react/commits/v19.2.8/packages/react-dom)

Updates `selenium-webdriver` from 4.44.0 to 4.46.0
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.44.0...selenium-4.46.0)

Updates `sinon` from 22.0.0 to 22.1.0
- [Release notes](https://github.com/sinonjs/sinon/releases)
- [Changelog](https://github.com/sinonjs/sinon/blob/main/CHANGES.md)
- [Commits](https://github.com/sinonjs/sinon/compare/v22.0.0...v22.1.0)

Updates `typescript` from 6.0.3 to 7.0.2
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Commits](https://github.com/microsoft/TypeScript/commits)

Updates `vitest` from 4.1.9 to 4.1.10
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Changelog](https://github.com/vitest-dev/vitest/blob/main/docs/releases.md)
- [Commits](https://github.com/vitest-dev/vitest/commits/v4.1.10/packages/vitest)

Updates `workerpool` from 10.0.2 to 10.0.3
- [Changelog](https://github.com/josdejong/workerpool/blob/master/HISTORY.md)
- [Commits](https://github.com/josdejong/workerpool/compare/v10.0.2...v10.0.3)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-version: 8.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: testing-and-build
- dependency-name: "@babel/preset-typescript"
  dependency-version: 8.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: testing-and-build
- dependency-name: "@electron/packager"
  dependency-version: 20.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testing-and-build
- dependency-name: "@happy-dom/jest-environment"
  dependency-version: 20.11.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: testing-and-build
- dependency-name: "@playwright/test"
  dependency-version: 1.61.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testing-and-build
- dependency-name: "@vitest/coverage-istanbul"
  dependency-version: 4.1.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testing-and-build
- dependency-name: "@vitest/coverage-v8"
  dependency-version: 4.1.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testing-and-build
- dependency-name: "@vitest/runner"
  dependency-version: 4.1.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testing-and-build
- dependency-name: cypress
  dependency-version: 15.18.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: testing-and-build
- dependency-name: electron
  dependency-version: 43.1.1
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: testing-and-build
- dependency-name: esbuild
  dependency-version: 0.28.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testing-and-build
- dependency-name: next
  dependency-version: 16.2.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testing-and-build
- dependency-name: nock
  dependency-version: 14.0.16
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testing-and-build
- dependency-name: playwright
  dependency-version: 1.61.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testing-and-build
- dependency-name: playwright-core
  dependency-version: 1.61.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testing-and-build
- dependency-name: react
  dependency-version: 19.2.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testing-and-build
- dependency-name: react-dom
  dependency-version: 19.2.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testing-and-build
- dependency-name: selenium-webdriver
  dependency-version: 4.46.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: testing-and-build
- dependency-name: sinon
  dependency-version: 22.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: testing-and-build
- dependency-name: typescript
  dependency-version: 7.0.2
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: testing-and-build
- dependency-name: vitest
  dependency-version: 4.1.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testing-and-build
- dependency-name: workerpool
  dependency-version: 10.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testing-and-build
...

Signed-off-by: dependabot[bot] <support@github.com>

* test(test-optimization): pin compatible dependency axes (#9559)

* fix(appsec): fix sourcemap fixture tsconfig for Typescript 7

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Juan Antonio Fernández de Alba <juan.fernandezdealba@datadoghq.com>
Co-authored-by: ishabi <ilyasshabi94@gmail.com>
---
 .github/workflows/test-optimization.yml       | 42 +++++++++++++++---
 .../tsconfig.json                             |  3 +-
 .../automatic-log-submission.spec.js          |  4 +-
 integration-tests/cypress/cypress-atr.spec.js |  5 +--
 integration-tests/cypress/cypress-efd.spec.js |  5 +--
 ...ypress-final-status-impacted-tests.spec.js |  5 +--
 integration-tests/cypress/cypress-itr.spec.js |  5 +--
 .../cypress-reporting-instrumentation.spec.js |  5 +--
 .../cypress/cypress-reporting.spec.js         |  5 +--
 .../cypress/cypress-test-management.spec.js   |  5 +--
 .../cypress/cypress-tia-code-coverage.spec.js |  3 +-
 integration-tests/cypress/dependencies.js     | 24 ++++++++++
 .../cypress/dependencies.spec.js              | 27 ++++++++++++
 integration-tests/jest/babel-dependencies.js  | 30 +++++++++++++
 .../jest/jest.babel-dependencies.spec.js      | 33 ++++++++++++++
 integration-tests/jest/jest.core.spec.js      |  4 +-
 .../jest/jest.test-management.spec.js         |  4 +-
 integration-tests/jest/jest.tia-efd.spec.js   |  4 +-
 .../playwright-active-test-span.spec.js       |  4 +-
 .../playwright/playwright-atr.spec.js         |  4 +-
 .../playwright/playwright-efd.spec.js         |  4 +-
 .../playwright-final-status.spec.js           |  4 +-
 .../playwright-impacted-tests.spec.js         |  4 +-
 .../playwright/playwright-reporting.spec.js   |  4 +-
 .../playwright-test-management.spec.js        |  4 +-
 integration-tests/playwright/versions.js      | 18 +++++++-
 integration-tests/playwright/versions.spec.js | 18 ++++++++
 integration-tests/vitest/vitest.core.spec.js  |  2 +-
 package.json                                  |  1 +
 .../test/plugins/versions/package.json        | 44 +++++++++----------
 30 files changed, 247 insertions(+), 77 deletions(-)
 create mode 100644 integration-tests/cypress/dependencies.js
 create mode 100644 integration-tests/cypress/dependencies.spec.js
 create mode 100644 integration-tests/jest/babel-dependencies.js
 create mode 100644 integration-tests/jest/jest.babel-dependencies.spec.js
 create mode 100644 integration-tests/playwright/versions.spec.js

diff --git a/.github/workflows/test-optimization.yml b/.github/workflows/test-optimization.yml
index dc8c599d8b..1d1cb94827 100644
--- a/.github/workflows/test-optimization.yml
+++ b/.github/workflows/test-optimization.yml
@@ -56,7 +56,11 @@ jobs:
       - name: Get Playwright version from versions package.json
         id: playwright-version
         run: |
-          PLAYWRIGHT_VERSION=$(node -p "require('./packages/dd-trace/test/plugins/versions/package.json').dependencies['@playwright/test']")
+          PLAYWRIGHT_VERSION=$(node -p \
+            "const versions = require('./integration-tests/playwright/versions'); \
+            versions.getLatestPlaywrightSpecifier() === 'latest' \
+              ? versions.latest \
+              : versions.latestSupportedByNode18")
           echo "version=$PLAYWRIGHT_VERSION" >> $GITHUB_OUTPUT
           echo "Playwright version: $PLAYWRIGHT_VERSION"
       - name: Cache Playwright browsers
@@ -73,14 +77,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        playwright-version: [oldest, latest]
+        playwright-version: [oldest, latest, latest-node18]
     name: Ensure Playwright Docker image (${{ matrix.playwright-version }})
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
     outputs:
-      # Both matrix jobs set this to the same value, so the last-writer-wins
+      # All matrix jobs set this to the same value, so the last-writer-wins
       # behaviour of matrix outputs is safe here.
       images: ${{ steps.versions.outputs.images }}
     steps:
@@ -89,14 +93,30 @@ jobs:
         id: versions
         run: |
           LATEST=$(node -p "require('./integration-tests/playwright/versions').latest")
+          LATEST_NODE18=$(node -p "require('./integration-tests/playwright/versions').latestSupportedByNode18")
           OLDEST=$(node -p "require('./integration-tests/playwright/versions').oldest")
           DOCKER_HASH=$(sha256sum .github/playwright/Dockerfile | cut -c1-8)
           LATEST_TAG="${LATEST}-${DOCKER_HASH}"
+          LATEST_NODE18_TAG="${LATEST_NODE18}-${DOCKER_HASH}"
           OLDEST_TAG="${OLDEST}-${DOCKER_HASH}"
           BASE="ghcr.io/datadog/dd-trace-js/playwright-tools"
-          IMAGES=$(printf '{"latest":"%s:%s","oldest":"%s:%s"}' "$BASE" "$LATEST_TAG" "$BASE" "$OLDEST_TAG")
-          PW_VERSION=$([ "${{ matrix.playwright-version }}" = "latest" ] && echo "$LATEST" || echo "$OLDEST")
-          IMAGE_TAG=$([ "${{ matrix.playwright-version }}" = "latest" ] && echo "$LATEST_TAG" || echo "$OLDEST_TAG")
+          IMAGES=$(printf \
+            '{"latest":{"latest":"%s:%s","oldest":"%s:%s"},"oldest":{"latest":"%s:%s","oldest":"%s:%s"}}' \
+            "$BASE" "$LATEST_TAG" "$BASE" "$OLDEST_TAG" "$BASE" "$LATEST_NODE18_TAG" "$BASE" "$OLDEST_TAG")
+          case "${{ matrix.playwright-version }}" in
+            latest)
+              PW_VERSION="$LATEST"
+              IMAGE_TAG="$LATEST_TAG"
+              ;;
+            latest-node18)
+              PW_VERSION="$LATEST_NODE18"
+              IMAGE_TAG="$LATEST_NODE18_TAG"
+              ;;
+            *)
+              PW_VERSION="$OLDEST"
+              IMAGE_TAG="$OLDEST_TAG"
+              ;;
+          esac
           echo "images=$IMAGES" >> $GITHUB_OUTPUT
           echo "pw-version=$PW_VERSION" >> $GITHUB_OUTPUT
           echo "image-tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
@@ -140,7 +160,7 @@ jobs:
     permissions:
       id-token: write
     container:
-      image: ${{ fromJson(needs.playwright-image.outputs.images)[matrix.playwright-version] }}
+      image: ${{ fromJson(needs.playwright-image.outputs.images)[matrix.node-version][matrix.playwright-version] }}
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -279,6 +299,14 @@ jobs:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - uses: ./.github/actions/plugins/test
 
+  dependency-helpers:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: ./.github/actions/node
+      - uses: ./.github/actions/install
+      - run: npm run test:integration:test-optimization:helpers
+
   integration-cucumber:
     strategy:
       fail-fast: false
diff --git a/integration-tests/appsec/iast-stack-traces-ts-with-sourcemaps/tsconfig.json b/integration-tests/appsec/iast-stack-traces-ts-with-sourcemaps/tsconfig.json
index b48221fb50..a9fe1ab703 100644
--- a/integration-tests/appsec/iast-stack-traces-ts-with-sourcemaps/tsconfig.json
+++ b/integration-tests/appsec/iast-stack-traces-ts-with-sourcemaps/tsconfig.json
@@ -11,8 +11,7 @@
     "esModuleInterop": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "node",
-    "ignoreDeprecations": "6.0",
+    "moduleResolution": "bundler",
     "types": ["node"],
     "resolveJsonModule": true
   },
diff --git a/integration-tests/ci-visibility/automatic-log-submission.spec.js b/integration-tests/ci-visibility/automatic-log-submission.spec.js
index 13ac26708c..9619eb3f6f 100644
--- a/integration-tests/ci-visibility/automatic-log-submission.spec.js
+++ b/integration-tests/ci-visibility/automatic-log-submission.spec.js
@@ -14,9 +14,11 @@ const {
 } = require('../helpers')
 const { FakeCiVisIntake } = require('../ci-visibility-intake')
 const { NODE_MAJOR } = require('../../version')
+const { getLatestPlaywrightSpecifier } = require('../playwright/versions')
 const webAppServer = require('./web-app-server')
 
 const isLatestCucumberSupported = NODE_MAJOR === 22 || NODE_MAJOR === 24 || NODE_MAJOR >= 26
+const playwrightDependency = `@playwright/test@${getLatestPlaywrightSpecifier()}`
 
 describe('test optimization automatic log submission', () => {
   let cwd, receiver, childProcess, webAppPort
@@ -27,7 +29,7 @@ describe('test optimization automatic log submission', () => {
     ...(isLatestCucumberSupported ? ['@cucumber/cucumber'] : []),
     'jest',
     'winston',
-    '@playwright/test',
+    playwrightDependency,
   ], true)
 
   before(async () => {
diff --git a/integration-tests/cypress/cypress-atr.spec.js b/integration-tests/cypress/cypress-atr.spec.js
index 6dde157cfc..a55f4d5d64 100644
--- a/integration-tests/cypress/cypress-atr.spec.js
+++ b/integration-tests/cypress/cypress-atr.spec.js
@@ -31,6 +31,7 @@ const {
   TEST_HAS_DYNAMIC_NAME,
 } = require('../../packages/dd-trace/src/plugins/util/test')
 const { DD_MAJOR, NODE_MAJOR } = require('../../version')
+const { getCypressDependencies } = require('./dependencies')
 
 const requestedVersion = process.env.CYPRESS_VERSION
 const oldestVersion = DD_MAJOR >= 6 ? '12.0.0' : '6.7.0'
@@ -97,9 +98,7 @@ moduleTypes.forEach(({
     this.timeout(80_000)
     let cwd, receiver, childProcess, webAppBaseUrl, webAppServer
 
-    // cypress-fail-fast is required as an incompatible plugin.
-    // typescript is required to compile .cy.ts spec files in the pre-compiled JS tests.
-    useSandbox([`cypress@${version}`, 'cypress-fail-fast@7.1.0', 'typescript'], true)
+    useSandbox(getCypressDependencies(version), true)
 
     before(async function () {
       this.timeout(180_000)
diff --git a/integration-tests/cypress/cypress-efd.spec.js b/integration-tests/cypress/cypress-efd.spec.js
index 2a8f261d05..6a2832bdca 100644
--- a/integration-tests/cypress/cypress-efd.spec.js
+++ b/integration-tests/cypress/cypress-efd.spec.js
@@ -28,6 +28,7 @@ const {
   TEST_FINAL_STATUS,
 } = require('../../packages/dd-trace/src/plugins/util/test')
 const { DD_MAJOR, NODE_MAJOR } = require('../../version')
+const { getCypressDependencies } = require('./dependencies')
 
 const requestedVersion = process.env.CYPRESS_VERSION
 const oldestVersion = DD_MAJOR >= 6 ? '12.0.0' : '6.7.0'
@@ -95,9 +96,7 @@ moduleTypes.forEach(({
     this.timeout(80_000)
     let cwd, receiver, childProcess, webAppBaseUrl, webAppServer
 
-    // cypress-fail-fast is required as an incompatible plugin.
-    // typescript is required to compile .cy.ts spec files in the pre-compiled JS tests.
-    useSandbox([`cypress@${version}`, 'cypress-fail-fast@7.1.0', 'typescript'], true)
+    useSandbox(getCypressDependencies(version), true)
 
     before(async function () {
       this.timeout(180_000)
diff --git a/integration-tests/cypress/cypress-final-status-impacted-tests.spec.js b/integration-tests/cypress/cypress-final-status-impacted-tests.spec.js
index 6929acf4d2..e8917d0261 100644
--- a/integration-tests/cypress/cypress-final-status-impacted-tests.spec.js
+++ b/integration-tests/cypress/cypress-final-status-impacted-tests.spec.js
@@ -43,6 +43,7 @@ const {
   TEST_IS_MODIFIED,
 } = require('../../packages/dd-trace/src/plugins/util/test')
 const { DD_MAJOR, NODE_MAJOR } = require('../../version')
+const { getCypressDependencies } = require('./dependencies')
 
 const requestedVersion = process.env.CYPRESS_VERSION
 const oldestVersion = DD_MAJOR >= 6 ? '12.0.0' : '6.7.0'
@@ -110,9 +111,7 @@ moduleTypes.forEach(({
     this.timeout(80_000)
     let cwd, receiver, childProcess, webAppBaseUrl, webAppServer
 
-    // cypress-fail-fast is required as an incompatible plugin.
-    // typescript is required to compile .cy.ts spec files in the pre-compiled JS tests.
-    useSandbox([`cypress@${version}`, 'cypress-fail-fast@7.1.0', 'typescript'], true)
+    useSandbox(getCypressDependencies(version), true)
 
     before(async function () {
       this.timeout(180_000)
diff --git a/integration-tests/cypress/cypress-itr.spec.js b/integration-tests/cypress/cypress-itr.spec.js
index 7c66cf4157..9311decfcf 100644
--- a/integration-tests/cypress/cypress-itr.spec.js
+++ b/integration-tests/cypress/cypress-itr.spec.js
@@ -28,6 +28,7 @@ const {
   TEST_ITR_FORCED_RUN,
 } = require('../../packages/dd-trace/src/plugins/util/test')
 const { DD_MAJOR, NODE_MAJOR } = require('../../version')
+const { getCypressDependencies } = require('./dependencies')
 
 const requestedVersion = process.env.CYPRESS_VERSION
 const oldestVersion = DD_MAJOR >= 6 ? '12.0.0' : '6.7.0'
@@ -111,9 +112,7 @@ moduleTypes.forEach(({
     this.timeout(80_000)
     let cwd, receiver, childProcess, webAppBaseUrl, webAppServer
 
-    // cypress-fail-fast is required as an incompatible plugin.
-    // typescript is required to compile .cy.ts spec files in the pre-compiled JS tests.
-    useSandbox([`cypress@${version}`, 'cypress-fail-fast@7.1.0', 'typescript'], true)
+    useSandbox(getCypressDependencies(version), true)
 
     before(async function () {
       this.timeout(180_000)
diff --git a/integration-tests/cypress/cypress-reporting-instrumentation.spec.js b/integration-tests/cypress/cypress-reporting-instrumentation.spec.js
index 38ce71728f..b6daffcafa 100644
--- a/integration-tests/cypress/cypress-reporting-instrumentation.spec.js
+++ b/integration-tests/cypress/cypress-reporting-instrumentation.spec.js
@@ -45,6 +45,7 @@ const {
   resolveOriginalSourceFile,
   resolveSourceLineForTest,
 } = require('../../packages/datadog-plugin-cypress/src/source-map-utils')
+const { getCypressDependencies } = require('./dependencies')
 
 const requestedVersion = process.env.CYPRESS_VERSION
 const oldestVersion = DD_MAJOR >= 6 ? '12.0.0' : '6.7.0'
@@ -165,9 +166,7 @@ moduleTypes.forEach(({
     this.timeout(80_000)
     let cwd, receiver, childProcess, webAppBaseUrl, webAppServer
 
-    // cypress-fail-fast is required as an incompatible plugin.
-    // typescript is required to compile .cy.ts spec files in the pre-compiled JS tests.
-    const sandboxDependencies = [`cypress@${version}`, 'cypress-fail-fast@7.1.0', 'typescript']
+    const sandboxDependencies = getCypressDependencies(version)
     if (type === 'commonJS' && version === 'latest') {
       // These dependencies are only needed by the component/Vite regression test below.
       sandboxDependencies.push(
diff --git a/integration-tests/cypress/cypress-reporting.spec.js b/integration-tests/cypress/cypress-reporting.spec.js
index 576207a229..d1b616ad62 100644
--- a/integration-tests/cypress/cypress-reporting.spec.js
+++ b/integration-tests/cypress/cypress-reporting.spec.js
@@ -34,6 +34,7 @@ const {
 } = require('../../packages/dd-trace/src/plugins/util/test')
 const { ERROR_MESSAGE, ERROR_TYPE, COMPONENT } = require('../../packages/dd-trace/src/constants')
 const { DD_MAJOR, NODE_MAJOR } = require('../../version')
+const { getCypressDependencies } = require('./dependencies')
 
 const requestedVersion = process.env.CYPRESS_VERSION
 const oldestVersion = DD_MAJOR >= 6 ? '12.0.0' : '6.7.0'
@@ -102,9 +103,7 @@ moduleTypes.forEach(({
     this.timeout(80_000)
     let cwd, receiver, childProcess, webAppBaseUrl, webAppServer
 
-    // cypress-fail-fast is required as an incompatible plugin.
-    // typescript is required to compile .cy.ts spec files in the pre-compiled JS tests.
-    useSandbox([`cypress@${version}`, 'cypress-fail-fast@7.1.0', 'typescript'], true)
+    useSandbox(getCypressDependencies(version), true)
 
     before(async function () {
       this.timeout(180_000)
diff --git a/integration-tests/cypress/cypress-test-management.spec.js b/integration-tests/cypress/cypress-test-management.spec.js
index 9a0203e827..f2b533663e 100644
--- a/integration-tests/cypress/cypress-test-management.spec.js
+++ b/integration-tests/cypress/cypress-test-management.spec.js
@@ -33,6 +33,7 @@ const {
   TEST_RETRY_REASON_TYPES,
 } = require('../../packages/dd-trace/src/plugins/util/test')
 const { DD_MAJOR, NODE_MAJOR } = require('../../version')
+const { getCypressDependencies } = require('./dependencies')
 
 const requestedVersion = process.env.CYPRESS_VERSION
 const oldestVersion = DD_MAJOR >= 6 ? '12.0.0' : '6.7.0'
@@ -100,9 +101,7 @@ moduleTypes.forEach(({
     this.timeout(80_000)
     let cwd, receiver, childProcess, webAppBaseUrl, webAppServer, secondWebAppBaseUrl, secondWebAppServer
 
-    // cypress-fail-fast is required as an incompatible plugin.
-    // typescript is required to compile .cy.ts spec files in the pre-compiled JS tests.
-    useSandbox([`cypress@${version}`, 'cypress-fail-fast@7.1.0', 'typescript'], true)
+    useSandbox(getCypressDependencies(version), true)
 
     before(async function () {
       this.timeout(180_000)
diff --git a/integration-tests/cypress/cypress-tia-code-coverage.spec.js b/integration-tests/cypress/cypress-tia-code-coverage.spec.js
index 29693ccd20..9318440686 100644
--- a/integration-tests/cypress/cypress-tia-code-coverage.spec.js
+++ b/integration-tests/cypress/cypress-tia-code-coverage.spec.js
@@ -24,6 +24,7 @@ const {
   getLineCoverageBitmap,
 } = require('../../packages/dd-trace/src/plugins/util/test')
 const { DD_MAJOR, NODE_MAJOR } = require('../../version')
+const { getCypressDependencies } = require('./dependencies')
 
 const requestedVersion = process.env.CYPRESS_VERSION
 const oldestVersion = DD_MAJOR >= 6 ? '12.0.0' : '6.7.0'
@@ -122,7 +123,7 @@ moduleTypes.forEach(({
 
     let cwd, childProcess, webAppBaseUrl, webAppServer
 
-    useSandbox([`cypress@${version}`, 'cypress-fail-fast@7.1.0', 'typescript'], true)
+    useSandbox(getCypressDependencies(version), true)
 
     before(async function () {
       cwd = sandboxCwd()
diff --git a/integration-tests/cypress/dependencies.js b/integration-tests/cypress/dependencies.js
new file mode 100644
index 0000000000..5d29e9c343
--- /dev/null
+++ b/integration-tests/cypress/dependencies.js
@@ -0,0 +1,24 @@
+'use strict'
+
+const BABEL_7_PRESET_TYPESCRIPT_VERSION = '7.28.5'
+const TYPESCRIPT_6_VERSION = '6.0.3'
+
+/**
+ * @param {string} cypressVersion
+ * @returns {string[]}
+ */
+function getCypressDependencies (cypressVersion) {
+  const dependencies = [
+    `cypress@${cypressVersion}`,
+    'cypress-fail-fast@7.1.0',
+    `typescript@${TYPESCRIPT_6_VERSION}`,
+  ]
+
+  if (cypressVersion === 'latest') {
+    dependencies.push(`@babel/preset-typescript@${BABEL_7_PRESET_TYPESCRIPT_VERSION}`)
+  }
+
+  return dependencies
+}
+
+module.exports = { getCypressDependencies }
diff --git a/integration-tests/cypress/dependencies.spec.js b/integration-tests/cypress/dependencies.spec.js
new file mode 100644
index 0000000000..07122e318b
--- /dev/null
+++ b/integration-tests/cypress/dependencies.spec.js
@@ -0,0 +1,27 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+
+const { getCypressDependencies } = require('./dependencies')
+
+const sharedDependencies = [
+  'cypress-fail-fast@7.1.0',
+  'typescript@6.0.3',
+]
+
+describe('getCypressDependencies', () => {
+  it('pins TypeScript 6 for Cypress versions using the bundled TypeScript loader', () => {
+    assert.deepStrictEqual(getCypressDependencies('12.0.0'), [
+      'cypress@12.0.0',
+      ...sharedDependencies,
+    ])
+  })
+
+  it('installs the Babel TypeScript preset required by latest Cypress', () => {
+    assert.deepStrictEqual(getCypressDependencies('latest'), [
+      'cypress@latest',
+      ...sharedDependencies,
+      '@babel/preset-typescript@7.28.5',
+    ])
+  })
+})
diff --git a/integration-tests/jest/babel-dependencies.js b/integration-tests/jest/babel-dependencies.js
new file mode 100644
index 0000000000..b60ba90bc4
--- /dev/null
+++ b/integration-tests/jest/babel-dependencies.js
@@ -0,0 +1,30 @@
+'use strict'
+
+const { satisfies } = require('semver')
+
+const { NODE_VERSION } = require('../../version')
+
+const BABEL_7_CORE_VERSION = '7.29.0'
+const BABEL_7_PRESET_TYPESCRIPT_VERSION = '7.28.5'
+const BABEL_8_NODE_RANGE = '^22.18.0 || >=24.11.0'
+
+/**
+ * @param {string} jestVersion
+ * @param {string} [nodeVersion]
+ * @returns {string[]}
+ */
+function getBabelDependencies (jestVersion, nodeVersion = NODE_VERSION) {
+  if (jestVersion === 'latest' && satisfies(nodeVersion, BABEL_8_NODE_RANGE)) {
+    return [
+      '@babel/core',
+      '@babel/preset-typescript',
+    ]
+  }
+
+  return [
+    `@babel/core@${BABEL_7_CORE_VERSION}`,
+    `@babel/preset-typescript@${BABEL_7_PRESET_TYPESCRIPT_VERSION}`,
+  ]
+}
+
+module.exports = { getBabelDependencies }
diff --git a/integration-tests/jest/jest.babel-dependencies.spec.js b/integration-tests/jest/jest.babel-dependencies.spec.js
new file mode 100644
index 0000000000..d7dc1469ad
--- /dev/null
+++ b/integration-tests/jest/jest.babel-dependencies.spec.js
@@ -0,0 +1,33 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+
+const { describe, it } = require('mocha')
+
+const { getBabelDependencies } = require('./babel-dependencies')
+
+const babel7Dependencies = [
+  '@babel/core@7.29.0',
+  '@babel/preset-typescript@7.28.5',
+]
+
+describe('getBabelDependencies', () => {
+  it('uses Babel 7 pins when Node.js does not support Babel 8', () => {
+    assert.deepStrictEqual(getBabelDependencies('latest', '18.20.8'), babel7Dependencies)
+  })
+
+  it('uses Babel 7 pins when Jest is not latest', () => {
+    assert.deepStrictEqual(getBabelDependencies('28.0.0', '22.22.3'), babel7Dependencies)
+  })
+
+  it('uses Babel 7 pins before the Node.js 24 version supported by Babel 8', () => {
+    assert.deepStrictEqual(getBabelDependencies('latest', '24.10.0'), babel7Dependencies)
+  })
+
+  it('uses the unversioned Babel entries when Node.js and Jest support Babel 8', () => {
+    assert.deepStrictEqual(getBabelDependencies('latest', '22.22.3'), [
+      '@babel/core',
+      '@babel/preset-typescript',
+    ])
+  })
+})
diff --git a/integration-tests/jest/jest.core.spec.js b/integration-tests/jest/jest.core.spec.js
index 05f9d1a7b1..0f15997961 100644
--- a/integration-tests/jest/jest.core.spec.js
+++ b/integration-tests/jest/jest.core.spec.js
@@ -56,6 +56,7 @@ const { DD_HOST_CPU_COUNT } = require('../../packages/dd-trace/src/plugins/util/
 const { ERROR_MESSAGE, ERROR_TYPE, ORIGIN_KEY, COMPONENT } = require('../../packages/dd-trace/src/constants')
 const { DD_MAJOR } = require('../../version')
 const { version: ddTraceVersion } = require('../../package.json')
+const { getBabelDependencies } = require('./babel-dependencies')
 
 const testFile = 'ci-visibility/run-jest.js'
 const expectedStdout = 'Test Suites: 2 passed'
@@ -83,8 +84,7 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
     shouldInstallJestEnvironmentJsdom ? `jest-environment-jsdom@${JEST_VERSION}` : '',
     // jest-circus is not included in older versions of jest
     JEST_VERSION !== 'latest' ? `jest-circus@${JEST_VERSION}` : '',
-    '@babel/core',
-    '@babel/preset-typescript',
+    ...getBabelDependencies(JEST_VERSION),
     '@happy-dom/jest-environment',
     'office-addin-mock',
     'winston',
diff --git a/integration-tests/jest/jest.test-management.spec.js b/integration-tests/jest/jest.test-management.spec.js
index 42fa34d04c..77a3e5ff23 100644
--- a/integration-tests/jest/jest.test-management.spec.js
+++ b/integration-tests/jest/jest.test-management.spec.js
@@ -53,6 +53,7 @@ const {
 const { TELEMETRY_COVERAGE_UPLOAD } = require('../../packages/dd-trace/src/ci-visibility/telemetry')
 const { ERROR_MESSAGE } = require('../../packages/dd-trace/src/constants')
 const { DD_MAJOR } = require('../../version')
+const { getBabelDependencies } = require('./babel-dependencies')
 
 const runTestsCommand = 'node ./ci-visibility/run-jest.js'
 
@@ -75,8 +76,7 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
     shouldInstallJestEnvironmentJsdom ? `jest-environment-jsdom@${JEST_VERSION}` : '',
     // jest-circus is not included in older versions of jest
     JEST_VERSION !== 'latest' ? `jest-circus@${JEST_VERSION}` : '',
-    '@babel/core',
-    '@babel/preset-typescript',
+    ...getBabelDependencies(JEST_VERSION),
     '@happy-dom/jest-environment',
     'office-addin-mock',
     'winston',
diff --git a/integration-tests/jest/jest.tia-efd.spec.js b/integration-tests/jest/jest.tia-efd.spec.js
index 2fef99441e..b5a5a5ac8c 100644
--- a/integration-tests/jest/jest.tia-efd.spec.js
+++ b/integration-tests/jest/jest.tia-efd.spec.js
@@ -51,6 +51,7 @@ const {
 } = require('../../packages/dd-trace/src/plugins/util/test')
 const { ERROR_MESSAGE } = require('../../packages/dd-trace/src/constants')
 const { DD_MAJOR, NODE_MAJOR } = require('../../version')
+const { getBabelDependencies } = require('./babel-dependencies')
 
 const testFile = 'ci-visibility/run-jest.js'
 const expectedCoverageFiles = [
@@ -98,8 +99,7 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
     shouldInstallJestEnvironmentJsdom ? `jest-environment-jsdom@${JEST_VERSION}` : '',
     // jest-circus is not included in older versions of jest
     JEST_VERSION !== 'latest' ? `jest-circus@${JEST_VERSION}` : '',
-    '@babel/core',
-    '@babel/preset-typescript',
+    ...getBabelDependencies(JEST_VERSION),
     '@happy-dom/jest-environment',
     'office-addin-mock',
     'winston',
diff --git a/integration-tests/playwright/playwright-active-test-span.spec.js b/integration-tests/playwright/playwright-active-test-span.spec.js
index f979984d74..3d985b2bbb 100644
--- a/integration-tests/playwright/playwright-active-test-span.spec.js
+++ b/integration-tests/playwright/playwright-active-test-span.spec.js
@@ -33,8 +33,8 @@ const { PLAYWRIGHT_VERSION } = process.env
 
 const NUM_RETRIES_EFD = 3
 
-const latest = 'latest'
-const { oldest } = require('./versions')
+const { getLatestPlaywrightSpecifier, oldest } = require('./versions')
+const latest = getLatestPlaywrightSpecifier()
 const versions = [oldest, latest]
 
 versions.forEach((version) => {
diff --git a/integration-tests/playwright/playwright-atr.spec.js b/integration-tests/playwright/playwright-atr.spec.js
index 8fec0d3a3b..eb8ad75b07 100644
--- a/integration-tests/playwright/playwright-atr.spec.js
+++ b/integration-tests/playwright/playwright-atr.spec.js
@@ -23,8 +23,8 @@ const {
 
 const { PLAYWRIGHT_VERSION } = process.env
 
-const latest = 'latest'
-const { oldest } = require('./versions')
+const { getLatestPlaywrightSpecifier, oldest } = require('./versions')
+const latest = getLatestPlaywrightSpecifier()
 const versions = [oldest, latest]
 
 versions.forEach((version) => {
diff --git a/integration-tests/playwright/playwright-efd.spec.js b/integration-tests/playwright/playwright-efd.spec.js
index 7c723ab642..7840efcd5b 100644
--- a/integration-tests/playwright/playwright-efd.spec.js
+++ b/integration-tests/playwright/playwright-efd.spec.js
@@ -31,8 +31,8 @@ const { PLAYWRIGHT_VERSION } = process.env
 const NUM_RETRIES_EFD = 3
 const PLAYWRIGHT_EFD_GATHER_TIMEOUT = 60000
 
-const latest = 'latest'
-const { oldest } = require('./versions')
+const { getLatestPlaywrightSpecifier, oldest } = require('./versions')
+const latest = getLatestPlaywrightSpecifier()
 const versions = [oldest, latest]
 
 versions.forEach((version) => {
diff --git a/integration-tests/playwright/playwright-final-status.spec.js b/integration-tests/playwright/playwright-final-status.spec.js
index 8652832d49..e152ff4f43 100644
--- a/integration-tests/playwright/playwright-final-status.spec.js
+++ b/integration-tests/playwright/playwright-final-status.spec.js
@@ -27,8 +27,8 @@ const { PLAYWRIGHT_VERSION } = process.env
 const NUM_RETRIES_EFD = 3
 const RETRY_FINAL_STATUS_TIMEOUT = 60000
 
-const latest = 'latest'
-const { oldest } = require('./versions')
+const { getLatestPlaywrightSpecifier, oldest } = require('./versions')
+const latest = getLatestPlaywrightSpecifier()
 const versions = [oldest, latest]
 
 versions.forEach((version) => {
diff --git a/integration-tests/playwright/playwright-impacted-tests.spec.js b/integration-tests/playwright/playwright-impacted-tests.spec.js
index 2607ac35ad..f180f3d1c7 100644
--- a/integration-tests/playwright/playwright-impacted-tests.spec.js
+++ b/integration-tests/playwright/playwright-impacted-tests.spec.js
@@ -30,8 +30,8 @@ const { PLAYWRIGHT_VERSION } = process.env
 
 const NUM_RETRIES_EFD = 3
 
-const latest = 'latest'
-const { oldest } = require('./versions')
+const { getLatestPlaywrightSpecifier, oldest } = require('./versions')
+const latest = getLatestPlaywrightSpecifier()
 const versions = [oldest, latest]
 
 const DEFAULT_IMPACTED_KNOWN_TESTS = {
diff --git a/integration-tests/playwright/playwright-reporting.spec.js b/integration-tests/playwright/playwright-reporting.spec.js
index 5644bdef0d..f2cb857fd1 100644
--- a/integration-tests/playwright/playwright-reporting.spec.js
+++ b/integration-tests/playwright/playwright-reporting.spec.js
@@ -48,8 +48,8 @@ const { ERROR_MESSAGE } = require('../../packages/dd-trace/src/constants')
 
 const { PLAYWRIGHT_VERSION } = process.env
 
-const latest = 'latest'
-const { oldest } = require('./versions')
+const { getLatestPlaywrightSpecifier, oldest } = require('./versions')
+const latest = getLatestPlaywrightSpecifier()
 const versions = [oldest, latest]
 const REQUEST_ERROR_TAG_TEST_DIR = './ci-visibility/playwright-tests-request-error-tag'
 const SCREENSHOT_CAPTURE_DISABLED_WARNING =
diff --git a/integration-tests/playwright/playwright-test-management.spec.js b/integration-tests/playwright/playwright-test-management.spec.js
index 0f01cb036c..e39f45a1fe 100644
--- a/integration-tests/playwright/playwright-test-management.spec.js
+++ b/integration-tests/playwright/playwright-test-management.spec.js
@@ -36,8 +36,8 @@ const { PLAYWRIGHT_VERSION } = process.env
 
 const PLAYWRIGHT_TEST_MANAGEMENT_GATHER_TIMEOUT = 60000
 
-const latest = 'latest'
-const { oldest } = require('./versions')
+const { getLatestPlaywrightSpecifier, oldest } = require('./versions')
+const latest = getLatestPlaywrightSpecifier()
 const versions = [oldest, latest]
 
 const ATF_MANAGEMENT_TESTS = {
diff --git a/integration-tests/playwright/versions.js b/integration-tests/playwright/versions.js
index 90ee673f79..69ca5f59c0 100644
--- a/integration-tests/playwright/versions.js
+++ b/integration-tests/playwright/versions.js
@@ -1,9 +1,23 @@
 'use strict'
 
-const { DD_MAJOR } = require('../../version')
+const { DD_MAJOR, NODE_MAJOR } = require('../../version')
 
 const oldest = DD_MAJOR >= 6 ? '1.38.0' : '1.18.0'
 const latest = require('../../packages/dd-trace/test/plugins/versions/package.json')
   .dependencies['@playwright/test']
+const latestSupportedByNode18 = '1.61.0'
 
-module.exports = { oldest, latest }
+/**
+ * @param {number} [nodeMajor]
+ * @returns {string}
+ */
+function getLatestPlaywrightSpecifier (nodeMajor = NODE_MAJOR) {
+  return nodeMajor < 20 ? latestSupportedByNode18 : 'latest'
+}
+
+module.exports = {
+  getLatestPlaywrightSpecifier,
+  latest,
+  latestSupportedByNode18,
+  oldest,
+}
diff --git a/integration-tests/playwright/versions.spec.js b/integration-tests/playwright/versions.spec.js
new file mode 100644
index 0000000000..d5ab14f614
--- /dev/null
+++ b/integration-tests/playwright/versions.spec.js
@@ -0,0 +1,18 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+
+const {
+  getLatestPlaywrightSpecifier,
+  latestSupportedByNode18,
+} = require('./versions')
+
+describe('getLatestPlaywrightSpecifier', () => {
+  it('uses the last Playwright version supporting Node.js 18', () => {
+    assert.strictEqual(getLatestPlaywrightSpecifier(18), latestSupportedByNode18)
+  })
+
+  it('uses latest Playwright on supported Node.js versions', () => {
+    assert.strictEqual(getLatestPlaywrightSpecifier(20), 'latest')
+  })
+})
diff --git a/integration-tests/vitest/vitest.core.spec.js b/integration-tests/vitest/vitest.core.spec.js
index 7a3be13442..45b286875a 100644
--- a/integration-tests/vitest/vitest.core.spec.js
+++ b/integration-tests/vitest/vitest.core.spec.js
@@ -121,7 +121,7 @@ versions.forEach((version) => {
       `@vitest/coverage-v8@${version}`,
       '@types/node',
       'tinypool',
-      'typescript',
+      'typescript@6.0.3',
     ], true)
 
     before(function () {
diff --git a/package.json b/package.json
index 21eb2561b9..ae41ead68e 100644
--- a/package.json
+++ b/package.json
@@ -96,6 +96,7 @@
     "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:webdriverio": "mocha --timeout 60000 \"integration-tests/webdriverio/*.spec.js\"",
     "test:integration:webdriverio:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/webdriverio/*.spec.js\"",
     "test:integration:vitest": "mocha --timeout 60000 \"integration-tests/vitest/${SPEC:-vitest*}.spec.js\"",
diff --git a/packages/dd-trace/test/plugins/versions/package.json b/packages/dd-trace/test/plugins/versions/package.json
index a291006a4f..b87b52cb3e 100644
--- a/packages/dd-trace/test/plugins/versions/package.json
+++ b/packages/dd-trace/test/plugins/versions/package.json
@@ -29,14 +29,14 @@
     "@azure/event-hubs": "6.0.4",
     "@azure/functions": "4.16.2",
     "@azure/service-bus": "7.9.5",
-    "@babel/core": "7.29.0",
-    "@babel/preset-typescript": "7.28.5",
+    "@babel/core": "8.0.1",
+    "@babel/preset-typescript": "8.0.1",
     "@confluentinc/kafka-javascript": "1.10.0",
     "@cucumber/cucumber": "13.2.0",
     "@datadog/openfeature-node-server": "2.0.2",
     "@elastic/elasticsearch": "9.4.2",
     "@elastic/transport": "9.3.7",
-    "@electron/packager": "20.0.0",
+    "@electron/packager": "20.0.4",
     "@fastify/cookie": "11.1.2",
     "@fastify/multipart": "10.1.0",
     "@google-cloud/pubsub": "5.3.1",
@@ -47,7 +47,7 @@
     "@grpc/proto-loader": "0.8.1",
     "@hapi/boom": "10.0.1",
     "@hapi/hapi": "21.4.9",
-    "@happy-dom/jest-environment": "20.10.6",
+    "@happy-dom/jest-environment": "20.11.1",
     "@hono/node-server": "2.0.10",
     "@jest/core": "30.4.2",
     "@jest/globals": "30.4.1",
@@ -79,7 +79,7 @@
     "@opentelemetry/instrumentation-express": "0.69.0",
     "@opentelemetry/instrumentation-http": "0.221.0",
     "@opentelemetry/sdk-node": "0.221.0",
-    "@playwright/test": "1.61.0",
+    "@playwright/test": "1.62.0",
     "@prisma/adapter-mariadb": "7.8.0",
     "@prisma/adapter-mssql": "7.8.0",
     "@prisma/adapter-pg": "7.8.0",
@@ -88,9 +88,9 @@
     "@smithy/core": "3.30.0",
     "@smithy/smithy-client": "4.14.14",
     "@types/node": "26.1.1",
-    "@vitest/coverage-istanbul": "4.1.9",
-    "@vitest/coverage-v8": "4.1.9",
-    "@vitest/runner": "4.1.9",
+    "@vitest/coverage-istanbul": "4.1.10",
+    "@vitest/coverage-v8": "4.1.10",
+    "@vitest/runner": "4.1.10",
     "@vscode/sqlite3": "5.1.12-vscode",
     "@wdio/cli": "9.30.0",
     "@wdio/local-runner": "9.30.0",
@@ -118,14 +118,14 @@
     "cookie": "2.0.1",
     "cookie-parser": "1.4.7",
     "couchbase": "4.7.1",
-    "cypress": "15.16.0",
+    "cypress": "15.19.0",
     "cypress-fail-fast": "8.1.0",
     "dd-trace-api": "1.0.1",
     "durable-functions": "3.5.0",
     "ejs": "6.0.1",
     "elasticsearch": "16.7.3",
-    "electron": "42.1.0",
-    "esbuild": "0.28.0",
+    "electron": "43.2.0",
+    "esbuild": "0.28.1",
     "express": "5.2.1",
     "express-mongo-sanitize": "2.2.0",
     "express-session": "1.19.0",
@@ -181,8 +181,8 @@
     "multer": "2.2.0",
     "mysql": "2.18.1",
     "mysql2": "3.23.0",
-    "next": "16.2.6",
-    "nock": "14.0.15",
+    "next": "16.2.11",
+    "nock": "14.0.16",
     "node-18": "npm:node@18.20.8",
     "node-20": "npm:node@20.20.2",
     "node-22": "npm:node@22.22.3",
@@ -203,8 +203,8 @@
     "pg-query-stream": "4.16.0",
     "pino": "10.3.1",
     "pino-pretty": "13.1.3",
-    "playwright": "1.61.0",
-    "playwright-core": "1.61.0",
+    "playwright": "1.62.0",
+    "playwright-core": "1.62.0",
     "pnpm": "11.17.0",
     "prisma": "7.8.0",
     "promise": "8.3.0",
@@ -212,27 +212,27 @@
     "protobufjs": "8.7.1",
     "pug": "3.0.4",
     "q": "2.0.3",
-    "react": "19.2.6",
-    "react-dom": "19.2.6",
+    "react": "19.2.8",
+    "react-dom": "19.2.8",
     "redis": "6.1.0",
     "request": "2.88.2",
     "restify": "11.1.0",
     "rhea": "3.0.5",
     "router": "2.2.0",
-    "selenium-webdriver": "4.44.0",
+    "selenium-webdriver": "4.46.0",
     "sequelize": "6.37.8",
     "sharedb": "6.0.1",
-    "sinon": "22.0.0",
+    "sinon": "22.1.0",
     "sqlite3": "6.0.1",
     "stripe": "22.3.2",
     "tedious": "20.0.0",
     "tinypool": "2.1.0",
-    "typescript": "6.0.3",
+    "typescript": "7.0.2",
     "undici": "8.7.0",
-    "vitest": "4.1.9",
+    "vitest": "4.1.10",
     "when": "3.7.8",
     "winston": "3.19.0",
-    "workerpool": "10.0.2",
+    "workerpool": "10.0.3",
     "ws": "8.21.1",
     "yarn": "1.22.22",
     "zod": "4.4.3",

From 6ba9c88937adf72f02cb24a14b9eb63501938f90 Mon Sep 17 00:00:00 2001
From: Pablo Erhard <104538390+pabloerhard@users.noreply.github.com>
Date: Tue, 28 Jul 2026 11:42:03 -0400
Subject: [PATCH 16/43] fix(logs): properly split name and version for scoped
 names (#9508)

---
 .../src/helpers/hook.js                       |  2 +-
 .../src/helpers/register.js                   |  4 ++-
 .../test/helpers/register.spec.js             | 25 +++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/packages/datadog-instrumentations/src/helpers/hook.js b/packages/datadog-instrumentations/src/helpers/hook.js
index 32ccbc8853..9b0e57ac3d 100644
--- a/packages/datadog-instrumentations/src/helpers/hook.js
+++ b/packages/datadog-instrumentations/src/helpers/hook.js
@@ -82,7 +82,7 @@ function Hook (modules, hookOptions, onrequire) {
       moduleVersion ||= getVersion(moduleBaseDir)
     } catch (error) {
       log.error('Error getting version for "%s": %s', moduleName, error.message, error)
-      return
+      return moduleExports
     }
 
     if (
diff --git a/packages/datadog-instrumentations/src/helpers/register.js b/packages/datadog-instrumentations/src/helpers/register.js
index db0b876674..fe3559cf5a 100644
--- a/packages/datadog-instrumentations/src/helpers/register.js
+++ b/packages/datadog-instrumentations/src/helpers/register.js
@@ -167,7 +167,9 @@ function logAbortedIntegrations () {
   for (const [nameVersion, success] of instrumentedIntegrationsSuccess) {
     // Only ever log a single version of an integration, even if it is loaded later.
     if (!success && !alreadyLoggedIncompatibleIntegrations.has(nameVersion)) {
-      const [name, version] = nameVersion.split('@')
+      const lastAtPosition = nameVersion.lastIndexOf('@')
+      const name = nameVersion.slice(0, lastAtPosition)
+      const version = nameVersion.slice(lastAtPosition + 1)
       telemetry('abort.integration', [
         `integration:${name}`,
         `integration_version:${version}`,
diff --git a/packages/datadog-instrumentations/test/helpers/register.spec.js b/packages/datadog-instrumentations/test/helpers/register.spec.js
index 489fcfee6f..af026dadf3 100644
--- a/packages/datadog-instrumentations/test/helpers/register.spec.js
+++ b/packages/datadog-instrumentations/test/helpers/register.spec.js
@@ -3,12 +3,14 @@
 const Module = require('module')
 const assert = require('node:assert/strict')
 
+const { channel } = require('dc-polyfill')
 const sinon = require('sinon')
 
 describe('register', () => {
   let hooksMock
   let HookMock
   let originalModuleProtoRequire
+  let telemetryMock
 
   const clearRegisterCache = () => {
     const registerPath = require.resolve('../../src/helpers/register')
@@ -29,6 +31,7 @@ describe('register', () => {
     }
 
     HookMock = sinon.stub()
+    telemetryMock = sinon.stub()
 
     const registerPath = require.resolve('../../src/helpers/register')
     originalModuleProtoRequire = Module.prototype.require
@@ -38,6 +41,7 @@ describe('register', () => {
         const stubs = {
           './hooks': hooksMock,
           './hook': HookMock,
+          '../../../dd-trace/src/guardrails/telemetry': telemetryMock,
         }
         return stubs[request] || originalModuleProtoRequire.call(this, request)
       }
@@ -97,4 +101,25 @@ describe('register', () => {
       assert.deepStrictEqual(registeredNames.sort(), ['@confluentinc/kafka-javascript', 'mongodb-core'])
     })
   }
+
+  it('should report the name and version correctly for scoped integration names', () => {
+    loadRegisterWithEnv()
+
+    const integrationName = '@confluentinc/kafka-javascript'
+    const moduleVersion = '0.1.0'
+    const hookCall = HookMock.getCalls().find(({ args }) => args[0][0] === integrationName)
+    const hook = hookCall.args[2]
+
+    hook('original', integrationName, '/path/to/module', moduleVersion)
+    channel('dd-trace:exporter:first-flush').publish()
+
+    sinon.assert.calledOnceWithExactly(telemetryMock, 'abort.integration', [
+      `integration:${integrationName}`,
+      `integration_version:${moduleVersion}`,
+    ], {
+      result: 'abort',
+      result_class: 'incompatible_library',
+      result_reason: `Incompatible integration version: ${integrationName}@${moduleVersion}`,
+    })
+  })
 })

From f38688ab5e9aa0722bf2cbb62dbe4379ceb2358a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2026 16:44:21 +0000
Subject: [PATCH 17/43] chore(deps): bump the web-frameworks group across 1
 directory with 7 updates (#9569)

Bumps the web-frameworks group with 7 updates in the /packages/dd-trace/test/plugins/versions directory:

| Package | From | To |
| --- | --- | --- |
| [@apollo/gateway](https://github.com/apollographql/federation/tree/HEAD/gateway-js) | `2.14.2` | `2.14.3` |
| [@apollo/subgraph](https://github.com/apollographql/federation/tree/HEAD/subgraph-js) | `2.14.2` | `2.14.3` |
| [@hapi/hapi](https://github.com/hapijs/hapi) | `21.4.9` | `21.4.10` |
| [@hono/node-server](https://github.com/honojs/node-server) | `2.0.10` | `2.0.11` |
| [find-my-way](https://github.com/delvedor/find-my-way) | `9.6.0` | `9.7.0` |
| [hono](https://github.com/honojs/hono) | `4.12.30` | `4.12.32` |
| [undici](https://github.com/nodejs/undici) | `8.7.0` | `8.9.0` |



Updates `@apollo/gateway` from 2.14.2 to 2.14.3
- [Release notes](https://github.com/apollographql/federation/releases)
- [Changelog](https://github.com/apollographql/federation/blob/main/gateway-js/CHANGELOG.md)
- [Commits](https://github.com/apollographql/federation/commits/@apollo/gateway@2.14.3/gateway-js)

Updates `@apollo/subgraph` from 2.14.2 to 2.14.3
- [Release notes](https://github.com/apollographql/federation/releases)
- [Changelog](https://github.com/apollographql/federation/blob/main/subgraph-js/CHANGELOG.md)
- [Commits](https://github.com/apollographql/federation/commits/@apollo/subgraph@2.14.3/subgraph-js)

Updates `@hapi/hapi` from 21.4.9 to 21.4.10
- [Release notes](https://github.com/hapijs/hapi/releases)
- [Commits](https://github.com/hapijs/hapi/compare/v21.4.9...v21.4.10)

Updates `@hono/node-server` from 2.0.10 to 2.0.11
- [Release notes](https://github.com/honojs/node-server/releases)
- [Commits](https://github.com/honojs/node-server/compare/v2.0.10...v2.0.11)

Updates `find-my-way` from 9.6.0 to 9.7.0
- [Release notes](https://github.com/delvedor/find-my-way/releases)
- [Commits](https://github.com/delvedor/find-my-way/compare/v9.6.0...v9.7.0)

Updates `hono` from 4.12.30 to 4.12.32
- [Release notes](https://github.com/honojs/hono/releases)
- [Commits](https://github.com/honojs/hono/compare/v4.12.30...v4.12.32)

Updates `undici` from 8.7.0 to 8.9.0
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v8.7.0...v8.9.0)

---
updated-dependencies:
- dependency-name: "@apollo/gateway"
  dependency-version: 2.14.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: web-frameworks
- dependency-name: "@apollo/subgraph"
  dependency-version: 2.14.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: web-frameworks
- dependency-name: "@hapi/hapi"
  dependency-version: 21.4.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: web-frameworks
- dependency-name: "@hono/node-server"
  dependency-version: 2.0.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: web-frameworks
- dependency-name: find-my-way
  dependency-version: 9.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: web-frameworks
- dependency-name: hono
  dependency-version: 4.12.32
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: web-frameworks
- dependency-name: undici
  dependency-version: 8.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: web-frameworks
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../dd-trace/test/plugins/versions/package.json    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/dd-trace/test/plugins/versions/package.json b/packages/dd-trace/test/plugins/versions/package.json
index b87b52cb3e..497e52a375 100644
--- a/packages/dd-trace/test/plugins/versions/package.json
+++ b/packages/dd-trace/test/plugins/versions/package.json
@@ -10,9 +10,9 @@
     "@ai-sdk/openai": "4.0.20",
     "@anthropic-ai/claude-agent-sdk": "0.3.220",
     "@anthropic-ai/sdk": "0.115.0",
-    "@apollo/gateway": "2.14.2",
+    "@apollo/gateway": "2.14.3",
     "@apollo/server": "5.5.1",
-    "@apollo/subgraph": "2.14.2",
+    "@apollo/subgraph": "2.14.3",
     "@aws/durable-execution-sdk-js": "2.2.0",
     "@aws/durable-execution-sdk-js-testing": "1.1.3",
     "@aws-sdk/client-bedrock-runtime": "3.1095.0",
@@ -46,9 +46,9 @@
     "@grpc/grpc-js": "1.14.4",
     "@grpc/proto-loader": "0.8.1",
     "@hapi/boom": "10.0.1",
-    "@hapi/hapi": "21.4.9",
+    "@hapi/hapi": "21.4.10",
     "@happy-dom/jest-environment": "20.11.1",
-    "@hono/node-server": "2.0.10",
+    "@hono/node-server": "2.0.11",
     "@jest/core": "30.4.2",
     "@jest/globals": "30.4.1",
     "@jest/reporters": "30.4.1",
@@ -130,7 +130,7 @@
     "express-mongo-sanitize": "2.2.0",
     "express-session": "1.19.0",
     "fastify": "5.10.0",
-    "find-my-way": "9.6.0",
+    "find-my-way": "9.7.0",
     "fs": "0.0.1-security",
     "generic-pool": "3.9.0",
     "google-gax": "5.0.8",
@@ -140,7 +140,7 @@
     "graphql-yoga": "5.21.2",
     "handlebars": "4.7.9",
     "hapi": "18.1.0",
-    "hono": "4.12.30",
+    "hono": "4.12.32",
     "ioredis": "5.11.1",
     "iovalkey": "0.3.3",
     "jest": "30.4.2",
@@ -228,7 +228,7 @@
     "tedious": "20.0.0",
     "tinypool": "2.1.0",
     "typescript": "7.0.2",
-    "undici": "8.7.0",
+    "undici": "8.9.0",
     "vitest": "4.1.10",
     "when": "3.7.8",
     "winston": "3.19.0",

From 2ccc9d2fd7a085c599a0cbd66e43bbc447e57543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Antonio=20Fern=C3=A1ndez=20de=20Alba?=
 <juan.fernandezdealba@datadoghq.com>
Date: Tue, 28 Jul 2026 19:03:31 +0200
Subject: [PATCH 18/43] fix(test-optimization): wait for WebDriverIO worker
 payloads (#9565)

---
 .../src/mocha/worker.js                       | 64 ++++++++++---
 .../fixtures/webdriverio-delayed-worker.js    | 94 +++++++++++++++++++
 .../test/webdriverio.spec.js                  |  5 +
 packages/datadog-plugin-mocha/src/index.js    |  4 +-
 4 files changed, 153 insertions(+), 14 deletions(-)
 create mode 100644 packages/datadog-instrumentations/test/fixtures/webdriverio-delayed-worker.js

diff --git a/packages/datadog-instrumentations/src/mocha/worker.js b/packages/datadog-instrumentations/src/mocha/worker.js
index 58ebc5d631..112c4479ca 100644
--- a/packages/datadog-instrumentations/src/mocha/worker.js
+++ b/packages/datadog-instrumentations/src/mocha/worker.js
@@ -42,20 +42,22 @@ let configurationRequestId = 0
  *
  * @param {object} message
  * @param {() => void} [onError]
+ * @param {() => void} [onDone]
  * @returns {void}
  */
-function sendWebdriverioMessage (message, onError) {
+function sendWebdriverioMessage (message, onError, onDone) {
   if (!process.send || !process.connected) {
     onError?.()
+    onDone?.()
     return
   }
 
   process.send(createWebdriverioWorkerMessage(message), (error) => {
-    if (!error) {
-      return
+    if (error) {
+      log.error('WebdriverIO Test Optimization IPC error', error)
+      onError?.()
     }
-    log.error('WebdriverIO Test Optimization IPC error', error)
-    onError?.()
+    onDone?.()
   })
 }
 
@@ -266,10 +268,12 @@ function getWebdriverioSuiteResults (runner) {
  * Sends suite results to the WebdriverIO launcher.
  *
  * @param {object} runner
+ * @param {() => void} [onDone]
  * @returns {void}
  */
-function reportWebdriverioSuiteResults (runner) {
+function reportWebdriverioSuiteResults (runner, onDone) {
   if (!isWebdriverioWorker) {
+    onDone?.()
     return
   }
 
@@ -279,7 +283,32 @@ function reportWebdriverioSuiteResults (runner) {
     content: {
       results: getWebdriverioSuiteResults(runner),
     },
-  })
+  }, undefined, onDone)
+}
+
+/**
+ * Flushes worker payloads before reporting suite results and completing Mocha.
+ *
+ * @param {object} runner
+ * @param {() => void} onDone
+ * @returns {void}
+ */
+function finishWebdriverioWorker (runner, onDone) {
+  try {
+    workerFinishCh.publish({
+      onDone: () => {
+        try {
+          reportWebdriverioSuiteResults(runner, onDone)
+        } catch (error) {
+          log.error('WebdriverIO Test Optimization worker completion error', error)
+          onDone()
+        }
+      },
+    })
+  } catch (error) {
+    log.error('WebdriverIO Test Optimization worker completion error', error)
+    onDone()
+  }
 }
 
 function isFailedTestReplayEnabled () {
@@ -376,11 +405,22 @@ addHook({
     if (isFailedTestReplayEnabled()) {
       patchFailedTestReplayHookUp(Runner)
     }
-    // Flush after the worker finishes its Mocha run, including grouped spec files.
-    this.once('end', () => {
-      workerFinishCh.publish()
-      reportWebdriverioSuiteResults(this)
-    })
+    const onRunDone = args[0]
+    if (isWebdriverioWorker && typeof onRunDone === 'function') {
+      args[0] = (...onRunDoneArgs) => {
+        finishWebdriverioWorker(this, () => onRunDone(...onRunDoneArgs))
+      }
+    } else {
+      // Flush after the worker finishes its Mocha run, including grouped spec files.
+      this.once('end', () => {
+        try {
+          workerFinishCh.publish()
+          reportWebdriverioSuiteResults(this)
+        } catch (error) {
+          log.error('WebdriverIO Test Optimization worker completion error', error)
+        }
+      })
+    }
     this.on('test', getOnTestHandler(false))
 
     this.on('test end', getOnTestEndHandler(config))
diff --git a/packages/datadog-instrumentations/test/fixtures/webdriverio-delayed-worker.js b/packages/datadog-instrumentations/test/fixtures/webdriverio-delayed-worker.js
new file mode 100644
index 0000000000..b730a9ecec
--- /dev/null
+++ b/packages/datadog-instrumentations/test/fixtures/webdriverio-delayed-worker.js
@@ -0,0 +1,94 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+const { EventEmitter } = require('node:events')
+
+const { channel } = require('../../src/helpers/instrument')
+const instrumentations = require('../../src/helpers/instrumentations')
+const {
+  SUITE_FINISH,
+  WEBDRIVERIO_WORKER_ENV,
+  WEBDRIVERIO_WORKER_EVENT,
+  WEBDRIVERIO_WORKER_ORIGIN,
+} = require('../../src/mocha/webdriverio-protocol')
+
+process.env[WEBDRIVERIO_WORKER_ENV] = 'true'
+const existingMochaHookCount = instrumentations.mocha?.length || 0
+require('../../src/mocha/worker')
+
+const runnerHook = instrumentations.mocha
+  .slice(existingMochaHookCount)
+  .find(({ file }) => file === 'lib/runner.js')
+
+assert.ok(runnerHook)
+
+const workerFinishCh = channel('ci:mocha:worker:finish')
+let flushDone
+
+function onWorkerFinish ({ onDone }) {
+  flushDone = onDone
+}
+
+workerFinishCh.subscribe(onWorkerFinish)
+
+class FakeRunner extends EventEmitter {
+  constructor () {
+    super()
+    this.failures = 0
+    this.suite = {
+      eachTest () {},
+    }
+  }
+
+  runTests () {}
+
+  run (onDone) {
+    this.emit('end')
+    onDone()
+  }
+}
+
+runnerHook.hook(FakeRunner)
+
+let runDone = false
+let suiteMessageDone
+process.connected = true
+process.send = (message, onDone) => {
+  assert.strictEqual(message.origin, WEBDRIVERIO_WORKER_ORIGIN)
+  assert.strictEqual(message.name, WEBDRIVERIO_WORKER_EVENT)
+  assert.strictEqual(message.args.name, SUITE_FINISH)
+  suiteMessageDone = onDone
+}
+
+new FakeRunner().run(() => {
+  runDone = true
+})
+
+assert.strictEqual(runDone, false)
+assert.strictEqual(typeof flushDone, 'function')
+assert.strictEqual(suiteMessageDone, undefined)
+
+flushDone()
+assert.strictEqual(runDone, false)
+assert.strictEqual(typeof suiteMessageDone, 'function')
+
+suiteMessageDone()
+assert.strictEqual(runDone, true)
+
+runDone = false
+flushDone = undefined
+suiteMessageDone = undefined
+process.connected = false
+
+new FakeRunner().run(() => {
+  runDone = true
+})
+
+assert.strictEqual(runDone, false)
+assert.strictEqual(typeof flushDone, 'function')
+
+flushDone()
+assert.strictEqual(runDone, true)
+assert.strictEqual(suiteMessageDone, undefined)
+
+workerFinishCh.unsubscribe(onWorkerFinish)
diff --git a/packages/datadog-instrumentations/test/webdriverio.spec.js b/packages/datadog-instrumentations/test/webdriverio.spec.js
index f73b710a11..b1a025adca 100644
--- a/packages/datadog-instrumentations/test/webdriverio.spec.js
+++ b/packages/datadog-instrumentations/test/webdriverio.spec.js
@@ -24,6 +24,7 @@ const {
 } = require('../src/mocha/webdriverio-protocol')
 
 const fixturePath = path.join(__dirname, 'fixtures', 'webdriverio-local-runner.mjs')
+const delayedWorkerFixturePath = path.join(__dirname, 'fixtures', 'webdriverio-delayed-worker.js')
 const disconnectedWorkerFixturePath = path.join(__dirname, 'fixtures', 'webdriverio-disconnected-worker.js')
 const regularMochaWorkerFixturePath = path.join(__dirname, 'fixtures', 'mocha-regular-worker.js')
 const fixtureModulePath = path.join(
@@ -150,6 +151,10 @@ describe('webdriverio instrumentation', () => {
     await execFileAsync(process.execPath, [disconnectedWorkerFixturePath])
   })
 
+  it('waits for worker payloads before completing Mocha', async () => {
+    await execFileAsync(process.execPath, [delayedWorkerFixturePath])
+  })
+
   it('does not track WebdriverIO hook failures in regular Mocha workers', async () => {
     await execFileAsync(process.execPath, [regularMochaWorkerFixturePath])
   })
diff --git a/packages/datadog-plugin-mocha/src/index.js b/packages/datadog-plugin-mocha/src/index.js
index b320c82fb9..32eb30a9ed 100644
--- a/packages/datadog-plugin-mocha/src/index.js
+++ b/packages/datadog-plugin-mocha/src/index.js
@@ -216,8 +216,8 @@ class MochaPlugin extends CiPlugin {
       return ctx.currentStore
     })
 
-    this.addSub('ci:mocha:worker:finish', () => {
-      this.tracer._exporter.flush()
+    this.addSub('ci:mocha:worker:finish', ({ onDone } = {}) => {
+      this.tracer._exporter.flush(onDone)
     })
 
     this.addSub('ci:mocha:test:finish', ({

From 974060cbd4a3fe0459c994a5dbebce1778f07b71 Mon Sep 17 00:00:00 2001
From: mehulsonowal <46061187+mehulsonowal@users.noreply.github.com>
Date: Tue, 28 Jul 2026 19:02:45 -0400
Subject: [PATCH 19/43] feat(llmobs): add experiments dataset operations
 (#9458)

* feat(llmobs): add experiments dataset operations

* feat(llmobs): add CSV dataset creation

* chore(llmobs): use csv parser for dataset import

* chore(llmobs): add csv parser license

* feat(llmobs): include dataset version in experiments

* fix(llmobs): address dataset review feedback

* create jsontype to replace any

* remove dataset operations from llmobs

* remove csv dataset func

* noops produce warn logs instead of error throwing

* use vcr testing instead

* Update packages/dd-trace/src/llmobs/experiments/index.js

Co-authored-by: Sam Brenner <106700075+sabrenner@users.noreply.github.com>

* fix(llmobs): address experiments ci failures

* test(llmobs): cover experiments noop accessors

* Apply suggestion from @sabrenner

Co-authored-by: Sam Brenner <106700075+sabrenner@users.noreply.github.com>

* Apply suggestion from @sabrenner

Co-authored-by: Sam Brenner <106700075+sabrenner@users.noreply.github.com>

* fix(llmobs): simplify dataset records query route

* test(llmobs): remove handmade experiment cassettes

* test(llmobs): isolate experiment fetch mocks

---------

Co-authored-by: Sam Brenner <106700075+sabrenner@users.noreply.github.com>
---
 index.d.ts                                    |  48 ++-
 index.d.v5.ts                                 |  48 ++-
 .../dd-trace/src/llmobs/experiments/client.js |   6 +-
 .../src/llmobs/experiments/dataset.js         |  80 +++-
 .../src/llmobs/experiments/experiment.js      |   2 +
 .../dd-trace/src/llmobs/experiments/index.js  |  53 ++-
 .../dd-trace/src/llmobs/experiments/noop.js   | 105 ++++-
 .../test/llmobs/experiments/client.spec.js    |  40 +-
 .../llmobs/experiments/experiment.spec.js     | 400 ++++--------------
 .../test/llmobs/experiments/index.spec.js     | 166 +++++++-
 .../dd-trace/test/llmobs/sdk/index.spec.js    |   7 +
 11 files changed, 546 insertions(+), 409 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 6f703250bd..0048417a75 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -3734,16 +3734,36 @@ declare namespace tracer {
       flush (): void
     }
 
+    /** JSON-serializable value accepted by LLMObs Experiments. */
+    type JSONType = string | number | boolean | null | JSONType[] | { [key: string]: JSONType }
+
     /**
      * A task run over each dataset record during an experiment.
      */
-    type ExperimentTask = (input: any, config: Record<string, any>) => any | Promise<any>
+    type ExperimentTask = (
+      input: JSONType,
+      config: Record<string, JSONType>
+    ) => JSONType | Promise<JSONType>
 
     /**
      * Scores a single task output. The return type selects the metric:
      * `boolean` -> boolean, `number` -> score, anything else -> categorical.
      */
-    type ExperimentEvaluator = (input: any, output: any, expectedOutput: any) => any | Promise<any>
+    type ExperimentEvaluator = (
+      input: JSONType,
+      output: JSONType,
+      expectedOutput: JSONType
+    ) => JSONType | Promise<JSONType>
+
+    interface CreateDatasetOptions {
+      description?: string
+      records?: Array<{
+        id?: string,
+        inputData: JSONType,
+        expectedOutput?: JSONType,
+        metadata?: Record<string, JSONType>
+      }>
+    }
 
     interface ExperimentOptions {
       name: string
@@ -3752,11 +3772,13 @@ declare namespace tracer {
       /** Evaluators keyed by metric label. */
       evaluators?: Record<string, ExperimentEvaluator>
       description?: string
-      config?: Record<string, any>
+      config?: Record<string, JSONType>
       tags?: Record<string, string>
     }
 
     interface PullDatasetOptions {
+      /** Dataset version to pull. Defaults to latest. */
+      version?: number
       /** Wait until at least this many records are readable (absorbs write lag). */
       expectedRecordCount?: number
       /** Maximum total time to wait, in ms. Default 30000. */
@@ -3769,13 +3791,13 @@ declare namespace tracer {
       traceId: string
       startNs: number
       durationNs: number
-      input: any
-      output: any
-      expectedOutput: any
+      input: JSONType
+      output: JSONType
+      expectedOutput: JSONType
       readonly isError: boolean
       errorType: string | null
       errorMessage: string | null
-      evaluations: Record<string, any>
+      evaluations: Record<string, JSONType>
       evaluationErrors: Record<string, string>
     }
 
@@ -3794,13 +3816,20 @@ declare namespace tracer {
     }
 
     interface Dataset {
-      addRecord (input: any, expectedOutput?: any, metadata?: Record<string, any>): Dataset
+      addRecord (input: JSONType, expectedOutput?: JSONType, metadata?: Record<string, JSONType>): Dataset
       /** Creates the dataset remotely if needed and pushes any unpushed records. */
       push (): Promise<DatasetPushResult>
       name (): string
       id (): string | null
       projectId (): string | null
-      records (): Array<{ input: any, expectedOutput: any, metadata: Record<string, any> }>
+      version (): number | null
+      latestVersion (): number | null
+      records (): Array<{
+        id: string | null,
+        input: JSONType,
+        expectedOutput: JSONType,
+        metadata: Record<string, JSONType>
+      }>
       /** Dashboard URL for the dataset, or null until pushed. */
       url (): string | null
     }
@@ -3815,6 +3844,7 @@ declare namespace tracer {
     interface Experiments {
       /** Create a local dataset buffer; pushed on the first experiment run. */
       createDataset (name: string, description?: string): Dataset
+      createDataset (name: string, options?: CreateDatasetOptions): Dataset
       /** Pull an existing dataset (with records) by name. */
       pullDataset (name: string, options?: PullDatasetOptions): Promise<Dataset>
       /** Build an experiment to run over a dataset. */
diff --git a/index.d.v5.ts b/index.d.v5.ts
index 14a7680153..b5041d9116 100644
--- a/index.d.v5.ts
+++ b/index.d.v5.ts
@@ -3931,16 +3931,36 @@ declare namespace tracer {
       flush (): void
     }
 
+    /** JSON-serializable value accepted by LLMObs Experiments. */
+    type JSONType = string | number | boolean | null | JSONType[] | { [key: string]: JSONType }
+
     /**
      * A task run over each dataset record during an experiment.
      */
-    type ExperimentTask = (input: any, config: Record<string, any>) => any | Promise<any>
+    type ExperimentTask = (
+      input: JSONType,
+      config: Record<string, JSONType>
+    ) => JSONType | Promise<JSONType>
 
     /**
      * Scores a single task output. The return type selects the metric:
      * `boolean` -> boolean, `number` -> score, anything else -> categorical.
      */
-    type ExperimentEvaluator = (input: any, output: any, expectedOutput: any) => any | Promise<any>
+    type ExperimentEvaluator = (
+      input: JSONType,
+      output: JSONType,
+      expectedOutput: JSONType
+    ) => JSONType | Promise<JSONType>
+
+    interface CreateDatasetOptions {
+      description?: string
+      records?: Array<{
+        id?: string,
+        inputData: JSONType,
+        expectedOutput?: JSONType,
+        metadata?: Record<string, JSONType>
+      }>
+    }
 
     interface ExperimentOptions {
       name: string
@@ -3949,11 +3969,13 @@ declare namespace tracer {
       /** Evaluators keyed by metric label. */
       evaluators?: Record<string, ExperimentEvaluator>
       description?: string
-      config?: Record<string, any>
+      config?: Record<string, JSONType>
       tags?: Record<string, string>
     }
 
     interface PullDatasetOptions {
+      /** Dataset version to pull. Defaults to latest. */
+      version?: number
       /** Wait until at least this many records are readable (absorbs write lag). */
       expectedRecordCount?: number
       /** Maximum total time to wait, in ms. Default 30000. */
@@ -3966,13 +3988,13 @@ declare namespace tracer {
       traceId: string
       startNs: number
       durationNs: number
-      input: any
-      output: any
-      expectedOutput: any
+      input: JSONType
+      output: JSONType
+      expectedOutput: JSONType
       readonly isError: boolean
       errorType: string | null
       errorMessage: string | null
-      evaluations: Record<string, any>
+      evaluations: Record<string, JSONType>
       evaluationErrors: Record<string, string>
     }
 
@@ -3991,13 +4013,20 @@ declare namespace tracer {
     }
 
     interface Dataset {
-      addRecord (input: any, expectedOutput?: any, metadata?: Record<string, any>): Dataset
+      addRecord (input: JSONType, expectedOutput?: JSONType, metadata?: Record<string, JSONType>): Dataset
       /** Creates the dataset remotely if needed and pushes any unpushed records. */
       push (): Promise<DatasetPushResult>
       name (): string
       id (): string | null
       projectId (): string | null
-      records (): Array<{ input: any, expectedOutput: any, metadata: Record<string, any> }>
+      version (): number | null
+      latestVersion (): number | null
+      records (): Array<{
+        id: string | null,
+        input: JSONType,
+        expectedOutput: JSONType,
+        metadata: Record<string, JSONType>
+      }>
       /** Dashboard URL for the dataset, or null until pushed. */
       url (): string | null
     }
@@ -4012,6 +4041,7 @@ declare namespace tracer {
     interface Experiments {
       /** Create a local dataset buffer; pushed on the first experiment run. */
       createDataset (name: string, description?: string): Dataset
+      createDataset (name: string, options?: CreateDatasetOptions): Dataset
       /** Pull an existing dataset (with records) by name. */
       pullDataset (name: string, options?: PullDatasetOptions): Promise<Dataset>
       /** Build an experiment to run over a dataset. */
diff --git a/packages/dd-trace/src/llmobs/experiments/client.js b/packages/dd-trace/src/llmobs/experiments/client.js
index 8477ae6b96..eef517cc08 100644
--- a/packages/dd-trace/src/llmobs/experiments/client.js
+++ b/packages/dd-trace/src/llmobs/experiments/client.js
@@ -14,9 +14,11 @@ function apiHost (site) {
 }
 
 // Web-app host for dashboard URLs. Single-level sites (datadoghq.com,
-// ddog-gov.com) are served from the `app.` subdomain; regional sites
-// (us3.datadoghq.com, ap1.datadoghq.com) are used as-is.
+// ddog-gov.com) are served from the `app.` subdomain; staging uses
+// dd.datad0g.com; regional sites (us3.datadoghq.com, ap1.datadoghq.com)
+// are used as-is.
 function appHost (site) {
+  if (site === 'datad0g.com') return 'dd.datad0g.com'
   return site.split('.').length === 2 ? `app.${site}` : site
 }
 
diff --git a/packages/dd-trace/src/llmobs/experiments/dataset.js b/packages/dd-trace/src/llmobs/experiments/dataset.js
index db9bf4f872..a3b3b93761 100644
--- a/packages/dd-trace/src/llmobs/experiments/dataset.js
+++ b/packages/dd-trace/src/llmobs/experiments/dataset.js
@@ -2,15 +2,35 @@
 
 const { API_BASE_PATH } = require('./client')
 
-// Immutable dataset record: { input, expectedOutput?, metadata? }.
+// Dataset record: { input, expectedOutput?, metadata?, id? }.
+// `id` may be user-provided before push or filled from the backend-created record.
 class DatasetRecord {
-  constructor (input, expectedOutput = null, metadata = {}) {
+  constructor (input, expectedOutput = null, metadata = {}, id = null) {
     this.input = input
     this.expectedOutput = expectedOutput ?? null
     this.metadata = metadata ?? {}
+    this.id = id ?? null
   }
 }
 
+function createdRecordsFromResponse (response) {
+  if (Array.isArray(response?.records)) return response.records
+  if (Array.isArray(response?.data)) return response.data
+  return []
+}
+
+function recordIdFromCreatedRecord (record) {
+  return String(record?.id ?? record?.attributes?.id ?? '')
+}
+
+function versionFromCreatedRecords (records) {
+  const versions = records
+    .map(record => Number(record?.attributes?.valid_from_version ?? record?.attributes?.version))
+    .filter(Number.isFinite)
+  if (versions.length === 0) return null
+  return Math.max(...versions)
+}
+
 // A local buffer of dataset records, created remotely and pushed on first run
 // (or eagerly via push()). Pushes are incremental.
 class Dataset {
@@ -22,6 +42,8 @@ class Dataset {
   #id
   #projectId
   #pushedCount
+  #version
+  #latestVersion
 
   constructor (client, name, description = '') {
     this.#client = client
@@ -32,16 +54,20 @@ class Dataset {
     this.#id = null
     this.#projectId = null
     this.#pushedCount = 0
+    this.#version = null
+    this.#latestVersion = null
   }
 
   // Build a Dataset that already exists remotely (used by pullDataset).
-  static fromExisting (client, name, description, id, projectId, records, recordIds) {
+  static fromExisting (client, name, description, id, projectId, records, recordIds, version, latestVersion) {
     const dataset = new Dataset(client, name, description)
     dataset.#id = id
     dataset.#projectId = projectId
     dataset.#records.push(...records)
     dataset.#recordIds.push(...recordIds)
     dataset.#pushedCount = records.length
+    dataset.#version = version ?? null
+    dataset.#latestVersion = latestVersion ?? version ?? null
     return dataset
   }
 
@@ -74,6 +100,14 @@ class Dataset {
     return this.#projectId
   }
 
+  version () {
+    return this.#version
+  }
+
+  latestVersion () {
+    return this.#latestVersion
+  }
+
   // Dashboard URL for this dataset, or null until pushed/pulled.
   url () {
     if (this.#id === null) return null
@@ -100,7 +134,12 @@ class Dataset {
         throw new Error(`Failed to create dataset '${this.#name}': ${err.message}`)
       }
       this.#id = response?.data?.id ?? null
+      if (this.#id === null) {
+        throw new Error(`Failed to create dataset '${this.#name}': backend response is missing dataset id`)
+      }
       this.#projectId = projectId
+      this.#version = response?.data?.attributes?.current_version ?? this.#version
+      this.#latestVersion = response?.data?.attributes?.current_version ?? this.#latestVersion
     }
 
     if (this.#pushedCount >= this.#records.length) return { pushedCount: 0, totalCount: 0 }
@@ -108,6 +147,9 @@ class Dataset {
     const pending = this.#records.slice(this.#pushedCount)
     const records = pending.map((rec) => {
       const out = { input: rec.input }
+      if (rec.id != null) {
+        out.id = rec.id
+      }
       if (rec.expectedOutput !== null && rec.expectedOutput !== undefined) {
         out.expected_output = rec.expectedOutput
       }
@@ -128,20 +170,30 @@ class Dataset {
       throw new Error(`Failed to push records to dataset '${this.#name}': ${err.message}`)
     }
 
-    // The append-records response returns created records under a top-level
-    // `records` field, not the usual `data` envelope.
-    const created = response?.records
+    // The append-records response has used both a top-level `records` array
+    // and JSON:API `data` resources. Accept either so generated/custom record
+    // ids are preserved for experiment row tagging.
+    const created = createdRecordsFromResponse(response)
+    const pushedVersion = versionFromCreatedRecords(created)
+    if (pushedVersion === null) {
+      // The dataset contents changed, but the backend did not report the new
+      // version. Avoid pinning later experiments to the pre-append create version.
+      this.#version = null
+    } else {
+      this.#version = pushedVersion
+      this.#latestVersion = Math.max(Number(this.#latestVersion ?? pushedVersion), pushedVersion)
+    }
+
     let pushedCount = 0
-    if (Array.isArray(created)) {
-      for (const node of created) {
-        const recordId = String(node?.id ?? '')
-        if (recordId !== '') pushedCount++
-        this.#recordIds.push(recordId)
+    for (const [index, node] of created.entries()) {
+      const recordId = recordIdFromCreatedRecord(node)
+      if (recordId !== '') {
+        pushedCount++
+        pending[index].id = recordId
       }
-      for (let i = created.length; i < pending.length; i++) this.#recordIds.push('')
-    } else {
-      for (let i = 0; i < pending.length; i++) this.#recordIds.push('')
+      this.#recordIds.push(recordId)
     }
+    for (let i = created.length; i < pending.length; i++) this.#recordIds.push('')
 
     // Advance by the snapshotted pending count, not the live records length,
     // so records added while this push was in flight aren't skipped by the next push.
diff --git a/packages/dd-trace/src/llmobs/experiments/experiment.js b/packages/dd-trace/src/llmobs/experiments/experiment.js
index d415f00a8f..8a2c603468 100644
--- a/packages/dd-trace/src/llmobs/experiments/experiment.js
+++ b/packages/dd-trace/src/llmobs/experiments/experiment.js
@@ -149,6 +149,8 @@ class Experiment {
       description: this.#description,
       ensure_unique: true,
     }
+    const datasetVersion = this.#dataset.version()
+    if (datasetVersion !== null) attributes.dataset_version = datasetVersion
     if (Object.keys(this.#config).length > 0) attributes.config = this.#config
 
     let created
diff --git a/packages/dd-trace/src/llmobs/experiments/index.js b/packages/dd-trace/src/llmobs/experiments/index.js
index ca9cd2f05c..b7b34edcb5 100644
--- a/packages/dd-trace/src/llmobs/experiments/index.js
+++ b/packages/dd-trace/src/llmobs/experiments/index.js
@@ -39,21 +39,38 @@ class Experiments {
   }
 
   // Create a local dataset buffer. Pushed remotely on first experiment run.
-  createDataset (name, description = '') {
-    return new Dataset(this.#client, name, description)
+  createDataset (name, descriptionOrOptions = '') {
+    const options = typeof descriptionOrOptions === 'string'
+      ? { description: descriptionOrOptions }
+      : (descriptionOrOptions ?? {})
+    const dataset = new Dataset(this.#client, name, options.description ?? '')
+    const recordIds = new Set()
+    for (const record of options.records ?? []) {
+      if (record.id !== undefined && (typeof record.id !== 'string' || record.id.length === 0)) {
+        throw new Error('record id must be a non-empty string')
+      }
+      if (record.id !== undefined) {
+        if (recordIds.has(record.id)) throw new Error(`Duplicate record id '${record.id}'`)
+        recordIds.add(record.id)
+      }
+      dataset.addRecord(new DatasetRecord(record.inputData, record.expectedOutput, record.metadata, record.id))
+    }
+    return dataset
   }
 
   // Pull an existing dataset by name (with its records). Polls with exponential
   // backoff to absorb read-after-write lag; pass `expectedRecordCount` to also
   // wait until that many records are readable.
   async pullDataset (name, options = {}) {
-    const { expectedRecordCount, maxWaitMs = 30_000 } = options
+    const { expectedRecordCount, maxWaitMs = 30_000, version } = options
     const projectId = await this.#client.ensureProjectId()
 
     let datasetId = null
     let description = ''
     let records = []
     let recordIds = []
+    let datasetVersion = version ?? null
+    let latestVersion = null
     let lastError = ''
 
     const succeeded = await retryWithBackoff(async () => {
@@ -67,6 +84,8 @@ class Experiments {
             if (item?.attributes?.name === name) {
               datasetId = String(item?.id ?? '')
               description = String(item?.attributes?.description ?? '')
+              latestVersion = item?.attributes?.current_version ?? null
+              datasetVersion = version ?? latestVersion
               break
             }
           }
@@ -78,16 +97,24 @@ class Experiments {
         let cursor = ''
         // Follow the meta.after / page[cursor] pagination until the last page.
         for (;;) {
-          const query = cursor ? `?page[cursor]=${encodeURIComponent(cursor)}` : ''
+          const query = new URLSearchParams()
+          if (cursor) query.set('page[cursor]', cursor)
+          if (datasetVersion !== null) query.set('filter[version]', String(datasetVersion))
           // eslint-disable-next-line no-await-in-loop
           const resp = await this.#client.request(
             'GET',
-            `${API_BASE_PATH}/${projectId}/datasets/${datasetId}/records${query}`
+            `${API_BASE_PATH}/${projectId}/datasets/${datasetId}/records?${query.toString()}`
           )
           for (const item of resp?.data ?? []) {
             const attrs = item?.attributes ?? item
-            recs.push(new DatasetRecord(attrs?.input ?? null, attrs?.expected_output ?? null, attrs?.metadata ?? {}))
-            ids.push(String(item?.id ?? ''))
+            const recordId = String(item?.id ?? attrs?.id ?? '')
+            recs.push(new DatasetRecord(
+              attrs?.input ?? null,
+              attrs?.expected_output ?? null,
+              attrs?.metadata ?? {},
+              recordId === '' ? null : recordId
+            ))
+            ids.push(recordId)
           }
           cursor = resp?.meta?.after ?? ''
           if (!cursor) break
@@ -119,7 +146,17 @@ class Experiments {
       )
     }
 
-    return Dataset.fromExisting(this.#client, name, description, datasetId, projectId, records, recordIds)
+    return Dataset.fromExisting(
+      this.#client,
+      name,
+      description,
+      datasetId,
+      projectId,
+      records,
+      recordIds,
+      datasetVersion,
+      latestVersion
+    )
   }
 
   // Build an experiment: { name, dataset, task, evaluators, description?, config?, tags? }.
diff --git a/packages/dd-trace/src/llmobs/experiments/noop.js b/packages/dd-trace/src/llmobs/experiments/noop.js
index bb80c4142c..ae32172f6b 100644
--- a/packages/dd-trace/src/llmobs/experiments/noop.js
+++ b/packages/dd-trace/src/llmobs/experiments/noop.js
@@ -1,8 +1,90 @@
 'use strict'
 
+const log = require('../../log')
+
+class NoopDataset {
+  #name
+  #records
+
+  constructor (name = '', options = {}) {
+    this.#name = name
+    this.#records = (typeof options === 'string' ? [] : (options.records ?? [])).map(record => ({
+      id: record.id ?? null,
+      input: record.inputData,
+      expectedOutput: record.expectedOutput ?? null,
+      metadata: record.metadata ?? {},
+    }))
+  }
+
+  addRecord (input, expectedOutput, metadata) {
+    this.#records.push({ id: null, input, expectedOutput: expectedOutput ?? null, metadata: metadata ?? {} })
+    return this
+  }
+
+  push () {
+    return Promise.resolve({ pushedCount: 0, totalCount: 0 })
+  }
+
+  name () {
+    return this.#name
+  }
+
+  id () {
+    return null
+  }
+
+  projectId () {
+    return null
+  }
+
+  version () {
+    return null
+  }
+
+  latestVersion () {
+    return null
+  }
+
+  records () {
+    return [...this.#records]
+  }
+
+  recordIds () {
+    return []
+  }
+
+  url () {
+    return null
+  }
+}
+
+class NoopExperiment {
+  #name
+
+  constructor (name = '') {
+    this.#name = name
+  }
+
+  name () {
+    return this.#name
+  }
+
+  experimentId () {
+    return null
+  }
+
+  url () {
+    return null
+  }
+
+  run () {
+    return Promise.resolve({ experimentId: null, rows: [], url: null })
+  }
+}
+
 // No-op Experiments used when LLM Observability is disabled or the API/APP keys
-// are not configured. Every operation throws a clear, actionable error rather
-// than silently doing nothing, so misconfiguration surfaces immediately.
+// are not configured. Operations warn and return inert objects rather than
+// throwing, so intentionally disabled experiments remain graceful.
 class NoopExperiments {
   #reason
 
@@ -10,20 +92,23 @@ class NoopExperiments {
     this.#reason = reason || 'LLMObs experiments are not available'
   }
 
-  #unavailable () {
-    return new Error(`LLMObs experiments unavailable: ${this.#reason}`)
+  #warn () {
+    log.warn('LLMObs experiments unavailable: %s', this.#reason)
   }
 
-  createDataset () {
-    throw this.#unavailable()
+  createDataset (name, options = {}) {
+    this.#warn()
+    return new NoopDataset(name, options)
   }
 
-  pullDataset () {
-    return Promise.reject(this.#unavailable())
+  pullDataset (name) {
+    this.#warn()
+    return Promise.resolve(new NoopDataset(name))
   }
 
-  experiment () {
-    throw this.#unavailable()
+  experiment (options = {}) {
+    this.#warn()
+    return new NoopExperiment(options.name)
   }
 }
 
diff --git a/packages/dd-trace/test/llmobs/experiments/client.spec.js b/packages/dd-trace/test/llmobs/experiments/client.spec.js
index eb0d7561b3..721ecf8785 100644
--- a/packages/dd-trace/test/llmobs/experiments/client.spec.js
+++ b/packages/dd-trace/test/llmobs/experiments/client.spec.js
@@ -7,11 +7,20 @@ const sinon = require('sinon')
 const { ExperimentsClient, apiHost, appHost } = require('../../../src/llmobs/experiments/client')
 
 describe('LLMObs Experiments control-plane client', () => {
+  let fetchError
+  let fetchResponse
+  let fetchStub
   let originalFetch
 
   beforeEach(() => {
     originalFetch = global.fetch
-    global.fetch = sinon.stub()
+    fetchError = undefined
+    fetchResponse = undefined
+    fetchStub = sinon.stub().callsFake(async () => {
+      if (fetchError) throw fetchError
+      return fetchResponse
+    })
+    global.fetch = fetchStub
   })
 
   afterEach(() => {
@@ -19,12 +28,16 @@ describe('LLMObs Experiments control-plane client', () => {
     sinon.restore()
   })
 
+  const rejectWith = (error) => {
+    fetchError = error
+  }
+
   const resolveWith = (status, body) => {
-    global.fetch.resolves({
+    fetchResponse = {
       ok: status >= 200 && status < 300,
       status,
       text: sinon.stub().resolves(JSON.stringify(body)),
-    })
+    }
   }
 
   it('resolves the control-plane host from the site', () => {
@@ -33,12 +46,13 @@ describe('LLMObs Experiments control-plane client', () => {
     assert.equal(apiHost('datad0g.com'), 'api.datad0g.com')
   })
 
-  it('resolves the web-app host (app.<site> for single-level, regional as-is)', () => {
+  it('resolves the web-app host (app.<site> for single-level, staging override, regional as-is)', () => {
     assert.equal(appHost('datadoghq.com'), 'app.datadoghq.com')
+    assert.equal(appHost('datad0g.com'), 'dd.datad0g.com')
     assert.equal(appHost('us3.datadoghq.com'), 'us3.datadoghq.com')
-    const client = new ExperimentsClient({ apiKey: 'k', appKey: 'a', site: 'datadoghq.com' })
-    assert.equal(client.appBase, 'https://app.datadoghq.com')
-    assert.equal(client.site, 'datadoghq.com')
+    const client = new ExperimentsClient({ apiKey: 'k', appKey: 'a', site: 'datad0g.com' })
+    assert.equal(client.appBase, 'https://dd.datad0g.com')
+    assert.equal(client.site, 'datad0g.com')
   })
 
   it('ensureProjectId resolves the configured project name', async () => {
@@ -46,7 +60,7 @@ describe('LLMObs Experiments control-plane client', () => {
     const client = new ExperimentsClient({ apiKey: 'k', appKey: 'a', site: 'datadoghq.com', projectName: 'cfg-app' })
     const id = await client.ensureProjectId()
     assert.equal(id, 'proj-9')
-    assert.deepEqual(JSON.parse(global.fetch.firstCall.args[1].body), {
+    assert.deepEqual(JSON.parse(fetchStub.firstCall.args[1].body), {
       data: { type: 'projects', attributes: { name: 'cfg-app' } },
     })
   })
@@ -64,9 +78,9 @@ describe('LLMObs Experiments control-plane client', () => {
     const id = await client.getOrCreateProject('my-project')
 
     assert.equal(id, 'proj-123')
-    sinon.assert.calledOnce(global.fetch)
+    sinon.assert.calledOnce(fetchStub)
 
-    const [url, opts] = global.fetch.firstCall.args
+    const [url, opts] = fetchStub.firstCall.args
     assert.equal(url, 'https://api.datadoghq.com/api/v2/llm-obs/v1/projects')
     assert.equal(opts.method, 'POST')
     assert.equal(opts.headers['DD-API-KEY'], 'key')
@@ -86,7 +100,7 @@ describe('LLMObs Experiments control-plane client', () => {
 
     assert.equal(first, 'proj-123')
     assert.equal(second, 'proj-123')
-    sinon.assert.calledOnce(global.fetch)
+    sinon.assert.calledOnce(fetchStub)
   })
 
   it('routes regional sites to api.<region>.<site>', async () => {
@@ -95,7 +109,7 @@ describe('LLMObs Experiments control-plane client', () => {
     const client = new ExperimentsClient({ apiKey: 'k', appKey: 'a', site: 'us3.datadoghq.com' })
     await client.getOrCreateProject('p')
 
-    assert.equal(global.fetch.firstCall.args[0], 'https://api.us3.datadoghq.com/api/v2/llm-obs/v1/projects')
+    assert.equal(fetchStub.firstCall.args[0], 'https://api.us3.datadoghq.com/api/v2/llm-obs/v1/projects')
   })
 
   it('throws a clear error on a non-2xx response', async () => {
@@ -109,7 +123,7 @@ describe('LLMObs Experiments control-plane client', () => {
   })
 
   it('throws a clear error when the request itself fails', async () => {
-    global.fetch.rejects(new Error('network down'))
+    rejectWith(new Error('network down'))
 
     const client = new ExperimentsClient({ apiKey: 'k', appKey: 'a', site: 'datadoghq.com' })
     await assert.rejects(
diff --git a/packages/dd-trace/test/llmobs/experiments/experiment.spec.js b/packages/dd-trace/test/llmobs/experiments/experiment.spec.js
index 5ce9adb2d3..2a7fd6b82a 100644
--- a/packages/dd-trace/test/llmobs/experiments/experiment.spec.js
+++ b/packages/dd-trace/test/llmobs/experiments/experiment.spec.js
@@ -1,82 +1,70 @@
 'use strict'
 
 const assert = require('node:assert/strict')
-const { afterEach, beforeEach, describe, it } = require('mocha')
-const sinon = require('sinon')
 
-const { ExperimentsClient } = require('../../../src/llmobs/experiments/client')
-const { Dataset } = require('../../../src/llmobs/experiments/dataset')
-const { Experiment } = require('../../../src/llmobs/experiments/experiment')
+const { describe, it } = require('mocha')
 
-// Routes the control-plane + events calls a run makes, recording each request.
-function installFetch (calls, overrides = {}) {
-  const route = (method, path, body) => {
-    if (method === 'POST' && path === '/api/v2/llm-obs/v1/projects') return { data: { id: 'proj' } }
-    if (method === 'POST' && path.endsWith('/proj/datasets/ds/records')) {
-      return { records: body.data.attributes.records.map((_, i) => ({ id: `rec-${i}` })) }
-    }
-    if (method === 'POST' && path.endsWith('/proj/datasets')) return { data: { id: 'ds' } }
-    if (method === 'POST' && path.endsWith('/experiments/exp/events')) return {}
-    if (method === 'PATCH' && path.endsWith('/experiments/exp')) return {}
-    if (method === 'POST' && path.endsWith('/experiments')) return { data: { id: 'exp' } }
-    return {}
-  }
+const { API_BASE_PATH, ExperimentsClient } = require('../../../src/llmobs/experiments/client')
+const { Dataset, DatasetRecord } = require('../../../src/llmobs/experiments/dataset')
+const { Experiment } = require('../../../src/llmobs/experiments/experiment')
 
-  global.fetch = sinon.stub().callsFake(async (url, opts) => {
-    const u = new URL(url)
-    const body = opts.body ? JSON.parse(opts.body) : undefined
-    calls.push({ method: opts.method, host: u.host, path: u.pathname, body })
-    const payload = (overrides[`${opts.method} ${u.pathname}`]) ?? route(opts.method, u.pathname, body)
-    return { ok: true, status: 200, text: sinon.stub().resolves(JSON.stringify(payload)) }
-  })
+function defaultAppendRecordAttributes (_record, index) {
+  return { id: `rec-${index}`, valid_from_version: 2 }
 }
 
-// Like installFetch, but returns a non-2xx for the given `METHOD /pathname`.
-function installFetchFailing (calls, failKey) {
-  installFetch(calls)
-  const stub = global.fetch
-  global.fetch = sinon.stub().callsFake(async (url, opts) => {
-    const u = new URL(url)
-    if (`${opts.method} ${u.pathname}` === failKey) {
-      calls.push({ method: opts.method, path: u.pathname, failed: true })
-      return { ok: false, status: 500, text: sinon.stub().resolves('boom') }
-    }
-    return stub(url, opts)
-  })
+function stubClient ({ appendRecordAttributes = defaultAppendRecordAttributes, createDatasetError } = {}) {
+  const requests = []
+  return {
+    appBase: 'https://app.datadoghq.com',
+    requests,
+    ensureProjectId: async () => 'proj',
+    request: async (method, requestPath, body) => {
+      requests.push({ method, path: requestPath, body })
+      if (method === 'POST' && requestPath === `${API_BASE_PATH}/proj/datasets`) {
+        if (createDatasetError) throw createDatasetError
+        return { data: { id: 'ds', attributes: { current_version: 1 } } }
+      }
+      if (method === 'POST' && requestPath === `${API_BASE_PATH}/proj/datasets/ds/records`) {
+        return {
+          data: body.data.attributes.records.map((record, index) => ({
+            id: record.id ?? `rec-${index}`,
+            attributes: appendRecordAttributes(record, index),
+          })),
+        }
+      }
+      if (method === 'POST' && requestPath === `${API_BASE_PATH}/experiments`) {
+        return { data: { id: 'exp' } }
+      }
+      if (method === 'POST' && requestPath === `${API_BASE_PATH}/experiments/exp/events`) return {}
+      if (method === 'PATCH' && requestPath === `${API_BASE_PATH}/experiments/exp`) return {}
+      throw new Error(`Unexpected request ${method} ${requestPath}`)
+    },
+  }
 }
 
 describe('LLMObs Experiments — dataset + experiment run', () => {
-  let originalFetch
-  let calls
-  let client
-
-  beforeEach(() => {
-    originalFetch = global.fetch
-    calls = []
-    installFetch(calls)
-    client = new ExperimentsClient({ apiKey: 'k', appKey: 'a', site: 'datadoghq.com', projectName: 'my-app' })
-  })
-
-  afterEach(() => {
-    global.fetch = originalFetch
-    sinon.restore()
+  const client = () => new ExperimentsClient({
+    apiKey: 'k',
+    appKey: 'a',
+    site: 'datadoghq.com',
+    projectName: 'my-app',
   })
 
-  const eventsBody = () => calls.find(c => c.path.endsWith('/experiments/exp/events')).body
-
-  it('runs an experiment and returns rows, id and dashboard url', async () => {
-    const dataset = new Dataset(client, 'demo', 'desc')
+  it('runs an experiment and returns rows, ids and dashboard URLs', async () => {
+    const c = stubClient()
+    const dataset = new Dataset(c, 'demo', 'desc')
       .addRecord({ q: 'apple' }, 'true', { row: 0 })
       .addRecord({ q: 'car' }, 'false', { row: 1 })
 
-    const result = await new Experiment(client, {
+    const result = await new Experiment(c, {
       name: 'exp-demo',
+      description: 'desc exp',
       dataset,
       task: (input) => ({ answer: input.q.toUpperCase() }),
       evaluators: {
-        nonempty: (_i, o) => o.answer.length > 0,
-        len: (_i, o) => o.answer.length,
-        label: (_i, o) => (o.answer === 'APPLE' ? 'match' : 'miss'),
+        nonempty: (_input, output) => output.answer.length > 0,
+        len: (_input, output) => output.answer.length,
+        label: (_input, output) => (output.answer === 'APPLE' ? 'match' : 'miss'),
       },
       config: { temperature: 0 },
       tags: { env: 'test' },
@@ -89,182 +77,45 @@ describe('LLMObs Experiments — dataset + experiment run', () => {
     assert.equal(result.rows[0].evaluations.nonempty, true)
     assert.equal(result.rows[0].evaluations.len, 5)
     assert.equal(result.rows[0].evaluations.label, 'match')
+    assert.equal(dataset.id(), 'ds')
+    assert.equal(dataset.version(), 2)
+    assert.deepEqual(dataset.recordIds(), ['rec-0', 'rec-1'])
     assert.equal(dataset.url(), 'https://app.datadoghq.com/llm/datasets/ds')
   })
 
-  it('sends records with type "datasets" and only new records on re-push', async () => {
-    const dataset = new Dataset(client, 'demo').addRecord('a')
-    await dataset.push()
-    dataset.addRecord('b')
-    await dataset.push()
-
-    const recordPosts = calls.filter(c => c.method === 'POST' && c.path.endsWith('/proj/datasets/ds/records'))
-    assert.equal(recordPosts.length, 2)
-    assert.equal(recordPosts[0].body.data.type, 'datasets')
-    assert.deepEqual(recordPosts[1].body.data.attributes.records.map(r => r.input), ['b'])
-  })
-
-  it('does not drop records added while a push is in flight', async () => {
-    const dataset = new Dataset(client, 'demo').addRecord('a')
-
-    let resolveRecordsFetch
-    const routingFetch = global.fetch
-    global.fetch = sinon.stub().callsFake((url, opts) => {
-      const u = new URL(url)
-      if (opts.method === 'POST' && u.pathname === '/api/v2/llm-obs/v1/proj/datasets/ds/records') {
-        return new Promise((resolve) => {
-          resolveRecordsFetch = () => resolve({
-            ok: true,
-            status: 200,
-            text: sinon.stub().resolves(JSON.stringify({ records: [{ id: 'rec-0' }] })),
-          })
-        })
-      }
-      return routingFetch(url, opts)
-    })
-
-    const pushPromise = dataset.push()
-    // Let push() get past dataset creation and snapshot pending records, up to the
-    // in-flight records POST, before adding a second record.
-    await new Promise((resolve) => setTimeout(resolve, 0))
-    dataset.addRecord('b')
-    resolveRecordsFetch()
-    await pushPromise
-
-    global.fetch = routingFetch
-    await dataset.push()
-
-    // Only the second push's records POST goes through the instrumented `calls` route
-    // (the first push's records POST was intercepted above to control its timing).
-    const recordPosts = calls.filter(c => c.method === 'POST' && c.path.endsWith('/proj/datasets/ds/records'))
-    assert.equal(recordPosts.length, 1, 'expected a second push to send the record dropped by the race')
-    assert.deepEqual(recordPosts[0].body.data.attributes.records.map((r) => r.input), ['b'])
-    assert.deepEqual(dataset.records().map((r) => r.input), ['a', 'b'])
-    assert.equal(dataset.recordIds().length, 2)
-  })
-
-  it('posts events with type "experiments", one span per row, auto tags and raw metadata', async () => {
-    const dataset = new Dataset(client, 'demo').addRecord({ q: 'apple' }, 'true', { row: 0 })
-    await new Experiment(client, {
-      name: 'exp-demo',
-      dataset,
-      task: (i) => ({ answer: i.q }),
-      evaluators: { ok: () => true },
-      tags: { env: 'test' },
-    }).run()
-
-    const body = eventsBody()
-    assert.equal(body.data.type, 'experiments')
-    const span = body.data.attributes.spans[0]
-    assert.match(span.span_id, /^[0-9a-f]{16}$/)
-    assert.match(span.trace_id, /^[0-9a-f]{32}$/)
-    // Root-span convention: the trace id's low 64 bits are the span id itself.
-    assert.equal(span.trace_id.slice(16), span.span_id)
-    assert.equal(span.status, 'ok')
-    assert.ok(span.tags.includes('experiment_id:exp'))
-    assert.ok(span.tags.includes('dataset_id:ds'))
-    assert.ok(span.tags.includes('dataset_record_id:rec-0'))
-    assert.ok(span.tags.includes('env:test'))
-    assert.deepEqual(span.meta.metadata, { row: 0 })
-  })
-
-  it('infers metric type from the evaluator return value', async () => {
-    const dataset = new Dataset(client, 'demo').addRecord('x')
-    await new Experiment(client, {
-      name: 'exp-demo',
-      dataset,
-      task: () => 'out',
-      evaluators: { b: () => true, s: () => 0.5, c: () => 'label' },
-    }).run()
-
-    const metrics = eventsBody().data.attributes.metrics
-    const byLabel = (l) => metrics.find(m => m.label === l)
-    assert.equal(byLabel('b').metric_type, 'boolean')
-    assert.equal(byLabel('b').boolean_value, true)
-    assert.equal(byLabel('s').metric_type, 'score')
-    assert.equal(byLabel('s').score_value, 0.5)
-    assert.equal(byLabel('c').metric_type, 'categorical')
-    assert.equal(byLabel('c').categorical_value, 'label')
-  })
-
-  it('captures a task error per row without aborting the run, but marks the experiment failed', async () => {
-    const dataset = new Dataset(client, 'demo').addRecord('good').addRecord('bad').addRecord('good2')
-    const result = await new Experiment(client, {
-      name: 'exp-demo',
-      dataset,
-      task: (input) => { if (input === 'bad') throw new Error('boom'); return `ok:${input}` },
-      evaluators: { len: (_i, o) => String(o ?? '').length },
-    }).run()
-
-    assert.equal(result.rows.length, 3)
-    assert.equal(result.rows[1].isError, true)
-    assert.equal(result.rows[1].errorMessage, 'boom')
-    assert.equal(eventsBody().data.attributes.spans[1].status, 'error')
-    const patch = calls.find(c => c.method === 'PATCH')
-    assert.equal(patch.body.data.attributes.status, 'failed')
-    assert.equal(patch.body.data.attributes.error, 'one or more rows failed')
-  })
-
-  it('captures an evaluator error per evaluation without aborting, and marks the experiment failed', async () => {
-    const dataset = new Dataset(client, 'demo').addRecord('x')
-    const result = await new Experiment(client, {
-      name: 'exp-demo',
-      dataset,
-      task: (i) => i,
-      evaluators: {
-        explodes: () => { throw new Error('eval-fail') },
-        fine: () => true,
-      },
-    }).run()
+  it('submits custom record ids with append responses', async () => {
+    const dataset = new Dataset(stubClient(), 'demo')
+      .addRecord(new DatasetRecord('a', null, {}, 'custom-a'))
+      .addRecord(new DatasetRecord('b', null, {}, 'custom-b'))
 
-    assert.equal(result.rows[0].evaluationErrors.explodes, 'eval-fail')
-    assert.equal(result.rows[0].evaluations.fine, true)
-    const errored = eventsBody().data.attributes.metrics.find(m => m.label === 'explodes')
-    assert.equal(errored.error.message, 'eval-fail')
-    const patch = calls.find(c => c.method === 'PATCH')
-    assert.equal(patch.body.data.attributes.status, 'failed')
-  })
-
-  it('marks the experiment completed when every row succeeds', async () => {
-    const dataset = new Dataset(client, 'demo').addRecord('x')
-    await new Experiment(client, {
-      name: 'exp-demo',
-      dataset,
-      task: (i) => i,
-      evaluators: { fine: () => true },
-    }).run()
+    const result = await dataset.push()
 
-    const patch = calls.find(c => c.method === 'PATCH')
-    assert.equal(patch.body.data.attributes.status, 'completed')
-    assert.equal(patch.body.data.attributes.error, undefined)
+    assert.deepEqual(result, { pushedCount: 2, totalCount: 2 })
+    assert.deepEqual(dataset.recordIds(), ['custom-a', 'custom-b'])
+    assert.deepEqual(dataset.records().map(record => record.id), ['custom-a', 'custom-b'])
+    assert.equal(dataset.version(), 2)
+    assert.equal(dataset.latestVersion(), 2)
   })
 
-  it('experiment create body carries project_id, dataset_id, config and ensure_unique', async () => {
-    const dataset = new Dataset(client, 'demo').addRecord('x')
-    await new Experiment(client, {
-      name: 'exp-demo', dataset, task: (i) => i, config: { approach: 'kw' },
-    }).run()
+  it('surfaces backend failures', async () => {
+    const c = stubClient({ createDatasetError: new Error('HTTP 500 boom') })
+    const dataset = new Dataset(c, 'demo').addRecord('a')
 
-    const create = calls.find(c =>
-      c.method === 'POST' && c.path.endsWith('/experiments') && !c.path.includes('/events')
+    await assert.rejects(
+      () => dataset.push(),
+      /Failed to create dataset 'demo'.*HTTP 500 boom/
     )
-    assert.equal(create.body.data.type, 'experiments')
-    assert.equal(create.body.data.attributes.project_id, 'proj')
-    assert.equal(create.body.data.attributes.dataset_id, 'ds')
-    assert.equal(create.body.data.attributes.ensure_unique, true)
-    assert.deepEqual(create.body.data.attributes.config, { approach: 'kw' })
   })
 
   it('validates required options', () => {
-    const dataset = new Dataset(client, 'demo')
-    assert.throws(() => new Experiment(client, { dataset, task: (i) => i }), /name/)
-    assert.throws(() => new Experiment(client, { name: 'n', task: (i) => i }), /dataset/)
-    assert.throws(() => new Experiment(client, { name: 'n', dataset }), /task/)
+    const dataset = new Dataset(client(), 'demo')
+    assert.throws(() => new Experiment(client(), { dataset, task: (input) => input }), /name/)
+    assert.throws(() => new Experiment(client(), { name: 'n', task: (input) => input }), /dataset/)
+    assert.throws(() => new Experiment(client(), { name: 'n', dataset }), /task/)
   })
 
   it('exposes dataset getters and accepts a DatasetRecord instance', () => {
-    const { DatasetRecord } = require('../../../src/llmobs/experiments/dataset')
-    const dataset = new Dataset(client, 'my-name', 'desc').addRecord(new DatasetRecord('in', 'out', { m: 1 }))
+    const dataset = new Dataset(client(), 'my-name', 'desc').addRecord(new DatasetRecord('in', 'out', { m: 1 }))
     assert.equal(dataset.name(), 'my-name')
     assert.equal(dataset.id(), null)
     assert.equal(dataset.url(), null)
@@ -273,113 +124,4 @@ describe('LLMObs Experiments — dataset + experiment run', () => {
     assert.equal(record.expectedOutput, 'out')
     assert.deepEqual(record.metadata, { m: 1 })
   })
-
-  it('pads record ids when the push response is not an array', async () => {
-    installFetch(calls, { 'POST /api/v2/llm-obs/v1/proj/datasets/ds/records': { data: { ok: true } } })
-    const dataset = new Dataset(client, 'demo').addRecord('a').addRecord('b')
-    const result = await dataset.push()
-    assert.deepEqual(dataset.recordIds(), ['', ''])
-    assert.deepEqual(result, { pushedCount: 0, totalCount: 2 })
-  })
-
-  it('resolves with the pushed/total record counts on a successful push', async () => {
-    const dataset = new Dataset(client, 'demo').addRecord('a').addRecord('b')
-    const result = await dataset.push()
-    assert.deepEqual(result, { pushedCount: 2, totalCount: 2 })
-  })
-
-  it('resolves with a lower pushedCount when the backend confirms fewer records than sent', async () => {
-    installFetch(calls, {
-      'POST /api/v2/llm-obs/v1/proj/datasets/ds/records': { records: [{ id: 'rec-0' }] },
-    })
-    const dataset = new Dataset(client, 'demo').addRecord('a').addRecord('b')
-    const result = await dataset.push()
-    assert.deepEqual(result, { pushedCount: 1, totalCount: 2 })
-    assert.deepEqual(dataset.recordIds(), ['rec-0', ''])
-  })
-
-  it('resolves with zero counts when there is nothing new to push', async () => {
-    const dataset = new Dataset(client, 'demo').addRecord('a')
-    await dataset.push()
-    const result = await dataset.push()
-    assert.deepEqual(result, { pushedCount: 0, totalCount: 0 })
-  })
-
-  it('throws a clear error when dataset creation fails', async () => {
-    installFetchFailing(calls, 'POST /api/v2/llm-obs/v1/proj/datasets')
-    const dataset = new Dataset(client, 'demo').addRecord('a')
-    await assert.rejects(() => dataset.push(), /Failed to create dataset 'demo'/)
-  })
-
-  it('throws a clear error when pushing records fails', async () => {
-    installFetchFailing(calls, 'POST /api/v2/llm-obs/v1/proj/datasets/ds/records')
-    const dataset = new Dataset(client, 'demo').addRecord('a')
-    await assert.rejects(() => dataset.push(), /Failed to push records to dataset 'demo'/)
-  })
-
-  it('exposes experiment getters before and after run', async () => {
-    const dataset = new Dataset(client, 'demo').addRecord('x')
-    const experiment = new Experiment(client, { name: 'exp-demo', dataset, task: (i) => i })
-    assert.equal(experiment.name(), 'exp-demo')
-    assert.equal(experiment.experimentId(), null)
-    assert.equal(experiment.url(), null)
-    await experiment.run()
-    assert.equal(experiment.experimentId(), 'exp')
-    assert.equal(experiment.url(), 'https://app.datadoghq.com/llm/experiments/exp')
-  })
-
-  it('throws when the dataset has no id after push', async () => {
-    installFetch(calls, { 'POST /api/v2/llm-obs/v1/proj/datasets': { data: {} } })
-    const dataset = new Dataset(client, 'demo').addRecord('x')
-    await assert.rejects(
-      () => new Experiment(client, { name: 'exp-demo', dataset, task: (i) => i }).run(),
-      /has no id after push/
-    )
-  })
-
-  it('throws a clear error when experiment creation fails', async () => {
-    installFetchFailing(calls, 'POST /api/v2/llm-obs/v1/experiments')
-    const dataset = new Dataset(client, 'demo').addRecord('x')
-    await assert.rejects(
-      () => new Experiment(client, { name: 'exp-demo', dataset, task: (i) => i }).run(),
-      /Failed to create experiment 'exp-demo'/
-    )
-  })
-
-  it('marks the experiment failed and rethrows if posting events fails', async () => {
-    installFetchFailing(calls, 'POST /api/v2/llm-obs/v1/experiments/exp/events')
-    const dataset = new Dataset(client, 'demo').addRecord('x')
-    await assert.rejects(() => new Experiment(client, { name: 'exp-demo', dataset, task: (i) => i }).run())
-    assert.ok(calls.some(c => c.method === 'PATCH' && c.body?.data?.attributes?.status === 'failed'))
-  })
-
-  it('classifies object-valued evaluator results as json (and empties null categorical values)', async () => {
-    const dataset = new Dataset(client, 'demo').addRecord('x')
-    await new Experiment(client, {
-      name: 'exp-demo',
-      dataset,
-      task: () => 'out',
-      evaluators: { obj: () => ({ x: 1 }), nul: () => null },
-    }).run()
-    const metrics = eventsBody().data.attributes.metrics
-    const objMetric = metrics.find(m => m.label === 'obj')
-    assert.equal(objMetric.metric_type, 'json')
-    assert.deepEqual(objMetric.json_value, { x: 1 })
-    assert.equal(metrics.find(m => m.label === 'nul').categorical_value, '')
-  })
-
-  it('keeps array-valued evaluator results categorical, lowercased like dd-trace-py', async () => {
-    const dataset = new Dataset(client, 'demo').addRecord('x')
-    await new Experiment(client, {
-      name: 'exp-demo',
-      dataset,
-      task: () => 'out',
-      evaluators: { arr: () => ['Pass', 'FAIL'], str: () => 'MATCH' },
-    }).run()
-    const metrics = eventsBody().data.attributes.metrics
-    const arrMetric = metrics.find(m => m.label === 'arr')
-    assert.equal(arrMetric.metric_type, 'categorical')
-    assert.equal(arrMetric.categorical_value, '["pass","fail"]')
-    assert.equal(metrics.find(m => m.label === 'str').categorical_value, 'match')
-  })
 })
diff --git a/packages/dd-trace/test/llmobs/experiments/index.spec.js b/packages/dd-trace/test/llmobs/experiments/index.spec.js
index ed789551f6..9acffe4502 100644
--- a/packages/dd-trace/test/llmobs/experiments/index.spec.js
+++ b/packages/dd-trace/test/llmobs/experiments/index.spec.js
@@ -4,6 +4,7 @@ const assert = require('node:assert/strict')
 const { afterEach, beforeEach, describe, it } = require('mocha')
 const sinon = require('sinon')
 
+const log = require('../../../src/log')
 const { createExperiments } = require('../../../src/llmobs/experiments')
 const NoopExperiments = require('../../../src/llmobs/experiments/noop')
 
@@ -16,11 +17,17 @@ const enabledConfig = (overrides = {}) => ({
 })
 
 describe('LLMObs Experiments facade', () => {
+  let fetchHandler
+  let fetchStub
   let originalFetch
 
   beforeEach(() => {
     originalFetch = global.fetch
-    global.fetch = sinon.stub()
+    fetchHandler = async (url) => {
+      throw new Error(`Unexpected fetch ${url}`)
+    }
+    fetchStub = sinon.stub().callsFake((...args) => fetchHandler(...args))
+    global.fetch = fetchStub
   })
 
   afterEach(() => {
@@ -28,11 +35,21 @@ describe('LLMObs Experiments facade', () => {
     sinon.restore()
   })
 
+  const resolveFetchWith = (handler) => {
+    fetchHandler = handler
+  }
+
   describe('createExperiments gating', () => {
     it('returns a no-op when LLM Obs is disabled', () => {
+      const warn = sinon.spy(log, 'warn')
       const exp = createExperiments({ llmobs: { DD_LLMOBS_ENABLED: false } })
       assert.ok(exp instanceof NoopExperiments)
-      assert.throws(() => exp.createDataset('d'), /unavailable/)
+
+      const dataset = exp.createDataset('d', { records: [{ inputData: 'in' }] })
+
+      assert.equal(dataset.name(), 'd')
+      assert.equal(dataset.records()[0].input, 'in')
+      sinon.assert.calledWith(warn, sinon.match(/LLMObs experiments unavailable/))
     })
 
     it('returns a no-op when app key is missing', () => {
@@ -42,14 +59,27 @@ describe('LLMObs Experiments facade', () => {
 
     it('returns a working facade when enabled and credentialed', () => {
       const exp = createExperiments(enabledConfig())
-      const dataset = exp.createDataset('d', 'desc')
+      const dataset = exp.createDataset('d', {
+        description: 'desc',
+        records: [{ inputData: 'in', expectedOutput: 'out', metadata: { source: 'test' } }],
+      })
       assert.equal(typeof dataset.addRecord, 'function')
+      assert.equal(dataset.records()[0].input, 'in')
       const experiment = exp.experiment({ name: 'n', dataset, task: (i) => i })
       assert.equal(typeof experiment.run, 'function')
     })
 
+    it('rejects duplicate custom record ids', () => {
+      assert.throws(
+        () => createExperiments(enabledConfig()).createDataset('d', {
+          records: [{ id: 'r1', inputData: 'a' }, { id: 'r1', inputData: 'b' }],
+        }),
+        /Duplicate record id 'r1'/
+      )
+    })
+
     it('falls back to config.service for the project name when llmobs.mlApp is not set', async () => {
-      global.fetch.callsFake(async () => ({
+      resolveFetchWith(async () => ({
         ok: true,
         status: 200,
         text: sinon.stub().resolves(JSON.stringify({ data: { id: 'proj' } })),
@@ -58,31 +88,91 @@ describe('LLMObs Experiments facade', () => {
       const exp = createExperiments(enabledConfig({ service: 'my-service', llmobs: { DD_LLMOBS_ENABLED: true } }))
       await exp.createDataset('d').push()
 
-      const [url, opts] = global.fetch.getCall(0).args
+      const [url, opts] = fetchStub.getCall(0).args
       assert.equal(new URL(url).pathname, '/api/v2/llm-obs/v1/projects')
       assert.equal(JSON.parse(opts.body).data.attributes.name, 'my-service')
     })
 
     it('returns a no-op with actionable steps when neither mlApp nor service is set', () => {
+      const warn = sinon.spy(log, 'warn')
       const exp = createExperiments(enabledConfig({ service: undefined, llmobs: { DD_LLMOBS_ENABLED: true } }))
       assert.ok(exp instanceof NoopExperiments)
-      assert.throws(() => exp.createDataset('d'), /DD_LLMOBS_ML_APP.*DD_SERVICE/)
+
+      exp.createDataset('d')
+
+      sinon.assert.calledWith(warn, sinon.match(/DD_LLMOBS_ML_APP.*DD_SERVICE/))
     })
   })
 
   describe('no-op (disabled / missing keys)', () => {
-    it('throws on every operation with a clear message', async () => {
+    it('warns and returns inert objects for every operation', async () => {
+      const warn = sinon.spy(log, 'warn')
       const exp = createExperiments({ llmobs: { DD_LLMOBS_ENABLED: false } })
-      assert.throws(() => exp.createDataset('d'), /unavailable/)
-      assert.throws(() => exp.experiment({}), /unavailable/)
-      await assert.rejects(() => exp.pullDataset('d'), /unavailable/)
+
+      const dataset = exp.createDataset('d')
+      assert.deepEqual(await dataset.push(), { pushedCount: 0, totalCount: 0 })
+      assert.equal(dataset.url(), null)
+
+      const pulled = await exp.pullDataset('d')
+      assert.equal(pulled.name(), 'd')
+
+      const experiment = exp.experiment({ name: 'exp' })
+      assert.equal(experiment.name(), 'exp')
+      assert.deepEqual(await experiment.run(), { experimentId: null, rows: [], url: null })
+      sinon.assert.calledThrice(warn)
+    })
+
+    it('models inert datasets and experiments with stable accessors', async () => {
+      const warn = sinon.spy(log, 'warn')
+      const exp = new NoopExperiments()
+
+      const ignoredDescriptionDataset = exp.createDataset('legacy description', 'ignored')
+      assert.deepEqual(ignoredDescriptionDataset.records(), [])
+
+      const dataset = exp.createDataset('d', {
+        records: [{
+          id: 'r1',
+          inputData: { question: 'q' },
+          expectedOutput: { answer: 'a' },
+          metadata: { source: 'test' },
+        }],
+      })
+      dataset.addRecord('input only')
+
+      assert.equal(dataset.name(), 'd')
+      assert.equal(dataset.id(), null)
+      assert.equal(dataset.projectId(), null)
+      assert.equal(dataset.version(), null)
+      assert.equal(dataset.latestVersion(), null)
+      assert.deepEqual(dataset.recordIds(), [])
+      assert.equal(dataset.url(), null)
+      assert.deepEqual(dataset.records(), [
+        {
+          id: 'r1',
+          input: { question: 'q' },
+          expectedOutput: { answer: 'a' },
+          metadata: { source: 'test' },
+        },
+        { id: null, input: 'input only', expectedOutput: null, metadata: {} },
+      ])
+      assert.deepEqual(await dataset.push(), { pushedCount: 0, totalCount: 0 })
+
+      const pulled = await exp.pullDataset('pulled')
+      assert.equal(pulled.name(), 'pulled')
+
+      const experiment = exp.experiment()
+      assert.equal(experiment.name(), '')
+      assert.equal(experiment.experimentId(), null)
+      assert.equal(experiment.url(), null)
+      assert.deepEqual(await experiment.run(), { experimentId: null, rows: [], url: null })
+      sinon.assert.callCount(warn, 4)
     })
   })
 
   describe('pullDataset', () => {
     const resolveRoutes = (recordsResponses) => {
       let recordsCall = 0
-      global.fetch.callsFake(async (url) => {
+      resolveFetchWith(async (url) => {
         const u = new URL(url)
         let payload
         if (u.pathname === '/api/v2/llm-obs/v1/projects') {
@@ -113,6 +203,52 @@ describe('LLMObs Experiments facade', () => {
       assert.deepEqual(ds.records()[0].input, { q: '2+2' })
       assert.equal(ds.records()[0].expectedOutput, '4')
       assert.deepEqual(ds.records()[0].metadata, { a: 1 })
+      assert.equal(ds.records()[0].id, 'r1')
+      assert.equal(ds.records()[1].id, 'r2')
+    })
+
+    it('passes explicit dataset version when reading records', async () => {
+      resolveFetchWith(async (url) => {
+        const u = new URL(url)
+        let payload
+        if (u.pathname === '/api/v2/llm-obs/v1/projects') {
+          payload = { data: { id: 'proj' } }
+        } else if (u.pathname === '/api/v2/llm-obs/v1/proj/datasets') {
+          payload = { data: [{ id: 'ds9', attributes: { name: 'wanted', description: 'd', current_version: 7 } }] }
+        } else if (u.pathname === '/api/v2/llm-obs/v1/proj/datasets/ds9/records') {
+          assert.equal(u.searchParams.get('filter[version]'), '3')
+          payload = { data: [{ id: 'r1', attributes: { input: 'i1' } }] }
+        } else {
+          payload = {}
+        }
+        return { ok: true, status: 200, text: sinon.stub().resolves(JSON.stringify(payload)) }
+      })
+
+      const ds = await createExperiments(enabledConfig()).pullDataset('wanted', { version: 3 })
+      assert.equal(ds.version(), 3)
+      assert.equal(ds.latestVersion(), 7)
+    })
+
+    it('pins the current version when pulling latest records', async () => {
+      resolveFetchWith(async (url) => {
+        const u = new URL(url)
+        let payload
+        if (u.pathname === '/api/v2/llm-obs/v1/projects') {
+          payload = { data: { id: 'proj' } }
+        } else if (u.pathname === '/api/v2/llm-obs/v1/proj/datasets') {
+          payload = { data: [{ id: 'ds9', attributes: { name: 'wanted', description: 'd', current_version: 7 } }] }
+        } else if (u.pathname === '/api/v2/llm-obs/v1/proj/datasets/ds9/records') {
+          assert.equal(u.searchParams.get('filter[version]'), '7')
+          payload = { data: [{ id: 'r1', attributes: { input: 'i1' } }] }
+        } else {
+          payload = {}
+        }
+        return { ok: true, status: 200, text: sinon.stub().resolves(JSON.stringify(payload)) }
+      })
+
+      const ds = await createExperiments(enabledConfig()).pullDataset('wanted')
+      assert.equal(ds.version(), 7)
+      assert.equal(ds.records().length, 1)
     })
 
     it('waits (backoff) until the expected record count is readable', async () => {
@@ -128,7 +264,7 @@ describe('LLMObs Experiments facade', () => {
     })
 
     it('throws when the dataset is absent (no wait)', async () => {
-      global.fetch.callsFake(async (url) => {
+      resolveFetchWith(async (url) => {
         const u = new URL(url)
         const payload = u.pathname === '/api/v2/llm-obs/v1/projects' ? { data: { id: 'proj' } } : { data: [] }
         return { ok: true, status: 200, text: sinon.stub().resolves(JSON.stringify(payload)) }
@@ -140,7 +276,7 @@ describe('LLMObs Experiments facade', () => {
     })
 
     it('throws with the underlying error when listing datasets fails', async () => {
-      global.fetch.callsFake(async (url) => {
+      resolveFetchWith(async (url) => {
         const u = new URL(url)
         if (u.pathname === '/api/v2/llm-obs/v1/projects') {
           return { ok: true, status: 200, text: sinon.stub().resolves(JSON.stringify({ data: { id: 'proj' } })) }
@@ -162,7 +298,7 @@ describe('LLMObs Experiments facade', () => {
     })
 
     it('throws the underlying error when fetching records fails, even without expectedRecordCount', async () => {
-      global.fetch.callsFake(async (url) => {
+      resolveFetchWith(async (url) => {
         const u = new URL(url)
         if (u.pathname === '/api/v2/llm-obs/v1/projects') {
           return { ok: true, status: 200, text: sinon.stub().resolves(JSON.stringify({ data: { id: 'proj' } })) }
@@ -184,7 +320,7 @@ describe('LLMObs Experiments facade', () => {
         '': { data: [{ id: 'r1', attributes: { input: 'i1' } }], meta: { after: 'cursor1' } },
         cursor1: { data: [{ id: 'r2', attributes: { input: 'i2' } }], meta: { after: '' } },
       }
-      global.fetch.callsFake(async (url) => {
+      resolveFetchWith(async (url) => {
         const u = new URL(url)
         let payload
         if (u.pathname === '/api/v2/llm-obs/v1/projects') {
diff --git a/packages/dd-trace/test/llmobs/sdk/index.spec.js b/packages/dd-trace/test/llmobs/sdk/index.spec.js
index 55720f9448..c622b9c098 100644
--- a/packages/dd-trace/test/llmobs/sdk/index.spec.js
+++ b/packages/dd-trace/test/llmobs/sdk/index.spec.js
@@ -90,6 +90,13 @@ describe('sdk', () => {
     }
   })
 
+  describe('experiments', () => {
+    it('exposes dataset operations only through the experiments facade', () => {
+      assert.strictEqual(typeof llmobs.experiments.createDataset, 'function')
+      assert.strictEqual(typeof llmobs.experiments.pullDataset, 'function')
+    })
+  })
+
   describe('enable', () => {
     it('enables llmobs if it is disabled', () => {
       const config = getConfigFresh({})

From 8d34294159fd11befb9636fe62e78ace159e7686 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Jul 2026 01:10:02 +0000
Subject: [PATCH 20/43] chore(deps): bump next (#9572)

Bumps the testing-and-build group with 1 update in the /packages/dd-trace/test/plugins/versions directory: [next](https://github.com/vercel/next.js).


Updates `next` from 16.2.11 to 16.2.12
- [Release notes](https://github.com/vercel/next.js/releases)
- [Commits](https://github.com/vercel/next.js/compare/v16.2.11...v16.2.12)

---
updated-dependencies:
- dependency-name: next
  dependency-version: 16.2.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: testing-and-build
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 packages/dd-trace/test/plugins/versions/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dd-trace/test/plugins/versions/package.json b/packages/dd-trace/test/plugins/versions/package.json
index 497e52a375..9a297197f5 100644
--- a/packages/dd-trace/test/plugins/versions/package.json
+++ b/packages/dd-trace/test/plugins/versions/package.json
@@ -181,7 +181,7 @@
     "multer": "2.2.0",
     "mysql": "2.18.1",
     "mysql2": "3.23.0",
-    "next": "16.2.11",
+    "next": "16.2.12",
     "nock": "14.0.16",
     "node-18": "npm:node@18.20.8",
     "node-20": "npm:node@20.20.2",

From 9f254b9d10d9ee94ae183e1f1d41b040486fd035 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Jul 2026 01:16:05 +0000
Subject: [PATCH 21/43] chore(deps): bump the gh-actions-packages group across
 2 directories with 5 updates (#9573)

Bumps the gh-actions-packages group with 5 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [actions/checkout](https://github.com/actions/checkout) | `7.0.0` | `7.0.1` |
| [github/codeql-action/init](https://github.com/github/codeql-action) | `4.37.1` | `4.37.3` |
| [github/codeql-action/analyze](https://github.com/github/codeql-action) | `4.37.1` | `4.37.3` |
| [docker/login-action](https://github.com/docker/login-action) | `4` | `4.5.1` |
| [actions/setup-python](https://github.com/actions/setup-python) | `6.3.0` | `7.0.0` |

Bumps the gh-actions-packages group with 5 updates in the /.github/workflows directory:

| Package | From | To |
| --- | --- | --- |
| [actions/checkout](https://github.com/actions/checkout) | `7.0.0` | `7.0.1` |
| [github/codeql-action/init](https://github.com/github/codeql-action) | `4.37.1` | `4.37.3` |
| [github/codeql-action/analyze](https://github.com/github/codeql-action) | `4.37.1` | `4.37.3` |
| [docker/login-action](https://github.com/docker/login-action) | `4` | `4.5.1` |
| [actions/setup-python](https://github.com/actions/setup-python) | `6.3.0` | `7.0.0` |



Updates `actions/checkout` from 7.0.0 to 7.0.1
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v7...3d3c42e5aac5ba805825da76410c181273ba90b1)

Updates `github/codeql-action/init` from 4.37.1 to 4.37.3
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/7188fc363630916deb702c7fdcf4e481b751f97a...e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81)

Updates `github/codeql-action/analyze` from 4.37.1 to 4.37.3
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/7188fc363630916deb702c7fdcf4e481b751f97a...e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81)

Updates `docker/login-action` from 4 to 4.5.1
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v4...v4.5.1)

Updates `actions/setup-python` from 6.3.0 to 7.0.0
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/ece7cb06caefa5fff74198d8649806c4678c61a1...5fda3b95a4ea91299a34e894583c3862153e4b97)

Updates `actions/checkout` from 7.0.0 to 7.0.1
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v7...3d3c42e5aac5ba805825da76410c181273ba90b1)

Updates `github/codeql-action/init` from 4.37.1 to 4.37.3
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/7188fc363630916deb702c7fdcf4e481b751f97a...e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81)

Updates `github/codeql-action/analyze` from 4.37.1 to 4.37.3
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/7188fc363630916deb702c7fdcf4e481b751f97a...e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81)

Updates `docker/login-action` from 4 to 4.5.1
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v4...v4.5.1)

Updates `actions/setup-python` from 6.3.0 to 7.0.0
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/ece7cb06caefa5fff74198d8649806c4678c61a1...5fda3b95a4ea91299a34e894583c3862153e4b97)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 7.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: gh-actions-packages
- dependency-name: github/codeql-action/init
  dependency-version: 4.37.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: gh-actions-packages
- dependency-name: github/codeql-action/analyze
  dependency-version: 4.37.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: gh-actions-packages
- dependency-name: docker/login-action
  dependency-version: 4.5.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: gh-actions-packages
- dependency-name: actions/setup-python
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: gh-actions-packages
- dependency-name: actions/checkout
  dependency-version: 7.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: gh-actions-packages
- dependency-name: github/codeql-action/init
  dependency-version: 4.37.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: gh-actions-packages
- dependency-name: github/codeql-action/analyze
  dependency-version: 4.37.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: gh-actions-packages
- dependency-name: docker/login-action
  dependency-version: 4.5.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: gh-actions-packages
- dependency-name: actions/setup-python
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: gh-actions-packages
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml          | 4 ++--
 .github/workflows/llmobs.yml                   | 2 +-
 .github/workflows/mirror-image.yml             | 2 +-
 .github/workflows/test-optimization.yml        | 6 +++---
 .github/workflows/update-3rdparty-licenses.yml | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3c71b45f8d..631bf33d3e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -45,7 +45,7 @@ jobs:
 
       - name: Initialize CodeQL
         id: init-codeql
-        uses: github/codeql-action/init@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+        uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
         with:
           languages: ${{ matrix.language }}
           config-file: .github/codeql_config.yml
@@ -57,7 +57,7 @@ jobs:
 
       - name: Perform CodeQL Analysis
         id: analyze
-        uses: github/codeql-action/analyze@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+        uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
         with:
           token: ${{ github.token }}
           wait-for-processing: false
diff --git a/.github/workflows/llmobs.yml b/.github/workflows/llmobs.yml
index 370a87db33..d24c232d04 100644
--- a/.github/workflows/llmobs.yml
+++ b/.github/workflows/llmobs.yml
@@ -311,7 +311,7 @@ jobs:
     env:
       PLUGINS: openai-agents
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/oldest-maintenance-lts
       - uses: ./.github/actions/install
diff --git a/.github/workflows/mirror-image.yml b/.github/workflows/mirror-image.yml
index 7a68f56962..5454d6167d 100644
--- a/.github/workflows/mirror-image.yml
+++ b/.github/workflows/mirror-image.yml
@@ -28,7 +28,7 @@ jobs:
           policy: self.mirror-image
 
       - name: Log in to GHCR
-        uses: docker/login-action@v4
+        uses: docker/login-action@v4.5.1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
diff --git a/.github/workflows/test-optimization.yml b/.github/workflows/test-optimization.yml
index 1d1cb94827..6d1dce1bcb 100644
--- a/.github/workflows/test-optimization.yml
+++ b/.github/workflows/test-optimization.yml
@@ -121,7 +121,7 @@ jobs:
           echo "pw-version=$PW_VERSION" >> $GITHUB_OUTPUT
           echo "image-tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
       - name: Log in to GHCR
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -234,7 +234,7 @@ jobs:
     name: integration-webdriverio (${{ matrix.webdriverio-version }}, node-${{ matrix.node-version }})
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - uses: ./.github/actions/node
         with:
           version: ${{ matrix.node-version }}
@@ -354,7 +354,7 @@ jobs:
           IMAGE="ghcr.io/datadog/dd-trace-js/selenium-tools:${DOCKER_HASH}"
           echo "image=$IMAGE" >> $GITHUB_OUTPUT
       - name: Log in to GHCR
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
diff --git a/.github/workflows/update-3rdparty-licenses.yml b/.github/workflows/update-3rdparty-licenses.yml
index c987158786..dd2399eb7a 100644
--- a/.github/workflows/update-3rdparty-licenses.yml
+++ b/.github/workflows/update-3rdparty-licenses.yml
@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Set up Python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: "3.14"
 

From b0123b74b75f4ad5736b66eefb60e56960d74f7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Antonio=20Fern=C3=A1ndez=20de=20Alba?=
 <juan.fernandezdealba@datadoghq.com>
Date: Wed, 29 Jul 2026 11:41:50 +0200
Subject: [PATCH 22/43] feat(test-optimization): add WebdriverIO optimizations
 (#9556)

---
 .github/workflows/test-optimization.yml       |   2 +-
 .../webdriverio/fixtures/atr.e2e.js           |  11 +
 .../webdriverio/fixtures/disabled-efd.e2e.js  |   9 +
 .../fixtures/efd-after-each-fail.e2e.js       |   9 +
 .../webdriverio/fixtures/efd.e2e.js           |  11 +
 .../fixtures/failed-test-replay.e2e.js        |  18 +
 .../webdriverio/fixtures/impacted.e2e.js      |   5 +
 .../fixtures/managed-hook-fail.e2e.js         |  21 +
 .../fixtures/suite-hook-fail.e2e.js           |  17 +
 .../fixtures/test-management.e2e.js           |  15 +
 .../webdriverio/fixtures/wdio.conf.js         |  50 ++
 .../webdriverio/webdriverio.spec.js           |  57 +-
 .../webdriverio.test-optimization.spec.js     | 700 ++++++++++++++++++
 .../src/helpers/hooks.js                      |   1 +
 .../rewriter/instrumentations/webdriverio.js  |  13 +
 .../src/mocha/main.js                         |  44 +-
 .../src/mocha/utils.js                        |  70 +-
 .../src/mocha/worker.js                       |  85 ++-
 .../src/webdriverio.js                        | 245 +++++-
 .../node_modules/@wdio/cli/package.json       |   5 +
 .../webdriverio-disconnected-worker.js        |  11 +
 .../test/fixtures/webdriverio-launcher.mjs    |   7 +
 .../test/webdriverio.spec.js                  | 376 +++++++++-
 packages/datadog-plugin-mocha/src/index.js    |   6 +
 .../exporters/test-worker/index.js            |   4 +
 .../src/debugger/devtools_client/log.js       |   3 +-
 packages/dd-trace/src/plugins/ci_plugin.js    |  40 +-
 packages/dd-trace/src/plugins/util/test.js    |   4 +-
 .../test/ci-visibility/ci-plugin.spec.js      |  69 ++
 .../exporters/test-worker/exporter.spec.js    |  16 +
 .../test/debugger/devtools_client/log.spec.js |  15 +-
 31 files changed, 1810 insertions(+), 129 deletions(-)
 create mode 100644 integration-tests/webdriverio/fixtures/atr.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/disabled-efd.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/efd-after-each-fail.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/efd.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/failed-test-replay.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/impacted.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/managed-hook-fail.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/suite-hook-fail.e2e.js
 create mode 100644 integration-tests/webdriverio/fixtures/test-management.e2e.js
 create mode 100644 integration-tests/webdriverio/webdriverio.test-optimization.spec.js
 create mode 100644 packages/datadog-instrumentations/test/fixtures/node_modules/@wdio/cli/package.json
 create mode 100644 packages/datadog-instrumentations/test/fixtures/webdriverio-launcher.mjs

diff --git a/.github/workflows/test-optimization.yml b/.github/workflows/test-optimization.yml
index 6d1dce1bcb..6965057ee4 100644
--- a/.github/workflows/test-optimization.yml
+++ b/.github/workflows/test-optimization.yml
@@ -239,7 +239,7 @@ jobs:
         with:
           version: ${{ matrix.node-version }}
       - uses: ./.github/actions/install
-      - run: npm run test:instrumentations
+      - run: npm run test:instrumentations:ci
         env:
           PLUGINS: webdriverio
       - run: npm run test:integration:webdriverio:coverage
diff --git a/integration-tests/webdriverio/fixtures/atr.e2e.js b/integration-tests/webdriverio/fixtures/atr.e2e.js
new file mode 100644
index 0000000000..ddded5ad00
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/atr.e2e.js
@@ -0,0 +1,11 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+
+let attempts = 0
+
+describe('WebdriverIO ATR', () => {
+  it('passes on retry', () => {
+    assert.strictEqual(attempts++, 1)
+  })
+})
diff --git a/integration-tests/webdriverio/fixtures/disabled-efd.e2e.js b/integration-tests/webdriverio/fixtures/disabled-efd.e2e.js
new file mode 100644
index 0000000000..1d3858a372
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/disabled-efd.e2e.js
@@ -0,0 +1,9 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+
+describe('WebdriverIO disabled EFD', () => {
+  it('is new', () => {
+    assert.fail('disabled test ran')
+  })
+})
diff --git a/integration-tests/webdriverio/fixtures/efd-after-each-fail.e2e.js b/integration-tests/webdriverio/fixtures/efd-after-each-fail.e2e.js
new file mode 100644
index 0000000000..1d93a194d1
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/efd-after-each-fail.e2e.js
@@ -0,0 +1,9 @@
+'use strict'
+
+describe('WebdriverIO EFD afterEach failure', () => {
+  afterEach(() => {
+    throw new Error('EFD afterEach failure')
+  })
+
+  it('fails every EFD hook attempt', () => {})
+})
diff --git a/integration-tests/webdriverio/fixtures/efd.e2e.js b/integration-tests/webdriverio/fixtures/efd.e2e.js
new file mode 100644
index 0000000000..a9d09b8cd0
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/efd.e2e.js
@@ -0,0 +1,11 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+
+let attempts = 0
+
+describe('WebdriverIO EFD', () => {
+  it('retries a new test', () => {
+    assert.strictEqual(attempts++ % 2, 1)
+  })
+})
diff --git a/integration-tests/webdriverio/fixtures/failed-test-replay.e2e.js b/integration-tests/webdriverio/fixtures/failed-test-replay.e2e.js
new file mode 100644
index 0000000000..70ccf02362
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/failed-test-replay.e2e.js
@@ -0,0 +1,18 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+
+const sum = require('./dependency')
+
+let attempts = 0
+
+describe('WebdriverIO Failed Test Replay', () => {
+  it('captures the failure on retry', () => {
+    if (attempts++ === 0) {
+      sum(11, 3)
+    }
+
+    assert.throws(() => sum(11, 3), /a is too big/)
+    assert.strictEqual(sum(1, 3), 4)
+  })
+})
diff --git a/integration-tests/webdriverio/fixtures/impacted.e2e.js b/integration-tests/webdriverio/fixtures/impacted.e2e.js
new file mode 100644
index 0000000000..2e344fbdbf
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/impacted.e2e.js
@@ -0,0 +1,5 @@
+'use strict'
+
+describe('WebdriverIO impacted tests', () => {
+  it('marks a modified test', () => {})
+})
diff --git a/integration-tests/webdriverio/fixtures/managed-hook-fail.e2e.js b/integration-tests/webdriverio/fixtures/managed-hook-fail.e2e.js
new file mode 100644
index 0000000000..45c7b128f6
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/managed-hook-fail.e2e.js
@@ -0,0 +1,21 @@
+'use strict'
+
+let earlyFlakeDetectionAttempts = 0
+
+describe('WebdriverIO quarantined hook failure', () => {
+  beforeEach(() => {
+    throw new Error('quarantined hook failure')
+  })
+
+  it('is quarantined', () => {})
+})
+
+describe('WebdriverIO EFD hook failure', () => {
+  beforeEach(() => {
+    if (earlyFlakeDetectionAttempts++ === 1) {
+      throw new Error('EFD hook failure')
+    }
+  })
+
+  it('passes an EFD retry', () => {})
+})
diff --git a/integration-tests/webdriverio/fixtures/suite-hook-fail.e2e.js b/integration-tests/webdriverio/fixtures/suite-hook-fail.e2e.js
new file mode 100644
index 0000000000..69e3beaed2
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/suite-hook-fail.e2e.js
@@ -0,0 +1,17 @@
+'use strict'
+
+const hookType = process.env.WEBDRIVERIO_SUITE_HOOK
+
+describe('WebdriverIO suite hook failure', () => {
+  if (hookType === 'beforeAll') {
+    before(() => {
+      throw new Error('beforeAll failure')
+    })
+  } else {
+    after(() => {
+      throw new Error('afterAll failure')
+    })
+  }
+
+  it('is quarantined', () => {})
+})
diff --git a/integration-tests/webdriverio/fixtures/test-management.e2e.js b/integration-tests/webdriverio/fixtures/test-management.e2e.js
new file mode 100644
index 0000000000..357cc5809a
--- /dev/null
+++ b/integration-tests/webdriverio/fixtures/test-management.e2e.js
@@ -0,0 +1,15 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+
+describe('WebdriverIO Test Management', () => {
+  it('is disabled', () => {
+    assert.fail('disabled test ran')
+  })
+
+  it('is quarantined', () => {
+    assert.fail('quarantined failure')
+  })
+
+  it('is attempt to fix', () => {})
+})
diff --git a/integration-tests/webdriverio/fixtures/wdio.conf.js b/integration-tests/webdriverio/fixtures/wdio.conf.js
index 088102e9ca..d5f5176ac3 100644
--- a/integration-tests/webdriverio/fixtures/wdio.conf.js
+++ b/integration-tests/webdriverio/fixtures/wdio.conf.js
@@ -27,6 +27,10 @@ const baseConfig = {
 }
 
 const scenarioConfig = {
+  atr: {
+    maxInstances: 1,
+    specs: ['./atr.e2e.js'],
+  },
   bail: {
     maxInstances: 1,
     mochaOpts: {
@@ -49,6 +53,36 @@ const scenarioConfig = {
     },
     specs: ['./delay.e2e.js'],
   },
+  disabledEfd: {
+    maxInstances: 1,
+    specs: [[
+      './impacted.e2e.js',
+      './disabled-efd.e2e.js',
+      './first.e2e.js',
+    ]],
+  },
+  efd: {
+    maxInstances: 1,
+    specs: ['./efd.e2e.js'],
+  },
+  efdAfterEachFailure: {
+    maxInstances: 1,
+    specs: ['./efd-after-each-fail.e2e.js'],
+  },
+  efdFaultySchedule: {
+    maxInstances: 1,
+    specs: [
+      [
+        './first.e2e.js',
+        './efd.e2e.js',
+      ],
+      './second.e2e.js',
+    ],
+  },
+  failedTestReplay: {
+    maxInstances: 1,
+    specs: ['./failed-test-replay.e2e.js'],
+  },
   grep: {
     maxInstances: 1,
     mochaOpts: {
@@ -73,10 +107,18 @@ const scenarioConfig = {
       './first.e2e.js',
     ]],
   },
+  impacted: {
+    maxInstances: 1,
+    specs: ['./impacted.e2e.js'],
+  },
   loadFailure: {
     maxInstances: 1,
     specs: ['./load-fail.e2e.js'],
   },
+  managedHookFailures: {
+    maxInstances: 1,
+    specs: ['./managed-hook-fail.e2e.js'],
+  },
   multipleCapabilities: {
     capabilities: [
       { browserName: 'chrome' },
@@ -108,6 +150,10 @@ const scenarioConfig = {
     specFileRetriesDelay: 0,
     specs: ['./spec-file-retry.e2e.js'],
   },
+  suiteHookFailure: {
+    maxInstances: 1,
+    specs: ['./suite-hook-fail.e2e.js'],
+  },
   tdd: {
     maxInstances: 1,
     mochaOpts: {
@@ -115,6 +161,10 @@ const scenarioConfig = {
     },
     specs: ['./tdd.e2e.js'],
   },
+  testManagement: {
+    maxInstances: 1,
+    specs: ['./test-management.e2e.js'],
+  },
 }
 
 const selectedScenario = scenarioConfig[scenario]
diff --git a/integration-tests/webdriverio/webdriverio.spec.js b/integration-tests/webdriverio/webdriverio.spec.js
index 06886fb789..68925a59cc 100644
--- a/integration-tests/webdriverio/webdriverio.spec.js
+++ b/integration-tests/webdriverio/webdriverio.spec.js
@@ -12,6 +12,14 @@ const {
 } = require('../helpers')
 const { FakeCiVisIntake } = require('../ci-visibility-intake')
 const {
+  DD_CAPABILITIES_AUTO_TEST_RETRIES,
+  DD_CAPABILITIES_EARLY_FLAKE_DETECTION,
+  DD_CAPABILITIES_FAILED_TEST_REPLAY,
+  DD_CAPABILITIES_IMPACTED_TESTS,
+  DD_CAPABILITIES_TEST_IMPACT_ANALYSIS,
+  DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX,
+  DD_CAPABILITIES_TEST_MANAGEMENT_DISABLE,
+  DD_CAPABILITIES_TEST_MANAGEMENT_QUARANTINE,
   MOCHA_IS_PARALLEL,
   TEST_CODE_COVERAGE_ENABLED,
   TEST_EARLY_FLAKE_ENABLED,
@@ -33,26 +41,22 @@ const versions = requestedVersion
   ? [requestedVersion === 'oldest' ? OLDEST_WEBDRIVERIO_VERSION : requestedVersion]
   : [OLDEST_WEBDRIVERIO_VERSION, 'latest']
 
-const advancedSettings = {
-  code_coverage: true,
-  tests_skipping: true,
-  itr_enabled: true,
+const disabledSettings = {
+  code_coverage: false,
+  tests_skipping: false,
+  itr_enabled: false,
   require_git: false,
   early_flake_detection: {
-    enabled: true,
-    slow_test_retries: {
-      '5s': 5,
-    },
+    enabled: false,
   },
-  flaky_test_retries_enabled: true,
-  di_enabled: true,
-  known_tests_enabled: true,
+  flaky_test_retries_enabled: false,
+  di_enabled: false,
+  known_tests_enabled: false,
   test_management: {
-    enabled: true,
-    attempt_to_fix_retries: 5,
+    enabled: false,
   },
-  impacted_tests_enabled: true,
-  coverage_report_upload_enabled: true,
+  impacted_tests_enabled: false,
+  coverage_report_upload_enabled: false,
 }
 
 const advancedRequestPaths = [
@@ -167,13 +171,13 @@ function assertOneTestPerSuiteExecution (suites, tests) {
 }
 
 /**
- * Extracts events and verifies the WebdriverIO run stayed in basic-reporting mode.
+ * Extracts events and verifies the WebdriverIO run stayed in reporting-only mode.
  *
  * @param {object[]} payloads
  * @param {string} requestedVersion
  * @returns {{session: object, module: object, suites: object[], tests: object[]}}
  */
-function getBasicReportingEvents (payloads, requestedVersion) {
+function getReportingEvents (payloads, requestedVersion) {
   const settingsRequests = payloads.filter(({ url }) =>
     url.endsWith('/api/v2/libraries/tests/services/setting'))
   const advancedRequests = payloads.filter(({ url }) =>
@@ -204,9 +208,14 @@ function getBasicReportingEvents (payloads, requestedVersion) {
   const metadata = cyclePayloads.flatMap(({ payload }) => payload.metadata || [])
   assert.ok(metadata.length > 0)
   for (const metadataEntry of metadata) {
-    const capabilities = Object.keys(metadataEntry.test || {})
-      .filter(tag => tag.startsWith('_dd.library_capabilities.'))
-    assert.deepStrictEqual(capabilities, [])
+    assert.strictEqual(metadataEntry.test[DD_CAPABILITIES_TEST_IMPACT_ANALYSIS], undefined)
+    assert.strictEqual(metadataEntry.test[DD_CAPABILITIES_EARLY_FLAKE_DETECTION], '1')
+    assert.strictEqual(metadataEntry.test[DD_CAPABILITIES_AUTO_TEST_RETRIES], '1')
+    assert.strictEqual(metadataEntry.test[DD_CAPABILITIES_IMPACTED_TESTS], '1')
+    assert.strictEqual(metadataEntry.test[DD_CAPABILITIES_TEST_MANAGEMENT_QUARANTINE], '1')
+    assert.strictEqual(metadataEntry.test[DD_CAPABILITIES_TEST_MANAGEMENT_DISABLE], '1')
+    assert.strictEqual(metadataEntry.test[DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX], '5')
+    assert.strictEqual(metadataEntry.test[DD_CAPABILITIES_FAILED_TEST_REPLAY], '1')
   }
 
   for (const event of [sessions[0], modules[0], ...suites, ...tests]) {
@@ -258,7 +267,7 @@ for (const version of versions) {
 
     beforeEach(async function () {
       receiver = await new FakeCiVisIntake().start()
-      receiver.setSettings(advancedSettings)
+      receiver.setSettings(disabledSettings)
     })
 
     afterEach(async function () {
@@ -272,7 +281,7 @@ for (const version of versions) {
      *
      * @param {string} scenario
      * @param {number} expectedWebDriverSessions
-     * @param {(events: ReturnType<typeof getBasicReportingEvents>) => void} assertEvents
+     * @param {(events: ReturnType<typeof getReportingEvents>) => void} assertEvents
      * @param {number} [expectedExitCode]
      * @returns {Promise<void>}
      */
@@ -298,7 +307,7 @@ for (const version of versions) {
       const payloadsPromise = receiver.gatherPayloadsUntilChildExit(
         childProcess,
         undefined,
-        payloads => assertEvents(getBasicReportingEvents(payloads, version)),
+        payloads => assertEvents(getReportingEvents(payloads, version)),
         { hardTimeout: 45_000 }
       )
 
@@ -322,7 +331,7 @@ for (const version of versions) {
       )
     }
 
-    it('reports parallel workers as one basic-reporting session', async () => {
+    it('reports parallel workers as one session', async () => {
       await runScenario('parallel', 2, ({ session, suites, tests }) => {
         assert.strictEqual(suites.length, 2)
         assert.strictEqual(tests.length, 2)
diff --git a/integration-tests/webdriverio/webdriverio.test-optimization.spec.js b/integration-tests/webdriverio/webdriverio.test-optimization.spec.js
new file mode 100644
index 0000000000..8a1bec6edb
--- /dev/null
+++ b/integration-tests/webdriverio/webdriverio.test-optimization.spec.js
@@ -0,0 +1,700 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+const { exec, execFileSync } = require('node:child_process')
+const { once } = require('node:events')
+const fs = require('node:fs')
+const http = require('node:http')
+const path = require('node:path')
+
+const {
+  getCiVisAgentlessConfig,
+  sandboxCwd,
+  useSandbox,
+} = require('../helpers')
+const { FakeCiVisIntake } = require('../ci-visibility-intake')
+const {
+  DD_CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS,
+  DD_CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS,
+  DI_DEBUG_ERROR_PREFIX,
+  DI_ERROR_DEBUG_INFO_CAPTURED,
+  TEST_CODE_COVERAGE_ENABLED,
+  TEST_EARLY_FLAKE_ABORT_REASON,
+  TEST_EARLY_FLAKE_ENABLED,
+  TEST_FINAL_STATUS,
+  TEST_IS_MODIFIED,
+  TEST_IS_NEW,
+  TEST_IS_RETRY,
+  TEST_ITR_SKIPPING_ENABLED,
+  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
+  TEST_MANAGEMENT_ENABLED,
+  TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
+  TEST_MANAGEMENT_IS_DISABLED,
+  TEST_MANAGEMENT_IS_QUARANTINED,
+  TEST_NAME,
+  TEST_RETRY_REASON,
+  TEST_RETRY_REASON_TYPES,
+  TEST_STATUS,
+  TEST_SUITE,
+} = require('../../packages/dd-trace/src/plugins/util/test')
+
+const OLDEST_WEBDRIVERIO_VERSION = '9.0.0'
+const requestedVersion = process.env.WEBDRIVERIO_VERSION
+const versions = requestedVersion
+  ? [requestedVersion === 'oldest' ? OLDEST_WEBDRIVERIO_VERSION : requestedVersion]
+  : [OLDEST_WEBDRIVERIO_VERSION, 'latest']
+
+const SETTINGS_PATH = '/api/v2/libraries/tests/services/setting'
+const KNOWN_TESTS_PATH = '/api/v2/ci/libraries/tests'
+const SKIPPABLE_TESTS_PATH = '/api/v2/ci/tests/skippable'
+const TEST_MANAGEMENT_PATH = '/api/v2/test/libraries/test-management/tests'
+
+/**
+ * Starts the minimal W3C WebDriver endpoint required by WebdriverIO workers.
+ *
+ * @returns {Promise<{port: number, server: import('node:http').Server, getSessionCount: () => number}>}
+ */
+function startWebDriverServer () {
+  let sessionCount = 0
+  const server = http.createServer((request, response) => {
+    request.resume()
+    request.once('end', () => {
+      const isNewSession = request.method === 'POST' && request.url === '/session'
+      let value = null
+
+      if (isNewSession) {
+        sessionCount++
+        value = {
+          sessionId: `webdriverio-${sessionCount}`,
+          capabilities: {
+            browserName: 'chrome',
+            browserVersion: 'test',
+            platformName: process.platform,
+          },
+        }
+      } else if (request.method === 'GET' && request.url === '/status') {
+        value = { ready: true, message: '' }
+      }
+
+      response.writeHead(200, { 'content-type': 'application/json' })
+      response.end(JSON.stringify({ value }))
+    })
+  })
+
+  return new Promise((resolve, reject) => {
+    server.once('error', reject)
+    server.listen(0, '127.0.0.1', () => {
+      server.removeListener('error', reject)
+      const address = server.address()
+
+      if (!address || typeof address === 'string') {
+        reject(new Error('WebDriver server did not bind to a TCP port'))
+        return
+      }
+
+      resolve({
+        port: address.port,
+        server,
+        getSessionCount: () => sessionCount,
+      })
+    })
+  })
+}
+
+/**
+ * Stops an HTTP server if it is listening.
+ *
+ * @param {import('node:http').Server|undefined} server
+ * @returns {Promise<void>}
+ */
+function stopServer (server) {
+  if (!server?.listening) {
+    return Promise.resolve()
+  }
+  return new Promise(resolve => server.close(resolve))
+}
+
+/**
+ * Gets all test events from intake payloads.
+ *
+ * @param {object[]} payloads
+ * @returns {object[]}
+ */
+function getEvents (payloads) {
+  return payloads
+    .filter(({ url }) => url.endsWith('/api/v2/citestcycle'))
+    .flatMap(({ payload }) => payload.events)
+}
+
+/**
+ * Counts intake requests for one endpoint.
+ *
+ * @param {object[]} payloads
+ * @param {string} requestPath
+ * @returns {number}
+ */
+function countRequests (payloads, requestPath) {
+  return payloads.filter(({ url }) => url.endsWith(requestPath)).length
+}
+
+for (const version of versions) {
+  describe(`webdriverio@${version} Test Optimization`, function () {
+    this.timeout(90_000)
+
+    let childProcess
+    let cwd
+    let receiver
+    let testOutput = ''
+    let webDriver
+
+    useSandbox([
+      `@wdio/cli@${version}`,
+      `@wdio/local-runner@${version}`,
+      `@wdio/mocha-framework@${version}`,
+    ], true, [
+      './integration-tests/webdriverio/fixtures/*',
+      './integration-tests/ci-visibility/dynamic-instrumentation/dependency.js',
+    ])
+
+    before(async function () {
+      cwd = sandboxCwd()
+      webDriver = await startWebDriverServer()
+
+      execFileSync('git', ['switch', '-c', 'feature-branch'], { cwd })
+      fs.appendFileSync(path.join(cwd, 'impacted.e2e.js'), '\n// modified by the integration test\n')
+      execFileSync('git', ['add', 'impacted.e2e.js'], { cwd })
+      execFileSync('git', ['commit', '-m', 'modify impacted test'], { cwd })
+    })
+
+    after(async function () {
+      await stopServer(webDriver?.server)
+    })
+
+    beforeEach(async function () {
+      receiver = await new FakeCiVisIntake().start()
+    })
+
+    afterEach(async function () {
+      childProcess?.kill()
+      testOutput = ''
+      await receiver.stop()
+    })
+
+    /**
+     * Runs one WebdriverIO Test Optimization scenario.
+     *
+     * @param {string} scenario
+     * @param {number} expectedWebDriverSessions
+     * @param {(payloads: object[]) => void} assertPayloads
+     * @param {object} [extraEnvironment]
+     * @param {number} [expectedExitCode]
+     * @returns {Promise<void>}
+     */
+    async function runScenario (
+      scenario,
+      expectedWebDriverSessions,
+      assertPayloads,
+      extraEnvironment = {},
+      expectedExitCode = 0
+    ) {
+      const initialWebDriverSessionCount = webDriver.getSessionCount()
+      childProcess = exec('./node_modules/.bin/wdio run ./wdio.conf.js', {
+        cwd,
+        env: {
+          ...getCiVisAgentlessConfig(receiver.port),
+          NODE_OPTIONS: '-r dd-trace/ci/init --import dd-trace/register.js',
+          DD_TEST_SESSION_NAME: 'webdriverio-test-optimization',
+          GITHUB_BASE_REF: '',
+          WEBDRIVERIO_SCENARIO: scenario,
+          WEBDRIVER_PORT: String(webDriver.port),
+          ...extraEnvironment,
+        },
+      })
+      childProcess.stdout?.on('data', chunk => {
+        testOutput += chunk.toString()
+      })
+      childProcess.stderr?.on('data', chunk => {
+        testOutput += chunk.toString()
+      })
+
+      const payloadsPromise = receiver.gatherPayloadsUntilChildExit(
+        childProcess,
+        undefined,
+        assertPayloads,
+        { hardTimeout: 60_000 }
+      )
+
+      let exitCode
+      try {
+        [[exitCode]] = await Promise.all([
+          once(childProcess, 'exit'),
+          payloadsPromise,
+        ])
+      } catch (error) {
+        error.message += `\n${testOutput}`
+        throw error
+      }
+
+      assert.strictEqual(exitCode, expectedExitCode, testOutput)
+      assert.doesNotMatch(testOutput, /WebdriverIO Test Optimization .* error/)
+      assert.strictEqual(
+        webDriver.getSessionCount() - initialWebDriverSessionCount,
+        expectedWebDriverSessions
+      )
+    }
+
+    it('requests enabled data once and keeps TIA disabled across parallel workers', async () => {
+      receiver.setSettings({
+        code_coverage: true,
+        coverage_report_upload_enabled: true,
+        impacted_tests_enabled: true,
+        itr_enabled: true,
+        known_tests_enabled: true,
+        test_management: { enabled: true },
+        tests_skipping: true,
+      })
+      receiver.setKnownTests({ webdriverio: {} })
+      receiver.setTestManagementTests({ webdriverio: { suites: {} } })
+
+      await runScenario('parallel', 2, payloads => {
+        assert.strictEqual(countRequests(payloads, SETTINGS_PATH), 1)
+        assert.strictEqual(countRequests(payloads, KNOWN_TESTS_PATH), 1)
+        assert.strictEqual(countRequests(payloads, TEST_MANAGEMENT_PATH), 1)
+        assert.strictEqual(countRequests(payloads, SKIPPABLE_TESTS_PATH), 0)
+        assert.strictEqual(countRequests(payloads, '/api/v2/citestcov'), 0)
+
+        const events = getEvents(payloads)
+        const session = events.find(event => event.type === 'test_session_end').content
+        const tests = events.filter(event => event.type === 'test')
+
+        assert.strictEqual(tests.length, 2)
+        assert.strictEqual(session.meta[TEST_ITR_SKIPPING_ENABLED], 'false')
+        assert.strictEqual(session.meta[TEST_CODE_COVERAGE_ENABLED], 'false')
+        assert.strictEqual(session.meta[TEST_MANAGEMENT_ENABLED], 'true')
+      })
+    })
+
+    it('retries new tests with EFD', async () => {
+      receiver.setSettings({
+        early_flake_detection: {
+          enabled: true,
+          faulty_session_threshold: 100,
+          slow_test_retries: { '5s': 2 },
+        },
+        known_tests_enabled: true,
+      })
+      receiver.setKnownTests({ webdriverio: {} })
+
+      await runScenario('efd', 1, payloads => {
+        const events = getEvents(payloads)
+        const session = events.find(event => event.type === 'test_session_end').content
+        const suite = events.find(event => event.type === 'test_suite_end').content
+        const tests = events.filter(event => event.type === 'test').map(event => event.content)
+
+        assert.strictEqual(countRequests(payloads, KNOWN_TESTS_PATH), 1)
+        assert.strictEqual(session.meta[TEST_EARLY_FLAKE_ENABLED], 'true')
+        assert.strictEqual(session.meta[TEST_STATUS], 'pass')
+        assert.strictEqual(suite.meta[TEST_STATUS], 'pass')
+        assert.strictEqual(tests.length, 3)
+        assert.deepStrictEqual(tests.map(test => test.meta[TEST_STATUS]), ['fail', 'pass', 'fail'])
+        assert.strictEqual(tests.filter(test => test.meta[TEST_IS_RETRY] === 'true').length, 2)
+        for (const test of tests) {
+          assert.strictEqual(test.meta[TEST_IS_NEW], 'true')
+        }
+        for (const test of tests.slice(1)) {
+          assert.strictEqual(test.meta[TEST_RETRY_REASON], TEST_RETRY_REASON_TYPES.efd)
+        }
+      })
+    })
+
+    it('does not retry disabled modified or new tests with EFD', async () => {
+      receiver.setSettings({
+        early_flake_detection: {
+          enabled: true,
+          faulty_session_threshold: 100,
+          slow_test_retries: { '5s': 2 },
+        },
+        impacted_tests_enabled: true,
+        known_tests_enabled: true,
+        test_management: { enabled: true },
+      })
+      receiver.setKnownTests({
+        webdriverio: {
+          'first.e2e.js': ['WebdriverIO first worker runs with an active Test Optimization span'],
+          'impacted.e2e.js': ['WebdriverIO impacted tests marks a modified test'],
+        },
+      })
+      receiver.setTestManagementTests({
+        webdriverio: {
+          suites: {
+            'disabled-efd.e2e.js': {
+              tests: {
+                'WebdriverIO disabled EFD is new': {
+                  properties: { disabled: true },
+                },
+              },
+            },
+            'impacted.e2e.js': {
+              tests: {
+                'WebdriverIO impacted tests marks a modified test': {
+                  properties: { disabled: true },
+                },
+              },
+            },
+          },
+        },
+      })
+
+      await runScenario('disabledEfd', 1, payloads => {
+        const events = getEvents(payloads)
+        const session = events.find(event => event.type === 'test_session_end').content
+        const tests = events.filter(event => event.type === 'test').map(event => event.content)
+        const disabledTests = tests.filter(test => test.meta[TEST_MANAGEMENT_IS_DISABLED] === 'true')
+        const modified = disabledTests.find(test => test.meta[TEST_SUITE] === 'impacted.e2e.js')
+        const newTest = disabledTests.find(test => test.meta[TEST_SUITE] === 'disabled-efd.e2e.js')
+
+        assert.strictEqual(session.meta[TEST_EARLY_FLAKE_ENABLED], 'true')
+        assert.strictEqual(session.meta[TEST_MANAGEMENT_ENABLED], 'true')
+        assert.deepStrictEqual(
+          tests.map(test => test.meta[TEST_SUITE]).sort(),
+          ['disabled-efd.e2e.js', 'first.e2e.js', 'impacted.e2e.js']
+        )
+        assert.strictEqual(disabledTests.length, 2)
+        for (const test of disabledTests) {
+          assert.strictEqual(test.meta[TEST_STATUS], 'skip')
+          assert.strictEqual(test.meta[TEST_FINAL_STATUS], 'skip')
+          assert.strictEqual(test.meta[TEST_IS_RETRY], undefined)
+        }
+        assert.strictEqual(modified.meta[TEST_IS_MODIFIED], 'true')
+        assert.strictEqual(modified.meta[TEST_IS_NEW], undefined)
+        assert.strictEqual(newTest.meta[TEST_IS_MODIFIED], undefined)
+        assert.strictEqual(newTest.meta[TEST_IS_NEW], 'true')
+      })
+    })
+
+    it('stops EFD when the run exceeds the faulty-session threshold', async () => {
+      receiver.setSettings({
+        early_flake_detection: {
+          enabled: true,
+          faulty_session_threshold: 0,
+          slow_test_retries: { '5s': 2 },
+        },
+        known_tests_enabled: true,
+      })
+      receiver.setKnownTests({ webdriverio: {} })
+
+      await runScenario('efd', 1, payloads => {
+        const events = getEvents(payloads)
+        const session = events.find(event => event.type === 'test_session_end').content
+        const tests = events.filter(event => event.type === 'test').map(event => event.content)
+
+        assert.strictEqual(session.meta[TEST_EARLY_FLAKE_ENABLED], undefined)
+        assert.strictEqual(session.meta[TEST_EARLY_FLAKE_ABORT_REASON], 'faulty')
+        assert.strictEqual(tests.length, 1)
+        assert.strictEqual(tests[0].meta[TEST_IS_NEW], undefined)
+        assert.strictEqual(tests[0].meta[TEST_IS_RETRY], undefined)
+      }, {}, 1)
+    })
+
+    it('evaluates EFD faultiness from specs that have not started yet', async () => {
+      receiver.setSettings({
+        early_flake_detection: {
+          enabled: true,
+          faulty_session_threshold: 1,
+          slow_test_retries: { '5s': 2 },
+        },
+        known_tests_enabled: true,
+      })
+      receiver.setKnownTests({
+        webdriverio: {
+          'first.e2e.js': ['WebdriverIO first worker runs with an active Test Optimization span'],
+        },
+      })
+
+      await runScenario('efdFaultySchedule', 2, payloads => {
+        const events = getEvents(payloads)
+        const session = events.find(event => event.type === 'test_session_end').content
+        const efdTests = events
+          .filter(event => event.type === 'test')
+          .map(event => event.content)
+          .filter(test => test.meta[TEST_NAME].endsWith('retries a new test'))
+
+        assert.strictEqual(session.meta[TEST_EARLY_FLAKE_ENABLED], undefined)
+        assert.strictEqual(session.meta[TEST_EARLY_FLAKE_ABORT_REASON], 'faulty')
+        assert.strictEqual(efdTests.length, 1)
+        assert.strictEqual(efdTests[0].meta[TEST_IS_NEW], undefined)
+        assert.strictEqual(efdTests[0].meta[TEST_IS_RETRY], undefined)
+      }, {}, 1)
+    })
+
+    it('retries failures with ATR', async () => {
+      receiver.setSettings({
+        flaky_test_retries_count: 2,
+        flaky_test_retries_enabled: true,
+      })
+
+      await runScenario('atr', 1, payloads => {
+        const tests = getEvents(payloads)
+          .filter(event => event.type === 'test')
+          .map(event => event.content)
+
+        assert.strictEqual(tests.length, 2)
+        assert.deepStrictEqual(tests.map(test => test.meta[TEST_STATUS]).sort(), ['fail', 'pass'])
+        const retry = tests.find(test => test.meta[TEST_IS_RETRY] === 'true')
+        assert.ok(retry)
+        assert.strictEqual(retry.meta[TEST_RETRY_REASON], TEST_RETRY_REASON_TYPES.atr)
+      })
+    })
+
+    it('applies disabled, quarantined, and attempt-to-fix policies', async () => {
+      receiver.setSettings({
+        test_management: {
+          attempt_to_fix_retries: 2,
+          enabled: true,
+        },
+      })
+      receiver.setTestManagementTests({
+        webdriverio: {
+          suites: {
+            'test-management.e2e.js': {
+              tests: {
+                'WebdriverIO Test Management is attempt to fix': {
+                  properties: { attempt_to_fix: true },
+                },
+                'WebdriverIO Test Management is disabled': {
+                  properties: { disabled: true },
+                },
+                'WebdriverIO Test Management is quarantined': {
+                  properties: { quarantined: true },
+                },
+              },
+            },
+          },
+        },
+      })
+
+      await runScenario('testManagement', 1, payloads => {
+        const events = getEvents(payloads)
+        const session = events.find(event => event.type === 'test_session_end').content
+        const tests = events.filter(event => event.type === 'test').map(event => event.content)
+        const disabled = tests.find(test => test.meta[TEST_NAME].endsWith('is disabled'))
+        const quarantined = tests.find(test => test.meta[TEST_NAME].endsWith('is quarantined'))
+        const attemptToFix = tests.filter(test => test.meta[TEST_NAME].endsWith('is attempt to fix'))
+
+        assert.strictEqual(countRequests(payloads, TEST_MANAGEMENT_PATH), 1)
+        assert.strictEqual(session.meta[TEST_MANAGEMENT_ENABLED], 'true')
+        assert.strictEqual(disabled.meta[TEST_STATUS], 'skip')
+        assert.strictEqual(disabled.meta[TEST_FINAL_STATUS], 'skip')
+        assert.strictEqual(disabled.meta[TEST_MANAGEMENT_IS_DISABLED], 'true')
+        assert.strictEqual(quarantined.meta[TEST_STATUS], 'fail')
+        assert.strictEqual(quarantined.meta[TEST_FINAL_STATUS], 'skip')
+        assert.strictEqual(quarantined.meta[TEST_MANAGEMENT_IS_QUARANTINED], 'true')
+        assert.strictEqual(attemptToFix.length, 3)
+        for (const test of attemptToFix) {
+          assert.strictEqual(test.meta[TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX], 'true')
+        }
+        const finalAttempt = attemptToFix.find(test => TEST_FINAL_STATUS in test.meta)
+        assert.ok(finalAttempt)
+        assert.strictEqual(finalAttempt.meta[TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED], 'true')
+      })
+    })
+
+    it('suppresses quarantined and recovered EFD hook failures', async () => {
+      receiver.setSettings({
+        early_flake_detection: {
+          enabled: true,
+          faulty_session_threshold: 100,
+          slow_test_retries: { '5s': 2 },
+        },
+        known_tests_enabled: true,
+        test_management: { enabled: true },
+      })
+      receiver.setKnownTests({
+        webdriverio: {
+          'managed-hook-fail.e2e.js': ['WebdriverIO quarantined hook failure is quarantined'],
+        },
+      })
+      receiver.setTestManagementTests({
+        webdriverio: {
+          suites: {
+            'managed-hook-fail.e2e.js': {
+              tests: {
+                'WebdriverIO quarantined hook failure is quarantined': {
+                  properties: { quarantined: true },
+                },
+              },
+            },
+          },
+        },
+      })
+
+      await runScenario('managedHookFailures', 1, payloads => {
+        const events = getEvents(payloads)
+        const session = events.find(event => event.type === 'test_session_end').content
+        const suite = events.find(event => event.type === 'test_suite_end').content
+        const tests = events.filter(event => event.type === 'test').map(event => event.content)
+        const quarantined = tests.find(test => test.meta[TEST_NAME].endsWith('is quarantined'))
+        const earlyFlakeDetectionTests = tests.filter(test =>
+          test.meta[TEST_NAME].endsWith('passes an EFD retry'))
+
+        assert.strictEqual(session.meta[TEST_STATUS], 'pass')
+        assert.strictEqual(suite.meta[TEST_STATUS], 'pass')
+        assert.strictEqual(quarantined.meta[TEST_STATUS], 'fail')
+        assert.strictEqual(quarantined.meta[TEST_FINAL_STATUS], 'skip')
+        assert.strictEqual(quarantined.meta[TEST_MANAGEMENT_IS_QUARANTINED], 'true')
+        assert.strictEqual(earlyFlakeDetectionTests.length, 2)
+        assert.deepStrictEqual(
+          earlyFlakeDetectionTests.map(test => test.meta[TEST_STATUS]).sort(),
+          ['fail', 'pass']
+        )
+      })
+    })
+
+    it('fails the run when every EFD attempt has a failing afterEach hook', async () => {
+      receiver.setSettings({
+        early_flake_detection: {
+          enabled: true,
+          faulty_session_threshold: 100,
+          slow_test_retries: { '5s': 2 },
+        },
+        known_tests_enabled: true,
+      })
+      receiver.setKnownTests({ webdriverio: {} })
+
+      await runScenario('efdAfterEachFailure', 1, payloads => {
+        const events = getEvents(payloads)
+        const session = events.find(event => event.type === 'test_session_end').content
+        const suite = events.find(event => event.type === 'test_suite_end').content
+        const tests = events.filter(event => event.type === 'test').map(event => event.content)
+
+        assert.strictEqual(session.meta[TEST_STATUS], 'fail')
+        assert.strictEqual(suite.meta[TEST_STATUS], 'fail')
+        assert.strictEqual(tests.length, 1)
+        assert.ok(tests.every(test => test.meta[TEST_STATUS] === 'fail'))
+      }, {}, 1)
+    })
+
+    for (const hookType of ['beforeAll', 'afterAll']) {
+      it(`does not suppress a quarantined test's ${hookType} failure`, async () => {
+        receiver.setSettings({
+          test_management: { enabled: true },
+        })
+        receiver.setTestManagementTests({
+          webdriverio: {
+            suites: {
+              'suite-hook-fail.e2e.js': {
+                tests: {
+                  'WebdriverIO suite hook failure is quarantined': {
+                    properties: { quarantined: true },
+                  },
+                },
+              },
+            },
+          },
+        })
+
+        await runScenario('suiteHookFailure', 1, payloads => {
+          const events = getEvents(payloads)
+          const session = events.find(event => event.type === 'test_session_end').content
+          const suite = events.find(event => event.type === 'test_suite_end').content
+
+          assert.strictEqual(session.meta[TEST_STATUS], 'fail')
+          assert.strictEqual(suite.meta[TEST_STATUS], 'fail')
+        }, {
+          WEBDRIVERIO_SUITE_HOOK: hookType,
+        }, 1)
+      })
+    }
+
+    it('does not suppress an afterAll failure after passing EFD attempts', async () => {
+      receiver.setSettings({
+        early_flake_detection: {
+          enabled: true,
+          faulty_session_threshold: 100,
+          slow_test_retries: { '5s': 2 },
+        },
+        known_tests_enabled: true,
+      })
+      receiver.setKnownTests({ webdriverio: {} })
+
+      await runScenario('suiteHookFailure', 1, payloads => {
+        const events = getEvents(payloads)
+        const session = events.find(event => event.type === 'test_session_end').content
+        const suite = events.find(event => event.type === 'test_suite_end').content
+
+        assert.strictEqual(session.meta[TEST_STATUS], 'fail')
+        assert.strictEqual(suite.meta[TEST_STATUS], 'fail')
+      }, {
+        WEBDRIVERIO_SUITE_HOOK: 'afterAll',
+      }, 1)
+    })
+
+    it('marks tests from modified files as impacted', async () => {
+      receiver.setSettings({ impacted_tests_enabled: true })
+
+      await runScenario('impacted', 1, payloads => {
+        const tests = getEvents(payloads)
+          .filter(event => event.type === 'test')
+          .map(event => event.content)
+
+        assert.strictEqual(tests.length, 1)
+        assert.strictEqual(tests[0].meta[TEST_SUITE], 'impacted.e2e.js')
+        assert.strictEqual(tests[0].meta[TEST_IS_MODIFIED], 'true')
+      })
+    })
+
+    it('captures Failed Test Replay snapshots in workers', async () => {
+      receiver.setSettings({
+        di_enabled: true,
+        flaky_test_retries_count: 1,
+        flaky_test_retries_enabled: true,
+      })
+
+      await runScenario('failedTestReplay', 1, payloads => {
+        const tests = getEvents(payloads)
+          .filter(event => event.type === 'test')
+          .map(event => event.content)
+        const retriedTest = tests.find(test =>
+          test.meta[TEST_RETRY_REASON] === TEST_RETRY_REASON_TYPES.atr)
+        const logPayload = payloads.find(({ url }) => url.endsWith('/api/v2/logs'))
+
+        assert.ok(retriedTest)
+        assert.strictEqual(retriedTest.meta[DI_ERROR_DEBUG_INFO_CAPTURED], 'true')
+        assert.ok(Object.keys(retriedTest.meta).some(tag => tag.startsWith(DI_DEBUG_ERROR_PREFIX)))
+        assert.ok(logPayload)
+        assert.strictEqual(logPayload.logMessage[0].ddsource, 'dd_debugger')
+      }, {
+        DD_CIVISIBILITY_FLAKY_RETRY_COUNT: '1',
+        _DD_TRACE_INTEGRATION_COVERAGE_DISABLE: '1',
+      })
+    })
+
+    it('falls back safely when policy requests fail', async () => {
+      receiver.setSettings({
+        early_flake_detection: {
+          enabled: true,
+          slow_test_retries: { '5s': 2 },
+        },
+        known_tests_enabled: true,
+        test_management: { enabled: true },
+      })
+      receiver.setKnownTestsResponseCode(500)
+      receiver.setTestManagementTestsResponseCode(500)
+
+      await runScenario('efd', 1, payloads => {
+        const events = getEvents(payloads)
+        const session = events.find(event => event.type === 'test_session_end').content
+        const suites = events.filter(event => event.type === 'test_suite_end').map(event => event.content)
+        const tests = events.filter(event => event.type === 'test').map(event => event.content)
+
+        assert.strictEqual(tests.length, 1)
+        assert.strictEqual(session.meta[TEST_EARLY_FLAKE_ENABLED], undefined)
+        assert.strictEqual(session.meta[TEST_MANAGEMENT_ENABLED], undefined)
+        for (const event of [session, ...suites, ...tests]) {
+          assert.strictEqual(event.meta[DD_CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS], 'true')
+          assert.strictEqual(event.meta[DD_CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS], 'true')
+        }
+      }, {}, 1)
+    })
+  })
+}
diff --git a/packages/datadog-instrumentations/src/helpers/hooks.js b/packages/datadog-instrumentations/src/helpers/hooks.js
index 7b2e2bfe52..d04e8c283e 100644
--- a/packages/datadog-instrumentations/src/helpers/hooks.js
+++ b/packages/datadog-instrumentations/src/helpers/hooks.js
@@ -58,6 +58,7 @@ module.exports = {
   '@smithy/core': () => require('../aws-sdk'),
   '@smithy/smithy-client': () => require('../aws-sdk'),
   '@vitest/runner': { esmFirst: true, fn: () => require('../vitest') },
+  '@wdio/cli': { esmFirst: true, fn: () => require('../webdriverio') },
   '@wdio/local-runner': { esmFirst: true, fn: () => require('../webdriverio') },
   aerospike: () => require('../aerospike'),
   ai: () => require('../ai'),
diff --git a/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/webdriverio.js b/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/webdriverio.js
index cf73ac7412..784f847d8a 100644
--- a/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/webdriverio.js
+++ b/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/webdriverio.js
@@ -1,6 +1,19 @@
 'use strict'
 
 module.exports = [
+  {
+    module: {
+      name: '@wdio/cli',
+      versionRange: '>=9.0.0',
+      filePath: 'build/index.js',
+    },
+    functionQuery: {
+      className: 'Launcher',
+      methodName: '_startInstance',
+      kind: 'Async',
+    },
+    channelName: 'Launcher_startInstance',
+  },
   {
     module: {
       name: '@wdio/local-runner',
diff --git a/packages/datadog-instrumentations/src/mocha/main.js b/packages/datadog-instrumentations/src/mocha/main.js
index 1b1d284fd2..36ba2ae2ac 100644
--- a/packages/datadog-instrumentations/src/mocha/main.js
+++ b/packages/datadog-instrumentations/src/mocha/main.js
@@ -53,6 +53,7 @@ const {
   newTestsWithDynamicNames,
   attemptToFixExecutions,
   loggedAttemptToFixTests,
+  adjustRunnerFailuresForTestOptimization,
 } = require('./utils')
 
 require('./common')
@@ -114,17 +115,6 @@ function warnDeprecatedMochaVersion (frameworkVersion) {
   )
 }
 
-// Tests from workers do not come with `isFailed` method
-function isTestFailed (test) {
-  if (test.isFailed) {
-    return test.isFailed()
-  }
-  if (test.isPending) {
-    return !test.isPending() && test.state === 'failed'
-  }
-  return false
-}
-
 function getRootSuiteStatus (rootTests) {
   let status = 'pass'
   if (rootTests.every(t => t.isPending())) {
@@ -309,37 +299,7 @@ function getOnEndHandler (isParallel, onDone) {
       status = 'fail'
     }
 
-    if (config.isEarlyFlakeDetectionEnabled) {
-      /**
-       * If Early Flake Detection (EFD) is enabled the logic is as follows:
-       * - If all attempts for a test are failing, the test has failed and we will let the test process fail.
-       * - If just a single attempt passes, we will prevent the test process from failing.
-       * The rationale behind is the following: you may still be able to block your CI pipeline by gating
-       * on flakiness (the test will be considered flaky), but you may choose to unblock the pipeline too.
-       */
-      for (const tests of Object.values(efdTests)) {
-        const failingEfdTests = tests.filter(test => isTestFailed(test))
-        const areAllEfdTestsFailing = failingEfdTests.length === tests.length
-        const nonQuarantinedFailingEfdTests = failingEfdTests.filter(test => !testsQuarantined.has(test))
-        if (nonQuarantinedFailingEfdTests.length && !areAllEfdTestsFailing) {
-          this.stats.failures -= nonQuarantinedFailingEfdTests.length
-          this.failures -= nonQuarantinedFailingEfdTests.length
-        }
-      }
-    }
-
-    // We subtract the errors from quarantined tests from the total number of failures.
-    // Attempt-to-fix tests ignore quarantine/disabled suppression and keep their framework result.
-    if (config.isTestManagementTestsEnabled) {
-      let numFailedQuarantinedTests = 0
-      for (const test of testsQuarantined) {
-        if (isTestFailed(test)) {
-          numFailedQuarantinedTests++
-        }
-      }
-      this.stats.failures -= numFailedQuarantinedTests
-      this.failures -= numFailedQuarantinedTests
-    }
+    adjustRunnerFailuresForTestOptimization(this, config)
 
     // Recompute status after EFD and quarantine adjustments have reduced failure counts
     if (status === 'fail') {
diff --git a/packages/datadog-instrumentations/src/mocha/utils.js b/packages/datadog-instrumentations/src/mocha/utils.js
index 7c45c03428..7ca9637d97 100644
--- a/packages/datadog-instrumentations/src/mocha/utils.js
+++ b/packages/datadog-instrumentations/src/mocha/utils.js
@@ -48,6 +48,59 @@ function waitForHitProbe () {
 }
 const loggedAttemptToFixTests = new Set()
 
+/**
+ * Checks whether a Mocha test failed, including serialized tests from parallel workers.
+ *
+ * @param {object} test
+ * @returns {boolean}
+ */
+function isTestFailed (test) {
+  if (test.isFailed) {
+    return test.isFailed()
+  }
+  if (test.isPending) {
+    return !test.isPending() && test.state === 'failed'
+  }
+  return false
+}
+
+/**
+ * Applies EFD and quarantine failure suppression to a completed Mocha runner.
+ *
+ * @param {object} runner
+ * @param {object} config
+ * @returns {void}
+ */
+function adjustRunnerFailuresForTestOptimization (runner, config) {
+  if (config.isEarlyFlakeDetectionEnabled) {
+    for (const tests of Object.values(efdTests)) {
+      const executedEfdTests = tests.filter(test => !test.isPending())
+      const failingEfdTests = tests.filter(test => isTestFailed(test))
+      const areAllEfdTestsFailing = failingEfdTests.length === executedEfdTests.length
+      const nonQuarantinedFailingEfdTests = failingEfdTests.filter(test => !testsQuarantined.has(test))
+      if (nonQuarantinedFailingEfdTests.length && !areAllEfdTestsFailing) {
+        if (runner.stats) {
+          runner.stats.failures -= nonQuarantinedFailingEfdTests.length
+        }
+        runner.failures -= nonQuarantinedFailingEfdTests.length
+      }
+    }
+  }
+
+  if (config.isTestManagementTestsEnabled) {
+    let numFailedQuarantinedTests = 0
+    for (const test of testsQuarantined) {
+      if (isTestFailed(test)) {
+        numFailedQuarantinedTests++
+      }
+    }
+    if (runner.stats) {
+      runner.stats.failures -= numFailedQuarantinedTests
+    }
+    runner.failures -= numFailedQuarantinedTests
+  }
+}
+
 function getAfterEachHooks (testOrHook) {
   const hooks = []
 
@@ -165,6 +218,7 @@ function isDatadogManagedRetryTest (test, config) {
  * Checks whether a runnable belongs to an Early Flake Detection execution.
  * @param {{
  *   _ddIsAttemptToFix?: boolean,
+ *   _ddIsDisabled?: boolean,
  *   _ddIsEfdRetry?: boolean,
  *   _ddIsModified?: boolean,
  *   _ddIsNew?: boolean
@@ -174,6 +228,7 @@ function isDatadogManagedRetryTest (test, config) {
  */
 function isEarlyFlakeDetectionTest (test, config) {
   return !test._ddIsAttemptToFix &&
+    !test._ddIsDisabled &&
     config.isEarlyFlakeDetectionEnabled &&
     (test._ddIsEfdRetry || test._ddIsNew || test._ddIsModified)
 }
@@ -949,7 +1004,12 @@ function getRunTestsWrapper (runTests, config) {
           onDone: (isModified) => {
             if (isModified) {
               test._ddIsModified = true
-              if (!test.isPending() && !test._ddIsAttemptToFix && config.isEarlyFlakeDetectionEnabled) {
+              if (
+                !test.isPending() &&
+                !test._ddIsDisabled &&
+                !test._ddIsAttemptToFix &&
+                config.isEarlyFlakeDetectionEnabled
+              ) {
                 retryTest(
                   test,
                   getConfiguredEfdRetryCount(config),
@@ -968,7 +1028,12 @@ function getRunTestsWrapper (runTests, config) {
       suite.tests.forEach((test) => {
         if (!test.isPending() && isNewTest(test, config.knownTests)) {
           test._ddIsNew = true
-          if (config.isEarlyFlakeDetectionEnabled && !test._ddIsAttemptToFix && !test._ddIsModified) {
+          if (
+            config.isEarlyFlakeDetectionEnabled &&
+            !test._ddIsDisabled &&
+            !test._ddIsAttemptToFix &&
+            !test._ddIsModified
+          ) {
             retryTest(
               test,
               getConfiguredEfdRetryCount(config),
@@ -1015,4 +1080,5 @@ module.exports = {
   testsStatuses,
   attemptToFixExecutions,
   loggedAttemptToFixTests,
+  adjustRunnerFailuresForTestOptimization,
 }
diff --git a/packages/datadog-instrumentations/src/mocha/worker.js b/packages/datadog-instrumentations/src/mocha/worker.js
index 112c4479ca..c5d5d148d1 100644
--- a/packages/datadog-instrumentations/src/mocha/worker.js
+++ b/packages/datadog-instrumentations/src/mocha/worker.js
@@ -16,6 +16,9 @@ const {
   getOnTestRetryHandler,
   getRunTestsWrapper,
   patchFailedTestReplayHookUp,
+  adjustRunnerFailuresForTestOptimization,
+  efdTests,
+  getTestFullName,
 } = require('./utils')
 const {
   CONFIGURATION_REQUEST,
@@ -30,10 +33,11 @@ require('./common')
 const MINIMUM_MOCHA_VERSION = DD_MAJOR >= 6 ? '>=8.0.0' : '>=5.2.0'
 
 const workerFinishCh = channel('ci:mocha:worker:finish')
+const workerConfigurationCh = channel('ci:mocha:worker:configuration')
 
 const config = {}
 const runnerToFiles = new WeakMap()
-const runnerToFailedHookFiles = new WeakMap()
+const runnerToFailedHooks = new WeakMap()
 const isWebdriverioWorker = !!getEnvironmentVariable(WEBDRIVERIO_WORKER_ENV)
 let configurationRequestId = 0
 
@@ -206,6 +210,52 @@ function reportWebdriverioWorkerReady (frameworkVersion) {
   })
 }
 
+/**
+ * Checks whether Test Optimization converts a failed WebdriverIO test attempt to a passing result.
+ *
+ * @param {object|undefined} test
+ * @returns {boolean}
+ */
+function isWebdriverioFailureSuppressed (test) {
+  if (!test) {
+    return false
+  }
+  const hasPassingEfdAttempt = config.isEarlyFlakeDetectionEnabled &&
+    efdTests[getTestFullName(test)]?.some(attempt => attempt.state === 'passed' && !attempt._ddHookFailed)
+  return (test._ddIsQuarantined && !test._ddIsAttemptToFix) || hasPassingEfdAttempt
+}
+
+/**
+ * Gets the test owned by a per-test hook without associating suite hooks with boundary tests.
+ *
+ * @param {object} hook
+ * @returns {object|undefined}
+ */
+function getWebdriverioHookTest (hook) {
+  const { parent } = hook
+  const isTestHook = parent?._beforeEach?.includes(hook) || parent?._afterEach?.includes(hook)
+  return isTestHook ? hook.ctx?.currentTest : undefined
+}
+
+/**
+ * Removes managed hook failures from WebdriverIO's Mocha runner totals.
+ *
+ * @param {object} runner
+ * @returns {void}
+ */
+function adjustWebdriverioHookFailures (runner) {
+  let suppressedFailures = 0
+  for (const { test } of runnerToFailedHooks.get(runner) || []) {
+    if (isWebdriverioFailureSuppressed(test)) {
+      suppressedFailures++
+    }
+  }
+  if (runner.stats) {
+    runner.stats.failures -= suppressedFailures
+  }
+  runner.failures -= suppressedFailures
+}
+
 /**
  * Computes a final result for every file loaded into one Mocha worker.
  *
@@ -229,16 +279,17 @@ function getWebdriverioSuiteResults (runner) {
     if (!result) {
       return
     }
-    if (test.state === 'failed' || test.timedOut || test._ddHookFailed) {
+    const isSuppressedFailure = isWebdriverioFailureSuppressed(test)
+    if ((test.state === 'failed' || test.timedOut || test._ddHookFailed) && !isSuppressedFailure) {
       result.status = 'fail'
-    } else if (test.state === 'passed') {
+    } else if (test.state === 'passed' || isSuppressedFailure) {
       result.hasPassingTest = true
     }
   })
 
-  for (const file of runnerToFailedHookFiles.get(runner) || []) {
+  for (const { file, test } of runnerToFailedHooks.get(runner) || []) {
     const result = resultsByFile.get(file)
-    if (result) {
+    if (result && !isWebdriverioFailureSuppressed(test)) {
       result.status = 'fail'
     }
   }
@@ -370,6 +421,11 @@ addHook({
     }) => {
       if (configuration) {
         Object.assign(config, configuration)
+        workerConfigurationCh.publish({
+          libraryConfig: config,
+          repositoryRoot: config.repositoryRoot,
+          testFramework: config.testFramework,
+        })
       }
       filterSkippedFiles(runner, skippedFiles)
       if (isFailedTestReplayEnabled()) {
@@ -405,6 +461,16 @@ addHook({
     if (isFailedTestReplayEnabled()) {
       patchFailedTestReplayHookUp(Runner)
     }
+    if (isWebdriverioWorker) {
+      this.prependOnceListener('end', () => {
+        try {
+          adjustRunnerFailuresForTestOptimization(this, config)
+          adjustWebdriverioHookFailures(this)
+        } catch (error) {
+          log.error('WebdriverIO Test Optimization failure adjustment error', error)
+        }
+      })
+    }
     const onRunDone = args[0]
     if (isWebdriverioWorker && typeof onRunDone === 'function') {
       args[0] = (...onRunDoneArgs) => {
@@ -431,11 +497,14 @@ addHook({
     this.on('hook end', getOnHookEndHandler(config))
 
     if (isWebdriverioWorker) {
-      const failedHookFiles = new Set()
-      runnerToFailedHookFiles.set(this, failedHookFiles)
+      const failedHooks = []
+      runnerToFailedHooks.set(this, failedHooks)
       this.on('fail', runnable => {
         if (runnable.type === 'hook' && runnable.file) {
-          failedHookFiles.add(runnable.file)
+          failedHooks.push({
+            file: runnable.file,
+            test: getWebdriverioHookTest(runnable),
+          })
         }
       })
     }
diff --git a/packages/datadog-instrumentations/src/webdriverio.js b/packages/datadog-instrumentations/src/webdriverio.js
index ca92df8c4d..568e2f5747 100644
--- a/packages/datadog-instrumentations/src/webdriverio.js
+++ b/packages/datadog-instrumentations/src/webdriverio.js
@@ -6,6 +6,11 @@ const { fileURLToPath } = require('node:url')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const log = require('../../dd-trace/src/log')
 const {
+  collectTestOptimizationSummariesFromTraces,
+  getIsFaultyEarlyFlakeDetection,
+  getTestSuitePath,
+  logTestOptimizationSummary,
+  MOCHA_WORKER_LOGS_PAYLOAD_CODE,
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,
   TEST_SUITE_EXECUTION_ID,
 } = require('../../dd-trace/src/plugins/util/test')
@@ -25,9 +30,14 @@ const testSessionStartCh = channel('ci:mocha:session:start')
 const testSessionFinishCh = channel('ci:mocha:session:finish')
 const testSuiteStartCh = channel('ci:mocha:test-suite:start')
 const testSuiteFinishCh = channel('ci:mocha:test-suite:finish')
+const knownTestsCh = channel('ci:mocha:known-tests')
 const libraryConfigurationCh = channel('ci:mocha:library-configuration')
+const modifiedFilesCh = channel('ci:mocha:modified-files')
+const testManagementTestsCh = channel('ci:mocha:test-management-tests')
+const workerReportLogsCh = channel('ci:mocha:worker-report:logs')
 const workerReportTraceCh = channel('ci:mocha:worker-report:trace')
 
+const launcherStartInstanceCh = tracingChannel('orchestrion:@wdio/cli:Launcher_startInstance')
 const localRunnerRunCh = tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_run')
 const localRunnerShutdownCh = tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_shutdown')
 
@@ -97,22 +107,24 @@ addHook({
  * @property {string|undefined} frameworkVersion
  * @property {string} testFrameworkAdapter
  * @property {number} activeWorkers
+ * @property {Map<string, object>} attemptToFixExecutions
  * @property {number} maxActiveWorkers
+ * @property {Set<string>} newTestsWithDynamicNames
  * @property {number} nextWorkerId
+ * @property {Set<string>} scheduledFiles
  * @property {unknown} runError
  * @property {Set<WorkerRecord>} workers
  * @property {Map<object, string>} suiteStatuses
  */
 
 /**
- * Creates the basic-reporting configuration consumed by Mocha workers.
- *
- * Advanced Test Optimization features remain disabled until they have WebdriverIO-specific coverage.
+ * Creates the configuration consumed by Mocha workers.
  *
  * @returns {object}
  */
 function createWorkerConfiguration () {
   return {
+    earlyFlakeDetectionFaultyThreshold: 30,
     earlyFlakeDetectionNumRetries: 0,
     earlyFlakeDetectionSlowTestRetries: {},
     flakyTestRetriesCount: 0,
@@ -130,6 +142,7 @@ function createWorkerConfiguration () {
     knownTests: {},
     modifiedFiles: [],
     repositoryRoot: undefined,
+    testFramework: TEST_FRAMEWORK,
     testManagementAttemptToFixRetries: 0,
     testManagementTests: {},
   }
@@ -169,8 +182,11 @@ function getCoordinatorState (localRunner) {
     frameworkVersion: localRunnerVersions.get(localRunner.constructor),
     testFrameworkAdapter: getRunnerConfiguration(localRunner)?.framework,
     activeWorkers: 0,
+    attemptToFixExecutions: new Map(),
     maxActiveWorkers: 0,
+    newTestsWithDynamicNames: new Set(),
     nextWorkerId: 0,
+    scheduledFiles: new Set(),
     runError: undefined,
     workers: new Set(),
     suiteStatuses: new Map(),
@@ -190,6 +206,19 @@ function normalizeFile (file) {
   return file.startsWith('file://') ? fileURLToPath(file) : file
 }
 
+/**
+ * Adds resolved WebdriverIO spec files to the coordinator's complete schedule.
+ *
+ * @param {CoordinatorState} state
+ * @param {string[]} files
+ * @returns {void}
+ */
+function addScheduledFiles (state, files) {
+  for (const file of files) {
+    state.scheduledFiles.add(normalizeFile(file))
+  }
+}
+
 /**
  * Checks whether worker NODE_OPTIONS contain the complete launcher options.
  *
@@ -245,15 +274,13 @@ function startSession (state) {
  * Completes coordinator initialization and releases waiting workers.
  *
  * @param {CoordinatorState} state
- * @param {object|undefined} response
  * @returns {void}
  */
-function completeCoordinatorInitialization (state, response) {
+function completeCoordinatorInitialization (state) {
   if (state.initialized) {
     return
   }
 
-  state.configuration.repositoryRoot = response?.repositoryRoot
   state.initialized = true
   state.initializing = false
   startSession(state)
@@ -266,9 +293,133 @@ function completeCoordinatorInitialization (state, response) {
 }
 
 /**
- * Requests settings once so the launcher owns initialization for every worker.
+ * Runs one coordinator-owned feature request.
+ *
+ * @param {CoordinatorState} state
+ * @param {import('node:diagnostics_channel').Channel} requestChannel
+ * @param {(response: object) => void} onDone
+ * @returns {void}
+ */
+function requestCoordinatorData (state, requestChannel, onDone) {
+  if (!requestChannel.hasSubscribers) {
+    onDone({ err: new Error('Test optimization was not initialized correctly') })
+    return
+  }
+
+  try {
+    requestChannel.runStores({
+      onDone: response => state.asyncResource.runInAsyncScope(onDone, undefined, response),
+    }, () => {})
+  } catch (error) {
+    log.error('WebdriverIO Test Optimization feature request error', error)
+    onDone({ err: error })
+  }
+}
+
+/**
+ * Maps backend framework data to the Mocha adapter's internal framework key.
  *
- * Settings for advanced features are intentionally ignored while WebdriverIO support is basic-reporting only.
+ * @param {object|undefined} frameworkData
+ * @returns {object|undefined}
+ */
+function getMochaFrameworkData (frameworkData) {
+  return frameworkData?.[TEST_FRAMEWORK] ?? frameworkData?.mocha
+}
+
+/**
+ * Applies settings and requests the enabled non-TIA datasets once for the whole run.
+ *
+ * @param {CoordinatorState} state
+ * @param {object|undefined} response
+ * @returns {void}
+ */
+function configureCoordinator (state, response) {
+  const { configuration } = state
+  const {
+    err,
+    isTestDynamicInstrumentationEnabled,
+    libraryConfig,
+    repositoryRoot,
+  } = response || {}
+
+  configuration.repositoryRoot = repositoryRoot
+  if (err || !libraryConfig) {
+    completeCoordinatorInitialization(state)
+    return
+  }
+
+  configuration.earlyFlakeDetectionFaultyThreshold = libraryConfig.earlyFlakeDetectionFaultyThreshold
+  configuration.earlyFlakeDetectionNumRetries = libraryConfig.earlyFlakeDetectionNumRetries
+  configuration.earlyFlakeDetectionSlowTestRetries = libraryConfig.earlyFlakeDetectionSlowTestRetries ?? {}
+  configuration.flakyTestRetriesCount = libraryConfig.flakyTestRetriesCount
+  configuration.isDiEnabled = libraryConfig.isDiEnabled
+  configuration.isEarlyFlakeDetectionEnabled = libraryConfig.isEarlyFlakeDetectionEnabled
+  configuration.isFlakyTestRetriesEnabled = libraryConfig.isFlakyTestRetriesEnabled
+  configuration.isImpactedTestsEnabled = libraryConfig.isImpactedTestsEnabled
+  configuration.isKnownTestsEnabled = libraryConfig.isKnownTestsEnabled
+  configuration.isTestDynamicInstrumentationEnabled = isTestDynamicInstrumentationEnabled
+  configuration.isTestManagementTestsEnabled = libraryConfig.isTestManagementEnabled
+  configuration.testManagementAttemptToFixRetries = libraryConfig.testManagementAttemptToFixRetries
+
+  let pendingRequests = 1
+
+  /**
+   * Completes initialization after all enabled requests settle.
+   *
+   * @returns {void}
+   */
+  function finishRequest () {
+    pendingRequests--
+    if (pendingRequests === 0) {
+      completeCoordinatorInitialization(state)
+    }
+  }
+
+  if (configuration.isKnownTestsEnabled) {
+    pendingRequests++
+    requestCoordinatorData(state, knownTestsCh, ({ err, knownTests } = {}) => {
+      const mochaKnownTests = getMochaFrameworkData(knownTests)
+      if (err || !mochaKnownTests) {
+        configuration.isEarlyFlakeDetectionEnabled = false
+        configuration.isKnownTestsEnabled = false
+      } else {
+        configuration.knownTests = { mocha: mochaKnownTests }
+      }
+      finishRequest()
+    })
+  }
+
+  if (configuration.isTestManagementTestsEnabled) {
+    pendingRequests++
+    requestCoordinatorData(state, testManagementTestsCh, ({ err, testManagementTests } = {}) => {
+      if (err) {
+        configuration.isTestManagementTestsEnabled = false
+        configuration.testManagementAttemptToFixRetries = 0
+      } else {
+        const mochaTestManagementTests = getMochaFrameworkData(testManagementTests) || { suites: {} }
+        configuration.testManagementTests = { mocha: mochaTestManagementTests }
+      }
+      finishRequest()
+    })
+  }
+
+  if (configuration.isImpactedTestsEnabled) {
+    pendingRequests++
+    requestCoordinatorData(state, modifiedFilesCh, ({ err, modifiedFiles } = {}) => {
+      if (err) {
+        configuration.isImpactedTestsEnabled = false
+      } else {
+        configuration.modifiedFiles = modifiedFiles
+      }
+      finishRequest()
+    })
+  }
+
+  finishRequest()
+}
+
+/**
+ * Requests settings once so the launcher owns initialization for every worker.
  *
  * @param {CoordinatorState} state
  * @param {(configuration: object) => void} [onDone]
@@ -294,11 +445,12 @@ function initializeCoordinator (state, onDone) {
 
   try {
     libraryConfigurationCh.runStores({
-      basicReportingOnly: true,
+      disableTestImpactAnalysis: true,
       frameworkVersion: state.frameworkVersion,
       isParallel: state.maxActiveWorkers > 1,
+      testFramework: TEST_FRAMEWORK,
       onDone: response => state.asyncResource.runInAsyncScope(
-        completeCoordinatorInitialization,
+        configureCoordinator,
         undefined,
         state,
         response
@@ -311,7 +463,7 @@ function initializeCoordinator (state, onDone) {
 }
 
 /**
- * Starts basic-reporting suites for one worker.
+ * Starts suites for one worker.
  *
  * @param {WorkerRecord} workerRecord
  * @param {string[]} files
@@ -411,6 +563,7 @@ function handleConfigurationRequest (state, workerRecord, message) {
   const { files = [], requestId } = message.content || {}
 
   initializeCoordinator(state, (configuration) => {
+    updateEarlyFlakeDetectionFaultyState(state, files)
     startWorkerSuites(workerRecord, files)
     sendWorkerMessage(workerRecord, {
       origin: 'datadog',
@@ -423,6 +576,37 @@ function handleConfigurationRequest (state, workerRecord, message) {
   })
 }
 
+/**
+ * Disables EFD when the accumulated WebdriverIO run exceeds its new-suite threshold.
+ *
+ * @param {CoordinatorState} state
+ * @param {string[]} files
+ * @returns {void}
+ */
+function updateEarlyFlakeDetectionFaultyState (state, files) {
+  const { configuration } = state
+  if (!configuration.isKnownTestsEnabled) {
+    return
+  }
+
+  addScheduledFiles(state, files)
+  const scheduledSuites = []
+  for (const file of state.scheduledFiles) {
+    scheduledSuites.push(getTestSuitePath(file, process.cwd()))
+  }
+
+  const isFaulty = getIsFaultyEarlyFlakeDetection(
+    scheduledSuites,
+    configuration.knownTests?.mocha || {},
+    configuration.earlyFlakeDetectionFaultyThreshold
+  )
+  if (isFaulty) {
+    configuration.isEarlyFlakeDetectionEnabled = false
+    configuration.isEarlyFlakeDetectionFaulty = true
+    configuration.isKnownTestsEnabled = false
+  }
+}
+
 /**
  * Handles suite results reported by a Mocha worker.
  *
@@ -456,10 +640,16 @@ function handleWorkerMessage (state, workerRecord, message) {
   if (Array.isArray(message)) {
     const [messageCode, payload] = message
     if (messageCode === MOCHA_WORKER_TRACE_PAYLOAD_CODE) {
+      collectTestOptimizationSummariesFromTraces(payload, {
+        attemptToFixExecutions: state.attemptToFixExecutions,
+        newTestsWithDynamicNames: state.newTestsWithDynamicNames,
+      })
       workerReportTraceCh.publish({
         traces: payload,
         [TEST_SUITE_EXECUTION_ID]: workerRecord.testSuiteExecutionId,
       })
+    } else if (messageCode === MOCHA_WORKER_LOGS_PAYLOAD_CODE) {
+      workerReportLogsCh.publish(payload)
     }
     return
   }
@@ -608,6 +798,10 @@ function finishCoordinator (state, error, onDone) {
   }
 
   if (!testSessionFinishCh.hasSubscribers) {
+    logTestOptimizationSummary({
+      attemptToFixExecutions: state.attemptToFixExecutions,
+      newTestsWithDynamicNames: state.newTestsWithDynamicNames,
+    })
     onDone()
     return
   }
@@ -615,11 +809,39 @@ function finishCoordinator (state, error, onDone) {
   testSessionFinishCh.publish({
     status: error ? 'fail' : getSessionStatus(state),
     error,
+    isEarlyFlakeDetectionEnabled: state.configuration.isEarlyFlakeDetectionEnabled,
+    isEarlyFlakeDetectionFaulty: state.configuration.isEarlyFlakeDetectionFaulty,
     isParallel: state.maxActiveWorkers > 1,
+    isSuitesSkipped: false,
+    isTestManagementEnabled: state.configuration.isTestManagementTestsEnabled,
     onDone,
   })
+  logTestOptimizationSummary({
+    attemptToFixExecutions: state.attemptToFixExecutions,
+    newTestsWithDynamicNames: state.newTestsWithDynamicNames,
+  })
 }
 
+// dc-polyfill supports partial tracing-channel subscribers, unlike the Node.js type definition.
+// @ts-expect-error
+launcherStartInstanceCh.subscribe({
+  start (context) {
+    const localRunner = context.self?.runner
+    const runnerConfiguration = localRunner && getRunnerConfiguration(localRunner)
+    if (!testFinishCh.hasSubscribers || runnerConfiguration?.framework !== 'mocha') {
+      return
+    }
+
+    const state = getCoordinatorState(localRunner)
+    addScheduledFiles(state, context.arguments?.[0] || [])
+    for (const schedule of context.self._schedule || []) {
+      for (const { files } of schedule.specs || []) {
+        addScheduledFiles(state, files)
+      }
+    }
+  },
+})
+
 // dc-polyfill supports partial tracing-channel subscribers, unlike the Node.js type definition.
 // @ts-expect-error
 localRunnerRunCh.subscribe({
@@ -631,6 +853,7 @@ localRunnerRunCh.subscribe({
 
     const state = getCoordinatorState(context.self)
     const workerOptions = context.arguments?.[0]
+    addScheduledFiles(state, workerOptions?.specs || [])
     let workerEnvironment = runnerConfiguration.runnerEnv || {}
     const launcherNodeOptions = getEnvironmentVariable('NODE_OPTIONS')
     const workerNodeOptions = workerEnvironment.NODE_OPTIONS
diff --git a/packages/datadog-instrumentations/test/fixtures/node_modules/@wdio/cli/package.json b/packages/datadog-instrumentations/test/fixtures/node_modules/@wdio/cli/package.json
new file mode 100644
index 0000000000..98e846e480
--- /dev/null
+++ b/packages/datadog-instrumentations/test/fixtures/node_modules/@wdio/cli/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "@wdio/cli",
+  "version": "9.0.0",
+  "type": "module"
+}
diff --git a/packages/datadog-instrumentations/test/fixtures/webdriverio-disconnected-worker.js b/packages/datadog-instrumentations/test/fixtures/webdriverio-disconnected-worker.js
index b11abc941a..9490dc7176 100644
--- a/packages/datadog-instrumentations/test/fixtures/webdriverio-disconnected-worker.js
+++ b/packages/datadog-instrumentations/test/fixtures/webdriverio-disconnected-worker.js
@@ -25,10 +25,16 @@ assert.ok(mochaHook)
 assert.ok(runnerHook)
 
 const workerFinishCh = channel('ci:mocha:worker:finish')
+const workerConfigurationCh = channel('ci:mocha:worker:configuration')
+let workerTestFramework
 
 function onWorkerFinish () {}
+function onWorkerConfiguration ({ testFramework }) {
+  workerTestFramework = testFramework
+}
 
 workerFinishCh.subscribe(onWorkerFinish)
+workerConfigurationCh.subscribe(onWorkerConfiguration)
 
 /**
  * Exercises worker-ready and suite-finish messages.
@@ -116,6 +122,9 @@ process.send = (message, onDone) => {
     process.emit('message', {
       name: CONFIGURATION_RESPONSE,
       content: {
+        configuration: {
+          testFramework: 'webdriverio',
+        },
         requestId: message.args.content.requestId,
       },
     })
@@ -124,5 +133,7 @@ process.send = (message, onDone) => {
 
 exerciseWorkerMessages()
 assert.strictEqual(sendCalls, 6)
+assert.strictEqual(workerTestFramework, 'webdriverio')
 
 workerFinishCh.unsubscribe(onWorkerFinish)
+workerConfigurationCh.unsubscribe(onWorkerConfiguration)
diff --git a/packages/datadog-instrumentations/test/fixtures/webdriverio-launcher.mjs b/packages/datadog-instrumentations/test/fixtures/webdriverio-launcher.mjs
new file mode 100644
index 0000000000..431b0a1c95
--- /dev/null
+++ b/packages/datadog-instrumentations/test/fixtures/webdriverio-launcher.mjs
@@ -0,0 +1,7 @@
+class Launcher {
+  async _startInstance (specs) {
+    return specs
+  }
+}
+
+export { Launcher }
diff --git a/packages/datadog-instrumentations/test/webdriverio.spec.js b/packages/datadog-instrumentations/test/webdriverio.spec.js
index b1a025adca..0906df648d 100644
--- a/packages/datadog-instrumentations/test/webdriverio.spec.js
+++ b/packages/datadog-instrumentations/test/webdriverio.spec.js
@@ -9,10 +9,24 @@ const path = require('node:path')
 const { pathToFileURL } = require('node:url')
 const { promisify } = require('node:util')
 
+const MochaTest = require('mocha/lib/test')
+const sinon = require('sinon')
+
+const MochaPlugin = require('../../datadog-plugin-mocha/src')
 const { channel, tracingChannel } = require('../src/helpers/instrument')
 const rewriter = require('../src/helpers/rewriter')
 const {
+  adjustRunnerFailuresForTestOptimization,
+  efdTests,
+} = require('../src/mocha/utils')
+const {
+  MOCHA_WORKER_LOGS_PAYLOAD_CODE,
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,
+  TEST_HAS_DYNAMIC_NAME,
+  TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
+  TEST_NAME,
+  TEST_STATUS,
+  TEST_SUITE,
   TEST_SUITE_EXECUTION_ID,
 } = require('../../dd-trace/src/plugins/util/test')
 const {
@@ -36,9 +50,27 @@ const fixtureModulePath = path.join(
   'build',
   'index.js'
 )
+const launcherFixturePath = path.join(__dirname, 'fixtures', 'webdriverio-launcher.mjs')
+const launcherFixtureModulePath = path.join(
+  __dirname,
+  'fixtures',
+  'node_modules',
+  '@wdio',
+  'cli',
+  'build',
+  'index.js'
+)
 const execFileAsync = promisify(execFile)
 
 describe('webdriverio instrumentation', () => {
+  it('rewrites the ESM launcher scheduler', () => {
+    const source = fs.readFileSync(launcherFixturePath, 'utf8')
+    const rewrittenSource = rewriter.rewrite(source, launcherFixtureModulePath, 'module')
+
+    assert.notStrictEqual(rewrittenSource, source)
+    assert.match(rewrittenSource, /orchestrion:@wdio\/cli:Launcher_startInstance/)
+  })
+
   it('rewrites the ESM local runner and waits for coordinator shutdown', () => {
     const source = fs.readFileSync(fixturePath, 'utf8')
     const rewrittenSource = rewriter.rewrite(source, fixtureModulePath, 'module')
@@ -159,6 +191,48 @@ describe('webdriverio instrumentation', () => {
     await execFileAsync(process.execPath, [regularMochaWorkerFixturePath])
   })
 
+  it('configures the Mocha worker plugin with the WebdriverIO framework', () => {
+    const plugin = new MochaPlugin({ _exporter: {} }, { testOptimization: {} })
+    plugin.configure({ enabled: true })
+
+    try {
+      channel('ci:mocha:worker:configuration').publish({
+        libraryConfig: {},
+        repositoryRoot: process.cwd(),
+        testFramework: 'webdriverio',
+      })
+
+      assert.strictEqual(plugin.testFramework, 'webdriverio')
+    } finally {
+      plugin.configure(false)
+    }
+  })
+
+  it('keeps failures when all executed EFD attempts fail and unused attempts are pending', () => {
+    const testName = 'mocha.test-suite.test-name'
+    const firstFailure = new MochaTest('first failure', () => {})
+    const secondFailure = new MochaTest('second failure', () => {})
+    const unusedRetry = new MochaTest('unused retry', () => {})
+    firstFailure.state = 'failed'
+    secondFailure.state = 'failed'
+    unusedRetry.pending = true
+    unusedRetry.state = 'pending'
+    efdTests[testName] = [firstFailure, secondFailure, unusedRetry]
+    const runner = {
+      failures: 2,
+      stats: { failures: 2 },
+    }
+
+    try {
+      adjustRunnerFailuresForTestOptimization(runner, { isEarlyFlakeDetectionEnabled: true })
+    } finally {
+      delete efdTests[testName]
+    }
+
+    assert.strictEqual(runner.failures, 2)
+    assert.strictEqual(runner.stats.failures, 2)
+  })
+
   it('coordinates two Mocha workers under one session', async () => {
     const testFinishCh = channel('ci:mocha:test:finish')
     const knownTestsCh = channel('ci:mocha:known-tests')
@@ -170,30 +244,69 @@ describe('webdriverio instrumentation', () => {
     const testSuiteStartCh = channel('ci:mocha:test-suite:start')
     const testSuiteFinishCh = channel('ci:mocha:test-suite:finish')
     const testManagementTestsCh = channel('ci:mocha:test-management-tests')
+    const workerReportLogsCh = channel('ci:mocha:worker-report:logs')
     const workerReportTraceCh = channel('ci:mocha:worker-report:trace')
 
     const sessionStarts = []
     const sessionFinishes = []
     const suiteStarts = []
     const suiteFinishes = []
+    const workerLogPayloads = []
     const workerTracePayloads = []
     let advancedFeatureRequests = 0
     let configurationRequests = 0
+    let skippableSuiteRequests = 0
+    const consoleWarn = sinon.stub(console, 'warn')
     const originalNodeOptions = process.env.NODE_OPTIONS
     process.env.NODE_OPTIONS = '--require dd-trace/ci/init'
 
     function onTestFinish () {}
-    function onAdvancedFeatureRequest (request) {
+    function onKnownTestsRequest (request) {
+      advancedFeatureRequests++
+      request.onDone({
+        knownTests: {
+          webdriverio: {
+            'first.spec.js': ['first test'],
+          },
+        },
+      })
+    }
+    function onModifiedFilesRequest (request) {
       advancedFeatureRequests++
+      request.onDone({
+        modifiedFiles: {
+          'first.spec.js': [1],
+        },
+      })
+    }
+    function onSkippableSuitesRequest (request) {
+      skippableSuiteRequests++
       request.onDone({})
     }
+    function onTestManagementTestsRequest (request) {
+      advancedFeatureRequests++
+      request.onDone({
+        testManagementTests: {
+          webdriverio: {
+            suites: {
+              'second.spec.js': {
+                tests: {},
+              },
+            },
+          },
+        },
+      })
+    }
     function onLibraryConfiguration (request) {
       configurationRequests++
+      assert.strictEqual(request.testFramework, 'webdriverio')
+      assert.strictEqual(request.disableTestImpactAnalysis, true)
       request.onDone({
         isTestDynamicInstrumentationEnabled: true,
         libraryConfig: {
           earlyFlakeDetectionNumRetries: 5,
           earlyFlakeDetectionSlowTestRetries: { '5s': 5 },
+          earlyFlakeDetectionFaultyThreshold: 30,
           flakyTestRetriesCount: 5,
           isCodeCoverageEnabled: true,
           isCoverageReportUploadEnabled: true,
@@ -226,17 +339,21 @@ describe('webdriverio instrumentation', () => {
     function onWorkerTrace (event) {
       workerTracePayloads.push(event)
     }
+    function onWorkerLogs (event) {
+      workerLogPayloads.push(event)
+    }
 
     testFinishCh.subscribe(onTestFinish)
-    knownTestsCh.subscribe(onAdvancedFeatureRequest)
+    knownTestsCh.subscribe(onKnownTestsRequest)
     libraryConfigurationCh.subscribe(onLibraryConfiguration)
-    modifiedFilesCh.subscribe(onAdvancedFeatureRequest)
-    skippableSuitesCh.subscribe(onAdvancedFeatureRequest)
+    modifiedFilesCh.subscribe(onModifiedFilesRequest)
+    skippableSuitesCh.subscribe(onSkippableSuitesRequest)
     testSessionStartCh.subscribe(onSessionStart)
     testSessionFinishCh.subscribe(onSessionFinish)
     testSuiteStartCh.subscribe(onSuiteStart)
     testSuiteFinishCh.subscribe(onSuiteFinish)
-    testManagementTestsCh.subscribe(onAdvancedFeatureRequest)
+    testManagementTestsCh.subscribe(onTestManagementTestsRequest)
+    workerReportLogsCh.subscribe(onWorkerLogs)
     workerReportTraceCh.subscribe(onWorkerTrace)
 
     try {
@@ -289,15 +406,35 @@ describe('webdriverio instrumentation', () => {
       requestConfiguration(secondWorker, secondFile, 'second-request')
       await new Promise(setImmediate)
 
+      const firstTrace = JSON.stringify([[{
+        meta: {
+          [TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX]: 'true',
+          [TEST_NAME]: 'first test',
+          [TEST_STATUS]: 'fail',
+          [TEST_SUITE]: 'first.spec.js',
+        },
+      }]])
+      const secondTrace = JSON.stringify([[{
+        meta: {
+          [TEST_HAS_DYNAMIC_NAME]: 'true',
+          [TEST_NAME]: 'dynamic 12345678',
+          [TEST_SUITE]: 'second.spec.js',
+        },
+      }]])
       firstWorker.emit('message', {
         origin: 'datadog',
         name: 'workerEvent',
-        args: [MOCHA_WORKER_TRACE_PAYLOAD_CODE, 'first-trace'],
+        args: [MOCHA_WORKER_TRACE_PAYLOAD_CODE, firstTrace],
       })
       secondWorker.emit('message', {
         origin: 'datadog',
         name: 'workerEvent',
-        args: [MOCHA_WORKER_TRACE_PAYLOAD_CODE, 'second-trace'],
+        args: [MOCHA_WORKER_TRACE_PAYLOAD_CODE, secondTrace],
+      })
+      firstWorker.emit('message', {
+        origin: 'datadog',
+        name: 'workerEvent',
+        args: [MOCHA_WORKER_LOGS_PAYLOAD_CODE, 'first-logs'],
       })
 
       assert.strictEqual(firstWorker.sentMessages[0].name, CONFIGURATION_RESPONSE)
@@ -305,25 +442,41 @@ describe('webdriverio instrumentation', () => {
       assert.strictEqual(secondWorker.sentMessages[0].name, CONFIGURATION_RESPONSE)
       assert.strictEqual(secondWorker.sentMessages[0].content.requestId, 'second-request')
       assert.deepStrictEqual(firstWorker.sentMessages[0].content.configuration, {
-        earlyFlakeDetectionNumRetries: 0,
-        earlyFlakeDetectionSlowTestRetries: {},
-        flakyTestRetriesCount: 0,
+        earlyFlakeDetectionFaultyThreshold: 30,
+        earlyFlakeDetectionNumRetries: 5,
+        earlyFlakeDetectionSlowTestRetries: { '5s': 5 },
+        flakyTestRetriesCount: 5,
         isCodeCoverageEnabled: false,
         isCoverageReportUploadEnabled: false,
-        isDiEnabled: false,
-        isEarlyFlakeDetectionEnabled: false,
-        isFlakyTestRetriesEnabled: false,
-        isImpactedTestsEnabled: false,
+        isDiEnabled: true,
+        isEarlyFlakeDetectionEnabled: true,
+        isFlakyTestRetriesEnabled: true,
+        isImpactedTestsEnabled: true,
         isItrEnabled: false,
-        isKnownTestsEnabled: false,
+        isKnownTestsEnabled: true,
         isSuitesSkippingEnabled: false,
-        isTestDynamicInstrumentationEnabled: false,
-        isTestManagementTestsEnabled: false,
-        knownTests: {},
-        modifiedFiles: [],
+        isTestDynamicInstrumentationEnabled: true,
+        isTestManagementTestsEnabled: true,
+        knownTests: {
+          mocha: {
+            'first.spec.js': ['first test'],
+          },
+        },
+        modifiedFiles: {
+          'first.spec.js': [1],
+        },
         repositoryRoot: process.cwd(),
-        testManagementAttemptToFixRetries: 0,
-        testManagementTests: {},
+        testFramework: 'webdriverio',
+        testManagementAttemptToFixRetries: 5,
+        testManagementTests: {
+          mocha: {
+            suites: {
+              'second.spec.js': {
+                tests: {},
+              },
+            },
+          },
+        },
       })
 
       reportSuiteFinish(firstWorker, firstFile, 'fail')
@@ -334,16 +487,17 @@ describe('webdriverio instrumentation', () => {
       await finishLocalRunner(localRunner)
 
       assert.strictEqual(configurationRequests, 1)
-      assert.strictEqual(advancedFeatureRequests, 0)
+      assert.strictEqual(advancedFeatureRequests, 3)
+      assert.strictEqual(skippableSuiteRequests, 0)
       assert.strictEqual(sessionStarts.length, 1)
       assert.strictEqual(sessionStarts[0].testFramework, 'webdriverio')
       assert.strictEqual(sessionStarts[0].testFrameworkAdapter, 'mocha')
       assert.strictEqual(sessionFinishes.length, 1)
       assert.strictEqual(sessionFinishes[0].status, 'pass')
       assert.strictEqual(sessionFinishes[0].isParallel, true)
-      assert.strictEqual('isEarlyFlakeDetectionEnabled' in sessionFinishes[0], false)
-      assert.strictEqual('isSuitesSkipped' in sessionFinishes[0], false)
-      assert.strictEqual('isTestManagementEnabled' in sessionFinishes[0], false)
+      assert.strictEqual(sessionFinishes[0].isEarlyFlakeDetectionEnabled, true)
+      assert.strictEqual(sessionFinishes[0].isTestManagementEnabled, true)
+      assert.strictEqual(sessionFinishes[0].isSuitesSkipped, false)
       assert.deepStrictEqual(suiteStarts.map(({ testSuiteAbsolutePath }) => testSuiteAbsolutePath), [
         firstFile,
         secondFile,
@@ -351,27 +505,33 @@ describe('webdriverio instrumentation', () => {
       assert.strictEqual(new Set(suiteStarts.map(({ testSuiteExecutionId }) => testSuiteExecutionId)).size, 2)
       assert.deepStrictEqual(workerTracePayloads, [
         {
-          traces: 'first-trace',
+          traces: firstTrace,
           [TEST_SUITE_EXECUTION_ID]: suiteStarts[0].testSuiteExecutionId,
         },
         {
-          traces: 'second-trace',
+          traces: secondTrace,
           [TEST_SUITE_EXECUTION_ID]: suiteStarts[1].testSuiteExecutionId,
         },
       ])
+      assert.deepStrictEqual(workerLogPayloads, ['first-logs'])
       assert.deepStrictEqual(suiteFinishes.map(({ status }) => status), ['fail', 'pass'])
+      assert.strictEqual(consoleWarn.callCount, 1)
+      assert.match(consoleWarn.firstCall.args[0], /Attempt to fix failed/)
+      assert.match(consoleWarn.firstCall.args[0], /second\.spec\.js › dynamic 12345678/)
     } finally {
       testFinishCh.unsubscribe(onTestFinish)
-      knownTestsCh.unsubscribe(onAdvancedFeatureRequest)
+      knownTestsCh.unsubscribe(onKnownTestsRequest)
       libraryConfigurationCh.unsubscribe(onLibraryConfiguration)
-      modifiedFilesCh.unsubscribe(onAdvancedFeatureRequest)
-      skippableSuitesCh.unsubscribe(onAdvancedFeatureRequest)
+      modifiedFilesCh.unsubscribe(onModifiedFilesRequest)
+      skippableSuitesCh.unsubscribe(onSkippableSuitesRequest)
       testSessionStartCh.unsubscribe(onSessionStart)
       testSessionFinishCh.unsubscribe(onSessionFinish)
       testSuiteStartCh.unsubscribe(onSuiteStart)
       testSuiteFinishCh.unsubscribe(onSuiteFinish)
-      testManagementTestsCh.unsubscribe(onAdvancedFeatureRequest)
+      testManagementTestsCh.unsubscribe(onTestManagementTestsRequest)
+      workerReportLogsCh.unsubscribe(onWorkerLogs)
       workerReportTraceCh.unsubscribe(onWorkerTrace)
+      consoleWarn.restore()
       if (originalNodeOptions === undefined) {
         delete process.env.NODE_OPTIONS
       } else {
@@ -380,6 +540,150 @@ describe('webdriverio instrumentation', () => {
     }
   })
 
+  it('uses the resolved launcher schedule before configuring the first lazy worker', async () => {
+    const testFinishCh = channel('ci:mocha:test:finish')
+    const knownTestsCh = channel('ci:mocha:known-tests')
+    const libraryConfigurationCh = channel('ci:mocha:library-configuration')
+    const testSessionFinishCh = channel('ci:mocha:session:finish')
+    const knownFile = path.join(process.cwd(), 'root-known.spec.js')
+    const currentNewFile = path.join(process.cwd(), 'current-new.spec.js')
+    const futureNewFile = path.join(process.cwd(), 'future-new.spec.js')
+
+    function onTestFinish () {}
+    function onKnownTestsRequest (request) {
+      request.onDone({
+        knownTests: {
+          webdriverio: {
+            'root-known.spec.js': ['known test'],
+          },
+        },
+      })
+    }
+    function onLibraryConfiguration (request) {
+      request.onDone({
+        libraryConfig: {
+          earlyFlakeDetectionFaultyThreshold: 1,
+          isEarlyFlakeDetectionEnabled: true,
+          isKnownTestsEnabled: true,
+        },
+        repositoryRoot: process.cwd(),
+      })
+    }
+    function onSessionFinish (event) {
+      event.onDone()
+    }
+
+    testFinishCh.subscribe(onTestFinish)
+    knownTestsCh.subscribe(onKnownTestsRequest)
+    libraryConfigurationCh.subscribe(onLibraryConfiguration)
+    testSessionFinishCh.subscribe(onSessionFinish)
+
+    try {
+      require('../src/webdriverio')
+
+      const localRunner = {
+        config: {
+          framework: 'mocha',
+          rootDir: process.cwd(),
+        },
+      }
+      const launcher = {
+        runner: localRunner,
+        _schedule: [{
+          specs: [{ files: [futureNewFile] }],
+        }],
+      }
+      tracingChannel('orchestrion:@wdio/cli:Launcher_startInstance').start.publish({
+        self: launcher,
+        arguments: [[knownFile, currentNewFile]],
+      })
+
+      const worker = createWorker()
+      registerWorker(localRunner, worker, [knownFile, currentNewFile])
+      requestConfiguration(worker, [knownFile, currentNewFile], 'first-request')
+      await new Promise(setImmediate)
+
+      const { configuration } = worker.sentMessages[0].content
+      assert.strictEqual(configuration.isEarlyFlakeDetectionEnabled, false)
+      assert.strictEqual(configuration.isEarlyFlakeDetectionFaulty, true)
+      assert.strictEqual(configuration.isKnownTestsEnabled, false)
+
+      worker.emit('exit', { exitCode: 0, retries: 0 })
+      await finishLocalRunner(localRunner)
+    } finally {
+      testFinishCh.unsubscribe(onTestFinish)
+      knownTestsCh.unsubscribe(onKnownTestsRequest)
+      libraryConfigurationCh.unsubscribe(onLibraryConfiguration)
+      testSessionFinishCh.unsubscribe(onSessionFinish)
+    }
+  })
+
+  it('uses the worker suite-name root when evaluating EFD faultiness', async () => {
+    const testFinishCh = channel('ci:mocha:test:finish')
+    const knownTestsCh = channel('ci:mocha:known-tests')
+    const libraryConfigurationCh = channel('ci:mocha:library-configuration')
+    const testSessionFinishCh = channel('ci:mocha:session:finish')
+    const knownFile = path.join(process.cwd(), 'known.spec.js')
+
+    function onTestFinish () {}
+    function onKnownTestsRequest (request) {
+      request.onDone({
+        knownTests: {
+          webdriverio: {
+            'known.spec.js': ['known test'],
+          },
+        },
+      })
+    }
+    function onLibraryConfiguration (request) {
+      request.onDone({
+        libraryConfig: {
+          earlyFlakeDetectionFaultyThreshold: 0,
+          isEarlyFlakeDetectionEnabled: true,
+          isKnownTestsEnabled: true,
+        },
+        repositoryRoot: path.dirname(process.cwd()),
+      })
+    }
+    function onSessionFinish (event) {
+      event.onDone()
+    }
+
+    testFinishCh.subscribe(onTestFinish)
+    knownTestsCh.subscribe(onKnownTestsRequest)
+    libraryConfigurationCh.subscribe(onLibraryConfiguration)
+    testSessionFinishCh.subscribe(onSessionFinish)
+
+    try {
+      require('../src/webdriverio')
+
+      const localRunner = {
+        config: {
+          framework: 'mocha',
+          rootDir: process.cwd(),
+        },
+      }
+      const worker = createWorker()
+
+      registerWorker(localRunner, worker, knownFile)
+      requestConfiguration(worker, knownFile, 'first-request')
+      await new Promise(setImmediate)
+
+      const { configuration } = worker.sentMessages[0].content
+      assert.strictEqual(configuration.isEarlyFlakeDetectionEnabled, true)
+      assert.strictEqual(configuration.isEarlyFlakeDetectionFaulty, undefined)
+      assert.strictEqual(configuration.isKnownTestsEnabled, true)
+
+      worker.emit('exit', { exitCode: 0, retries: 0 })
+      await finishLocalRunner(localRunner)
+    } finally {
+      testFinishCh.unsubscribe(onTestFinish)
+      knownTestsCh.unsubscribe(onKnownTestsRequest)
+      libraryConfigurationCh.unsubscribe(onLibraryConfiguration)
+      testSessionFinishCh.unsubscribe(onSessionFinish)
+    }
+  })
+
   it('fails a terminal worker exit without marking sequential workers as parallel', async () => {
     const testFinishCh = channel('ci:mocha:test:finish')
     const testSessionFinishCh = channel('ci:mocha:session:finish')
@@ -706,13 +1010,14 @@ function createWorker () {
  *
  * @param {object} localRunner
  * @param {object} worker
- * @param {string} file
+ * @param {string|string[]} file
  * @returns {void}
  */
 function registerWorker (localRunner, worker, file) {
+  const specs = Array.isArray(file) ? file : [file]
   const context = {
     self: localRunner,
-    arguments: [{ specs: [file] }],
+    arguments: [{ specs }],
   }
   const runCh = tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_run')
   runCh.start.publish(context)
@@ -738,18 +1043,19 @@ function finishLocalRunner (localRunner, error) {
  * Requests execution configuration from the coordinator.
  *
  * @param {EventEmitter} worker
- * @param {string} file
+ * @param {string|string[]} file
  * @param {string} requestId
  * @returns {void}
  */
 function requestConfiguration (worker, file, requestId) {
+  const files = Array.isArray(file) ? file : [file]
   worker.emit('message', {
     origin: 'datadog',
     name: 'workerEvent',
     args: {
       name: CONFIGURATION_REQUEST,
       content: {
-        files: [file],
+        files,
         frameworkVersion: '10.8.2',
         requestId,
       },
diff --git a/packages/datadog-plugin-mocha/src/index.js b/packages/datadog-plugin-mocha/src/index.js
index 32eb30a9ed..7d9e274b03 100644
--- a/packages/datadog-plugin-mocha/src/index.js
+++ b/packages/datadog-plugin-mocha/src/index.js
@@ -60,6 +60,12 @@ class MochaPlugin extends CiPlugin {
     this._testTitleToParams = {}
     this.sourceRoot = process.cwd()
 
+    this.addSub('ci:mocha:worker:configuration', ({ libraryConfig, repositoryRoot, testFramework }) => {
+      this.libraryConfig = libraryConfig
+      this.testFramework = testFramework
+      this._setRepositoryRoot(repositoryRoot)
+    })
+
     this.addSub('ci:mocha:test-suite:code-coverage', ({ coverageFiles, suiteFile }) => {
       if (!this.libraryConfig?.isCodeCoverageEnabled) {
         return
diff --git a/packages/dd-trace/src/ci-visibility/exporters/test-worker/index.js b/packages/dd-trace/src/ci-visibility/exporters/test-worker/index.js
index 094ef93155..d618f3599a 100644
--- a/packages/dd-trace/src/ci-visibility/exporters/test-worker/index.js
+++ b/packages/dd-trace/src/ci-visibility/exporters/test-worker/index.js
@@ -5,6 +5,7 @@ const {
   JEST_WORKER_TRACE_PAYLOAD_CODE,
   JEST_WORKER_TELEMETRY_PAYLOAD_CODE,
   CUCUMBER_WORKER_TRACE_PAYLOAD_CODE,
+  MOCHA_WORKER_LOGS_PAYLOAD_CODE,
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,
   JEST_WORKER_LOGS_PAYLOAD_CODE,
   PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE,
@@ -50,6 +51,9 @@ function getInterprocessLogsCode () {
   if (getEnvironmentVariable('JEST_WORKER_ID')) {
     return JEST_WORKER_LOGS_PAYLOAD_CODE
   }
+  if (getEnvironmentVariable('MOCHA_WORKER_ID') === 'webdriverio') {
+    return MOCHA_WORKER_LOGS_PAYLOAD_CODE
+  }
   if (getEnvironmentVariable('TINYPOOL_WORKER_ID')) {
     return VITEST_WORKER_LOGS_PAYLOAD_CODE
   }
diff --git a/packages/dd-trace/src/debugger/devtools_client/log.js b/packages/dd-trace/src/debugger/devtools_client/log.js
index a780bc6a1b..c1124745ba 100644
--- a/packages/dd-trace/src/debugger/devtools_client/log.js
+++ b/packages/dd-trace/src/debugger/devtools_client/log.js
@@ -20,11 +20,12 @@ const on = (level, ...args) => {
 const off = () => {}
 
 const threshold = LEVELS.indexOf(logLevel)
+const isEnabled = debug && typeof logPort?.postMessage === 'function'
 
 /** @type {Logger} */
 module.exports = Object.fromEntries(
   LEVELS.map(level => [
     level,
-    debug && threshold >= LEVELS.indexOf(level) ? on.bind(null, level) : off,
+    isEnabled && threshold >= LEVELS.indexOf(level) ? on.bind(null, level) : off,
   ])
 )
diff --git a/packages/dd-trace/src/plugins/ci_plugin.js b/packages/dd-trace/src/plugins/ci_plugin.js
index 44084e4a2b..736a0b71da 100644
--- a/packages/dd-trace/src/plugins/ci_plugin.js
+++ b/packages/dd-trace/src/plugins/ci_plugin.js
@@ -168,6 +168,22 @@ function getTestSuiteLevelVisibilityTags (testSuiteSpan, testFramework) {
   return suiteTags
 }
 
+/**
+ * Keeps non-TIA settings while disabling suite skipping and coverage collection.
+ *
+ * @param {object} libraryConfig
+ * @returns {object}
+ */
+function disableTestImpactAnalysis (libraryConfig) {
+  return Object.freeze({
+    ...libraryConfig,
+    isCodeCoverageEnabled: false,
+    isCoverageReportUploadEnabled: false,
+    isItrEnabled: false,
+    isSuitesSkippingEnabled: false,
+  })
+}
+
 module.exports = class CiPlugin extends Plugin {
   constructor (...args) {
     super(...args)
@@ -182,14 +198,28 @@ module.exports = class CiPlugin extends Plugin {
     this._pendingRequestErrorTags = []
 
     this.addSub(`ci:${this.constructor.id}:library-configuration`, (ctx) => {
-      const { basicReportingOnly, onDone, frameworkVersion } = ctx
+      const {
+        basicReportingOnly,
+        disableTestImpactAnalysis: shouldDisableTestImpactAnalysis,
+        onDone,
+        frameworkVersion,
+      } = ctx
       ctx.currentStore = legacyStorage.getStore()
 
       if (!this.tracer._exporter || !this.tracer._exporter.getLibraryConfiguration) {
         return onDone({ err: new Error('Test optimization was not initialized correctly') })
       }
       this.tracer._exporter.getLibraryConfiguration(this.testConfiguration, (err, libraryConfig) => {
-        const effectiveLibraryConfig = err ? undefined : basicReportingOnly ? {} : libraryConfig
+        let effectiveLibraryConfig
+        if (!err) {
+          if (basicReportingOnly) {
+            effectiveLibraryConfig = {}
+          } else if (shouldDisableTestImpactAnalysis) {
+            effectiveLibraryConfig = disableTestImpactAnalysis(libraryConfig)
+          } else {
+            effectiveLibraryConfig = libraryConfig
+          }
+        }
         if (err) {
           this.libraryConfig = undefined
           this.itrCorrelationId = undefined
@@ -496,13 +526,17 @@ module.exports = class CiPlugin extends Plugin {
    * @param {string} frameworkVersion - The test framework version.
    * @param {object} [ctx] - Diagnostic channel context.
    * @param {boolean} [ctx.basicReportingOnly] - Whether advanced capabilities must be omitted.
+   * @param {string} [ctx.testFramework] - Effective framework when one framework is hosted by another.
    * @returns {Record<string, string|undefined>}
    */
   getLibraryCapabilitiesTags (frameworkVersion, ctx = {}) {
     if (ctx.basicReportingOnly) {
       return {}
     }
-    return getDefaultLibraryCapabilitiesTags(this.constructor.id, frameworkVersion)
+    return getDefaultLibraryCapabilitiesTags(
+      ctx.testFramework || this.testFramework || this.constructor.id,
+      frameworkVersion
+    )
   }
 
   /**
diff --git a/packages/dd-trace/src/plugins/util/test.js b/packages/dd-trace/src/plugins/util/test.js
index 38adcdbc7d..6e9c6e4b29 100644
--- a/packages/dd-trace/src/plugins/util/test.js
+++ b/packages/dd-trace/src/plugins/util/test.js
@@ -183,6 +183,7 @@ const CUCUMBER_WORKER_TRACE_PAYLOAD_CODE = 70
 
 // mocha worker variables
 const MOCHA_WORKER_TRACE_PAYLOAD_CODE = 80
+const MOCHA_WORKER_LOGS_PAYLOAD_CODE = 81
 
 // playwright worker variables
 const PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE = 90
@@ -210,7 +211,7 @@ const DD_CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS = '_dd.ci.library_configurat
 const DD_CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS =
   '_dd.ci.library_configuration_error.test_management_tests'
 
-const UNSUPPORTED_TIA_FRAMEWORKS = new Set(['playwright', 'vitest'])
+const UNSUPPORTED_TIA_FRAMEWORKS = new Set(['playwright', 'vitest', 'webdriverio'])
 const MINIMUM_FRAMEWORK_VERSION_FOR_EFD = {
   playwright: '>=1.38.0',
 }
@@ -472,6 +473,7 @@ module.exports = {
   JEST_WORKER_QUARANTINE_PAYLOAD_CODE,
   CUCUMBER_WORKER_TRACE_PAYLOAD_CODE,
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,
+  MOCHA_WORKER_LOGS_PAYLOAD_CODE,
   PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE,
   VITEST_WORKER_TRACE_PAYLOAD_CODE,
   VITEST_WORKER_LOGS_PAYLOAD_CODE,
diff --git a/packages/dd-trace/test/ci-visibility/ci-plugin.spec.js b/packages/dd-trace/test/ci-visibility/ci-plugin.spec.js
index 299dc32752..c4698e5c3d 100644
--- a/packages/dd-trace/test/ci-visibility/ci-plugin.spec.js
+++ b/packages/dd-trace/test/ci-visibility/ci-plugin.spec.js
@@ -27,6 +27,16 @@ const {
   GIT_REPOSITORY_URL,
   GIT_TAG,
 } = require('../../src/plugins/util/tags')
+const {
+  DD_CAPABILITIES_AUTO_TEST_RETRIES,
+  DD_CAPABILITIES_EARLY_FLAKE_DETECTION,
+  DD_CAPABILITIES_FAILED_TEST_REPLAY,
+  DD_CAPABILITIES_IMPACTED_TESTS,
+  DD_CAPABILITIES_TEST_IMPACT_ANALYSIS,
+  DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX,
+  DD_CAPABILITIES_TEST_MANAGEMENT_DISABLE,
+  DD_CAPABILITIES_TEST_MANAGEMENT_QUARANTINE,
+} = require('../../src/plugins/util/test')
 
 describe('CiPlugin', () => {
   let CiPlugin
@@ -194,6 +204,65 @@ describe('CiPlugin', () => {
     sinon.assert.calledOnce(onDone)
   })
 
+  it('disables only TIA for WebdriverIO library configuration requests', () => {
+    const libraryConfig = {
+      isCodeCoverageEnabled: true,
+      isCoverageReportUploadEnabled: true,
+      isEarlyFlakeDetectionEnabled: true,
+      isFlakyTestRetriesEnabled: true,
+      isImpactedTestsEnabled: true,
+      isItrEnabled: true,
+      isKnownTestsEnabled: true,
+      isSuitesSkippingEnabled: true,
+      isTestManagementEnabled: true,
+    }
+    const getLibraryConfiguration = sinon.stub().callsArgWith(1, null, libraryConfig)
+    const addMetadataTags = sinon.stub()
+    const onDone = sinon.stub()
+    const plugin = createPlugin('mocha')
+    plugin.tracer._exporter = {
+      addMetadataTags,
+      getLibraryConfiguration,
+    }
+    plugin.configure({
+      enabled: true,
+      experimental: {
+        exporter: 'mocha',
+      },
+    })
+
+    dc.channel('ci:vitest:library-configuration').publish({
+      disableTestImpactAnalysis: true,
+      frameworkVersion: '9.0.0',
+      onDone,
+      testFramework: 'webdriverio',
+    })
+    plugin.configure(false)
+
+    assert.deepStrictEqual(plugin.libraryConfig, {
+      ...libraryConfig,
+      isCodeCoverageEnabled: false,
+      isCoverageReportUploadEnabled: false,
+      isItrEnabled: false,
+      isSuitesSkippingEnabled: false,
+    })
+    assert.deepStrictEqual(onDone.firstCall.args[0].libraryConfig, plugin.libraryConfig)
+    assert.deepStrictEqual(addMetadataTags.firstCall.args[0], {
+      test: {
+        [DD_CAPABILITIES_TEST_IMPACT_ANALYSIS]: undefined,
+        [DD_CAPABILITIES_EARLY_FLAKE_DETECTION]: '1',
+        [DD_CAPABILITIES_AUTO_TEST_RETRIES]: '1',
+        [DD_CAPABILITIES_IMPACTED_TESTS]: '1',
+        [DD_CAPABILITIES_TEST_MANAGEMENT_QUARANTINE]: '1',
+        [DD_CAPABILITIES_TEST_MANAGEMENT_DISABLE]: '1',
+        [DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX]: '5',
+        [DD_CAPABILITIES_FAILED_TEST_REPLAY]: '1',
+      },
+    })
+    sinon.assert.calledOnce(getLibraryConfiguration)
+    sinon.assert.calledOnce(onDone)
+  })
+
   it('tags telemetry with the effective test framework', () => {
     const exportTelemetry = sinon.stub()
     const plugin = createPlugin('mocha')
diff --git a/packages/dd-trace/test/ci-visibility/exporters/test-worker/exporter.spec.js b/packages/dd-trace/test/ci-visibility/exporters/test-worker/exporter.spec.js
index 9d1ee8acf2..dda88c14a1 100644
--- a/packages/dd-trace/test/ci-visibility/exporters/test-worker/exporter.spec.js
+++ b/packages/dd-trace/test/ci-visibility/exporters/test-worker/exporter.spec.js
@@ -16,6 +16,7 @@ const {
   JEST_WORKER_TRACE_PAYLOAD_CODE,
   JEST_WORKER_COVERAGE_PAYLOAD_CODE,
   CUCUMBER_WORKER_TRACE_PAYLOAD_CODE,
+  MOCHA_WORKER_LOGS_PAYLOAD_CODE,
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,
   PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE,
   VITEST_WORKER_TRACE_PAYLOAD_CODE,
@@ -180,6 +181,21 @@ describe('CI Visibility Test Worker Exporter', () => {
       sinon.assert.calledWith(send, [MOCHA_WORKER_TRACE_PAYLOAD_CODE, JSON.stringify([trace, traceSecond])])
     })
 
+    it('can export DI logs', () => {
+      process.env.MOCHA_WORKER_ID = 'webdriverio'
+      const testEnvironmentMetadata = { testFramework: 'webdriverio' }
+      const logMessage = { message: 'test log' }
+      const mochaWorkerExporter = new TestWorkerCiVisibilityExporter()
+
+      mochaWorkerExporter.exportDiLogs(testEnvironmentMetadata, logMessage)
+      mochaWorkerExporter.flush()
+
+      sinon.assert.calledWith(send, [
+        MOCHA_WORKER_LOGS_PAYLOAD_CODE,
+        JSON.stringify([{ testEnvironmentMetadata, logMessage }]),
+      ])
+    })
+
     it('does not break if process.send is undefined', () => {
       delete process.send
       const trace = [{ type: 'test' }]
diff --git a/packages/dd-trace/test/debugger/devtools_client/log.spec.js b/packages/dd-trace/test/debugger/devtools_client/log.spec.js
index b94faee5ad..8d7d7fafc5 100644
--- a/packages/dd-trace/test/debugger/devtools_client/log.spec.js
+++ b/packages/dd-trace/test/debugger/devtools_client/log.spec.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const assert = require('node:assert')
+const assert = require('node:assert/strict')
 const { MessageChannel } = require('node:worker_threads')
 
 const { describe, it } = require('mocha')
@@ -55,6 +55,19 @@ describe('worker thread logger', function () {
     setImmediate(done)
   })
 
+  it('should not log without a message port', function () {
+    const log = proxyquire('../../../src/debugger/devtools_client/log', {
+      'node:worker_threads': {
+        workerData: { config: { debug: true, logLevel: 'debug' } },
+      },
+    })
+
+    log.error('test1')
+    log.warn('test2')
+    log.info('test3')
+    log.debug('test4')
+  })
+
   it('should should resolve the function argument', function (done) {
     const logChannel = new MessageChannel()
     const log = proxyquire('../../../src/debugger/devtools_client/log', {

From 9fc22e07e78ed823b36867639ae14a395d6dce6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Jul 2026 13:02:44 +0200
Subject: [PATCH 23/43] chore(deps): bump the
 vendor-minor-and-patch-dependencies group across 1 directory with 3 updates
 (#9571)

Bumps the vendor-minor-and-patch-dependencies group with 3 updates in the /vendor directory: [@apm-js-collab/code-transformer](https://github.com/nodejs/orchestrion-js), [pprof-format](https://github.com/DataDog/pprof-format) and [source-map](https://github.com/mozilla/source-map).


Updates `@apm-js-collab/code-transformer` from 0.18.0 to 0.18.1
- [Release notes](https://github.com/nodejs/orchestrion-js/releases)
- [Changelog](https://github.com/nodejs/orchestrion-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nodejs/orchestrion-js/compare/code-transformer-v0.18.0...code-transformer-v0.18.1)

Updates `pprof-format` from 2.2.2 to 2.2.3
- [Commits](https://github.com/DataDog/pprof-format/compare/v2.2.2...v2.2.3)

Updates `source-map` from 0.7.6 to 0.8.0
- [Release notes](https://github.com/mozilla/source-map/releases)
- [Changelog](https://github.com/mozilla/source-map/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mozilla/source-map/compare/0.7.6...v0.8.0)

---
updated-dependencies:
- dependency-name: "@apm-js-collab/code-transformer"
  dependency-version: 0.18.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: vendor-minor-and-patch-dependencies
- dependency-name: pprof-format
  dependency-version: 2.2.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: vendor-minor-and-patch-dependencies
- dependency-name: source-map
  dependency-version: 0.8.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: vendor-minor-and-patch-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 vendor/package-lock.json | 24 ++++++++++++------------
 vendor/package.json      |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/vendor/package-lock.json b/vendor/package-lock.json
index c663d82fb1..07acb0583b 100644
--- a/vendor/package-lock.json
+++ b/vendor/package-lock.json
@@ -7,7 +7,7 @@
       "hasInstallScript": true,
       "license": "(Apache-2.0 OR BSD-3-Clause)",
       "dependencies": {
-        "@apm-js-collab/code-transformer": "^0.18.0",
+        "@apm-js-collab/code-transformer": "^0.18.1",
         "@datadog/sketches-js": "2.1.1",
         "@datadog/source-map": "npm:source-map@^0.6.0",
         "@isaacs/ttlcache": "^2.1.5",
@@ -25,13 +25,13 @@
         "meriyah": "^6.1.4",
         "module-details-from-path": "^1.0.4",
         "mutexify": "^1.4.0",
-        "pprof-format": "^2.2.2",
+        "pprof-format": "^2.2.3",
         "protobufjs": "^8.7.1",
         "retry": "^0.13.1",
         "rfdc": "^1.4.1",
         "semifies": "^1.0.0",
         "shell-quote": "^1.10.0",
-        "source-map": "^0.7.4",
+        "source-map": "^0.8.0",
         "tlhunter-sorted-set": "^0.1.0",
         "ttl-set": "^1.0.0"
       },
@@ -41,9 +41,9 @@
       }
     },
     "node_modules/@apm-js-collab/code-transformer": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/@apm-js-collab/code-transformer/-/code-transformer-0.18.0.tgz",
-      "integrity": "sha512-aN3Oq8r1J3gPJtCwErP664gM0+HhM1I1lujPr9TMTCcEl/joQQbpGpeMdts9B1+W2wHMsvioDMv5F4PvMWE6gw==",
+      "version": "0.18.1",
+      "resolved": "https://registry.npmjs.org/@apm-js-collab/code-transformer/-/code-transformer-0.18.1.tgz",
+      "integrity": "sha512-u1Hb6bHjWtkSpiprwVP6YaHC1DTN4RAU3zYkUDUe7WMnJwdyU1pwTL9dFKiSJB9IiLue/EQovmyx6xhU7FFtAQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/estree": "^1.0.8",
@@ -666,9 +666,9 @@
       }
     },
     "node_modules/pprof-format": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/pprof-format/-/pprof-format-2.2.2.tgz",
-      "integrity": "sha512-hd90rHVDhNOhgHTmazVzDSVwTLOBjpZQ26AO/0j46sAFZ9uSWY0DcK2zJcwnuo2R6EzufBbOoWlPazA5nSyHcg==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/pprof-format/-/pprof-format-2.2.3.tgz",
+      "integrity": "sha512-gkcixnBUN3k1+ovWOfD97dF87ZV7P8twaIENitC+/InkpyHc7n2SDIHZ6fD1XcF/NE/JKrBGUGDhmygJVdOR7Q==",
       "license": "MIT"
     },
     "node_modules/protobufjs": {
@@ -723,9 +723,9 @@
       }
     },
     "node_modules/source-map": {
-      "version": "0.7.6",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz",
-      "integrity": "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==",
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0.tgz",
+      "integrity": "sha512-d8EqvL+k/SOXCreS/SUzg2ciyHqBBLcN/yuRjFsbvVhHTE2pgei7oAhmPM7kWFbkX6OSMQfUq4KbkF3au9lhYQ==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">= 12"
diff --git a/vendor/package.json b/vendor/package.json
index ea89488b8d..84f6a30765 100644
--- a/vendor/package.json
+++ b/vendor/package.json
@@ -4,7 +4,7 @@
     "postinstall": "node rspack"
   },
   "dependencies": {
-    "@apm-js-collab/code-transformer": "^0.18.0",
+    "@apm-js-collab/code-transformer": "^0.18.1",
     "@datadog/sketches-js": "2.1.1",
     "@datadog/source-map": "npm:source-map@^0.6.0",
     "@isaacs/ttlcache": "^2.1.5",
@@ -22,13 +22,13 @@
     "meriyah": "^6.1.4",
     "module-details-from-path": "^1.0.4",
     "mutexify": "^1.4.0",
-    "pprof-format": "^2.2.2",
+    "pprof-format": "^2.2.3",
     "protobufjs": "^8.7.1",
     "retry": "^0.13.1",
     "rfdc": "^1.4.1",
     "semifies": "^1.0.0",
     "shell-quote": "^1.10.0",
-    "source-map": "^0.7.4",
+    "source-map": "^0.8.0",
     "tlhunter-sorted-set": "^0.1.0",
     "ttl-set": "^1.0.0"
   },

From c749bbde3f2da95f9946056431d914d66b225e1e Mon Sep 17 00:00:00 2001
From: Pablo Erhard <104538390+pabloerhard@users.noreply.github.com>
Date: Wed, 29 Jul 2026 09:14:11 -0400
Subject: [PATCH 24/43] test(mocha): prevent test swallowing errors (#9567)

---
 packages/dd-trace/test/mocha-hooks.spec.js  | 55 ++++++++++++++++++---
 packages/dd-trace/test/setup/mocha-hooks.js | 16 +++++-
 2 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/packages/dd-trace/test/mocha-hooks.spec.js b/packages/dd-trace/test/mocha-hooks.spec.js
index 7884b0198a..f2d6ae515c 100644
--- a/packages/dd-trace/test/mocha-hooks.spec.js
+++ b/packages/dd-trace/test/mocha-hooks.spec.js
@@ -345,6 +345,36 @@ describe('mocha hooks setup', () => {
     )
   })
 
+  it('does not swallow errors thrown after a hook completes with allow uncaught enabled', () => {
+    const failure = new Error('test failed')
+    const hook = new Hook('before each', () => {})
+
+    hook.allowUncaught = true
+
+    assert.throws(() => {
+      hook.run(() => {
+        throw failure
+      })
+    }, error => error === failure)
+  })
+
+  it('does not swallow test errors after a promise hook completes with allow uncaught enabled', async () => {
+    await assert.rejects(runFixtureProcess(`
+      describe('suite', () => {
+        beforeEach(async () => {})
+
+        it('fails for the real reason', () => {
+          throw new Error('test failed')
+        })
+      })
+    `, ['--allow-uncaught']), (error) => {
+      assert.strictEqual(typeof error.code, 'number')
+      assert.notStrictEqual(error.code, 0)
+      assert.match(error.stderr, /test failed/)
+      return true
+    })
+  })
+
   it('does not let a suppressed after each error change bail behavior', async () => {
     const result = await runFixture(`
       describe('suite', () => {
@@ -372,6 +402,21 @@ describe('mocha hooks setup', () => {
  * @returns {Promise<MochaJsonResult>}
  */
 async function runFixture (body, args = []) {
+  try {
+    const { stdout } = await runFixtureProcess(body, args)
+    return JSON.parse(stdout)
+  } catch (err) {
+    if (!err || typeof err !== 'object' || !('stdout' in err) || typeof err.stdout !== 'string') throw err
+    return JSON.parse(err.stdout)
+  }
+}
+
+/**
+ * @param {string} body
+ * @param {string[]} [args]
+ * @returns {Promise<{ stdout: string, stderr: string }>}
+ */
+async function runFixtureProcess (body, args = []) {
   const tmpdir = fs.mkdtempSync(path.join(os.tmpdir(), 'dd-trace-mocha-hooks-'))
   const fixture = path.join(tmpdir, 'fixture.spec.js')
   fs.writeFileSync(fixture, `'use strict'
@@ -382,8 +427,7 @@ ${body}
 `)
 
   try {
-    const { stdout } = await execFileMocha(fixture, args)
-    return JSON.parse(stdout)
+    return await execFileMocha(fixture, args)
   } finally {
     fs.rmSync(tmpdir, { force: true, recursive: true })
   }
@@ -400,12 +444,7 @@ async function execFileMocha (fixture, args) {
   // plain Mocha behavior with JSON emitted on stdout.
   const mochaArgs = [mochaBin, '--no-config', '--reporter', 'json', ...args, fixture]
 
-  try {
-    return await execFileAsync(process.execPath, mochaArgs)
-  } catch (err) {
-    if (!err || typeof err !== 'object' || !('stdout' in err) || typeof err.stdout !== 'string') throw err
-    return { stdout: err.stdout }
-  }
+  return execFileAsync(process.execPath, mochaArgs)
 }
 
 /**
diff --git a/packages/dd-trace/test/setup/mocha-hooks.js b/packages/dd-trace/test/setup/mocha-hooks.js
index 8489ddfc0f..83a1af22aa 100644
--- a/packages/dd-trace/test/setup/mocha-hooks.js
+++ b/packages/dd-trace/test/setup/mocha-hooks.js
@@ -46,11 +46,23 @@ if (!patched.has(Runner.prototype)) {
    * @param {(err?: Error) => void} fn
    */
   Hook.prototype.run = function patchedRunHook (fn) {
+    let hookCompleted = false
+    let hookRunReturned = false
+
     try {
-      return runHook.call(this, (err) => {
-        return fn(err && shouldSuppress(this) ? undefined : err)
+      const result = runHook.call(this, (err) => {
+        hookCompleted = true
+        try {
+          return fn(err && shouldSuppress(this) ? undefined : err)
+        } catch (err) {
+          if (!hookRunReturned) throw err
+          process.nextTick(() => { throw err })
+        }
       })
+      hookRunReturned = true
+      return result
     } catch (err) {
+      if (hookCompleted) throw err
       return this.callback(shouldSuppress(this) ? undefined : Runnable.toValueOrError(err))
     }
   }

From 6985d5f1aa04b5e4d80269b16deb8d38dc6f834e Mon Sep 17 00:00:00 2001
From: robcarlan-datadog <rob.carlan@datadoghq.com>
Date: Wed, 29 Jul 2026 09:56:16 -0400
Subject: [PATCH 25/43] fix(rhea): DSM context leak between concurrent
 consumers (#7581)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* test(rhea): add regression test for DSM context leak between concurrent consumers

Rhea's producer DSM checkpoint happens in a separate encode hook (not
bindStart), so the fix applied to other plugins doesn't cover it. This
test verifies the bug exists and will guide the fix.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* fix(rhea): move DSM consumer checkpoint from bindStart to start

Same fix as the other plugins — DSM context must be set in start()
(which runs after the store is bound) rather than bindStart() (where
enterWith calls leak to the outer context).

Note: the producer side still needs fixing since its DSM checkpoint
happens in a separate encode hook.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* fix(rhea): fix racy DSM env setup and unclosed connection in regression test

beforeEach didn't await agent.load, letting its internal tracer.use('rhea',
undefined) race and overwrite the explicit dsmEnabled config; the suite also
never set DD_DATA_STREAMS_ENABLED, so DSM never actually engaged. The AMQP
connection opened per test was also never closed, leaking into later
withVersions iterations on the same shared queue addresses and causing
cross-run contamination.

* fix(rhea): restore spy before calling done to satisfy sonarjs/no-code-after-done

* fix(rhea): save/restore DD_DATA_STREAMS_ENABLED instead of unconditional delete

dsm.spec.js sorts before index.spec.js in the same Mocha process, so
unconditionally deleting the env var in after() wiped out the CI
job-level DD_DATA_STREAMS_ENABLED before index.spec.js's own DSM
assertions ran, breaking the full rhea plugin suite.

* fix(rhea): stop deleting DD_DATA_STREAMS_ENABLED, match sibling dsm.spec.js convention

Save/restore was unnecessarily defensive. amqplib, bullmq, and
confluentinc-kafka-javascript's dsm.spec.js files all just set the var
once and never delete it, which avoids the file-ordering hazard
entirely. Match that convention here instead.

* fix(rhea): remove leaked container message listener in dsm test

require('rhea').get() returns the shared singleton container, so the
persistent on('message') listener leaked across every later test in the
process, firing stray produces and calling a dead done(). Use a named
handler removed on completion, guard done() with a finished flag, and
drop leftover listeners in afterEach.

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
---
 packages/datadog-plugin-rhea/src/consumer.js  |  29 ++--
 packages/datadog-plugin-rhea/test/dsm.spec.js | 125 ++++++++++++++++++
 2 files changed, 141 insertions(+), 13 deletions(-)
 create mode 100644 packages/datadog-plugin-rhea/test/dsm.spec.js

diff --git a/packages/datadog-plugin-rhea/src/consumer.js b/packages/datadog-plugin-rhea/src/consumer.js
index 53c194c245..73d12634fc 100644
--- a/packages/datadog-plugin-rhea/src/consumer.js
+++ b/packages/datadog-plugin-rhea/src/consumer.js
@@ -15,12 +15,27 @@ class RheaConsumerPlugin extends ConsumerPlugin {
     })
   }
 
+  start (ctx) {
+    if (!this.config.dsmEnabled) return
+    const { msgObj } = ctx
+    if (!msgObj?.message?.delivery_annotations) return
+
+    const { span } = ctx.currentStore
+    const name = getResourceNameFromMessage(msgObj)
+    const payloadSize = getAmqpMessageSize(
+      { headers: msgObj.message.delivery_annotations, content: msgObj.message.body }
+    )
+    this.tracer.decodeDataStreamsContext(msgObj.message.delivery_annotations)
+    this.tracer
+      .setCheckpoint(['direction:in', `topic:${name}`, 'type:rabbitmq'], span, payloadSize)
+  }
+
   bindStart (ctx) {
     const { msgObj } = ctx
     const name = getResourceNameFromMessage(msgObj)
     const childOf = extractTextMap(msgObj, this.tracer)
 
-    const span = this.startSpan({
+    this.startSpan({
       childOf,
       resource: name,
       type: 'worker',
@@ -31,18 +46,6 @@ class RheaConsumerPlugin extends ConsumerPlugin {
       },
     }, ctx)
 
-    if (
-      this.config.dsmEnabled &&
-      msgObj?.message?.delivery_annotations
-    ) {
-      const payloadSize = getAmqpMessageSize(
-        { headers: msgObj.message.delivery_annotations, content: msgObj.message.body }
-      )
-      this.tracer.decodeDataStreamsContext(msgObj.message.delivery_annotations)
-      this.tracer
-        .setCheckpoint(['direction:in', `topic:${name}`, 'type:rabbitmq'], span, payloadSize)
-    }
-
     return ctx.currentStore
   }
 }
diff --git a/packages/datadog-plugin-rhea/test/dsm.spec.js b/packages/datadog-plugin-rhea/test/dsm.spec.js
new file mode 100644
index 0000000000..93417851d7
--- /dev/null
+++ b/packages/datadog-plugin-rhea/test/dsm.spec.js
@@ -0,0 +1,125 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+
+const { after, afterEach, beforeEach, describe, it } = require('mocha')
+const sinon = require('sinon')
+
+const { DataStreamsProcessor } = require('../../dd-trace/src/datastreams/processor')
+const agent = require('../../dd-trace/test/plugins/agent')
+const { withVersions } = require('../../dd-trace/test/setup/mocha')
+
+describe('Plugin', () => {
+  describe('rhea', function () {
+    before(() => {
+      process.env.DD_DATA_STREAMS_ENABLED = 'true'
+    })
+
+    after(() => agent.close({ ritmReset: false }))
+
+    withVersions('rhea', 'rhea', version => {
+      describe('data stream monitoring', function () {
+        this.timeout(30000)
+        let container
+        let connection
+
+        beforeEach(() => {
+          return agent.load('rhea', { dsmEnabled: true })
+        })
+
+        afterEach(() => {
+          container?.removeAllListeners('message')
+          connection?.close()
+          connection = null
+          return agent.close({ ritmReset: false })
+        })
+
+        describe('concurrent context isolation', () => {
+          it('Should maintain separate DSM context for sequential consume-produce flows', (done) => {
+            const setCheckpointSpy = sinon.spy(DataStreamsProcessor.prototype, 'setCheckpoint')
+            container = require(`../../../versions/rhea@${version}`).get()
+
+            // Use pre-existing Qpid addresses to avoid "Node not found"
+            const addrAIn = 'amq.topic'
+            const addrBIn = 'amq.fanout'
+            const addrAOut = 'amq.direct'
+            const addrBOut = 'amq.match'
+
+            let finished = false
+            let messageCount = 0
+
+            const finish = (err) => {
+              if (finished) return
+              finished = true
+              container.removeListener('message', onMessage)
+              setCheckpointSpy.restore()
+              done(err)
+            }
+
+            const checkAssertions = () => {
+              const calls = setCheckpointSpy.getCalls()
+
+              try {
+                const checkpoint = (dir, tag) => calls.find(c =>
+                  c.args[0].includes(`direction:${dir}`) && c.args[0].includes(tag)
+                )
+
+                const consumeA = checkpoint('in', `topic:${addrAIn}`)
+                const consumeB = checkpoint('in', `topic:${addrBIn}`)
+                const produceA = checkpoint('out', `exchange:${addrAOut}`)
+                const produceB = checkpoint('out', `exchange:${addrBOut}`)
+
+                assert.ok(produceA?.args[2], 'Process A produce should have a parent DSM context')
+                assert.ok(produceB?.args[2], 'Process B produce should have a parent DSM context')
+                assert.deepStrictEqual(produceA.args[2].hash, consumeA.returnValue.hash)
+                assert.deepStrictEqual(produceB.args[2].hash, consumeB.returnValue.hash)
+                finish()
+              } catch (e) {
+                finish(e)
+              }
+            }
+
+            const onMessage = msg => {
+              const address = msg.receiver?.options?.source?.address
+              if (address === addrAIn) {
+                senderAOut.send({ body: 'from-a' })
+              } else if (address === addrBIn) {
+                senderBOut.send({ body: 'from-b' })
+              } else {
+                return
+              }
+              if (++messageCount === 2) checkAssertions()
+            }
+
+            container.on('message', onMessage)
+
+            connection = container.connect({
+              username: 'admin',
+              password: 'admin',
+              host: 'localhost',
+              port: 5673,
+            })
+
+            const senderAOut = connection.open_sender(addrAOut)
+            const senderBOut = connection.open_sender(addrBOut)
+            connection.open_receiver(addrAIn)
+            connection.open_receiver(addrBIn)
+
+            const senderA = connection.open_sender(addrAIn)
+            const senderB = connection.open_sender(addrBIn)
+
+            // Wait for input senders to be sendable before seeding messages
+            let readyCount = 0
+            const sendWhenReady = () => {
+              if (++readyCount < 2) return
+              senderA.send({ body: 'msg-a' })
+              senderB.send({ body: 'msg-b' })
+            }
+            senderA.once('sendable', sendWhenReady)
+            senderB.once('sendable', sendWhenReady)
+          })
+        })
+      })
+    })
+  })
+})

From 9a6c5451ae1a2a51de2ddc187d5cba575fc8411f Mon Sep 17 00:00:00 2001
From: robcarlan-datadog <rob.carlan@datadoghq.com>
Date: Wed, 29 Jul 2026 09:56:43 -0400
Subject: [PATCH 26/43] fix(google-cloud-pubsub): fix DSM context propagation
 for google-cloud-pubsub (#7582)

* test(dsm): add regression test for DSM context leak in google-cloud-pubsub

Same root cause as the kafkajs test: ctx.currentStore is set by
startSpan before decodeDataStreamsContext/setCheckpoint call enterWith,
so the DSM context is never included in the bound store for async
continuations.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix(dsm): move DSM logic from bindStart to start for google-cloud-pubsub

Move DSM checkpoint logic from bindStart to start in both consumer and
producer plugins so DSM context is properly bound in the async store.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* add api guard

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../src/consumer.js                           | 21 ++++--
 .../src/producer.js                           | 29 +++++---
 .../test/dsm.spec.js                          | 66 +++++++++++++++++++
 3 files changed, 99 insertions(+), 17 deletions(-)

diff --git a/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js b/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js
index e833e4b219..cef852e087 100644
--- a/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js
+++ b/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js
@@ -96,6 +96,20 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
     })
   }
 
+  start (ctx) {
+    if (!this.config.dsmEnabled) return
+    const { message } = ctx
+    if (!message?.attributes) return
+
+    const { span } = ctx.currentStore
+    const subscription = message._subscriber._subscription
+    const topic = subscription?.metadata?.topic || message.attributes?.['pubsub.topic']
+    const payloadSize = getMessageSize(message)
+    this.tracer.decodeDataStreamsContext(message.attributes)
+    this.tracer
+      .setCheckpoint(['direction:in', `topic:${topic}`, 'type:google-pubsub'], span, payloadSize)
+  }
+
   bindStart (ctx) {
     const { message } = ctx
     const subscription = message._subscriber._subscription
@@ -181,13 +195,6 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
       }
     }
 
-    if (this.config.dsmEnabled && message?.attributes) {
-      const payloadSize = getMessageSize(message)
-      this.tracer.decodeDataStreamsContext(message.attributes)
-      this.tracer
-        .setCheckpoint(['direction:in', `topic:${topic}`, 'type:google-pubsub'], span, payloadSize)
-    }
-
     return ctx.currentStore
   }
 
diff --git a/packages/datadog-plugin-google-cloud-pubsub/src/producer.js b/packages/datadog-plugin-google-cloud-pubsub/src/producer.js
index 86e5cdf534..82183e7090 100644
--- a/packages/datadog-plugin-google-cloud-pubsub/src/producer.js
+++ b/packages/datadog-plugin-google-cloud-pubsub/src/producer.js
@@ -36,6 +36,25 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
     if (topicName) attributes['pubsub.topic'] = topicName
   }
 
+  start (ctx) {
+    if (!this.config.dsmEnabled) return
+    if (ctx.api !== 'publish' || !ctx.currentStore) return
+    const { request } = ctx
+    const messages = request.messages || []
+    const topic = request.topic
+    const { span } = ctx.currentStore
+
+    for (const msg of messages) {
+      const attributes = msg.attributes ??= {}
+      const dataStreamsContext = this.tracer.setCheckpoint(
+        ['direction:out', `topic:${topic}`, 'type:google-pubsub'],
+        span,
+        getHeadersSize(msg)
+      )
+      DsmPathwayCodec.encode(dataStreamsContext, attributes)
+    }
+  }
+
   bindStart (ctx) {
     const { request, api, projectId } = ctx
     if (api !== 'publish') return
@@ -113,7 +132,6 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
 
     const messageCountStr = String(messageCount)
     const startTimeStr = String(Math.floor(batchSpan._startTime))
-    const dsmEnabled = this.config.dsmEnabled
 
     for (let i = 0; i < messageCount; i++) {
       const msg = messages[i]
@@ -137,15 +155,6 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
       if (batchTraceIdUpper) {
         attributes['_dd.pubsub_request.p.tid'] = batchTraceIdUpper
       }
-
-      if (dsmEnabled) {
-        const dataStreamsContext = this.tracer.setCheckpoint(
-          ['direction:out', `topic:${topic}`, 'type:google-pubsub'],
-          batchSpan,
-          getHeadersSize(msg)
-        )
-        DsmPathwayCodec.encode(dataStreamsContext, attributes)
-      }
     }
 
     ctx.batchSpan = batchSpan
diff --git a/packages/datadog-plugin-google-cloud-pubsub/test/dsm.spec.js b/packages/datadog-plugin-google-cloud-pubsub/test/dsm.spec.js
index 7ff87aeb94..4b68844efe 100644
--- a/packages/datadog-plugin-google-cloud-pubsub/test/dsm.spec.js
+++ b/packages/datadog-plugin-google-cloud-pubsub/test/dsm.spec.js
@@ -128,6 +128,72 @@ describe('Plugin', () => {
           })
         })
 
+        describe('concurrent context isolation', () => {
+          it('Should maintain separate DSM context for interleaved consume-produce flows', async () => {
+            const setCheckpointSpy = sinon.spy(DataStreamsProcessor.prototype, 'setCheckpoint')
+
+            try {
+              const topicAIn = (await pubsub.createTopic(`dsm-iso-a-in-${id()}`))[0]
+              const topicBIn = (await pubsub.createTopic(`dsm-iso-b-in-${id()}`))[0]
+              const topicAOut = (await pubsub.createTopic(`dsm-iso-a-out-${id()}`))[0]
+              const topicBOut = (await pubsub.createTopic(`dsm-iso-b-out-${id()}`))[0]
+
+              const subA = (await topicAIn.createSubscription(`sub-a-${id()}`))[0]
+              const subB = (await topicBIn.createSubscription(`sub-b-${id()}`))[0]
+
+              const fullTopicAIn = topicAIn.metadata?.name || topicAIn.name
+              const fullTopicBIn = topicBIn.metadata?.name || topicBIn.name
+              const fullTopicAOut = topicAOut.metadata?.name || topicAOut.name
+              const fullTopicBOut = topicBOut.metadata?.name || topicBOut.name
+
+              // Synchronization: both consumers must receive before either produces
+              let resolveAEntered, resolveBEntered
+              const aEntered = new Promise(resolve => { resolveAEntered = resolve })
+              const bEntered = new Promise(resolve => { resolveBEntered = resolve })
+              let doneCount = 0
+              const allDone = new Promise(resolve => {
+                const check = () => { if (++doneCount === 2) resolve() }
+                subA.on('message', async (msg) => {
+                  msg.ack()
+                  resolveAEntered()
+                  await bEntered
+                  await publish(topicAOut, { data: Buffer.from('from-a') })
+                  check()
+                })
+                subB.on('message', async (msg) => {
+                  msg.ack()
+                  resolveBEntered()
+                  await aEntered
+                  await publish(topicBOut, { data: Buffer.from('from-b') })
+                  check()
+                })
+              })
+
+              await publish(topicAIn, { data: Buffer.from('msg-a') })
+              await publish(topicBIn, { data: Buffer.from('msg-b') })
+
+              await allDone
+
+              const calls = setCheckpointSpy.getCalls()
+              const checkpoint = (dir, topic) => calls.find(c =>
+                c.args[0].includes(`direction:${dir}`) && c.args[0].includes(`topic:${topic}`)
+              )
+
+              const consumeA = checkpoint('in', fullTopicAIn)
+              const consumeB = checkpoint('in', fullTopicBIn)
+              const produceA = checkpoint('out', fullTopicAOut)
+              const produceB = checkpoint('out', fullTopicBOut)
+
+              assert.ok(produceA?.args[2], 'Process A produce should have a parent DSM context')
+              assert.ok(produceB?.args[2], 'Process B produce should have a parent DSM context')
+              assert.deepStrictEqual(produceA.args[2].hash, consumeA.returnValue.hash)
+              assert.deepStrictEqual(produceB.args[2].hash, consumeB.returnValue.hash)
+            } finally {
+              setCheckpointSpy.restore()
+            }
+          })
+        })
+
         describe('it should set a message payload size', () => {
           let recordCheckpointSpy
 

From d504ddf65ac098dc3b8ef088edd76e87ce20cf90 Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Wed, 29 Jul 2026 16:16:35 +0200
Subject: [PATCH 27/43] test(jest): gather multiproject payloads until the
 child exits (#9577)

The multiproject test-skipping case asserted on whatever the intake had received
after a fixed 15 s window, so a slow Jest start or a request that was still
draining left it asserting against zero skipped suites. Waiting for the child to
exit ties the collection to the run it asserts on, and the exit-code check keeps
a child that died before reporting anything from passing silently.
---
 integration-tests/jest/jest.tia-efd.spec.js | 48 ++++++++++-----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/integration-tests/jest/jest.tia-efd.spec.js b/integration-tests/jest/jest.tia-efd.spec.js
index b5a5a5ac8c..2242d8a25d 100644
--- a/integration-tests/jest/jest.tia-efd.spec.js
+++ b/integration-tests/jest/jest.tia-efd.spec.js
@@ -735,7 +735,7 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
       })
     })
 
-    it('works with multi project setup and test skipping', (done) => {
+    it('works with multi project setup and test skipping', async () => {
       const projects = ['standard', 'node'].map(displayName => ({
         displayName,
         rootDir: 'ci-visibility/test',
@@ -762,24 +762,6 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
         'ci-visibility/test/ci-visibility-test.js': getLinesBitmapBase64(1, 20),
       })
 
-      const eventsPromise = receiver
-        .gatherPayloadsMaxTimeout(({ url }) => url.endsWith('/api/v2/citestcycle'), (payloads) => {
-          // suites for both projects in the multi-project config are reported as skipped
-          const events = payloads.flatMap(({ payload }) => payload.events)
-
-          const testSuites = events.filter(event => event.type === 'test_suite_end').map(event => event.content)
-
-          const skippedSuites = testSuites.filter(
-            suite => suite.resource === 'test_suite.ci-visibility/test/ci-visibility-test.js'
-          )
-          assert.strictEqual(skippedSuites.length, 2)
-
-          skippedSuites.forEach(skippedSuite => {
-            assert.strictEqual(skippedSuite.meta[TEST_STATUS], 'skip')
-            assert.strictEqual(skippedSuite.meta[TEST_SKIPPED_BY_ITR], 'true')
-          })
-        })
-
       childProcess = exec(
         'node ./node_modules/jest/bin/jest --config config-jest.js',
         {
@@ -791,11 +773,29 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
         }
       )
 
-      childProcess.on('exit', () => {
-        eventsPromise.then(() => {
-          done()
-        }).catch(done)
-      })
+      await receiver
+        .gatherPayloadsUntilChildExit(
+          childProcess,
+          ({ url }) => url.endsWith('/api/v2/citestcycle'),
+          (payloads) => {
+            // suites for both projects in the multi-project config are reported as skipped
+            const events = payloads.flatMap(({ payload }) => payload.events)
+
+            const testSuites = events.filter(event => event.type === 'test_suite_end').map(event => event.content)
+
+            const skippedSuites = testSuites.filter(
+              suite => suite.resource === 'test_suite.ci-visibility/test/ci-visibility-test.js'
+            )
+            assert.strictEqual(skippedSuites.length, 2)
+
+            skippedSuites.forEach(skippedSuite => {
+              assert.strictEqual(skippedSuite.meta[TEST_STATUS], 'skip')
+              assert.strictEqual(skippedSuite.meta[TEST_SKIPPED_BY_ITR], 'true')
+            })
+          }
+        )
+
+      assert.strictEqual(childProcess.exitCode, 0)
     })
 
     it('does not run coverage reporters when TIA forces coverage collection', async () => {

From 584d6613683ab84dea3e2e6cff2e4f2198591155 Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Wed, 29 Jul 2026 16:17:29 +0200
Subject: [PATCH 28/43] fix(instrumentation): wrap Node builtins once across
 CommonJS and ESM (#9576)

Loading a builtin through both `require` and `import` instrumented it twice.
`Hook` keys its idempotency cache on the module object, and a builtin's ESM
named exports are a second view of the implementation the hook already ran
against, so the cache cannot relate the two. The second pass stacked another
wrapper: `crypto`, `dns` and `http` published every operation twice, leaving
duplicate HTTP client spans; `require('vm').runInNewContext` and its `import`
counterpart resolved to different functions; and `url` aborted instrumentation
with `TypeError: Cannot read private member #context from an object whose class
did not declare it`, because the second pass reached the inherited
`URL.prototype.host` getter with the prototype as receiver.

Drive-by fix:

* Move the builtin-name helpers from `ritm.js` to `shared-utils.js`, which it
  already imports from, dropping their unreachable non-string guards.
* Document that `engines.node` differs per release line, so a runtime gate reads
  its range from `package.json` instead of hardcoding a major.
---
 AGENTS.md                                     |  13 ++
 eslint.config.mjs                             |   1 +
 .../src/helpers/hook.js                       |  19 ++-
 .../src/helpers/shared-utils.js               |  39 ++++++
 .../test/helpers/hook-module-views.spec.js    | 115 ++++++++++++++++++
 .../helpers/hook-module-views/load-order.js   |  71 +++++++++++
 .../test/helpers/hook.spec.js                 |  71 +++++++++++
 .../test/helpers/shared-utils.spec.js         |  52 ++++++++
 packages/dd-trace/src/ritm.js                 |  25 +---
 9 files changed, 385 insertions(+), 21 deletions(-)
 create mode 100644 packages/datadog-instrumentations/test/helpers/hook-module-views.spec.js
 create mode 100644 packages/datadog-instrumentations/test/helpers/hook-module-views/load-order.js
 create mode 100644 packages/datadog-instrumentations/test/helpers/shared-utils.spec.js

diff --git a/AGENTS.md b/AGENTS.md
index 1e80037883..1c344b7e10 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -271,6 +271,19 @@ Composition is the default; inheritance only when ≤2 sibling types share a com
 - Don't use language/runtime features that are too new
 - **Guard breaking changes with version checks** using [`version.js`](./version.js) (e.g., `DD_MAJOR`)
 
+#### The supported Node.js range differs per release line
+
+`engines.node` is `>=22` on `master`, `>=18` on `v5.x`, so never hardcode a major in a runtime gate —
+derive it from `engines.node` + `nodeMaxMajor`, the source `src/guardrails/index.js` reads. Below the
+floor the guardrail aborts instrumentation entirely, yet CI still runs Node 18 and 20 on `master` so
+backports stay honest. A spec needing a live tracer must therefore skip outside the range, honouring
+`DD_INJECT_FORCE` as `withVersions` (`packages/dd-trace/test/setup/mocha.js`) does:
+
+```js
+const runtimeSupported = Boolean(process.env.DD_INJECT_FORCE) ||
+  semver.satisfies(process.version, `${engines.node} <${nodeMaxMajor}`)
+```
+
 ### Public TypeScript Types
 
 The repo carries two public TypeScript surfaces:
diff --git a/eslint.config.mjs b/eslint.config.mjs
index af77ab3c79..5362309da0 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -722,6 +722,7 @@ export default [
       'integration-tests/**/*.js',
       'integration-tests/**/*.mjs',
       'packages/datadog-instrumentations/test/helpers/check-require-cache/**/*.js',
+      'packages/datadog-instrumentations/test/helpers/hook-module-views/**/*.js',
       'packages/datadog-plugin-net/test/epipe-crash/**/*.js',
       'packages/datadog-plugin-openai/test/no-init.js',
       'packages/dd-trace/test/custom-metrics-app.js',
diff --git a/packages/datadog-instrumentations/src/helpers/hook.js b/packages/datadog-instrumentations/src/helpers/hook.js
index 9b0e57ac3d..64bb25bef1 100644
--- a/packages/datadog-instrumentations/src/helpers/hook.js
+++ b/packages/datadog-instrumentations/src/helpers/hook.js
@@ -6,6 +6,7 @@ const iitm = require('../../../dd-trace/src/iitm')
 const ritm = require('../../../dd-trace/src/ritm')
 const log = require('../../../dd-trace/src/log')
 const requirePackageJson = require('../../../dd-trace/src/require-package-json')
+const { isNodeBuiltinModuleName } = require('./shared-utils')
 
 /**
  * @param {string} moduleBaseDir
@@ -101,7 +102,23 @@ function Hook (modules, hookOptions, onrequire) {
       }
     }
 
-    const newExports = wrappedOnrequire(moduleExports, moduleName, moduleBaseDir, moduleVersion, isIitm)
+    // A builtin's named ESM exports are a second view of what `default` already points at, and
+    // `patched` cannot relate them because it keys on the object the hook ran against.
+    let newExports
+    if (defaultWrapResult && isNodeBuiltinModuleName(moduleName)) {
+      // Accessor exports are read, not skipped: `replaceGetter` leaves Node 20's `fs.opendir`
+      // an accessor, and Node's ESM facade resolved every export before handing us this view.
+      for (const key of Object.keys(defaultWrapResult)) {
+        const wrapped = defaultWrapResult[key]
+        const existing = moduleExports[key]
+        if (existing !== wrapped && existing !== undefined) {
+          moduleExports[key] = wrapped
+        }
+      }
+      newExports = moduleExports
+    } else {
+      newExports = wrappedOnrequire(moduleExports, moduleName, moduleBaseDir, moduleVersion, isIitm)
+    }
 
     if (defaultWrapResult && defaultExportAliases) {
       newExports.default = defaultWrapResult
diff --git a/packages/datadog-instrumentations/src/helpers/shared-utils.js b/packages/datadog-instrumentations/src/helpers/shared-utils.js
index 1fe8db4928..9a131fd08e 100644
--- a/packages/datadog-instrumentations/src/helpers/shared-utils.js
+++ b/packages/datadog-instrumentations/src/helpers/shared-utils.js
@@ -1,9 +1,48 @@
 'use strict'
 
+const { builtinModules } = require('node:module')
+
+/**
+ * @param {string} moduleName
+ */
+function stripNodePrefix (moduleName) {
+  return moduleName.startsWith('node:') ? moduleName.slice(5) : moduleName
+}
+
+const builtinModuleNames = new Set(builtinModules.map(stripNodePrefix))
+
+/**
+ * @param {string} moduleName
+ */
+function isNodeBuiltinModuleName (moduleName) {
+  return builtinModuleNames.has(stripNodePrefix(moduleName))
+}
+
+/**
+ * @param {string} moduleName
+ */
+function isBuiltinModuleName (moduleName) {
+  return moduleName === 'electron' || isNodeBuiltinModuleName(moduleName)
+}
+
+/**
+ * @param {string} moduleName
+ */
+function normalizeModuleName (moduleName) {
+  const stripped = stripNodePrefix(moduleName)
+  return builtinModuleNames.has(stripped) ? stripped : moduleName
+}
+
+/**
+ * @param {string} moduleName
+ */
 function isRelativeRequire (moduleName) {
   return moduleName.startsWith('./') || moduleName.startsWith('../')
 }
 
 module.exports = {
+  isBuiltinModuleName,
+  isNodeBuiltinModuleName,
   isRelativeRequire,
+  normalizeModuleName,
 }
diff --git a/packages/datadog-instrumentations/test/helpers/hook-module-views.spec.js b/packages/datadog-instrumentations/test/helpers/hook-module-views.spec.js
new file mode 100644
index 0000000000..9c8743ca90
--- /dev/null
+++ b/packages/datadog-instrumentations/test/helpers/hook-module-views.spec.js
@@ -0,0 +1,115 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+const { execFile } = require('node:child_process')
+const path = require('node:path')
+const { pathToFileURL } = require('node:url')
+const { promisify } = require('node:util')
+
+const { describe, it } = require('mocha')
+const semver = require('semver')
+
+const { engines, nodeMaxMajor } = require('../../../../package.json')
+
+const execFileAsync = promisify(execFile)
+
+// Outside its supported runtime range the tracer aborts instrumentation on purpose, so a child
+// process has nothing to report. `DD_INJECT_FORCE` overrides that, the same way `withVersions` does.
+const injectForce = process.env.DD_INJECT_FORCE
+const runtimeSupported = Boolean(injectForce) ||
+  semver.satisfies(process.version, `${engines.node} <${nodeMaxMajor}`)
+
+const repositoryRoot = path.resolve(__dirname, '../../../..')
+const fixture = path.join(__dirname, 'hook-module-views', 'load-order.js')
+
+const initPath = path.join(repositoryRoot, 'init.js')
+const moduleUrl = (name) => pathToFileURL(path.join(repositoryRoot, name)).href
+
+const bootstrapModes = {
+  'initialize.mjs': `--import ${moduleUrl('initialize.mjs')}`,
+  'init.js + loader-hook.mjs': `--require ${initPath} --loader ${moduleUrl('loader-hook.mjs')}`,
+  'register.js + init.js': `--import ${moduleUrl('register.js')} --require ${initPath}`,
+}
+
+/**
+ * @typedef {object} ViewReport
+ * @property {string} request
+ * @property {number} publishes channel publishes the view produced for one operation
+ * @property {number} [getterPublishes] getter channel publishes for the view
+ * @property {boolean} matchesFirstView whether the instrumented function is the same object
+ * @property {boolean} [matchesOwnDefaultExport] ESM views only
+ */
+
+/**
+ * @param {string} nodeOptions
+ * @param {string[]} requests view specifiers such as `cjs:url` or `esm:node:url`
+ * @returns {Promise<ViewReport[]>}
+ */
+async function loadViews (nodeOptions, requests) {
+  // A bare environment keeps an instrumented shell (`OTEL_TRACES_EXPORTER`) and a developer's
+  // own `DD_*` settings out of the child, and keeps stdout to the fixture's JSON.
+  const { stdout, stderr } = await execFileAsync(process.execPath, [fixture, ...requests], {
+    cwd: repositoryRoot,
+    env: {
+      PATH: process.env.PATH,
+      DD_INJECT_FORCE: injectForce,
+      DD_INSTRUMENTATION_TELEMETRY_ENABLED: 'false',
+      DD_REMOTE_CONFIG_ENABLED: 'false',
+      DD_TRACE_STARTUP_LOGS: 'false',
+      NODE_OPTIONS: nodeOptions,
+    },
+  })
+
+  assert.doesNotMatch(stderr, /Error during ddtrace instrumentation/, stderr)
+
+  return JSON.parse(stdout)
+}
+
+;(runtimeSupported ? describe : describe.skip)('builtin instrumentation across CommonJS and ESM views', () => {
+  for (const [mode, nodeOptions] of Object.entries(bootstrapModes)) {
+    describe(`with ${mode}`, () => {
+      it('wraps url and its getters once when CommonJS loads it before ESM', async () => {
+        assert.deepStrictEqual(await loadViews(nodeOptions, ['cjs:url', 'esm:node:url']), [
+          { request: 'cjs:url', publishes: 1, getterPublishes: 1, matchesFirstView: true },
+          {
+            request: 'esm:node:url',
+            publishes: 1,
+            getterPublishes: 1,
+            matchesFirstView: true,
+            matchesOwnDefaultExport: true,
+          },
+        ])
+      })
+
+      it('wraps crypto once when CommonJS loads it before ESM', async () => {
+        assert.deepStrictEqual(await loadViews(nodeOptions, ['cjs:crypto', 'esm:node:crypto']), [
+          { request: 'cjs:crypto', publishes: 1, matchesFirstView: true },
+          { request: 'esm:node:crypto', publishes: 1, matchesFirstView: true, matchesOwnDefaultExport: true },
+        ])
+      })
+
+      it('wraps vm once when ESM loads it before CommonJS', async () => {
+        assert.deepStrictEqual(await loadViews(nodeOptions, ['esm:node:vm', 'cjs:vm']), [
+          { request: 'esm:node:vm', publishes: 1, matchesFirstView: true, matchesOwnDefaultExport: true },
+          { request: 'cjs:vm', publishes: 1, matchesFirstView: true },
+        ])
+      })
+
+      it('wraps zlib once when ESM loads it before CommonJS', async () => {
+        assert.deepStrictEqual(await loadViews(nodeOptions, ['esm:node:zlib', 'cjs:zlib']), [
+          { request: 'esm:node:zlib', publishes: 1, matchesFirstView: true, matchesOwnDefaultExport: true },
+          { request: 'cjs:zlib', publishes: 1, matchesFirstView: true },
+        ])
+      })
+
+      it('wraps vm once across prefixed and unprefixed requests of every kind', async () => {
+        assert.deepStrictEqual(await loadViews(nodeOptions, ['cjs:vm', 'cjs:node:vm', 'esm:vm', 'esm:node:vm']), [
+          { request: 'cjs:vm', publishes: 1, matchesFirstView: true },
+          { request: 'cjs:node:vm', publishes: 1, matchesFirstView: true },
+          { request: 'esm:vm', publishes: 1, matchesFirstView: true, matchesOwnDefaultExport: true },
+          { request: 'esm:node:vm', publishes: 1, matchesFirstView: true, matchesOwnDefaultExport: true },
+        ])
+      })
+    })
+  }
+})
diff --git a/packages/datadog-instrumentations/test/helpers/hook-module-views/load-order.js b/packages/datadog-instrumentations/test/helpers/hook-module-views/load-order.js
new file mode 100644
index 0000000000..e28054fa4b
--- /dev/null
+++ b/packages/datadog-instrumentations/test/helpers/hook-module-views/load-order.js
@@ -0,0 +1,71 @@
+'use strict'
+
+// Loads one Node builtin through every view named on the command line (`cjs:url`,
+// `esm:node:url`), exercises each once, and reports the result as JSON on stdout.
+
+const { channel } = require('../../../src/helpers/instrument')
+
+const builtins = {
+  crypto: {
+    channel: 'datadog:crypto:hashing:start',
+    probe: 'createHash',
+    exercise: (view) => view.createHash('sha256').update('a').digest('hex'),
+  },
+  url: {
+    channel: 'datadog:url:parse:finish',
+    getterChannel: 'datadog:url:getter:finish',
+    probe: 'parse',
+    exercise: (view) => {
+      const parsed = new view.URL('https://www.datadoghq.com/path')
+      parsed.host
+    },
+  },
+  vm: {
+    channel: 'datadog:vm:run-script:start',
+    probe: 'runInNewContext',
+    exercise: (view) => view.runInNewContext('1 + 1'),
+  },
+  zlib: {
+    channel: 'apm:zlib:operation:start',
+    probe: 'gzip',
+    exercise: (view) => new Promise((resolve) => view.gzip(Buffer.from('hello'), resolve)),
+  },
+}
+
+async function main () {
+  const requests = process.argv.slice(2)
+  const { channel: channelName, getterChannel, probe, exercise } = builtins[requests[0].split(':').at(-1)]
+
+  let publishes = 0
+  let getterPublishes = 0
+  channel(channelName).subscribe(() => { publishes++ })
+  if (getterChannel) channel(getterChannel).subscribe(() => { getterPublishes++ })
+
+  const views = []
+  for (const request of requests) {
+    const specifier = request.slice(request.indexOf(':') + 1)
+    views.push(request.startsWith('esm:') ? await import(specifier) : require(specifier))
+  }
+
+  const report = []
+  for (const [index, view] of views.entries()) {
+    const before = publishes
+    const getterBefore = getterPublishes
+    await exercise(view)
+    const entry = {
+      request: requests[index],
+      publishes: publishes - before,
+      matchesFirstView: view[probe] === views[0][probe],
+    }
+    if (getterChannel) entry.getterPublishes = getterPublishes - getterBefore
+    if (view.default !== undefined) {
+      entry.matchesOwnDefaultExport = view.default[probe] === view[probe]
+    }
+    report.push(entry)
+  }
+
+  // The tracer's own timers keep the process alive, so exit once stdout has drained.
+  process.stdout.write(JSON.stringify(report), () => process.exit(0))
+}
+
+main()
diff --git a/packages/datadog-instrumentations/test/helpers/hook.spec.js b/packages/datadog-instrumentations/test/helpers/hook.spec.js
index cc7a6adc4f..d23874fad8 100644
--- a/packages/datadog-instrumentations/test/helpers/hook.spec.js
+++ b/packages/datadog-instrumentations/test/helpers/hook.spec.js
@@ -53,6 +53,77 @@ describe('Hook', () => {
     assert.strictEqual(wrapped.default, wrapped)
   })
 
+  it('wraps a builtin once and mirrors the result onto its named ESM exports', () => {
+    const original = sinon.stub()
+    const wrapped = sinon.stub()
+    const cjsExports = { parse: original }
+    const namespace = { default: cjsExports, parse: original }
+    const onrequire = sinon.stub().callsFake(() => {
+      cjsExports.parse = wrapped
+      return cjsExports
+    })
+
+    Hook(['url'], onrequire)
+
+    const hook = iitm.args[0][2]
+    assert.strictEqual(hook(namespace, 'url', undefined), namespace)
+    assert.strictEqual(namespace.parse, wrapped)
+    sinon.assert.calledOnceWithExactly(onrequire, cjsExports, 'url', undefined, process.version, true)
+  })
+
+  it('leaves a builtin export the ESM view does not carry', () => {
+    const cjsExports = { parse: sinon.stub() }
+    const namespace = { default: cjsExports }
+    const onrequire = sinon.stub().returns(cjsExports)
+
+    Hook(['url'], onrequire)
+
+    const hook = iitm.args[0][2]
+    assert.strictEqual(hook(namespace, 'url', undefined), namespace)
+    assert.deepStrictEqual(Object.keys(namespace), ['default'])
+  })
+
+  it('mirrors an accessor-backed builtin export, as `replaceGetter` leaves behind', () => {
+    const wrapped = sinon.stub()
+    const cjsExports = {}
+    Object.defineProperty(cjsExports, 'opendir', { get: () => wrapped, enumerable: true, configurable: true })
+    const namespace = { default: cjsExports, opendir: sinon.stub() }
+    const onrequire = sinon.stub().returns(cjsExports)
+
+    Hook(['fs'], onrequire)
+
+    const hook = iitm.args[0][2]
+    assert.strictEqual(hook(namespace, 'fs', undefined), namespace)
+    assert.strictEqual(namespace.opendir, wrapped)
+  })
+
+  it('leaves electron to the regular hook, since it is not a Node builtin', () => {
+    const cjsExports = { app: sinon.stub() }
+    const namespace = { default: cjsExports, app: cjsExports.app }
+    const onrequire = sinon.stub().returns(cjsExports)
+
+    Hook(['electron'], onrequire)
+
+    const hook = iitm.args[0][2]
+    assert.strictEqual(hook(namespace, 'electron', undefined), cjsExports)
+    sinon.assert.calledTwice(onrequire)
+  })
+
+  it('rebinds a builtin ESM view when the hook replaces the default export', () => {
+    const original = sinon.stub()
+    const replacement = { parse: sinon.stub() }
+    const cjsExports = { parse: original }
+    const namespace = { default: cjsExports, parse: original }
+    const onrequire = sinon.stub().returns(replacement)
+
+    Hook(['url'], onrequire)
+
+    const hook = iitm.args[0][2]
+    assert.strictEqual(hook(namespace, 'url', undefined), namespace)
+    assert.strictEqual(namespace.default, replacement)
+    assert.strictEqual(namespace.parse, replacement.parse)
+  })
+
   it('does not inspect named ESM exports when the default export is unchanged', () => {
     const original = sinon.stub()
     const ownKeys = sinon.stub().returns(['default', 'named'])
diff --git a/packages/datadog-instrumentations/test/helpers/shared-utils.spec.js b/packages/datadog-instrumentations/test/helpers/shared-utils.spec.js
new file mode 100644
index 0000000000..d9660c0321
--- /dev/null
+++ b/packages/datadog-instrumentations/test/helpers/shared-utils.spec.js
@@ -0,0 +1,52 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+
+const { describe, it } = require('mocha')
+
+const {
+  isBuiltinModuleName,
+  isNodeBuiltinModuleName,
+  normalizeModuleName,
+} = require('../../src/helpers/shared-utils')
+
+describe('shared-utils', () => {
+  describe('isNodeBuiltinModuleName', () => {
+    it('accepts builtins with and without the node: prefix', () => {
+      assert.strictEqual(isNodeBuiltinModuleName('url'), true)
+      assert.strictEqual(isNodeBuiltinModuleName('node:url'), true)
+      assert.strictEqual(isNodeBuiltinModuleName('dns/promises'), true)
+    })
+
+    it('rejects electron, which Node does not resolve as a builtin', () => {
+      assert.strictEqual(isNodeBuiltinModuleName('electron'), false)
+    })
+
+    it('rejects packages and paths that merely look builtin', () => {
+      assert.strictEqual(isNodeBuiltinModuleName('express'), false)
+      assert.strictEqual(isNodeBuiltinModuleName('node:express'), false)
+      assert.strictEqual(isNodeBuiltinModuleName('url-parse'), false)
+      assert.strictEqual(isNodeBuiltinModuleName('/app/node_modules/url/index.js'), false)
+    })
+  })
+
+  describe('isBuiltinModuleName', () => {
+    it('accepts electron, which a packaged binary resolves without a package directory', () => {
+      assert.strictEqual(isBuiltinModuleName('electron'), true)
+      assert.strictEqual(isBuiltinModuleName('url'), true)
+      assert.strictEqual(isBuiltinModuleName('express'), false)
+    })
+  })
+
+  describe('normalizeModuleName', () => {
+    it('strips the node: prefix from a builtin', () => {
+      assert.strictEqual(normalizeModuleName('node:url'), 'url')
+      assert.strictEqual(normalizeModuleName('url'), 'url')
+    })
+
+    it('keeps a name that is not a prefixable builtin', () => {
+      assert.strictEqual(normalizeModuleName('electron'), 'electron')
+      assert.strictEqual(normalizeModuleName('node:express'), 'node:express')
+    })
+  })
+})
diff --git a/packages/dd-trace/src/ritm.js b/packages/dd-trace/src/ritm.js
index 2cf29eb982..250b17e820 100644
--- a/packages/dd-trace/src/ritm.js
+++ b/packages/dd-trace/src/ritm.js
@@ -7,7 +7,11 @@ const Module = require('module')
 const dc = require('dc-polyfill')
 
 const parse = require('../../../vendor/dist/module-details-from-path')
-const { isRelativeRequire } = require('../../datadog-instrumentations/src/helpers/shared-utils')
+const {
+  isBuiltinModuleName,
+  isRelativeRequire,
+  normalizeModuleName,
+} = require('../../datadog-instrumentations/src/helpers/shared-utils')
 const { getConfiguredEnvName, getEnvironmentVariable } = require('./config/helper')
 
 const origRequire = Module.prototype.require
@@ -22,25 +26,6 @@ let patchedRequire = null
 const moduleLoadStartChannel = dc.channel('dd-trace:moduleLoadStart')
 const moduleLoadEndChannel = dc.channel('dd-trace:moduleLoadEnd')
 
-function stripNodePrefix (name) {
-  if (typeof name !== 'string') return name
-  return name.startsWith('node:') ? name.slice(5) : name
-}
-
-const builtinModules = new Set(Module.builtinModules.map(stripNodePrefix))
-
-function isBuiltinModuleName (name) {
-  if (typeof name !== 'string') return false
-  if (name === 'electron') return true
-  return builtinModules.has(stripNodePrefix(name))
-}
-
-function normalizeModuleName (name) {
-  if (typeof name !== 'string') return name
-  const stripped = stripNodePrefix(name)
-  return builtinModules.has(stripped) ? stripped : name
-}
-
 /**
  * @overload
  * @param {string[]} modules list of modules to hook into

From e158ff099a95e598bd824c502d3ac680f9e5078e Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Wed, 29 Jul 2026 16:17:42 +0200
Subject: [PATCH 29/43] test(test-optimization): set the API key on the config
 the exporter reads (#9579)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`getConfig()` memoizes the `Config` instance on its first call, so the
`beforeEach` writing `process.env.DD_API_KEY` was only visible while this spec
was the first thing in the process to build it. Sibling specs build the
singleton too, some of them while mocha collects files. After any of those the
exporter sees no API key, so every request path that needs a `dd-api-key` header
bails out with "… because Datadog API key is not defined." before sending: the
nock interceptors never fire, and `getKnownTests` hands an error to a spec
asserting a null one. Under `allowUncaught` that assertion crashes the run
before mocha prints a summary.

Restoring the previous value in `afterEach` also stops the spec from leaving the
key set for everything that runs after it.
---
 .../ci-visibility/exporters/ci-visibility-exporter.spec.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/dd-trace/test/ci-visibility/exporters/ci-visibility-exporter.spec.js b/packages/dd-trace/test/ci-visibility/exporters/ci-visibility-exporter.spec.js
index 7d9fc42a41..73e4749a57 100644
--- a/packages/dd-trace/test/ci-visibility/exporters/ci-visibility-exporter.spec.js
+++ b/packages/dd-trace/test/ci-visibility/exporters/ci-visibility-exporter.spec.js
@@ -16,6 +16,7 @@ const proxyquire = require('proxyquire')
 const { assertObjectContains } = require('../../../../../integration-tests/helpers')
 const { version: tracerVersion } = require('../../../../../package.json')
 require('../../../../dd-trace/test/setup/core')
+const getConfig = require('../../../src/config')
 const { defaults: { hostname, port } } = require('../../../src/config/defaults')
 const ciVisibilityLog = require('../../../src/log')
 const { uploadCoverageReport: actualUploadCoverageReportRequest } =
@@ -40,17 +41,21 @@ class CiVisibilityExporter extends CiVisibilityExporterBase {
 
 describe('CI Visibility Exporter', () => {
   const url = new URL(`http://${hostname}:${port}`)
+  let originalApiKey
 
   beforeEach(() => {
     // to make sure `isShallowRepository` in `git.js` returns false
     sinon.stub(cp, 'execFileSync').returns('false')
     sinon.stub(fs, 'readFileSync').returns('')
-    process.env.DD_API_KEY = '1'
+    const config = getConfig()
+    originalApiKey = config.DD_API_KEY
+    config.DD_API_KEY = '1'
     nock.cleanAll()
     uploadCoverageReportRequest = actualUploadCoverageReportRequest
   })
 
   afterEach(() => {
+    getConfig().DD_API_KEY = originalApiKey
     sinon.restore()
   })
 

From ac0d060ac9ad64e6f9bb91d72ef2579c004e82b2 Mon Sep 17 00:00:00 2001
From: Roch Devost <roch.devost@datadoghq.com>
Date: Wed, 29 Jul 2026 10:55:39 -0400
Subject: [PATCH 30/43] ci: pin docker/login-action to a commit SHA (#9582)

docker/login-action was referenced by version tag instead of a
commit SHA, unlike the rest of our pinned GitHub Actions.
---
 .github/workflows/mirror-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/mirror-image.yml b/.github/workflows/mirror-image.yml
index 5454d6167d..2f720e0490 100644
--- a/.github/workflows/mirror-image.yml
+++ b/.github/workflows/mirror-image.yml
@@ -28,7 +28,7 @@ jobs:
           policy: self.mirror-image
 
       - name: Log in to GHCR
-        uses: docker/login-action@v4.5.1
+        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

From d35444bf881e109cd2e5098baba88126c09d4e26 Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Wed, 29 Jul 2026 16:55:58 +0200
Subject: [PATCH 31/43] test(test-optimization): make preload path assertion
 portable (#9581)

---
 .../test/ci-visibility/validation-execution-phases.spec.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dd-trace/test/ci-visibility/validation-execution-phases.spec.js b/packages/dd-trace/test/ci-visibility/validation-execution-phases.spec.js
index 9fef6e959a..85a19d1292 100644
--- a/packages/dd-trace/test/ci-visibility/validation-execution-phases.spec.js
+++ b/packages/dd-trace/test/ci-visibility/validation-execution-phases.spec.js
@@ -401,7 +401,7 @@ describe('test optimization validation execution boundary', () => {
       serializeApprovalCommand({ argv: ['/path with spaces/node', 'a\'b', '--flag'] }),
       expectedCommand
     )
-    assert.match(withCiPreloads('', framework).replaceAll('\\', '/'), /dd-trace-js\/ci\/init\.js/)
+    assert.match(withCiPreloads('', framework).replaceAll('\\', '/'), /-r "?[^"]*\/ci\/init\.js"?$/)
   })
 
   /**

From 7431611537fb1eea132dff5eb9626c69520c421f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Antonio=20Fern=C3=A1ndez=20de=20Alba?=
 <juan.fernandezdealba@datadoghq.com>
Date: Wed, 29 Jul 2026 17:02:43 +0200
Subject: [PATCH 32/43] feat(test-optimization): support Vitest Browser Mode
 (#9535)

---
 .github/workflows/test-optimization.yml       |  42 +
 ci/vitest-no-worker-init-setup.mjs            | 399 +++++++--
 .../vitest-browser-tests/browser-atr.mjs      |  13 +
 .../browser-conditional-retry-quarantine.mjs  |  22 +
 .../browser-efd-fake-timers.mjs               |   6 +
 .../vitest-browser-tests/browser-efd.mjs      |   8 +
 .../browser-multiple-errors.mjs               |  12 +
 .../browser-object-retry-quarantine.mjs       |   8 +
 .../browser-partial-process-shim.mjs          |   6 +
 .../browser-reporting.mjs                     |  12 +
 .../browser-retry-repeat-quarantine.mjs       |   8 +
 .../browser-rum-concurrent.mjs                |  28 +
 .../browser-rum-crypto-failure.mjs            |  15 +
 .../browser-rum-crypto-reuse.mjs              |  28 +
 .../browser-rum-dynamic-skip.mjs              |  25 +
 .../browser-rum-parallel-first.mjs            |  11 +
 .../browser-rum-parallel-second.mjs           |  11 +
 .../browser-rum-teardown.mjs                  |  14 +
 .../browser-rum-uninitialized.mjs             |   7 +
 .../browser-rum-user-setup.mjs                |   7 +
 .../vitest-browser-tests/browser-rum.mjs      |  62 ++
 .../browser-test-management.mjs               |  16 +
 .../vitest-browser-tests/mixed-node.mjs       |   5 +
 .../vitest-tests/efd-fake-timers.mjs          |   6 +
 .../vitest-tests/fake-timers-setup.mjs        |   3 +
 .../vitest-tests/rum-before-each-setup.mjs    |  28 +
 .../vitest-tests/rum-crypto-failure-setup.mjs |  16 +
 .../vitest-tests/rum-crypto-reuse-setup.mjs   |  13 +
 integration-tests/vitest.config.mjs           |  65 ++
 .../vitest/vitest.browser.spec.js             | 810 ++++++++++++++++++
 .../vitest/vitest.no-worker-init.spec.js      | 577 ++++++++++++-
 .../src/vitest-main-no-worker-init.js         | 581 +++++++++++--
 .../src/vitest-main.js                        | 100 ++-
 .../test/vitest-main.spec.js                  | 123 +++
 packages/datadog-plugin-vitest/src/index.js   |  95 +-
 packages/dd-trace/src/plugins/ci_plugin.js    |   5 +-
 packages/dd-trace/src/plugins/util/test.js    |  11 +-
 .../dd-trace/test/plugins/util/test.spec.js   |  12 +
 38 files changed, 3070 insertions(+), 140 deletions(-)
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-atr.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-conditional-retry-quarantine.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-efd-fake-timers.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-efd.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-multiple-errors.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-object-retry-quarantine.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-partial-process-shim.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-reporting.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-retry-repeat-quarantine.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-rum-concurrent.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-rum-crypto-failure.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-rum-crypto-reuse.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-rum-dynamic-skip.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-rum-parallel-first.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-rum-parallel-second.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-rum-teardown.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-rum-uninitialized.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-rum-user-setup.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-rum.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/browser-test-management.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-browser-tests/mixed-node.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-tests/efd-fake-timers.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-tests/fake-timers-setup.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-tests/rum-before-each-setup.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-tests/rum-crypto-failure-setup.mjs
 create mode 100644 integration-tests/ci-visibility/vitest-tests/rum-crypto-reuse-setup.mjs
 create mode 100644 integration-tests/vitest/vitest.browser.spec.js
 create mode 100644 packages/datadog-instrumentations/test/vitest-main.spec.js

diff --git a/.github/workflows/test-optimization.yml b/.github/workflows/test-optimization.yml
index 6965057ee4..7185d249ce 100644
--- a/.github/workflows/test-optimization.yml
+++ b/.github/workflows/test-optimization.yml
@@ -527,3 +527,45 @@ jobs:
       - uses: ./.github/actions/coverage
         with:
           flags: test-optimization-vitest-${{ matrix.version }}
+
+  integration-vitest-browser:
+    needs: playwright-image
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [oldest, latest]
+    name: integration-vitest-browser (node-${{ matrix.version }})
+    container:
+      image: ${{ fromJson(needs.playwright-image.outputs.images)[matrix.version].latest }}
+      credentials:
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    env:
+      DD_SERVICE: dd-trace-js-integration-tests
+      DD_CIVISIBILITY_AGENTLESS_ENABLED: 1
+      OPTIONS_OVERRIDE: 1
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: ./.github/actions/dd-sts-api-key
+        id: dd-sts
+        continue-on-error: true
+      - uses: ./.github/actions/node
+        with:
+          version: ${{ matrix.version }}
+      - uses: ./.github/actions/install
+      - name: Configure Git safe directory
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+      - run: npm run test:instrumentations
+        env:
+          PLUGINS: vitest-main
+      - run: npm run test:integration:vitest:coverage
+        env:
+          NODE_OPTIONS: "-r ./ci/init"
+          DD_API_KEY: ${{ steps.dd-sts.outputs.api_key }}
+          SPEC: vitest.browser
+      - uses: ./.github/actions/coverage
+        with:
+          flags: test-optimization-vitest-browser-${{ matrix.version }}
diff --git a/ci/vitest-no-worker-init-setup.mjs b/ci/vitest-no-worker-init-setup.mjs
index af24be1f37..00b12be78b 100644
--- a/ci/vitest-no-worker-init-setup.mjs
+++ b/ci/vitest-no-worker-init-setup.mjs
@@ -1,14 +1,10 @@
-import { realpathSync } from 'node:fs'
-import { relative } from 'node:path'
-import { performance } from 'node:perf_hooks'
+import { afterEach, beforeAll, beforeEach, inject } from 'vitest'
 
-import { afterEach, beforeAll, beforeEach } from 'vitest'
-
-// Instrumentation-less worker setup for DD_EXPERIMENTAL_TEST_OPT_VITEST_NO_WORKER_INIT.
-// It applies Test Optimization execution changes without initializing dd-trace in Vitest workers.
+// Instrumentation-less setup for DD_EXPERIMENTAL_TEST_OPT_VITEST_NO_WORKER_INIT.
+// It applies Test Optimization execution changes without initializing dd-trace and also supports Browser Mode.
 const VITEST_NO_WORKER_INIT_ACTIVE_ENV = 'DD_TEST_OPT_VITEST_NO_WORKER_INIT_ACTIVE'
-const isNoWorkerInitActive = getIsNoWorkerInitActive()
-const providedContext = isNoWorkerInitActive ? getProvidedContext() : {}
+const providedContext = getProvidedContext()
+const isNoWorkerInitActive = providedContext.isActive ?? getIsNoWorkerInitActive()
 const attemptToFixTests = providedContext.attemptToFixTests || {}
 const attemptToFixRetries = providedContext.attemptToFixRetries || 0
 const disabledTests = providedContext.disabledTests || {}
@@ -22,7 +18,9 @@ const isEarlyFlakeDetectionEnabled = providedContext.isEarlyFlakeDetectionEnable
 const knownTests = providedContext.knownTests || {}
 const modifiedFiles = providedContext.modifiedFiles || {}
 const quarantinedTests = providedContext.quarantinedTests || {}
-const repositoryRoot = realpath(providedContext.repositoryRoot || process.cwd())
+const isRumCorrelationEnabled = providedContext.isRumCorrelationEnabled !== false
+const rumTestExecutionIdCookieName = providedContext.rumTestExecutionIdCookieName
+const testPropertiesByFilepath = providedContext.testPropertiesByFilepath || {}
 let setVitestTaskFn
 if (isNoWorkerInitActive) {
   try {
@@ -35,7 +33,21 @@ const earlyFlakeDetectionRetriesByTask = new WeakMap()
 const earlyFlakeDetectionSkippedResults = new WeakMap()
 const earlyFlakeDetectionStartByTask = new WeakMap()
 const nextAttemptIndexByTask = new WeakMap()
-const realpaths = new Map()
+const retryAttemptIndexByTask = new WeakMap()
+const usedRumTestExecutionIds = new Set()
+let now
+let timeOrigin
+// Use an unfaked monotonic clock in Node and Vitest's parent frame in Browser Mode.
+if (typeof globalThis.process?.uptime === 'function') {
+  now = () => globalThis.process.uptime() * 1000
+  timeOrigin = Date.now() - now()
+} else {
+  const clock = globalThis.window?.parent && globalThis.window.parent !== globalThis.window
+    ? globalThis.window.parent.performance
+    : globalThis.performance
+  now = clock ? clock.now.bind(clock) : Date.now
+  timeOrigin = Number.isFinite(clock?.timeOrigin) ? clock.timeOrigin : Date.now() - now()
+}
 
 if (isNoWorkerInitActive) {
   // eslint-disable-next-line no-empty-pattern
@@ -51,11 +63,12 @@ if (isNoWorkerInitActive) {
     const isEarlyFlakeDetectionTestAttempt = isEarlyFlakeDetectionTest(testSuite, testName)
     const isQuarantinedTest = quarantinedTests[testSuite]?.[testName] && !isAttemptToFixTest
     const attemptIndex = getNextAttemptIndex(task)
+    const attemptStart = now()
     if (attemptIndex > 0) {
       recordTestOptimizationStatus(task, attemptIndex - 1)
     }
 
-    if (disabledTests[testSuite]?.[testName] && !isAttemptToFixTest) {
+    if (!isAttemptToFixTest && disabledTests[testSuite]?.[testName]) {
       skip('Skipped by Datadog Test Optimization')
     } else if (isAttemptToFixTest && attemptIndex > 0) {
       task.result.state = 'run'
@@ -66,27 +79,33 @@ if (isNoWorkerInitActive) {
       }
     }
 
-    if (isAttemptToFixTest || isEarlyFlakeDetectionTestAttempt || isQuarantinedTest) {
-      onTestFinished(() => {
-        if (attemptIndex === getFinalAttemptIndex(task)) {
-          if (isAttemptToFixTest || isEarlyFlakeDetectionTestAttempt) {
-            recordTestOptimizationStatus(task, attemptIndex, true)
-          }
-          switchQuarantinedFinalFailure(task, attemptIndex)
+    prepareRumCorrelation(task, attemptIndex)
+
+    onTestFinished(() => {
+      recordTestAttemptTiming(task, attemptIndex, attemptStart)
+      recordRetryErrorCount(task)
+      if (
+        (isAttemptToFixTest || isEarlyFlakeDetectionTestAttempt || isQuarantinedTest) &&
+        attemptIndex === getFinalAttemptIndex(task)
+      ) {
+        if (isAttemptToFixTest || isEarlyFlakeDetectionTestAttempt) {
+          recordTestOptimizationStatus(task, attemptIndex, true)
         }
-      })
-    }
+        switchQuarantinedFinalFailure(task, attemptIndex)
+      }
+      finishRumCorrelation(task, attemptIndex)
+    })
   })
 
   afterEach(function ({ task }) {
     const attemptIndex = task.meta.__ddTestOptCurrentAttemptIndex
-    if (restoreEarlyFlakeDetectionSkippedResult(task)) {
-      return
-    }
-    if (attemptIndex === getFinalAttemptIndex(task)) {
+    const restoredEarlyFlakeDetectionResult = restoreEarlyFlakeDetectionSkippedResult(task)
+    if (!restoredEarlyFlakeDetectionResult && attemptIndex === getFinalAttemptIndex(task)) {
       recordTestOptimizationStatus(task, attemptIndex)
     }
-    switchQuarantinedFinalFailure(task, attemptIndex)
+    if (!restoredEarlyFlakeDetectionResult) {
+      switchQuarantinedFinalFailure(task, attemptIndex)
+    }
   })
 }
 
@@ -110,6 +129,7 @@ function applyExecutionChanges (suite) {
       task.repeats = earlyFlakeDetectionRetries
       task.meta.__ddTestOptEfdRetries = earlyFlakeDetectionRetries
     }
+    wrapRetryCondition(task)
   }
 }
 
@@ -117,9 +137,194 @@ function getNextAttemptIndex (task) {
   const attemptIndex = nextAttemptIndexByTask.get(task) || 0
   nextAttemptIndexByTask.set(task, attemptIndex + 1)
   task.meta.__ddTestOptCurrentAttemptIndex = attemptIndex
+
+  const repeatCount = task.result?.repeatCount || 0
+  const retryAttempt = retryAttemptIndexByTask.get(task)
+  const retryAttemptIndex = retryAttempt?.repeatCount === repeatCount ? retryAttempt.index + 1 : 0
+  retryAttemptIndexByTask.set(task, {
+    index: retryAttemptIndex,
+    repeatCount,
+  })
+
   return attemptIndex
 }
 
+/**
+ * Sets the RUM correlation cookie for a sequential browser test attempt.
+ *
+ * @param {object} task
+ * @param {number} attemptIndex
+ * @returns {void}
+ */
+function prepareRumCorrelation (task, attemptIndex) {
+  // A per-origin cookie cannot identify overlapping attempts without racing.
+  if (!isRumCorrelationEnabled || isConcurrentTask(task)) return
+
+  if (
+    typeof window === 'undefined' ||
+    typeof document === 'undefined' ||
+    typeof rumTestExecutionIdCookieName !== 'string'
+  ) {
+    return
+  }
+
+  const testExecutionId = generateTestExecutionId()
+  if (
+    !testExecutionId ||
+    usedRumTestExecutionIds.has(testExecutionId) ||
+    !setRumCorrelationCookie(testExecutionId)
+  ) {
+    return
+  }
+
+  usedRumTestExecutionIds.add(testExecutionId)
+  task.meta.__ddTestOptRumTestExecutionIds ||= []
+  task.meta.__ddTestOptRumTestExecutionIds[attemptIndex] = testExecutionId
+  recordRumActivity(task, attemptIndex)
+}
+
+/**
+ * Records whether RUM was active and clears the attempt cookie.
+ *
+ * @param {object} task
+ * @param {number} attemptIndex
+ * @returns {void}
+ */
+function finishRumCorrelation (task, attemptIndex) {
+  const testExecutionId = task.meta.__ddTestOptRumTestExecutionIds?.[attemptIndex]
+  if (!testExecutionId) return
+
+  recordRumActivity(task, attemptIndex)
+  clearRumCorrelationCookie(testExecutionId)
+}
+
+/**
+ * Retains evidence that RUM was active at any point observed during the attempt.
+ *
+ * @param {object} task
+ * @param {number} attemptIndex
+ * @returns {void}
+ */
+function recordRumActivity (task, attemptIndex) {
+  if (!getIsRumActive(getRum())) return
+
+  task.meta.__ddTestOptRumActive ||= []
+  task.meta.__ddTestOptRumActive[attemptIndex] = true
+}
+
+/**
+ * Returns the RUM public API without letting application-defined accessors fail a test.
+ *
+ * @returns {object|undefined}
+ */
+function getRum () {
+  try {
+    return window.DD_RUM
+  } catch {}
+}
+
+/**
+ * Returns whether the current RUM session is active.
+ *
+ * @param {object|undefined} rum
+ * @returns {boolean}
+ */
+function getIsRumActive (rum) {
+  if (!rum) return false
+  if (typeof rum.getInternalContext !== 'function') return false
+
+  try {
+    return !!rum.getInternalContext()
+  } catch {
+    return false
+  }
+}
+
+/**
+ * Returns whether a task or any containing suite is concurrent.
+ *
+ * @param {object} task
+ * @returns {boolean}
+ */
+function isConcurrentTask (task) {
+  let currentTask = task
+  while (currentTask) {
+    if (currentTask.concurrent === true) return true
+    currentTask = currentTask.suite
+  }
+  return false
+}
+
+/**
+ * Generates a positive 63-bit decimal test execution ID.
+ *
+ * @returns {string|undefined}
+ */
+function generateTestExecutionId () {
+  // This setup file executes in a browser even though lint validates it against the package's Node.js target.
+  // eslint-disable-next-line n/no-unsupported-features/node-builtins
+  if (typeof globalThis.crypto?.getRandomValues !== 'function') return
+
+  const words = new Uint32Array(2)
+  try {
+    // eslint-disable-next-line n/no-unsupported-features/node-builtins
+    globalThis.crypto.getRandomValues(words)
+  } catch {
+    return
+  }
+
+  words[0] &= 0x7F_FF_FF_FF
+  if (words[0] === 0 && words[1] === 0) return
+
+  return ((BigInt(words[0]) << 32n) | BigInt(words[1])).toString(10)
+}
+
+/**
+ * Sets and verifies the RUM correlation cookie for the current origin.
+ *
+ * @param {string} testExecutionId
+ * @returns {boolean}
+ */
+function setRumCorrelationCookie (testExecutionId) {
+  try {
+    // eslint-disable-next-line unicorn/no-document-cookie
+    document.cookie = `${rumTestExecutionIdCookieName}=${testExecutionId}; path=/`
+    return getRumCorrelationCookie() === testExecutionId
+  } catch {
+    return false
+  }
+}
+
+/**
+ * Clears the RUM correlation cookie if it still belongs to this attempt.
+ *
+ * @param {string} testExecutionId
+ * @returns {void}
+ */
+function clearRumCorrelationCookie (testExecutionId) {
+  try {
+    if (getRumCorrelationCookie() === testExecutionId) {
+      // eslint-disable-next-line unicorn/no-document-cookie
+      document.cookie = `${rumTestExecutionIdCookieName}=; path=/; max-age=0`
+    }
+  } catch {}
+}
+
+/**
+ * Returns the current RUM correlation cookie value.
+ *
+ * @returns {string|undefined}
+ */
+function getRumCorrelationCookie () {
+  const prefix = `${rumTestExecutionIdCookieName}=`
+  for (const cookie of document.cookie.split(';')) {
+    const normalizedCookie = cookie.trim()
+    if (normalizedCookie.startsWith(prefix)) {
+      return normalizedCookie.slice(prefix.length)
+    }
+  }
+}
+
 function recordTestOptimizationStatus (task, attemptIndex = task.result?.repeatCount || 0, onlyIfNewErrors = false) {
   const testSuite = getTestSuite(task)
   const testName = getTestName(task)
@@ -206,6 +411,76 @@ function recordManualRepeatStatus (task, attemptIndex) {
   task.meta.__ddTestOptRepeatErrorCounts[attemptIndex] = task.result?.errors?.length || 0
 }
 
+/**
+ * Records cumulative errors at the end of each configured retry attempt.
+ *
+ * @param {object} task
+ * @returns {void}
+ */
+function recordRetryErrorCount (task) {
+  const retryLimit = getRetryLimit(task)
+  if (retryLimit <= 0) return
+
+  const retryCount = task.result?.retryCount || 0
+  task.meta.__ddTestOptRetryErrorCounts ||= []
+  task.meta.__ddTestOptRetryErrorCounts[retryCount] = task.result?.errors?.length || 0
+}
+
+/**
+ * Records the wall-clock start and elapsed time for one retry or repeat execution.
+ *
+ * @param {object} task
+ * @param {number} attemptIndex
+ * @param {number} attemptStart
+ * @returns {void}
+ */
+function recordTestAttemptTiming (task, attemptIndex, attemptStart) {
+  task.meta.__ddTestOptAttemptStartTimes ||= []
+  task.meta.__ddTestOptAttemptDurations ||= []
+  task.meta.__ddTestOptAttemptStartTimes[attemptIndex] = timeOrigin + attemptStart
+  task.meta.__ddTestOptAttemptDurations[attemptIndex] = now() - attemptStart
+}
+
+/**
+ * Returns the configured retry count for numeric and object-form retry options.
+ *
+ * @param {object} task
+ * @returns {number}
+ */
+function getRetryLimit (task) {
+  return typeof task.retry === 'number' ? task.retry : task.retry?.count || 0
+}
+
+/**
+ * Wraps Vitest's retry condition so final-attempt handling follows the condition's actual result.
+ *
+ * @param {object} task
+ * @returns {void}
+ */
+function wrapRetryCondition (task) {
+  if (typeof task.retry !== 'object' || !task.retry?.condition || getRetryLimit(task) === 0) return
+
+  const condition = task.retry.condition
+  task.retry = {
+    ...task.retry,
+    condition (error) {
+      let shouldRetry = false
+      if (condition instanceof RegExp) {
+        shouldRetry = condition.test(error?.message || '')
+      } else if (typeof condition === 'function') {
+        shouldRetry = condition(error)
+      }
+
+      if (!shouldRetry && (task.result?.repeatCount || 0) >= (task.repeats || 0)) {
+        const attemptIndex = task.meta.__ddTestOptCurrentAttemptIndex
+        recordTestOptimizationStatus(task, attemptIndex)
+        markQuarantinedFailure(task)
+      }
+      return shouldRetry
+    },
+  }
+}
+
 function restoreEarlyFlakeDetectionSkippedResult (task) {
   if (!task.meta.__ddTestOptEfdSkipCurrentAttempt) {
     return false
@@ -236,7 +511,18 @@ function getFinalAttemptIndex (task) {
   if (isEarlyFlakeDetectionTest(testSuite, testName)) {
     return getEarlyFlakeDetectionRetryCountForTask(task)
   }
-  return task.repeats
+
+  const attemptIndex = task.meta.__ddTestOptCurrentAttemptIndex
+  const repeatCount = task.result?.repeatCount || 0
+  const repeatLimit = task.repeats || 0
+  const retryAttemptIndex = retryAttemptIndexByTask.get(task)?.index || 0
+  const retryLimit = getRetryLimit(task)
+  const retriesRemaining = task.result?.state === 'fail' || task.result?.state === 'run'
+    ? Math.max(retryLimit - retryAttemptIndex, 0)
+    : 0
+  const repeatsRemaining = Math.max(repeatLimit - repeatCount, 0)
+
+  return attemptIndex + retriesRemaining + (repeatsRemaining * (retryLimit + 1))
 }
 
 function switchQuarantinedFinalFailure (task, attemptIndex) {
@@ -250,9 +536,27 @@ function switchQuarantinedFinalFailure (task, attemptIndex) {
     return
   }
 
-  const retryCount = task.result?.retryCount || 0
-  const retryLimit = task.retry || 0
-  if (retryCount < retryLimit || attemptIndex < getFinalAttemptIndex(task)) {
+  if (attemptIndex < getFinalAttemptIndex(task)) {
+    return
+  }
+
+  markQuarantinedFailure(task)
+}
+
+/**
+ * Converts a quarantined failure into the passing runner state expected by Vitest.
+ *
+ * @param {object} task
+ * @returns {void}
+ */
+function markQuarantinedFailure (task) {
+  const testSuite = getTestSuite(task)
+  const testName = getTestName(task)
+  if (
+    !quarantinedTests[testSuite]?.[testName] ||
+    attemptToFixTests[testSuite]?.[testName] ||
+    task.result?.state !== 'fail'
+  ) {
     return
   }
 
@@ -292,7 +596,7 @@ function getPreviousErrorCount (errorCounts, repeatCount) {
 
 function prepareEarlyFlakeDetectionAttempt (task, attemptIndex) {
   if (attemptIndex === 0) {
-    earlyFlakeDetectionStartByTask.set(task, performance.now())
+    earlyFlakeDetectionStartByTask.set(task, now())
     return false
   }
 
@@ -308,12 +612,12 @@ function prepareEarlyFlakeDetectionAttempt (task, attemptIndex) {
   }
 
   if (attemptIndex <= retryCount) {
-    earlyFlakeDetectionStartByTask.set(task, performance.now())
+    earlyFlakeDetectionStartByTask.set(task, now())
     return false
   }
 
   if (!canReplaceVitestTaskFn()) {
-    earlyFlakeDetectionStartByTask.set(task, performance.now())
+    earlyFlakeDetectionStartByTask.set(task, now())
     return false
   }
 
@@ -334,7 +638,7 @@ function getEarlyFlakeDetectionRetryCount (task) {
   }
 
   const executionStart = earlyFlakeDetectionStartByTask.get(task)
-  const duration = executionStart === undefined ? task.result?.duration ?? 0 : performance.now() - executionStart
+  const duration = executionStart === undefined ? task.result?.duration ?? 0 : now() - executionStart
   for (const { key, limitMs } of earlyFlakeDetectionRetryThresholds) {
     if (duration < limitMs) {
       return earlyFlakeDetectionSlowRetries[key] ?? 0
@@ -376,21 +680,10 @@ function isModifiedTest (testSuite) {
 }
 
 function getTestSuite (task) {
-  let filepath = realpaths.get(task.file.filepath)
-  if (filepath === undefined) {
-    filepath = realpath(task.file.filepath)
-    realpaths.set(task.file.filepath, filepath)
-  }
-
-  return normalizePath(relative(repositoryRoot, filepath))
-}
-
-function realpath (filepath) {
-  try {
-    return realpathSync(filepath)
-  } catch {
-    return filepath
-  }
+  const filepath = task.file.filepath
+  return testPropertiesByFilepath[filepath]?.testSuite ||
+    testPropertiesByFilepath[normalizePath(filepath)]?.testSuite ||
+    normalizePath(filepath)
 }
 
 function getTestName (task) {
@@ -423,8 +716,12 @@ function getIsNoWorkerInitActive () {
 
 function getProvidedContext () {
   try {
-    return globalThis.__vitest_worker__.providedContext._ddVitestWorkerSetup || {}
+    return inject('_ddVitestWorkerSetup') || {}
   } catch {
-    return {}
+    try {
+      return globalThis.__vitest_worker__.providedContext._ddVitestWorkerSetup || {}
+    } catch {
+      return {}
+    }
   }
 }
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-atr.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-atr.mjs
new file mode 100644
index 0000000000..7717c69f83
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-atr.mjs
@@ -0,0 +1,13 @@
+import { expect, test } from 'vitest'
+
+let attempts = 0
+
+function wait (ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}
+
+test('retries a failing browser test', async () => {
+  await wait(50)
+  attempts++
+  expect(attempts).toBe(2)
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-conditional-retry-quarantine.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-conditional-retry-quarantine.mjs
new file mode 100644
index 0000000000..8ff3fce4db
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-conditional-retry-quarantine.mjs
@@ -0,0 +1,22 @@
+import { afterAll, expect, test } from 'vitest'
+
+let attempts = 0
+let conditionCalls = 0
+
+test('stops conditional retries before quarantining', {
+  retry: {
+    count: 2,
+    condition: () => {
+      conditionCalls++
+      return false
+    },
+  },
+}, () => {
+  attempts++
+  throw new Error(`conditional retry attempt ${attempts}`)
+})
+
+afterAll(() => {
+  expect(attempts).toBe(1)
+  expect(conditionCalls).toBe(1)
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-efd-fake-timers.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-efd-fake-timers.mjs
new file mode 100644
index 0000000000..ce4506b95d
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-efd-fake-timers.mjs
@@ -0,0 +1,6 @@
+import { expect, test, vi } from 'vitest'
+
+test('uses real time for browser early flake detection with fake timers', () => {
+  vi.advanceTimersByTime(6000)
+  expect(true).toBe(true)
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-efd.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-efd.mjs
new file mode 100644
index 0000000000..d001d85c83
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-efd.mjs
@@ -0,0 +1,8 @@
+import { expect, test } from 'vitest'
+
+let executions = 0
+
+test('repeats a new browser test', () => {
+  executions++
+  expect(executions).toBeGreaterThan(0)
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-multiple-errors.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-multiple-errors.mjs
new file mode 100644
index 0000000000..3575aa960f
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-multiple-errors.mjs
@@ -0,0 +1,12 @@
+import { afterEach, expect, test } from 'vitest'
+
+let attempts = 0
+
+afterEach(() => {
+  throw new Error(`cleanup for attempt ${attempts} failed`)
+})
+
+test('reports one attempt when the test and its cleanup fail', () => {
+  attempts++
+  expect.fail(`test attempt ${attempts} failed`)
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-object-retry-quarantine.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-object-retry-quarantine.mjs
new file mode 100644
index 0000000000..5d90a19c23
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-object-retry-quarantine.mjs
@@ -0,0 +1,8 @@
+import { expect, test } from 'vitest'
+
+let attempts = 0
+
+test('honors object-form retries before quarantining', { retry: { count: 1 } }, () => {
+  attempts++
+  expect(attempts).toBe(2)
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-partial-process-shim.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-partial-process-shim.mjs
new file mode 100644
index 0000000000..61415710e3
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-partial-process-shim.mjs
@@ -0,0 +1,6 @@
+import { expect, test } from 'vitest'
+
+test('runs with a partial process shim', () => {
+  expect(globalThis.process?.versions?.node).toBeDefined()
+  expect(globalThis.process?.uptime).toBeUndefined()
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-reporting.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-reporting.mjs
new file mode 100644
index 0000000000..4504234af9
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-reporting.mjs
@@ -0,0 +1,12 @@
+import { describe, expect, test } from 'vitest'
+
+describe('vitest browser reporting', () => {
+  test('runs the test body in the browser', () => {
+    document.body.innerHTML = '<button>Save</button>'
+
+    expect(document.querySelector('button')?.textContent).toBe('Save')
+    expect(window.location.protocol).toMatch(/^https?:$/)
+  })
+
+  test.skip('reports skipped browser tests', () => {})
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-retry-repeat-quarantine.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-retry-repeat-quarantine.mjs
new file mode 100644
index 0000000000..aee442d5b2
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-retry-repeat-quarantine.mjs
@@ -0,0 +1,8 @@
+import { test } from 'vitest'
+
+let attempts = 0
+
+test('waits for every retry and repeat before quarantining', { repeats: 1, retry: 1 }, () => {
+  attempts++
+  throw new Error(`retry and repeat attempt ${attempts}`)
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-concurrent.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-concurrent.mjs
new file mode 100644
index 0000000000..96569820cd
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-concurrent.mjs
@@ -0,0 +1,28 @@
+import { describe, expect, test } from 'vitest'
+
+const RUM_COOKIE_NAME = 'datadog-ci-visibility-test-execution-id'
+
+window.DD_RUM = {
+  getInternalContext: () => ({ session_id: 'rum-session' }),
+  stopSession: () => {},
+}
+
+describe.concurrent('concurrent browser tests', () => {
+  test('does not correlate the first inherited concurrent test with RUM', () => {
+    expect(getCookie(RUM_COOKIE_NAME)).toBeUndefined()
+  })
+
+  test('does not correlate the second inherited concurrent test with RUM', () => {
+    expect(getCookie(RUM_COOKIE_NAME)).toBeUndefined()
+  })
+})
+
+function getCookie (name) {
+  const prefix = `${name}=`
+  for (const cookie of document.cookie.split(';')) {
+    const normalizedCookie = cookie.trim()
+    if (normalizedCookie.startsWith(prefix)) {
+      return normalizedCookie.slice(prefix.length)
+    }
+  }
+}
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-crypto-failure.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-crypto-failure.mjs
new file mode 100644
index 0000000000..9d8e78ed0a
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-crypto-failure.mjs
@@ -0,0 +1,15 @@
+import { expect, test } from 'vitest'
+
+const RUM_COOKIE_NAME = 'datadog-ci-visibility-test-execution-id'
+
+window.DD_RUM = {
+  getInternalContext: () => ({ session_id: 'rum-session' }),
+}
+
+test('does not fail when browser crypto throws', () => {
+  expect(document.cookie).not.toContain(`${RUM_COOKIE_NAME}=`)
+})
+
+test('does not retry ID generation when browser crypto returns zero', () => {
+  expect(document.cookie).not.toContain(`${RUM_COOKIE_NAME}=`)
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-crypto-reuse.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-crypto-reuse.mjs
new file mode 100644
index 0000000000..3644742d59
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-crypto-reuse.mjs
@@ -0,0 +1,28 @@
+import { expect, test } from 'vitest'
+
+const RUM_COOKIE_NAME = 'datadog-ci-visibility-test-execution-id'
+
+window.DD_RUM = {
+  getInternalContext: () => ({ session_id: 'rum-session' }),
+}
+
+test('correlates the first fixed browser crypto value', () => {
+  const testExecutionId = getCookie(RUM_COOKIE_NAME)
+  expect(testExecutionId).toMatch(/^[1-9]\d*$/)
+  // eslint-disable-next-line no-console
+  console.log(`DD_VITEST_RUM_EXECUTION_ID:fixed:${testExecutionId}`)
+})
+
+test('does not reuse a fixed browser crypto value', () => {
+  expect(getCookie(RUM_COOKIE_NAME)).toBeUndefined()
+})
+
+function getCookie (name) {
+  const prefix = `${name}=`
+  for (const cookie of document.cookie.split(';')) {
+    const normalizedCookie = cookie.trim()
+    if (normalizedCookie.startsWith(prefix)) {
+      return normalizedCookie.slice(prefix.length)
+    }
+  }
+}
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-dynamic-skip.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-dynamic-skip.mjs
new file mode 100644
index 0000000000..3005acb4fb
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-dynamic-skip.mjs
@@ -0,0 +1,25 @@
+import { expect, test } from 'vitest'
+
+const RUM_COOKIE_NAME = 'datadog-ci-visibility-test-execution-id'
+
+window.DD_RUM = {
+  getInternalContext: () => ({ session_id: 'rum-session' }),
+}
+
+test('correlates a dynamically skipped browser test', ({ skip }) => {
+  const testExecutionId = getCookie(RUM_COOKIE_NAME)
+  expect(testExecutionId).toMatch(/^[1-9]\d*$/)
+  // eslint-disable-next-line no-console
+  console.log(`DD_VITEST_RUM_EXECUTION_ID:dynamic-skip:${testExecutionId}`)
+  skip()
+})
+
+function getCookie (name) {
+  const prefix = `${name}=`
+  for (const cookie of document.cookie.split(';')) {
+    const normalizedCookie = cookie.trim()
+    if (normalizedCookie.startsWith(prefix)) {
+      return normalizedCookie.slice(prefix.length)
+    }
+  }
+}
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-parallel-first.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-parallel-first.mjs
new file mode 100644
index 0000000000..7fd1c6835c
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-parallel-first.mjs
@@ -0,0 +1,11 @@
+import { expect, test } from 'vitest'
+
+const RUM_COOKIE_NAME = 'datadog-ci-visibility-test-execution-id'
+
+window.DD_RUM = {
+  getInternalContext: () => ({ session_id: 'rum-session' }),
+}
+
+test('does not correlate the first parallel browser file with RUM', () => {
+  expect(document.cookie).not.toContain(`${RUM_COOKIE_NAME}=`)
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-parallel-second.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-parallel-second.mjs
new file mode 100644
index 0000000000..8ff14b6a7a
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-parallel-second.mjs
@@ -0,0 +1,11 @@
+import { expect, test } from 'vitest'
+
+const RUM_COOKIE_NAME = 'datadog-ci-visibility-test-execution-id'
+
+window.DD_RUM = {
+  getInternalContext: () => ({ session_id: 'rum-session' }),
+}
+
+test('does not correlate the second parallel browser file with RUM', () => {
+  expect(document.cookie).not.toContain(`${RUM_COOKIE_NAME}=`)
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-teardown.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-teardown.mjs
new file mode 100644
index 0000000000..0061a7acf9
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-teardown.mjs
@@ -0,0 +1,14 @@
+import { afterEach, expect, test } from 'vitest'
+
+const RUM_COOKIE_NAME = 'datadog-ci-visibility-test-execution-id'
+
+afterEach(() => {
+  expect(document.cookie).toContain(`${RUM_COOKIE_NAME}=`)
+  window.DD_RUM = {
+    getInternalContext: () => ({ session_id: 'rum-session' }),
+  }
+})
+
+test('keeps RUM correlation active through user teardown hooks', () => {
+  expect(window.DD_RUM).toBeUndefined()
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-uninitialized.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-uninitialized.mjs
new file mode 100644
index 0000000000..13a2ed0b4d
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-uninitialized.mjs
@@ -0,0 +1,7 @@
+import { expect, test } from 'vitest'
+
+window.DD_RUM = {}
+
+test('does not activate RUM correlation for an uninitialized stub', () => {
+  expect(document.cookie).toContain('datadog-ci-visibility-test-execution-id=')
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-user-setup.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-user-setup.mjs
new file mode 100644
index 0000000000..a805883848
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum-user-setup.mjs
@@ -0,0 +1,7 @@
+import { expect, test } from 'vitest'
+
+test('retains RUM activity after the session stops', () => {
+  expect(window.DD_RUM.getInternalContext()).toBeDefined()
+  window.DD_RUM.stopSession()
+  expect(window.DD_RUM.getInternalContext()).toBeUndefined()
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-rum.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum.mjs
new file mode 100644
index 0000000000..0df15381f6
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-rum.mjs
@@ -0,0 +1,62 @@
+import { afterAll, describe, expect, test } from 'vitest'
+
+const RUM_COOKIE_NAME = 'datadog-ci-visibility-test-execution-id'
+const rumState = {
+  clickCalls: 0,
+  startViewCalls: 0,
+  stopSessionCalls: 0,
+}
+let retryAttempts = 0
+
+window.DD_RUM = {
+  getInternalContext: () => ({ session_id: 'rum-session' }),
+  startView: () => {
+    rumState.startViewCalls++
+  },
+  stopSession: () => {
+    rumState.stopSessionCalls++
+  },
+}
+window.addEventListener('click', () => {
+  rumState.clickCalls++
+})
+
+describe('vitest browser RUM correlation', () => {
+  test('correlates the first browser test', () => {
+    assertAndLogExecutionId('first')
+  })
+
+  test('uses a new correlation ID without restarting RUM', () => {
+    assertAndLogExecutionId('second')
+  })
+
+  test('uses a new RUM correlation ID on retry', () => {
+    retryAttempts++
+    assertAndLogExecutionId(`retry-${retryAttempts}`)
+    expect(retryAttempts).toBe(2)
+  })
+})
+
+afterAll(() => {
+  expect(getCookie(RUM_COOKIE_NAME)).toBeUndefined()
+  expect(rumState.clickCalls).toBe(0)
+  expect(rumState.startViewCalls).toBe(0)
+  expect(rumState.stopSessionCalls).toBe(0)
+})
+
+function assertAndLogExecutionId (testName) {
+  const testExecutionId = getCookie(RUM_COOKIE_NAME)
+  expect(testExecutionId).toMatch(/^[1-9]\d*$/)
+  // eslint-disable-next-line no-console
+  console.log(`DD_VITEST_RUM_EXECUTION_ID:${testName}:${testExecutionId}`)
+}
+
+function getCookie (name) {
+  const prefix = `${name}=`
+  for (const cookie of document.cookie.split(';')) {
+    const normalizedCookie = cookie.trim()
+    if (normalizedCookie.startsWith(prefix)) {
+      return normalizedCookie.slice(prefix.length)
+    }
+  }
+}
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/browser-test-management.mjs b/integration-tests/ci-visibility/vitest-browser-tests/browser-test-management.mjs
new file mode 100644
index 0000000000..d3709ecc42
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/browser-test-management.mjs
@@ -0,0 +1,16 @@
+import { expect, test } from 'vitest'
+
+let attemptToFixExecutions = 0
+
+test('does not execute a disabled browser test', () => {
+  throw new Error('disabled browser test was executed')
+})
+
+test('quarantines a failing browser test', () => {
+  expect(true).toBe(false)
+})
+
+test('attempts to fix a browser test', () => {
+  attemptToFixExecutions++
+  expect(attemptToFixExecutions).toBeGreaterThan(0)
+})
diff --git a/integration-tests/ci-visibility/vitest-browser-tests/mixed-node.mjs b/integration-tests/ci-visibility/vitest-browser-tests/mixed-node.mjs
new file mode 100644
index 0000000000..bfc0f07185
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-browser-tests/mixed-node.mjs
@@ -0,0 +1,5 @@
+import { expect, test } from 'vitest'
+
+test('keeps Node worker instrumentation active', () => {
+  expect(typeof window).toBe('undefined')
+})
diff --git a/integration-tests/ci-visibility/vitest-tests/efd-fake-timers.mjs b/integration-tests/ci-visibility/vitest-tests/efd-fake-timers.mjs
new file mode 100644
index 0000000000..b059c5af9e
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-tests/efd-fake-timers.mjs
@@ -0,0 +1,6 @@
+import { expect, test, vi } from 'vitest'
+
+test('uses real time for early flake detection with fake timers', () => {
+  vi.advanceTimersByTime(6000)
+  expect(true).toBe(true)
+})
diff --git a/integration-tests/ci-visibility/vitest-tests/fake-timers-setup.mjs b/integration-tests/ci-visibility/vitest-tests/fake-timers-setup.mjs
new file mode 100644
index 0000000000..3c8756447d
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-tests/fake-timers-setup.mjs
@@ -0,0 +1,3 @@
+import { vi } from 'vitest'
+
+vi.useFakeTimers()
diff --git a/integration-tests/ci-visibility/vitest-tests/rum-before-each-setup.mjs b/integration-tests/ci-visibility/vitest-tests/rum-before-each-setup.mjs
new file mode 100644
index 0000000000..f2bb1cebe0
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-tests/rum-before-each-setup.mjs
@@ -0,0 +1,28 @@
+import { beforeEach, expect } from 'vitest'
+
+const RUM_COOKIE_NAME = 'datadog-ci-visibility-test-execution-id'
+let isRumActive = true
+
+window.DD_RUM = {
+  getInternalContext: () => isRumActive ? { session_id: 'rum-session' } : undefined,
+  stopSession: () => {
+    isRumActive = false
+  },
+}
+
+beforeEach(() => {
+  const testExecutionId = getCookie(RUM_COOKIE_NAME)
+  expect(testExecutionId).toMatch(/^[1-9]\d*$/)
+  // eslint-disable-next-line no-console
+  console.log(`DD_VITEST_RUM_EXECUTION_ID:user-setup:${testExecutionId}`)
+})
+
+function getCookie (name) {
+  const prefix = `${name}=`
+  for (const cookie of document.cookie.split(';')) {
+    const normalizedCookie = cookie.trim()
+    if (normalizedCookie.startsWith(prefix)) {
+      return normalizedCookie.slice(prefix.length)
+    }
+  }
+}
diff --git a/integration-tests/ci-visibility/vitest-tests/rum-crypto-failure-setup.mjs b/integration-tests/ci-visibility/vitest-tests/rum-crypto-failure-setup.mjs
new file mode 100644
index 0000000000..0494315873
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-tests/rum-crypto-failure-setup.mjs
@@ -0,0 +1,16 @@
+import { afterAll, expect, vi } from 'vitest'
+
+let calls = 0
+vi.spyOn(globalThis.crypto, 'getRandomValues').mockImplementation(words => {
+  calls++
+  if (calls !== 2) {
+    throw new Error('mock getRandomValues failure')
+  }
+  words.fill(0)
+  return words
+})
+
+afterAll(() => {
+  expect(calls).toBe(2)
+  vi.restoreAllMocks()
+})
diff --git a/integration-tests/ci-visibility/vitest-tests/rum-crypto-reuse-setup.mjs b/integration-tests/ci-visibility/vitest-tests/rum-crypto-reuse-setup.mjs
new file mode 100644
index 0000000000..4a29e4ab6a
--- /dev/null
+++ b/integration-tests/ci-visibility/vitest-tests/rum-crypto-reuse-setup.mjs
@@ -0,0 +1,13 @@
+import { afterAll, expect, vi } from 'vitest'
+
+let calls = 0
+vi.spyOn(globalThis.crypto, 'getRandomValues').mockImplementation(words => {
+  calls++
+  words.fill(1)
+  return words
+})
+
+afterAll(() => {
+  expect(calls).toBe(2)
+  vi.restoreAllMocks()
+})
diff --git a/integration-tests/vitest.config.mjs b/integration-tests/vitest.config.mjs
index 8573d856d7..e5664b50f0 100644
--- a/integration-tests/vitest.config.mjs
+++ b/integration-tests/vitest.config.mjs
@@ -46,16 +46,81 @@ if (process.env.VITEST_SETUP_FILE) {
   config.test.setupFiles = process.env.VITEST_SETUP_FILE
 }
 
+if (process.env.VITEST_PARTIAL_PROCESS_SHIM) {
+  config.define = {
+    'globalThis.process': JSON.stringify({
+      env: {},
+      versions: {
+        node: '20.0.0',
+      },
+    }),
+  }
+}
+
 if (process.env.CUSTOM_SEQUENCER) {
   config.test.sequence = {
     sequencer: CustomSequencer,
   }
 }
 
+if (process.env.VITEST_HOOKS_SEQUENCE) {
+  config.test.sequence = {
+    ...config.test.sequence,
+    hooks: process.env.VITEST_HOOKS_SEQUENCE,
+  }
+}
+
 if (process.env.VITEST_RUNNER) {
   config.test.runner = process.env.VITEST_RUNNER
 }
 
+if (process.env.VITEST_BROWSER_MODE) {
+  const provider = process.env.VITEST_BROWSER_PROVIDER_FACTORY
+    ? (await import('@vitest/browser-playwright')).playwright()
+    : 'playwright'
+
+  config.test.browser = {
+    enabled: true,
+    headless: true,
+    provider,
+    instances: [{
+      browser: 'chromium',
+      name: 'browser-chromium',
+    }],
+  }
+}
+
+if (process.env.VITEST_MIXED_BROWSER_MODE) {
+  const provider = process.env.VITEST_BROWSER_PROVIDER_FACTORY
+    ? (await import('@vitest/browser-playwright')).playwright()
+    : 'playwright'
+
+  config.test.projects = [
+    {
+      test: {
+        include: ['ci-visibility/vitest-browser-tests/mixed-node.mjs'],
+        name: 'node-project',
+        pool: 'forks',
+      },
+    },
+    {
+      test: {
+        browser: {
+          enabled: true,
+          headless: true,
+          provider,
+          instances: [{
+            browser: 'chromium',
+            name: 'browser-chromium',
+          }],
+        },
+        include: ['ci-visibility/vitest-browser-tests/browser-reporting.mjs'],
+        name: 'browser-project',
+      },
+    },
+  ]
+}
+
 if (process.env.PROJECT_POOL_CONFIG) {
   const projectConfigs = []
   const firstProjectConfig = {
diff --git a/integration-tests/vitest/vitest.browser.spec.js b/integration-tests/vitest/vitest.browser.spec.js
new file mode 100644
index 0000000000..a1a8f41bd0
--- /dev/null
+++ b/integration-tests/vitest/vitest.browser.spec.js
@@ -0,0 +1,810 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+const { exec } = require('node:child_process')
+const { once } = require('node:events')
+const { inspect } = require('node:util')
+
+const {
+  getCiVisAgentlessConfig,
+  installPlaywrightChromium,
+  sandboxCwd,
+  useSandbox,
+} = require('../helpers')
+const { FakeCiVisIntake } = require('../ci-visibility-intake')
+const { getLatestPlaywrightSpecifier } = require('../playwright/versions')
+const { ERROR_MESSAGE, ERROR_STACK } = require('../../packages/dd-trace/src/constants')
+const {
+  DD_CAPABILITIES_FAILED_TEST_REPLAY,
+  TEST_BROWSER_DRIVER,
+  TEST_BROWSER_NAME,
+  TEST_CODE_OWNERS,
+  TEST_FINAL_STATUS,
+  TEST_IS_NEW,
+  TEST_IS_RETRY,
+  TEST_IS_RUM_ACTIVE,
+  TEST_IS_TEST_FRAMEWORK_WORKER,
+  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
+  TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
+  TEST_MANAGEMENT_IS_DISABLED,
+  TEST_MANAGEMENT_IS_QUARANTINED,
+  TEST_NAME,
+  TEST_PARAMETERS,
+  TEST_RETRY_REASON,
+  TEST_RETRY_REASON_TYPES,
+  TEST_SOURCE_FILE,
+  TEST_SOURCE_START,
+  TEST_STATUS,
+  TEST_TYPE,
+} = require('../../packages/dd-trace/src/plugins/util/test')
+const { NODE_MAJOR } = require('../../version')
+
+const latestVersions = require('../../packages/dd-trace/test/plugins/versions/package.json').dependencies
+const isLegacyBrowserProvider = process.env.VITEST_BROWSER_LEGACY === '1' || NODE_MAJOR <= 18
+const vitestVersion = isLegacyBrowserProvider ? '3.2.6' : latestVersions.vitest
+const playwrightVersion = getLatestPlaywrightSpecifier()
+const browserProviderDependency = isLegacyBrowserProvider
+  ? `@vitest/browser@${vitestVersion}`
+  : `@vitest/browser-playwright@${vitestVersion}`
+const sandboxDependencies = [
+  `vitest@${vitestVersion}`,
+  browserProviderDependency,
+  `playwright@${playwrightVersion}`,
+]
+if (isLegacyBrowserProvider) {
+  sandboxDependencies.push('vite@6.1.0')
+}
+const NODE_OPTIONS = '--import dd-trace/register.js -r dd-trace/ci/init'
+
+function getEvents (payloads) {
+  return payloads.flatMap(({ payload }) => payload.events)
+}
+
+function getEventContents (events, type) {
+  return events.filter(event => event.type === type).map(event => event.content)
+}
+
+function getTestByName (tests, name) {
+  const test = tests.find(test => test.meta[TEST_NAME] === name)
+  assert.ok(test, `Could not find test ${name}. Found: ${inspect(tests.map(test => test.meta[TEST_NAME]))}`)
+  return test
+}
+
+describe(`vitest@${vitestVersion} Browser Mode`, function () {
+  this.timeout(180_000)
+
+  let childProcess
+  let cwd
+  let receiver
+  let testOutput
+
+  useSandbox(sandboxDependencies, true)
+
+  before(function () {
+    this.timeout(120_000)
+    cwd = sandboxCwd()
+    installPlaywrightChromium(cwd)
+  })
+
+  beforeEach(async () => {
+    childProcess = undefined
+    receiver = await new FakeCiVisIntake().start()
+    testOutput = ''
+  })
+
+  afterEach(async () => {
+    childProcess?.kill()
+    await receiver.stop()
+  })
+
+  async function runVitest (testFile, extraEnv = {}, expectedExitCode = 0) {
+    childProcess = exec('./node_modules/.bin/vitest run', {
+      cwd,
+      env: {
+        ...getCiVisAgentlessConfig(receiver.port),
+        DD_SERVICE: undefined,
+        NODE_OPTIONS,
+        TEST_DIR: testFile ? `ci-visibility/vitest-browser-tests/${testFile}` : undefined,
+        VITEST_BROWSER_MODE: '1',
+        VITEST_BROWSER_PROVIDER_FACTORY: isLegacyBrowserProvider ? undefined : '1',
+        ...extraEnv,
+      },
+    })
+    childProcess.stdout.on('data', data => { testOutput += data })
+    childProcess.stderr.on('data', data => { testOutput += data })
+
+    const [exitCode] = await once(childProcess, 'exit')
+    assert.strictEqual(exitCode, expectedExitCode, testOutput)
+    return exitCode
+  }
+
+  function gatherEvents (assertions) {
+    return receiver.gatherPayloadsMaxTimeout(
+      ({ url }) => url === '/api/v2/citestcycle',
+      payloads => assertions(getEvents(payloads), payloads),
+      60_000
+    )
+  }
+
+  it('reports each browser test once with browser identity', async () => {
+    receiver.setSettings({
+      di_enabled: true,
+    })
+
+    const payloadsPromise = gatherEvents((events, payloads) => {
+      const metadata = payloads.flatMap(({ payload }) => payload.metadata)
+      for (const metadataEntry of metadata) {
+        assert.ok(!(DD_CAPABILITIES_FAILED_TEST_REPLAY in metadataEntry.test))
+      }
+
+      assert.strictEqual(getEventContents(events, 'test_session_end').length, 1)
+      assert.strictEqual(getEventContents(events, 'test_module_end').length, 1)
+      assert.strictEqual(getEventContents(events, 'test_suite_end').length, 1)
+
+      const tests = getEventContents(events, 'test')
+      assert.strictEqual(tests.length, 2)
+      const testSuite = getEventContents(events, 'test_suite_end')[0]
+      assert.strictEqual(testSuite.meta[TEST_TYPE], 'browser')
+
+      const passedTest = getTestByName(tests, 'vitest browser reporting runs the test body in the browser')
+      assert.strictEqual(passedTest.meta[TEST_STATUS], 'pass')
+      assert.strictEqual(passedTest.meta[TEST_TYPE], 'browser')
+      assert.strictEqual(passedTest.meta[TEST_BROWSER_NAME], 'chromium')
+      assert.strictEqual(passedTest.meta[TEST_BROWSER_DRIVER], 'playwright')
+      assert.strictEqual(passedTest.meta[TEST_CODE_OWNERS], JSON.stringify(['@datadog-dd-trace-js']))
+      assert.strictEqual(passedTest.meta[TEST_FINAL_STATUS], 'pass')
+      assert.strictEqual(passedTest.meta[TEST_IS_TEST_FRAMEWORK_WORKER], 'true')
+      assert.strictEqual(passedTest.meta[TEST_SOURCE_FILE], 'ci-visibility/vitest-browser-tests/browser-reporting.mjs')
+      assert.strictEqual(passedTest.metrics[TEST_SOURCE_START], 4)
+      assert.ok(!(TEST_IS_RUM_ACTIVE in passedTest.meta))
+      assert.deepStrictEqual(JSON.parse(passedTest.meta[TEST_PARAMETERS]), {
+        arguments: {
+          browser: 'chromium',
+          project: 'browser-chromium',
+        },
+        metadata: {},
+      })
+
+      const skippedTest = getTestByName(tests, 'vitest browser reporting reports skipped browser tests')
+      assert.strictEqual(skippedTest.meta[TEST_STATUS], 'skip')
+      assert.strictEqual(skippedTest.meta[TEST_TYPE], 'browser')
+      assert.strictEqual(skippedTest.meta[TEST_BROWSER_NAME], 'chromium')
+      assert.strictEqual(skippedTest.meta[TEST_CODE_OWNERS], JSON.stringify(['@datadog-dd-trace-js']))
+      assert.strictEqual(skippedTest.meta[TEST_FINAL_STATUS], 'skip')
+      assert.strictEqual(skippedTest.meta[TEST_IS_TEST_FRAMEWORK_WORKER], 'true')
+      assert.strictEqual(skippedTest.meta[TEST_SOURCE_FILE], 'ci-visibility/vitest-browser-tests/browser-reporting.mjs')
+      assert.strictEqual(skippedTest.metrics[TEST_SOURCE_START], 11)
+      assert.strictEqual(testSuite.meta[TEST_CODE_OWNERS], JSON.stringify(['@datadog-dd-trace-js']))
+      assert.strictEqual(testSuite.metrics[TEST_SOURCE_START], 1)
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-reporting.mjs'),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  it('reports multiple errors from one browser test execution as one attempt', async () => {
+    const payloadsPromise = gatherEvents(events => {
+      const tests = getEventContents(events, 'test')
+      assert.strictEqual(tests.length, 1)
+      assert.strictEqual(tests[0].meta[TEST_STATUS], 'fail')
+      assert.ok(!(TEST_IS_RETRY in tests[0].meta))
+      assert.match(tests[0].meta[ERROR_MESSAGE], /test attempt 1 failed/)
+      assert.doesNotMatch(tests[0].meta[ERROR_MESSAGE], /cleanup for attempt 1 failed/)
+      assert.match(tests[0].meta[ERROR_STACK], /browser-multiple-errors\.mjs:\d+:\d+/)
+      assert.doesNotMatch(tests[0].meta[ERROR_STACK], /[?&](?:import|browserv)(?:[=&]|$)/)
+      assert.doesNotMatch(tests[0].meta[ERROR_STACK], /https?:\/\/localhost:\d+/)
+      if (!isLegacyBrowserProvider) {
+        assert.doesNotMatch(tests[0].meta[ERROR_STACK], /node_modules\/@vitest\/runner/)
+      }
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-multiple-errors.mjs', {}, 1),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 1, testOutput)
+  })
+
+  it('reports errors from the correct automatic retry attempt', async () => {
+    receiver.setSettings({
+      flaky_test_retries_enabled: true,
+      early_flake_detection: {
+        enabled: false,
+      },
+    })
+
+    const payloadsPromise = gatherEvents(events => {
+      const tests = getEventContents(events, 'test')
+      assert.strictEqual(tests.length, 2)
+      assert.match(tests[0].meta[ERROR_MESSAGE], /test attempt 1 failed/)
+      assert.match(tests[1].meta[ERROR_MESSAGE], /test attempt 2 failed/)
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-multiple-errors.mjs', {
+        DD_CIVISIBILITY_FLAKY_RETRY_COUNT: '1',
+      }, 1),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 1, testOutput)
+  })
+
+  it('waits for retries within repeated browser tests before quarantining', async () => {
+    const testSuite = 'ci-visibility/vitest-browser-tests/browser-retry-repeat-quarantine.mjs'
+    receiver.setSettings({
+      test_management: {
+        enabled: true,
+      },
+    })
+    receiver.setTestManagementTests({
+      vitest: {
+        suites: {
+          [testSuite]: {
+            tests: {
+              'waits for every retry and repeat before quarantining': {
+                properties: {
+                  quarantined: true,
+                },
+              },
+            },
+          },
+        },
+      },
+    })
+
+    const payloadsPromise = gatherEvents(events => {
+      const tests = getEventContents(events, 'test')
+      assert.strictEqual(tests.length, 4)
+      for (let index = 0; index < tests.length; index++) {
+        const test = tests[index]
+        assert.strictEqual(test.meta[TEST_STATUS], 'fail')
+        assert.strictEqual(test.meta[TEST_MANAGEMENT_IS_QUARANTINED], 'true')
+        assert.match(test.meta[ERROR_MESSAGE], new RegExp(`retry and repeat attempt ${index + 1}`))
+        if (index === 0) {
+          assert.ok(!(TEST_IS_RETRY in test.meta))
+        } else {
+          assert.strictEqual(test.meta[TEST_IS_RETRY], 'true')
+        }
+      }
+      assert.strictEqual(tests.at(-1).meta[TEST_FINAL_STATUS], 'skip')
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-retry-repeat-quarantine.mjs'),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  it('correlates sequential browser tests with RUM', async () => {
+    receiver.setSettings({
+      flaky_test_retries_enabled: true,
+      early_flake_detection: {
+        enabled: false,
+      },
+    })
+
+    const payloadsPromise = gatherEvents(events => {
+      const tests = getEventContents(events, 'test')
+      assert.strictEqual(tests.length, 4)
+
+      const firstTest = getTestByName(tests, 'vitest browser RUM correlation correlates the first browser test')
+      const secondTest = getTestByName(
+        tests,
+        'vitest browser RUM correlation uses a new correlation ID without restarting RUM'
+      )
+      const retriedTests = tests.filter(
+        test => test.meta[TEST_NAME] === 'vitest browser RUM correlation uses a new RUM correlation ID on retry'
+      )
+      const firstTestExecutionId = getRumTestExecutionId(testOutput, 'first')
+      const secondTestExecutionId = getRumTestExecutionId(testOutput, 'second')
+      const firstRetryExecutionId = getRumTestExecutionId(testOutput, 'retry-1')
+      const secondRetryExecutionId = getRumTestExecutionId(testOutput, 'retry-2')
+
+      assert.strictEqual(firstTest.meta[TEST_IS_RUM_ACTIVE], 'true')
+      assert.strictEqual(firstTest.trace_id.toString(), firstTestExecutionId)
+      assert.strictEqual(secondTest.meta[TEST_IS_RUM_ACTIVE], 'true')
+      assert.strictEqual(secondTest.trace_id.toString(), secondTestExecutionId)
+      assert.strictEqual(retriedTests.length, 2)
+      assert.strictEqual(retriedTests[0].meta[TEST_STATUS], 'fail')
+      assert.strictEqual(retriedTests[0].meta[TEST_IS_RUM_ACTIVE], 'true')
+      assert.strictEqual(retriedTests[0].trace_id.toString(), firstRetryExecutionId)
+      assert.strictEqual(retriedTests[1].meta[TEST_STATUS], 'pass')
+      assert.strictEqual(retriedTests[1].meta[TEST_IS_RUM_ACTIVE], 'true')
+      assert.strictEqual(retriedTests[1].trace_id.toString(), secondRetryExecutionId)
+      assert.notStrictEqual(firstTestExecutionId, secondTestExecutionId)
+      assert.notStrictEqual(firstRetryExecutionId, secondRetryExecutionId)
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-rum.mjs'),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  it('keeps RUM correlation active through user teardown hooks', async () => {
+    const payloadsPromise = gatherEvents(events => {
+      const [test] = getEventContents(events, 'test')
+      assert.ok(test)
+      assert.strictEqual(test.meta[TEST_STATUS], 'pass')
+      assert.strictEqual(test.meta[TEST_IS_RUM_ACTIVE], 'true')
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-rum-teardown.mjs', {
+        VITEST_HOOKS_SEQUENCE: 'list',
+      }),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  it('installs RUM correlation before user setup hooks and retains earlier RUM activity', async () => {
+    const payloadsPromise = gatherEvents(events => {
+      const [test] = getEventContents(events, 'test')
+      const testExecutionId = getRumTestExecutionId(testOutput, 'user-setup')
+
+      assert.ok(test)
+      assert.strictEqual(test.meta[TEST_STATUS], 'pass')
+      assert.strictEqual(test.meta[TEST_IS_RUM_ACTIVE], 'true')
+      assert.strictEqual(test.trace_id.toString(), testExecutionId)
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-rum-user-setup.mjs', {
+        VITEST_SETUP_FILE: 'ci-visibility/vitest-tests/rum-before-each-setup.mjs',
+      }),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  it('does not fail browser tests when correlation ID generation fails', async () => {
+    const payloadsPromise = gatherEvents(events => {
+      const tests = getEventContents(events, 'test')
+      assert.strictEqual(tests.length, 2)
+      for (const test of tests) {
+        assert.strictEqual(test.meta[TEST_STATUS], 'pass')
+        assert.ok(!(TEST_IS_RUM_ACTIVE in test.meta))
+      }
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-rum-crypto-failure.mjs', {
+        VITEST_SETUP_FILE: 'ci-visibility/vitest-tests/rum-crypto-failure-setup.mjs',
+      }),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  it('does not correlate browser tests with a reused correlation ID', async () => {
+    const payloadsPromise = gatherEvents(events => {
+      const tests = getEventContents(events, 'test')
+      assert.strictEqual(tests.length, 2)
+      const firstTest = getTestByName(tests, 'correlates the first fixed browser crypto value')
+      const secondTest = getTestByName(tests, 'does not reuse a fixed browser crypto value')
+      const testExecutionId = getRumTestExecutionId(testOutput, 'fixed')
+
+      assert.strictEqual(firstTest.meta[TEST_IS_RUM_ACTIVE], 'true')
+      assert.strictEqual(firstTest.trace_id.toString(), testExecutionId)
+      assert.ok(!(TEST_IS_RUM_ACTIVE in secondTest.meta))
+      assert.notStrictEqual(secondTest.trace_id.toString(), testExecutionId)
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-rum-crypto-reuse.mjs', {
+        VITEST_SETUP_FILE: 'ci-visibility/vitest-tests/rum-crypto-reuse-setup.mjs',
+      }),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  it('correlates dynamically skipped browser tests with RUM', async () => {
+    const payloadsPromise = gatherEvents(events => {
+      const [test] = getEventContents(events, 'test')
+      const testExecutionId = getRumTestExecutionId(testOutput, 'dynamic-skip')
+
+      assert.ok(test)
+      assert.strictEqual(test.meta[TEST_STATUS], 'skip')
+      assert.strictEqual(test.meta[TEST_IS_RUM_ACTIVE], 'true')
+      assert.strictEqual(test.trace_id.toString(), testExecutionId)
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-rum-dynamic-skip.mjs'),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  it('does not treat an uninitialized RUM stub as active', async () => {
+    const payloadsPromise = gatherEvents(events => {
+      const [test] = getEventContents(events, 'test')
+      assert.ok(test)
+      assert.ok(!(TEST_IS_RUM_ACTIVE in test.meta))
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-rum-uninitialized.mjs'),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  it('does not correlate concurrent browser tests with RUM', async () => {
+    const payloadsPromise = gatherEvents(events => {
+      const tests = getEventContents(events, 'test')
+      assert.strictEqual(tests.length, 2)
+      for (const test of tests) {
+        assert.ok(!(TEST_IS_RUM_ACTIVE in test.meta))
+      }
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-rum-concurrent.mjs'),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  it('does not correlate parallel browser files with RUM', async () => {
+    const payloadsPromise = gatherEvents(events => {
+      const tests = getEventContents(events, 'test')
+      assert.strictEqual(tests.length, 2)
+      for (const test of tests) {
+        assert.ok(!(TEST_IS_RUM_ACTIVE in test.meta))
+      }
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-rum-parallel-*.mjs'),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  it('reports mixed Node and browser projects without duplicate events', async () => {
+    const payloadsPromise = gatherEvents(events => {
+      assert.strictEqual(getEventContents(events, 'test_session_end').length, 1)
+      assert.strictEqual(getEventContents(events, 'test_module_end').length, 1)
+      assert.strictEqual(getEventContents(events, 'test_suite_end').length, 2)
+
+      const tests = getEventContents(events, 'test')
+      assert.strictEqual(tests.length, 3)
+
+      const nodeTest = getTestByName(tests, 'keeps Node worker instrumentation active')
+      assert.strictEqual(nodeTest.meta[TEST_STATUS], 'pass')
+      assert.strictEqual(nodeTest.meta[TEST_TYPE], 'test')
+      assert.ok(!(TEST_BROWSER_NAME in nodeTest.meta))
+
+      const browserTest = getTestByName(tests, 'vitest browser reporting runs the test body in the browser')
+      assert.strictEqual(browserTest.meta[TEST_STATUS], 'pass')
+      assert.strictEqual(browserTest.meta[TEST_TYPE], 'browser')
+      assert.strictEqual(browserTest.meta[TEST_BROWSER_NAME], 'chromium')
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest(undefined, {
+        VITEST_BROWSER_MODE: undefined,
+        VITEST_MIXED_BROWSER_MODE: '1',
+      }),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  it('applies Auto Test Retries to browser tests', async () => {
+    receiver.setSettings({
+      flaky_test_retries_enabled: true,
+      early_flake_detection: {
+        enabled: false,
+      },
+    })
+
+    const payloadsPromise = gatherEvents(events => {
+      const [testSuite] = getEventContents(events, 'test_suite_end')
+      const tests = getEventContents(events, 'test')
+      assert.strictEqual(tests.length, 2)
+      const testSuiteEnd = BigInt(testSuite.start) + BigInt(testSuite.duration)
+      assert.strictEqual(tests[0].meta[TEST_STATUS], 'fail')
+      assert.ok(!(TEST_IS_RETRY in tests[0].meta))
+      assert.ok(Number(tests[0].duration) >= 30 * 1e6)
+      assert.strictEqual(tests[1].meta[TEST_STATUS], 'pass')
+      assert.strictEqual(tests[1].meta[TEST_IS_RETRY], 'true')
+      assert.strictEqual(tests[1].meta[TEST_RETRY_REASON], TEST_RETRY_REASON_TYPES.atr)
+      assert.ok(Number(tests[1].duration) >= 30 * 1e6)
+      const firstAttemptEnd = BigInt(tests[0].start) + BigInt(tests[0].duration)
+      assert.ok(firstAttemptEnd <= BigInt(tests[1].start), 'Expected sequential attempts not to overlap')
+      for (const test of tests) {
+        const testEnd = BigInt(test.start) + BigInt(test.duration)
+        assert.ok(testEnd <= testSuiteEnd, 'Expected every test attempt to finish before its suite')
+      }
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-atr.mjs'),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  if (!isLegacyBrowserProvider) {
+    it('honors object-form retries before quarantining browser failures', async () => {
+      const testSuite = 'ci-visibility/vitest-browser-tests/browser-object-retry-quarantine.mjs'
+      receiver.setSettings({
+        test_management: {
+          enabled: true,
+        },
+      })
+      receiver.setTestManagementTests({
+        vitest: {
+          suites: {
+            [testSuite]: {
+              tests: {
+                'honors object-form retries before quarantining': {
+                  properties: {
+                    quarantined: true,
+                  },
+                },
+              },
+            },
+          },
+        },
+      })
+
+      const payloadsPromise = gatherEvents(events => {
+        const tests = getEventContents(events, 'test')
+        assert.strictEqual(tests.length, 2)
+        assert.strictEqual(tests[0].meta[TEST_STATUS], 'fail')
+        assert.ok(!(TEST_IS_RETRY in tests[0].meta))
+        assert.strictEqual(tests[0].meta[TEST_MANAGEMENT_IS_QUARANTINED], 'true')
+        assert.strictEqual(tests[1].meta[TEST_STATUS], 'pass')
+        assert.strictEqual(tests[1].meta[TEST_IS_RETRY], 'true')
+        assert.strictEqual(tests[1].meta[TEST_MANAGEMENT_IS_QUARANTINED], 'true')
+      })
+
+      const [exitCode] = await Promise.all([
+        runVitest('browser-object-retry-quarantine.mjs'),
+        payloadsPromise,
+      ])
+
+      assert.strictEqual(exitCode, 0, testOutput)
+    })
+
+    it('quarantines failures when an object-form retry condition stops retries', async () => {
+      const testSuite = 'ci-visibility/vitest-browser-tests/browser-conditional-retry-quarantine.mjs'
+      receiver.setSettings({
+        test_management: {
+          enabled: true,
+        },
+      })
+      receiver.setTestManagementTests({
+        vitest: {
+          suites: {
+            [testSuite]: {
+              tests: {
+                'stops conditional retries before quarantining': {
+                  properties: {
+                    quarantined: true,
+                  },
+                },
+              },
+            },
+          },
+        },
+      })
+
+      const payloadsPromise = gatherEvents(events => {
+        const [test] = getEventContents(events, 'test')
+        assert.ok(test)
+        assert.strictEqual(test.meta[TEST_STATUS], 'fail')
+        assert.strictEqual(test.meta[TEST_FINAL_STATUS], 'skip')
+        assert.strictEqual(test.meta[TEST_MANAGEMENT_IS_QUARANTINED], 'true')
+        assert.ok(!(TEST_IS_RETRY in test.meta))
+        assert.match(test.meta[ERROR_MESSAGE], /conditional retry attempt 1/)
+      })
+
+      const [exitCode] = await Promise.all([
+        runVitest('browser-conditional-retry-quarantine.mjs'),
+        payloadsPromise,
+      ])
+
+      assert.strictEqual(exitCode, 0, testOutput)
+    })
+  }
+
+  it('applies Early Flake Detection repetitions to new browser tests', async () => {
+    receiver.setSettings({
+      early_flake_detection: {
+        enabled: true,
+        slow_test_retries: {
+          '5s': 2,
+        },
+      },
+      known_tests_enabled: true,
+    })
+    receiver.setKnownTests({ vitest: {} })
+
+    const payloadsPromise = gatherEvents(events => {
+      const tests = getEventContents(events, 'test')
+      assert.strictEqual(tests.length, 3)
+      for (let index = 0; index < tests.length; index++) {
+        const test = tests[index]
+        assert.strictEqual(test.meta[TEST_STATUS], 'pass')
+        assert.strictEqual(test.meta[TEST_IS_NEW], 'true')
+        if (index === 0) {
+          assert.ok(!(TEST_IS_RETRY in test.meta))
+        } else {
+          assert.strictEqual(test.meta[TEST_IS_RETRY], 'true')
+          assert.strictEqual(test.meta[TEST_RETRY_REASON], TEST_RETRY_REASON_TYPES.efd)
+        }
+      }
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-efd.mjs'),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  it('uses an unmocked clock for browser attempt durations and EFD retries', async () => {
+    receiver.setSettings({
+      early_flake_detection: {
+        enabled: true,
+        slow_test_retries: {
+          '5s': 2,
+          '10s': 1,
+        },
+      },
+      known_tests_enabled: true,
+    })
+    receiver.setKnownTests({ vitest: {} })
+
+    const payloadsPromise = gatherEvents(events => {
+      const tests = getEventContents(events, 'test')
+      assert.strictEqual(tests.length, 3)
+      for (let index = 0; index < tests.length; index++) {
+        const test = tests[index]
+        assert.ok(
+          Number(test.duration) < 1000 * 1e6,
+          `Expected duration to use an unmocked clock, got ${Number(test.duration) / 1e6}ms`
+        )
+        if (index === 0) {
+          assert.ok(!(TEST_IS_RETRY in test.meta))
+        } else {
+          assert.strictEqual(test.meta[TEST_RETRY_REASON], TEST_RETRY_REASON_TYPES.efd)
+        }
+      }
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-efd-fake-timers.mjs', {
+        VITEST_SETUP_FILE: 'ci-visibility/vitest-tests/fake-timers-setup.mjs',
+      }),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  it('uses the browser performance clock when process.uptime is unavailable', async () => {
+    const payloadsPromise = gatherEvents(events => {
+      const [test] = getEventContents(events, 'test')
+      assert.ok(test)
+      assert.strictEqual(test.meta[TEST_STATUS], 'pass')
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-partial-process-shim.mjs', {
+        VITEST_PARTIAL_PROCESS_SHIM: '1',
+      }),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+
+  it('applies Test Management execution changes to browser tests', async () => {
+    const testSuite = 'ci-visibility/vitest-browser-tests/browser-test-management.mjs'
+    receiver.setSettings({
+      test_management: {
+        enabled: true,
+        attempt_to_fix_retries: 2,
+      },
+    })
+    receiver.setTestManagementTests({
+      vitest: {
+        suites: {
+          [testSuite]: {
+            tests: {
+              'does not execute a disabled browser test': {
+                properties: {
+                  disabled: true,
+                },
+              },
+              'quarantines a failing browser test': {
+                properties: {
+                  quarantined: true,
+                },
+              },
+              'attempts to fix a browser test': {
+                properties: {
+                  attempt_to_fix: true,
+                },
+              },
+            },
+          },
+        },
+      },
+    })
+
+    const payloadsPromise = gatherEvents(events => {
+      const tests = getEventContents(events, 'test')
+      assert.strictEqual(tests.length, 5)
+
+      const disabledTest = getTestByName(tests, 'does not execute a disabled browser test')
+      assert.strictEqual(disabledTest.meta[TEST_STATUS], 'skip')
+      assert.strictEqual(disabledTest.meta[TEST_MANAGEMENT_IS_DISABLED], 'true')
+
+      const quarantinedTest = getTestByName(tests, 'quarantines a failing browser test')
+      assert.strictEqual(quarantinedTest.meta[TEST_STATUS], 'fail')
+      assert.strictEqual(quarantinedTest.meta[TEST_FINAL_STATUS], 'skip')
+      assert.strictEqual(quarantinedTest.meta[TEST_MANAGEMENT_IS_QUARANTINED], 'true')
+
+      const attemptedToFixTests = tests.filter(test => test.meta[TEST_NAME] === 'attempts to fix a browser test')
+      assert.strictEqual(attemptedToFixTests.length, 3)
+      attemptedToFixTests.forEach((test, index) => {
+        assert.strictEqual(test.meta[TEST_STATUS], 'pass')
+        assert.strictEqual(test.meta[TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX], 'true')
+        if (index > 0) {
+          assert.strictEqual(test.meta[TEST_IS_RETRY], 'true')
+          assert.strictEqual(test.meta[TEST_RETRY_REASON], TEST_RETRY_REASON_TYPES.atf)
+        }
+      })
+      assert.strictEqual(
+        attemptedToFixTests.at(-1).meta[TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED],
+        'true'
+      )
+
+      const [suite] = getEventContents(events, 'test_suite_end')
+      assert.strictEqual(suite.meta[TEST_SOURCE_FILE], testSuite)
+      assert.strictEqual(suite.meta[TEST_STATUS], 'pass')
+    })
+
+    const [exitCode] = await Promise.all([
+      runVitest('browser-test-management.mjs'),
+      payloadsPromise,
+    ])
+
+    assert.strictEqual(exitCode, 0, testOutput)
+  })
+})
+
+function getRumTestExecutionId (testOutput, testName) {
+  const match = testOutput.match(new RegExp(`DD_VITEST_RUM_EXECUTION_ID:${testName}:(\\d+)`))
+  assert.ok(match, testOutput)
+  return match[1]
+}
diff --git a/integration-tests/vitest/vitest.no-worker-init.spec.js b/integration-tests/vitest/vitest.no-worker-init.spec.js
index 6af2682c3a..13bc420040 100644
--- a/integration-tests/vitest/vitest.no-worker-init.spec.js
+++ b/integration-tests/vitest/vitest.no-worker-init.spec.js
@@ -15,7 +15,15 @@ const {
 } = require('../helpers')
 const { FakeCiVisIntake } = require('../ci-visibility-intake')
 const noWorkerInit = require('../../packages/datadog-instrumentations/src/vitest-main-no-worker-init')
-const { testSuiteStartCh } = require('../../packages/datadog-instrumentations/src/vitest-util')
+const {
+  RUM_TEST_EXECUTION_ID_COOKIE_NAME,
+} = require('../../packages/dd-trace/src/ci-visibility/rum')
+const {
+  testErrorCh,
+  testStartCh,
+  testSuiteFinishCh,
+  testSuiteStartCh,
+} = require('../../packages/datadog-instrumentations/src/vitest-util')
 const {
   ERROR_MESSAGE,
 } = require('../../packages/dd-trace/src/constants')
@@ -285,8 +293,8 @@ describe('vitest no-worker init instrumentation selection', () => {
       }
     }
 
-    function configureNoWorkerReporter (ctx) {
-      noWorkerInit.configure(ctx, '3.2.6', undefined, {
+    function configureNoWorkerReporter (ctx, testSpecifications) {
+      noWorkerInit.configure(ctx, '3.2.6', testSpecifications, {
         knownTestsBySuite: {},
         modifiedFiles: {},
         repositoryRoot: '/repo',
@@ -304,15 +312,406 @@ describe('vitest no-worker init instrumentation selection', () => {
       })
     }
 
-    it('sends EFD retry thresholds to the no-worker setup context', () => {
+    function createReporterTestFile (retryCount = 0, errors = []) {
+      const file = {
+        filepath: '/repo/watch-rerun.test.mjs',
+        id: 'watch-rerun-file',
+        meta: {},
+        projectName: 'browser',
+        result: { state: 'pass' },
+        tasks: [],
+        type: 'suite',
+      }
+      const task = {
+        file,
+        id: 'watch-rerun-test',
+        meta: {},
+        name: 'does not reuse retry state',
+        result: {
+          errors,
+          retryCount,
+          state: 'pass',
+        },
+        type: 'test',
+      }
+      file.tasks.push(task)
+      return { file, task }
+    }
+
+    it('sends execution and RUM configuration to the no-worker setup context', () => {
       const ctx = getNoWorkerReporterContext()
 
       configureNoWorkerReporter(ctx)
 
-      assert.deepStrictEqual(
-        ctx.getRootProject()._provided._ddVitestWorkerSetup.earlyFlakeDetectionRetryThresholds,
-        EARLY_FLAKE_DETECTION_RETRY_THRESHOLDS
-      )
+      const setupContext = ctx.getRootProject()._provided._ddVitestWorkerSetup
+      assert.deepStrictEqual(setupContext.earlyFlakeDetectionRetryThresholds, EARLY_FLAKE_DETECTION_RETRY_THRESHOLDS)
+      assert.strictEqual(setupContext.isRumCorrelationEnabled, true)
+      assert.strictEqual(setupContext.rumTestExecutionIdCookieName, RUM_TEST_EXECUTION_ID_COOKIE_NAME)
+    })
+
+    it('installs the Datadog setup before user setup files', () => {
+      const ctx = getNoWorkerReporterContext()
+      ctx.config.setupFiles = ['/repo/user-setup.mjs']
+
+      configureNoWorkerReporter(ctx)
+
+      assert.strictEqual(ctx.config.includeTaskLocation, true)
+      assert.strictEqual(path.basename(ctx.config.setupFiles[0]), 'vitest-no-worker-init-setup.mjs')
+      assert.deepStrictEqual(ctx.config.setupFiles.slice(1), ['/repo/user-setup.mjs'])
+    })
+
+    it('allows Vite to serve the Datadog setup when dd-trace is linked outside the browser project', () => {
+      const ctx = getNoWorkerReporterContext()
+      const userPlugin = { name: 'user-plugin' }
+      const parentProject = {
+        options: {
+          plugins: [userPlugin],
+        },
+      }
+      const project = {
+        _parent: parentProject,
+        config: {
+          browser: {
+            enabled: true,
+          },
+        },
+      }
+      const testSpecifications = [[project, { filepath: '/repo/test.mjs', pool: 'browser' }]]
+
+      configureNoWorkerReporter(ctx, testSpecifications)
+      configureNoWorkerReporter(ctx, testSpecifications)
+
+      assert.strictEqual(parentProject.options.plugins[0], userPlugin)
+      assert.strictEqual(parentProject.options.plugins.length, 2)
+      const accessPlugin = parentProject.options.plugins[1]
+      assert.strictEqual(accessPlugin.name, 'datadog:vitest-browser-setup-file')
+
+      const viteConfig = {
+        resolve: {
+          dedupe: ['user-dependency'],
+        },
+      }
+      accessPlugin.config(viteConfig)
+      accessPlugin.config(viteConfig)
+
+      assert.deepStrictEqual(viteConfig.resolve.dedupe, ['user-dependency', '@vitest/runner'])
+      assert.strictEqual(viteConfig.server, undefined)
+
+      const resolvedConfig = {
+        server: {
+          fs: {
+            allow: ['/repo'],
+          },
+        },
+      }
+      accessPlugin.configResolved(resolvedConfig)
+      accessPlugin.configResolved(resolvedConfig)
+
+      assert.strictEqual(resolvedConfig.server.fs.allow[0], '/repo')
+      assert.strictEqual(resolvedConfig.server.fs.allow.length, 2)
+      assert.strictEqual(path.basename(resolvedConfig.server.fs.allow[1]), 'vitest-no-worker-init-setup.mjs')
+    })
+
+    it('does not install the Vite access plugin for Node test projects', () => {
+      const ctx = getNoWorkerReporterContext()
+      const project = {
+        config: {
+          pool: 'forks',
+        },
+      }
+
+      configureNoWorkerReporter(ctx, [[project, { filepath: '/repo/test.mjs', pool: 'forks' }]])
+
+      assert.strictEqual(project.options, undefined)
+    })
+
+    for (const [description, project] of [
+      ['the project API', { isBrowserEnabled: () => true }],
+      ['serialized configuration', {
+        get config () {
+          throw new Error('config is unavailable')
+        },
+        serializedConfig: {
+          browser: {
+            enabled: true,
+          },
+        },
+      }],
+    ]) {
+      it(`installs the Vite access plugin for Browser Mode detected through ${description}`, () => {
+        const ctx = getNoWorkerReporterContext()
+
+        configureNoWorkerReporter(ctx, [[project, { filepath: '/repo/test.mjs' }]])
+
+        assert.strictEqual(project.options.plugins[0].name, 'datadog:vitest-browser-setup-file')
+      })
+    }
+
+    it('disables RUM correlation when browser files can run in parallel', () => {
+      const ctx = getNoWorkerReporterContext()
+      const project = {
+        config: {
+          browser: {
+            enabled: true,
+          },
+          fileParallelism: true,
+        },
+      }
+
+      configureNoWorkerReporter(ctx, [
+        [project, { filepath: '/repo/first.test.mjs', pool: 'browser' }],
+        [project, { filepath: '/repo/second.test.mjs', pool: 'browser' }],
+      ])
+
+      assert.strictEqual(ctx.getRootProject()._provided._ddVitestWorkerSetup.isRumCorrelationEnabled, false)
+    })
+
+    it('disables RUM correlation when browser setup files run in parallel', () => {
+      const ctx = getNoWorkerReporterContext()
+      const project = {
+        config: {
+          browser: {
+            enabled: true,
+          },
+          sequence: {
+            setupFiles: 'parallel',
+          },
+        },
+      }
+
+      configureNoWorkerReporter(ctx, [
+        [project, { filepath: '/repo/test.mjs', pool: 'browser' }],
+      ])
+
+      assert.strictEqual(ctx.getRootProject()._provided._ddVitestWorkerSetup.isRumCorrelationEnabled, false)
+    })
+
+    it('disables RUM correlation when tests are globally concurrent', () => {
+      const ctx = getNoWorkerReporterContext()
+      const project = {
+        config: {
+          browser: {
+            enabled: true,
+          },
+          sequence: {
+            concurrent: true,
+          },
+        },
+      }
+
+      configureNoWorkerReporter(ctx, [
+        [project, { filepath: '/repo/test.mjs', pool: 'browser' }],
+      ])
+
+      assert.strictEqual(ctx.getRootProject()._provided._ddVitestWorkerSetup.isRumCorrelationEnabled, false)
+    })
+
+    it('disables RUM correlation when browser hooks run in parallel', () => {
+      const ctx = getNoWorkerReporterContext()
+      const project = {
+        config: {
+          browser: {
+            enabled: true,
+          },
+          sequence: {
+            hooks: 'parallel',
+          },
+        },
+      }
+
+      configureNoWorkerReporter(ctx, [
+        [project, { filepath: '/repo/test.mjs', pool: 'browser' }],
+      ])
+
+      assert.strictEqual(ctx.getRootProject()._provided._ddVitestWorkerSetup.isRumCorrelationEnabled, false)
+    })
+
+    it('keeps RUM correlation enabled when browser files run sequentially', () => {
+      const ctx = getNoWorkerReporterContext()
+      const project = {
+        config: {
+          browser: {
+            enabled: true,
+          },
+          fileParallelism: false,
+          sequence: {
+            hooks: 'list',
+          },
+        },
+      }
+
+      configureNoWorkerReporter(ctx, [
+        [project, { filepath: '/repo/first.test.mjs', pool: 'browser' }],
+        [project, { filepath: '/repo/second.test.mjs', pool: 'browser' }],
+      ])
+
+      assert.strictEqual(ctx.getRootProject()._provided._ddVitestWorkerSetup.isRumCorrelationEnabled, true)
+    })
+
+    it('uses resolved browser file parallelism when available', () => {
+      const ctx = getNoWorkerReporterContext()
+      const project = {
+        config: {
+          browser: {
+            enabled: true,
+            fileParallelism: false,
+          },
+          fileParallelism: true,
+        },
+      }
+
+      configureNoWorkerReporter(ctx, [
+        [project, { filepath: '/repo/first.test.mjs', pool: 'browser' }],
+        [project, { filepath: '/repo/second.test.mjs', pool: 'browser' }],
+      ])
+
+      assert.strictEqual(ctx.getRootProject()._provided._ddVitestWorkerSetup.isRumCorrelationEnabled, true)
+    })
+
+    it('uses serialized browser configuration for reporter metadata', () => {
+      const ctx = getNoWorkerReporterContext()
+      const testSuiteStarts = []
+      const onTestSuiteStart = context => testSuiteStarts.push({
+        browserDriver: context.browserDriver,
+        browserName: context.browserName,
+        isBrowserMode: context.isBrowserMode,
+      })
+      testSuiteStartCh.subscribe(onTestSuiteStart)
+
+      try {
+        configureNoWorkerReporter(ctx)
+        ctx.reporters[0].onTestModuleStart({
+          id: 'serialized-browser-module',
+          moduleId: '/repo/serialized-browser.test.mjs',
+          project: {
+            serializedConfig: {
+              browser: {
+                enabled: true,
+                name: 'chromium',
+                provider: 'playwright',
+              },
+            },
+          },
+        })
+      } finally {
+        testSuiteStartCh.unsubscribe(onTestSuiteStart)
+      }
+
+      assert.deepStrictEqual(testSuiteStarts, [{
+        browserDriver: 'playwright',
+        browserName: 'chromium',
+        isBrowserMode: true,
+      }])
+    })
+
+    it('reports the source line collected by Vitest', () => {
+      const ctx = getNoWorkerReporterContext()
+      const testStartLines = []
+      const onTestStart = context => testStartLines.push(context.testStartLine)
+      testStartCh.subscribe(onTestStart)
+
+      try {
+        configureNoWorkerReporter(ctx)
+        const { file, task } = createReporterTestFile()
+        task.location = {
+          column: 3,
+          line: 42,
+        }
+        ctx.reporters[0].onTestCaseResult({ task })
+        ctx.reporters[0].onFinished([file])
+      } finally {
+        testStartCh.unsubscribe(onTestStart)
+      }
+
+      assert.deepStrictEqual(testStartLines, [42])
+    })
+
+    it('removes Vitest browser URL metadata from reported errors', () => {
+      const ctx = getNoWorkerReporterContext()
+      const reportedErrors = []
+      const onTestError = context => reportedErrors.push(context.error)
+      const error = {
+        message: 'failed at http://localhost:63315/repo/test.mjs?import&browserv=1785328307188:60:13',
+        name: 'Error',
+        stack: [
+          'Error: failed',
+          '    at http://localhost:63315/repo/test.mjs?import&browserv=1785328307188:60:13',
+          '    at http://localhost:63315/repo/helper.mjs?foo=bar:10:5',
+        ].join('\n'),
+        stacks: [{
+          column: 13,
+          file: '/repo/test.mjs',
+          line: 60,
+          method: '',
+        }, {
+          column: 5,
+          file: '/repo/helper.mjs?foo=bar',
+          line: 10,
+          method: 'runHelper',
+        }],
+      }
+      testErrorCh.subscribe(onTestError)
+
+      try {
+        configureNoWorkerReporter(ctx)
+        const { file, task } = createReporterTestFile(0, [error])
+        file.pool = 'browser'
+        task.result.state = 'fail'
+        file.result.state = 'fail'
+        ctx.reporters[0].onTestCaseResult({ task })
+        ctx.reporters[0].onFinished([file])
+      } finally {
+        testErrorCh.unsubscribe(onTestError)
+      }
+
+      assert.strictEqual(reportedErrors.length, 1)
+      assert.strictEqual(reportedErrors[0].message, 'failed at http://localhost:63315/repo/test.mjs:60:13')
+      assert.strictEqual(reportedErrors[0].stack, [
+        'Error: failed',
+        '    at /repo/test.mjs:60:13',
+        '    at runHelper (/repo/helper.mjs?foo=bar:10:5)',
+      ].join('\n'))
+      assert.match(error.stack, /[?]import&browserv=/)
+    })
+
+    it('preserves Node error URLs for final and repeated attempts', () => {
+      const reportedErrors = []
+      const onTestError = context => reportedErrors.push(context.error)
+      const finalError = {
+        message: 'failed at http://localhost:63315/repo/test.mjs?import&browserv=123:60:13',
+        stack: 'Error: failed\n    at http://localhost:63315/repo/test.mjs?import&browserv=123:60:13',
+      }
+      const retryError = {
+        message: 'retry at http://localhost:63315/repo/test.mjs?import&browserv=456:70:13',
+        stack: 'Error: retry\n    at http://localhost:63315/repo/test.mjs?import&browserv=456:70:13',
+      }
+      testErrorCh.subscribe(onTestError)
+
+      try {
+        const finalCtx = getNoWorkerReporterContext()
+        configureNoWorkerReporter(finalCtx)
+        const finalRun = createReporterTestFile(0, [finalError])
+        finalRun.task.result.state = 'fail'
+        finalRun.file.result.state = 'fail'
+        finalCtx.reporters[0].onTestCaseResult({ task: finalRun.task })
+        finalCtx.reporters[0].onFinished([finalRun.file])
+
+        const retryCtx = getNoWorkerReporterContext()
+        configureNoWorkerReporter(retryCtx)
+        const retryRun = createReporterTestFile(1, [retryError])
+        retryCtx.reporters[0].onTaskUpdate(
+          [[retryRun.task.id, retryRun.task.result, retryRun.task.meta]],
+          [[retryRun.task.id, 'test-retried']]
+        )
+        retryCtx.reporters[0].onTestCaseResult({ task: retryRun.task })
+        retryCtx.reporters[0].onFinished([retryRun.file])
+      } finally {
+        testErrorCh.unsubscribe(onTestError)
+      }
+
+      assert.strictEqual(reportedErrors.length, 2)
+      assert.strictEqual(reportedErrors[0], finalError)
+      assert.strictEqual(reportedErrors[1], retryError)
     })
 
     it('deactivates the no-worker reporter for reused contexts that fall back', () => {
@@ -330,6 +729,7 @@ describe('vitest no-worker init instrumentation selection', () => {
           moduleId: '/repo/first.test.mjs',
         })
         noWorkerInit.deactivate(ctx)
+        assert.strictEqual(ctx.getRootProject()._provided._ddVitestWorkerSetup.isActive, false)
         ctx.reporters[0].onTestModuleStart({
           id: 'second',
           moduleId: '/repo/second.test.mjs',
@@ -340,6 +740,66 @@ describe('vitest no-worker init instrumentation selection', () => {
 
       assert.deepStrictEqual(testSuiteStarts, ['/repo/first.test.mjs'])
     })
+
+    it('clears completed modules and retry state before a watch rerun', () => {
+      const ctx = getNoWorkerReporterContext()
+      const testAttemptRetries = []
+      const onTestStart = context => testAttemptRetries.push(context.isRetry)
+      testStartCh.subscribe(onTestStart)
+
+      try {
+        configureNoWorkerReporter(ctx)
+        const reporter = ctx.reporters[0]
+        const firstRun = createReporterTestFile(1, [new Error('first attempt failed')])
+        reporter.onTaskUpdate(
+          [[firstRun.task.id, firstRun.task.result, firstRun.task.meta]],
+          [[firstRun.task.id, 'test-retried']]
+        )
+        reporter.onTestCaseResult({ task: firstRun.task })
+        reporter.onFinished([firstRun.file])
+
+        reporter.onWatcherRerun()
+
+        const secondRun = createReporterTestFile()
+        reporter.onTestCaseResult({ task: secondRun.task })
+        reporter.onFinished([secondRun.file])
+      } finally {
+        testStartCh.unsubscribe(onTestStart)
+      }
+
+      assert.deepStrictEqual(testAttemptRetries, [false, true, false])
+    })
+
+    it('finishes active suites before a watch rerun', () => {
+      const ctx = getNoWorkerReporterContext()
+      const testSuiteStarts = []
+      const testSuiteFinishes = []
+      const onTestSuiteStart = context => testSuiteStarts.push(context.testSuiteAbsolutePath)
+      const onTestSuiteFinish = context => testSuiteFinishes.push(context)
+      testSuiteStartCh.subscribe(onTestSuiteStart)
+      testSuiteFinishCh.subscribe(onTestSuiteFinish)
+
+      try {
+        configureNoWorkerReporter(ctx)
+        const reporter = ctx.reporters[0]
+        const { file } = createReporterTestFile()
+        reporter.onTestModuleStart(file)
+
+        reporter.onWatcherRerun()
+        reporter.onFinished([file])
+      } finally {
+        testSuiteStartCh.unsubscribe(onTestSuiteStart)
+        testSuiteFinishCh.unsubscribe(onTestSuiteFinish)
+      }
+
+      assert.deepStrictEqual(testSuiteStarts, [
+        '/repo/watch-rerun.test.mjs',
+        '/repo/watch-rerun.test.mjs',
+      ])
+      assert.strictEqual(testSuiteFinishes.length, 2)
+      assert.strictEqual(testSuiteFinishes[0].status, 'skip')
+      assert.strictEqual(testSuiteFinishes[1].status, 'pass')
+    })
   })
 
   describe('configureWorkerEnv', () => {
@@ -1182,6 +1642,107 @@ describe('impacted test', () => {
       assert.strictEqual(exitCode, 0, testOutput)
     })
 
+    it('normalizes no-worker setup data when the repository root is a symlink', async () => {
+      const testSuite = 'ci-visibility/vitest-tests/early-flake-detection.mjs'
+      receiver.setSettings({
+        early_flake_detection: {
+          enabled: true,
+          slow_test_retries: {
+            '5s': 2,
+          },
+          faulty_session_threshold: 100,
+        },
+        known_tests_enabled: true,
+      })
+      receiver.setKnownTests({
+        vitest: {
+          [testSuite]: [
+            'early flake detection does not retry if it is not new',
+          ],
+        },
+      })
+
+      const linkedRepositoryRoot = path.join(
+        path.dirname(cwd),
+        `repository-link-${path.basename(cwd)}-${process.pid}`
+      )
+      fs.symlinkSync(cwd, linkedRepositoryRoot, process.platform === 'win32' ? 'junction' : 'dir')
+
+      try {
+        const payloadsPromise = gatherCitestcyclePayloads(receiver, events => {
+          assert.strictEqual(getEventContents(events, 'test_session_end').length, 1)
+          const knownTests = getTestsByName(
+            getEventContents(events, 'test'),
+            'early flake detection does not retry if it is not new'
+          )
+          assert.strictEqual(knownTests.length, 1)
+          assert.ok(!(TEST_IS_NEW in knownTests[0].meta), inspect(knownTests[0].meta))
+          assert.ok(!(TEST_IS_RETRY in knownTests[0].meta), inspect(knownTests[0].meta))
+          assert.strictEqual(knownTests[0].meta[TEST_SUITE], testSuite)
+        })
+
+        const exitCode = await Promise.all([
+          runVitest({
+            CI_PROJECT_DIR: linkedRepositoryRoot,
+            GITLAB_CI: 'true',
+            POOL_CONFIG: 'forks',
+            TEST_DIR: testSuite,
+          }),
+          payloadsPromise,
+        ]).then(([exitCode]) => exitCode)
+
+        assert.strictEqual(exitCode, 0, testOutput)
+      } finally {
+        fs.unlinkSync(linkedRepositoryRoot)
+      }
+    })
+
+    it('uses an unmocked clock for no-worker attempt durations and EFD retries', async () => {
+      receiver.setSettings({
+        early_flake_detection: {
+          enabled: true,
+          slow_test_retries: {
+            '5s': 2,
+            '10s': 1,
+          },
+          faulty_session_threshold: 100,
+        },
+        known_tests_enabled: true,
+      })
+      receiver.setKnownTests({ vitest: {} })
+
+      const payloadsPromise = gatherCitestcyclePayloads(receiver, events => {
+        const tests = getTestsByName(
+          getEventContents(events, 'test'),
+          'uses real time for early flake detection with fake timers'
+        )
+        assert.strictEqual(tests.length, 3)
+        for (let index = 0; index < tests.length; index++) {
+          const test = tests[index]
+          assert.ok(
+            Number(test.duration) < 1000 * 1e6,
+            `Expected duration to use an unmocked clock, got ${Number(test.duration) / 1e6}ms`
+          )
+          if (index === 0) {
+            assert.ok(!(TEST_IS_RETRY in test.meta), inspect(test.meta))
+          } else {
+            assert.strictEqual(test.meta[TEST_RETRY_REASON], TEST_RETRY_REASON_TYPES.efd)
+          }
+        }
+      })
+
+      const exitCode = await Promise.all([
+        runVitest({
+          TEST_DIR: 'ci-visibility/vitest-tests/efd-fake-timers.mjs',
+          POOL_CONFIG: 'forks',
+          VITEST_SETUP_FILE: 'ci-visibility/vitest-tests/fake-timers-setup.mjs',
+        }),
+        payloadsPromise,
+      ]).then(([exitCode]) => exitCode)
+
+      assert.strictEqual(exitCode, 0, testOutput)
+    })
+
     it('keeps a failed slow EFD test failed when remaining repeats are no-ops', async () => {
       receiver.setSettings({
         early_flake_detection: {
diff --git a/packages/datadog-instrumentations/src/vitest-main-no-worker-init.js b/packages/datadog-instrumentations/src/vitest-main-no-worker-init.js
index 175f67b361..3a311c1c44 100644
--- a/packages/datadog-instrumentations/src/vitest-main-no-worker-init.js
+++ b/packages/datadog-instrumentations/src/vitest-main-no-worker-init.js
@@ -4,6 +4,7 @@ const path = require('node:path')
 
 const satisfies = require('../../../vendor/dist/semifies')
 
+const { RUM_TEST_EXECUTION_ID_COOKIE_NAME } = require('../../dd-trace/src/ci-visibility/rum')
 const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 const log = require('../../dd-trace/src/log')
 const {
@@ -29,9 +30,9 @@ const {
   testSuiteStartCh,
 } = require('./vitest-util')
 
-// No-worker-init instrumentation for DD_EXPERIMENTAL_TEST_OPT_VITEST_NO_WORKER_INIT.
-// When enabled, Vitest workers do not initialize dd-trace, so this main-process instrumentation
-// takes over some worker responsibilities, including test span creation and lifecycle reporting.
+// Main-process Vitest reporting used by no-worker-init and Browser Mode.
+// Execution changes are applied by an instrumentation-less setup file in the test environment,
+// while this module creates test spans from Vitest reporter events.
 const mainProcessReporterStates = new WeakMap()
 const loggedAttemptToFixTests = new Set()
 
@@ -53,16 +54,181 @@ const VITEST_NO_WORKER_INIT_SETUP_FILE = path.join(
   'ci',
   'vitest-no-worker-init-setup.mjs'
 )
+const VITEST_BROWSER_SETUP_FILE_PLUGIN = {
+  name: 'datadog:vitest-browser-setup-file',
+  config: configureVitestBrowserSetupFile,
+  configResolved: allowVitestBrowserSetupFile,
+}
 const VITEST_NO_WORKER_INIT_ISOLATE_WARNING =
   `${VITEST_NO_WORKER_INIT_REQUEST_ENV} is ignored because Vitest isolate is disabled. ` +
   'The lighter Vitest worker path only works when each test file runs in an isolated worker.'
 const NODE_OPTIONS_QUOTE_RE = /[\s"\\]/
+const VITEST_BROWSER_STACK_LOCATION_RE = /:\d+:\d+$/
+const VITEST_BROWSER_URL_RE = /https?:\/\/[^\s)"'>\]]+/g
 let hasWarnedDisabledIsolate = false
 let hasWarnedUnsupportedVersion = false
 let nodeOptionsBeforeNoWorkerInit
 
 function noop () {}
 
+/**
+ * Removes Vite and Vitest runtime query parameters from browser error URLs.
+ *
+ * @param {string} url
+ * @returns {string}
+ */
+function removeVitestBrowserUrlMetadata (url) {
+  const locationMatch = url.match(VITEST_BROWSER_STACK_LOCATION_RE)
+  const location = locationMatch?.[0] || ''
+  const urlWithoutLocation = location ? url.slice(0, -location.length) : url
+  const queryStart = urlWithoutLocation.indexOf('?')
+  if (queryStart === -1) return url
+
+  const fragmentStart = urlWithoutLocation.indexOf('#', queryStart)
+  const queryEnd = fragmentStart === -1 ? urlWithoutLocation.length : fragmentStart
+  const parameters = urlWithoutLocation.slice(queryStart + 1, queryEnd).split('&')
+  const keptParameters = []
+  let removedParameter = false
+
+  for (const parameter of parameters) {
+    const valueSeparator = parameter.indexOf('=')
+    const name = valueSeparator === -1 ? parameter : parameter.slice(0, valueSeparator)
+    if (name === 'import' || name === 'browserv') {
+      removedParameter = true
+    } else {
+      keptParameters.push(parameter)
+    }
+  }
+
+  if (!removedParameter) return url
+
+  const query = keptParameters.length ? `?${keptParameters.join('&')}` : ''
+  return urlWithoutLocation.slice(0, queryStart) + query + urlWithoutLocation.slice(queryEnd) + location
+}
+
+/**
+ * Removes Vite and Vitest runtime URL metadata from browser error text.
+ *
+ * @param {string} value
+ * @returns {string}
+ */
+function normalizeVitestBrowserErrorText (value) {
+  return value.replaceAll(VITEST_BROWSER_URL_RE, removeVitestBrowserUrlMetadata)
+}
+
+/**
+ * Removes the ephemeral Vite server origin in addition to its runtime query parameters.
+ *
+ * @param {string} url
+ * @returns {string}
+ */
+function normalizeVitestBrowserStackUrl (url) {
+  const normalizedUrl = removeVitestBrowserUrlMetadata(url)
+  const protocolEnd = normalizedUrl.indexOf('://')
+  const pathStart = normalizedUrl.indexOf('/', protocolEnd + 3)
+  return pathStart === -1 ? normalizedUrl : normalizedUrl.slice(pathStart)
+}
+
+/**
+ * Normalizes browser URLs in a stack when Vitest does not provide parsed frames.
+ *
+ * @param {string} value
+ * @returns {string}
+ */
+function normalizeVitestBrowserStackText (value) {
+  return value.replaceAll(VITEST_BROWSER_URL_RE, normalizeVitestBrowserStackUrl)
+}
+
+/**
+ * Rebuilds an error stack from the source-mapped frames already parsed by Vitest.
+ *
+ * @param {{
+ *   stack?: string,
+ *   stacks?: Array<{ column: number, file: string, line: number, method?: string }>
+ * }} error
+ * @returns {string|undefined}
+ */
+function normalizeVitestBrowserErrorStack (error) {
+  if (typeof error.stack !== 'string') return error.stack
+  if (!Array.isArray(error.stacks)) {
+    return normalizeVitestBrowserStackText(error.stack)
+  }
+
+  const firstLineEnd = error.stack.indexOf('\n')
+  const stackLines = new Array(error.stacks.length + 1)
+  stackLines[0] = normalizeVitestBrowserErrorText(
+    firstLineEnd === -1 ? error.stack : error.stack.slice(0, firstLineEnd)
+  )
+
+  for (let index = 0; index < error.stacks.length; index++) {
+    const frame = error.stacks[index]
+    const location = `${frame.file}:${frame.line}:${frame.column}`
+    stackLines[index + 1] = frame.method
+      ? `    at ${frame.method} (${location})`
+      : `    at ${location}`
+  }
+
+  return stackLines.join('\n')
+}
+
+/**
+ * Returns an error copy with browser-only URL metadata removed.
+ *
+ * @param {{
+ *   message?: string,
+ *   name?: string,
+ *   stack?: string,
+ *   stacks?: Array<{ column: number, file: string, line: number, method?: string }>
+ * }|undefined} error
+ * @returns {{
+ *   message?: string,
+ *   name?: string,
+ *   stack?: string,
+ *   stacks?: Array<{ column: number, file: string, line: number, method?: string }>
+ * }|undefined}
+ */
+function normalizeVitestBrowserError (error) {
+  if (!error) return error
+
+  const message = typeof error.message === 'string'
+    ? normalizeVitestBrowserErrorText(error.message)
+    : error.message
+  const stack = normalizeVitestBrowserErrorStack(error)
+  if (message === error.message && stack === error.stack) return error
+
+  const normalizedError = { ...error }
+  if (error.name !== undefined) normalizedError.name = error.name
+  if (message !== undefined) normalizedError.message = message
+  if (stack !== undefined) normalizedError.stack = stack
+  return normalizedError
+}
+
+/**
+ * Normalizes browser errors without mutating Vitest's task result.
+ *
+ * @param {Array<{
+ *   message?: string,
+ *   name?: string,
+ *   stack?: string,
+ *   stacks?: Array<{ column: number, file: string, line: number, method?: string }>
+ * }>|undefined} errors
+ * @returns {Array<{
+ *   message?: string,
+ *   name?: string,
+ *   stack?: string,
+ *   stacks?: Array<{ column: number, file: string, line: number, method?: string }>
+ * }>}
+ */
+function normalizeVitestBrowserErrors (errors) {
+  if (!errors?.length) return []
+
+  const normalizedErrors = new Array(errors.length)
+  for (let index = 0; index < errors.length; index++) {
+    normalizedErrors[index] = normalizeVitestBrowserError(errors[index])
+  }
+  return normalizedErrors
+}
+
 function isRequested () {
   return getValueFromEnvSources(VITEST_NO_WORKER_INIT_REQUEST_ENV) === true
 }
@@ -144,19 +310,22 @@ function isNoWorkerInitPool (pool, isVitestWorkerPool) {
 }
 
 function configure (ctx, frameworkVersion, testSpecifications, setupData, options) {
-  const { getConfiguredEfdRetryCount, state } = options
+  const { getConfiguredEfdRetryCount, shouldReportTestModule, state } = options
   addSetupFileToVitestConfigs(ctx, VITEST_NO_WORKER_INIT_SETUP_FILE, testSpecifications)
+  addVitestBrowserSetupFileAccess(testSpecifications)
 
   const {
     knownTestsBySuite,
     modifiedFiles,
     repositoryRoot,
     testManagementTestsBySuite,
+    testPropertiesByFilepath,
     testSessionConfiguration,
   } = setupData
 
   setProvidedContext(ctx, {
     _ddVitestWorkerSetup: {
+      isActive: true,
       attemptToFixRetries: state.testManagementAttemptToFixRetries,
       attemptToFixTests: getSelectedTestManagementTests(testManagementTestsBySuite, 'isAttemptToFix'),
       disabledTests: getSelectedTestManagementTests(testManagementTestsBySuite, 'isDisabled'),
@@ -167,14 +336,19 @@ function configure (ctx, frameworkVersion, testSpecifications, setupData, option
       earlyFlakeDetectionRetryThresholds: EARLY_FLAKE_DETECTION_RETRY_THRESHOLDS,
       earlyFlakeDetectionSlowRetries: state.earlyFlakeDetectionSlowTestRetries,
       isEarlyFlakeDetectionEnabled: state.isEarlyFlakeDetectionEnabled && !state.isEarlyFlakeDetectionFaulty,
+      isRumCorrelationEnabled: !canRaceRumCorrelation(ctx, testSpecifications),
       knownTests: knownTestsBySuite || {},
       modifiedFiles: modifiedFiles || {},
       quarantinedTests: getSelectedTestManagementTests(testManagementTestsBySuite, 'isQuarantined'),
       repositoryRoot: repositoryRoot || process.cwd(),
+      rumTestExecutionIdCookieName: RUM_TEST_EXECUTION_ID_COOKIE_NAME,
+      testPropertiesByFilepath: testPropertiesByFilepath || {},
     },
-  }, 'Could not send Vitest worker setup context, so no-worker execution changes will not work.')
+  }, 'Could not send Vitest setup context, so main-process execution changes will not work.')
 
-  installMainProcessReporter(ctx, frameworkVersion, testSessionConfiguration || {}, setupData, state)
+  installMainProcessReporter(ctx, frameworkVersion, testSessionConfiguration || {}, setupData, state, {
+    shouldReportTestModule,
+  })
 }
 
 function deactivate (ctx) {
@@ -182,6 +356,11 @@ function deactivate (ctx) {
   if (installedReporterState) {
     installedReporterState.isActive = false
   }
+  setProvidedContext(ctx, {
+    _ddVitestWorkerSetup: {
+      isActive: false,
+    },
+  }, 'Could not deactivate Vitest main-process execution changes.')
 }
 
 function configureWorkerEnv (workerEnv, shouldSkipWorkerInit = false) {
@@ -224,14 +403,75 @@ function addSetupFileToVitestConfigs (ctx, setupFile, testSpecifications) {
   for (const config of configs) {
     if (!config) continue
 
+    config.includeTaskLocation = true
     if (config.setupFiles === undefined) {
       config.setupFiles = []
     } else if (typeof config.setupFiles === 'string') {
       config.setupFiles = [config.setupFiles]
     }
 
-    if (!config.setupFiles.includes(setupFile)) {
-      config.setupFiles.push(setupFile)
+    const setupFileIndex = config.setupFiles.indexOf(setupFile)
+    if (setupFileIndex !== 0) {
+      if (setupFileIndex > 0) {
+        config.setupFiles.splice(setupFileIndex, 1)
+      }
+      config.setupFiles.unshift(setupFile)
+    }
+  }
+}
+
+/**
+ * Resolves the Vitest runner from the browser project's dependency tree.
+ *
+ * @param {{
+ *   resolve?: { dedupe?: string[] }
+ * }} viteConfig
+ * @returns {void}
+ */
+function configureVitestBrowserSetupFile (viteConfig) {
+  viteConfig.resolve ||= {}
+  viteConfig.resolve.dedupe ||= []
+
+  if (!viteConfig.resolve.dedupe.includes('@vitest/runner')) {
+    viteConfig.resolve.dedupe.push('@vitest/runner')
+  }
+}
+
+/**
+ * Allows Vite to serve the Datadog setup file after its default workspace detection has run.
+ *
+ * @param {{ server?: { fs?: { allow?: string[] } } }} viteConfig
+ * @returns {void}
+ */
+function allowVitestBrowserSetupFile (viteConfig) {
+  const allow = viteConfig.server?.fs?.allow
+  if (allow && !allow.includes(VITEST_NO_WORKER_INIT_SETUP_FILE)) {
+    allow.push(VITEST_NO_WORKER_INIT_SETUP_FILE)
+  }
+}
+
+/**
+ * Installs the Vite access plugin on each parent project that owns a Browser Mode server.
+ *
+ * @param {object[]|undefined} testSpecifications
+ * @returns {void}
+ */
+function addVitestBrowserSetupFileAccess (testSpecifications) {
+  if (!Array.isArray(testSpecifications)) return
+
+  const configuredProjects = new Set()
+  for (const testSpecification of testSpecifications) {
+    const project = getTestSpecificationProject(testSpecification)
+    if (!isBrowserTestSpecification(testSpecification)) continue
+
+    const browserServerProject = project?._parent || project
+    if (!browserServerProject || configuredProjects.has(browserServerProject)) continue
+
+    configuredProjects.add(browserServerProject)
+    browserServerProject.options ||= {}
+    browserServerProject.options.plugins ||= []
+    if (!browserServerProject.options.plugins.includes(VITEST_BROWSER_SETUP_FILE_PLUGIN)) {
+      browserServerProject.options.plugins.push(VITEST_BROWSER_SETUP_FILE_PLUGIN)
     }
   }
 }
@@ -279,12 +519,20 @@ function getSelectedTestManagementTests (testManagementTestsBySuite, propertyNam
   return selectedTests
 }
 
-function installMainProcessReporter (ctx, frameworkVersion, testSessionConfiguration, testOptimizationData, state) {
+function installMainProcessReporter (
+  ctx,
+  frameworkVersion,
+  testSessionConfiguration,
+  testOptimizationData,
+  state,
+  options
+) {
   if (!ctx?.reporters) return
 
   const reporterState = {
     frameworkVersion,
     isActive: true,
+    shouldReportTestModule: options.shouldReportTestModule,
     state,
     testSessionConfiguration,
     testOptimizationData,
@@ -307,26 +555,26 @@ function createMainProcessReporter (reporterState) {
 
   return {
     onTestModuleStart (testModule) {
-      if (!isActive()) return
+      if (!shouldReport(testModule)) return
 
       startTestSuite(testModule)
     },
 
     onTestModuleEnd (testModule) {
-      if (!isActive()) return
+      if (!shouldReport(testModule)) return
 
       return reportTestModule(testModule)
     },
 
     onTestCaseResult (testCase) {
-      if (!isActive()) return
+      if (!shouldReport(testCase.module || testCase.task?.file)) return
 
       const task = getTestCaseTask(testCase)
       recordFinalTaskAttemptResult(task)
     },
 
     onTaskUpdate (packs, events) {
-      if (!isActive()) return
+      if (!isReporterActive()) return
       if (!events) return
 
       for (const event of events) {
@@ -336,23 +584,43 @@ function createMainProcessReporter (reporterState) {
       }
     },
 
+    onWatcherRerun () {
+      for (const testSuiteCtx of testSuiteContexts.values()) {
+        testSuiteFinishCh.publish({
+          status: 'skip',
+          deferFlush: true,
+          onDone: noop,
+          ...testSuiteCtx.currentStore,
+        })
+      }
+      testSuiteContexts.clear()
+      finishedTestModules.clear()
+      taskAttemptStatuses.clear()
+      tasksWithRecordedFinalAttempt.clear()
+    },
+
     onFinished (files) {
-      if (!isActive()) return
+      if (!isReporterActive()) return
       if (!files) return
 
       for (const file of files) {
         const testModule = createTestModuleFromFile(file)
-        if (!finishedTestModules.has(file.id)) {
+        if (shouldReport(testModule) && !finishedTestModules.has(file.id)) {
           reportTestModule(testModule)
         }
       }
     },
   }
 
-  function isActive () {
+  function isReporterActive () {
     return reporterState.isActive === true
   }
 
+  function shouldReport (testModule) {
+    return isReporterActive() &&
+      (!reporterState.shouldReportTestModule || reporterState.shouldReportTestModule(testModule))
+  }
+
   function recordTaskAttemptStatus (taskId, status, attemptCount) {
     let statuses = taskAttemptStatuses.get(taskId)
     if (!statuses) {
@@ -389,7 +657,7 @@ function createMainProcessReporter (reporterState) {
     let testSuiteError
 
     for (const task of testTasks) {
-      const testReport = getTestReport(task, testSuiteCtx.currentStore)
+      const testReport = getTestReport(task, testSuiteCtx.currentStore, testSuiteCtx.browserEnvironment)
       testReports.push(testReport)
 
       for (const attempt of testReport.nonFinalAttempts) {
@@ -412,7 +680,9 @@ function createMainProcessReporter (reporterState) {
     }
 
     if (testSuiteError) {
-      testSuiteCtx.error = testSuiteError
+      testSuiteCtx.error = testSuiteCtx.browserEnvironment
+        ? normalizeVitestBrowserError(testSuiteError)
+        : testSuiteError
       testSuiteErrorCh.runStores(testSuiteCtx, () => {})
     }
 
@@ -428,16 +698,22 @@ function createMainProcessReporter (reporterState) {
   function startTestSuite (testModule) {
     const { frameworkVersion, testSessionConfiguration } = reporterState
     const testModuleId = getTestModuleId(testModule)
+    const browserEnvironment = getTestModuleBrowserEnvironment(testModule)
     const testSuiteCtx = {
+      browserEnvironment,
+      browserDriver: browserEnvironment?.browserDriver,
+      browserName: browserEnvironment?.browserName,
+      browserProjectName: browserEnvironment?.browserProjectName,
       testSuiteAbsolutePath: getTestModuleFilepath(testModule),
       frameworkVersion,
       testSessionId: testSessionConfiguration.testSessionId,
       testModuleId: testSessionConfiguration.testModuleId,
       testCommand: testSessionConfiguration.testCommand,
       repositoryRoot: testSessionConfiguration.repositoryRoot,
-      codeOwnersEntries: testSessionConfiguration.codeOwnersEntries,
+      codeOwnersEntries: testSessionConfiguration.codeOwnersEntries ?? undefined,
       requestErrorTags: reporterState.state.requestErrorTags,
       isTestFrameworkWorker: true,
+      isBrowserMode: browserEnvironment !== undefined,
       isVitestNoWorkerInitActive: true,
     }
     testSuiteStartCh.runStores(testSuiteCtx, () => {})
@@ -445,7 +721,7 @@ function createMainProcessReporter (reporterState) {
     return testSuiteCtx
   }
 
-  function getTestReport (task, testSuiteStore) {
+  function getTestReport (task, testSuiteStore, browserEnvironment) {
     const result = task.result
     const testSuiteAbsolutePath = task.file?.filepath
     const testName = getTestName(task)
@@ -459,6 +735,7 @@ function createMainProcessReporter (reporterState) {
 
     if (testProperties.isAttemptToFix && task.meta?.__ddTestOptAtfStatuses?.length) {
       return getRepeatedTestReport(task, testName, testSuiteAbsolutePath, testProperties, status, {
+        browserEnvironment,
         errorCounts: task.meta.__ddTestOptAtfErrorCounts,
         finalStatus: getAttemptToFixFinalStatus,
         state,
@@ -470,6 +747,7 @@ function createMainProcessReporter (reporterState) {
 
     if (testProperties.isEarlyFlakeDetection && task.meta?.__ddTestOptEfdStatuses?.length) {
       return getRepeatedTestReport(task, testName, testSuiteAbsolutePath, testProperties, status, {
+        browserEnvironment,
         errorCounts: task.meta.__ddTestOptEfdErrorCounts,
         finalStatus: getEarlyFlakeDetectionFinalStatus,
         state,
@@ -481,8 +759,9 @@ function createMainProcessReporter (reporterState) {
 
     if (!testProperties.isAttemptToFix && task.meta?.__ddTestOptRepeatStatuses?.length) {
       return getRepeatedTestReport(task, testName, testSuiteAbsolutePath, testProperties, status, {
+        browserEnvironment,
         errorCounts: task.meta.__ddTestOptRepeatErrorCounts,
-        finalStatus: () => status,
+        finalStatus: () => getExternalFinalStatus(status, testProperties),
         state,
         statuses: task.meta.__ddTestOptRepeatStatuses,
         testSuiteStore,
@@ -491,11 +770,18 @@ function createMainProcessReporter (reporterState) {
     }
 
     const attemptStatuses = taskAttemptStatuses.get(task.id)
-    if (!testProperties.isAttemptToFix && !testProperties.isEarlyFlakeDetection && attemptStatuses?.length > 1) {
+    const retryCount = task.result?.retryCount || 0
+    if (
+      !testProperties.isAttemptToFix &&
+      !testProperties.isEarlyFlakeDetection &&
+      (attemptStatuses?.length > 1 || retryCount > 0)
+    ) {
       return getRepeatedTestReport(task, testName, testSuiteAbsolutePath, testProperties, status, {
-        finalStatus: () => status,
+        browserEnvironment,
+        errorCounts: task.meta?.__ddTestOptRetryErrorCounts,
+        finalStatus: () => getExternalFinalStatus(status, testProperties),
         state,
-        statuses: attemptStatuses,
+        statuses: getRetriedTaskStatuses(attemptStatuses, retryCount, status),
         testSuiteStore,
         type: 'external',
       })
@@ -503,6 +789,7 @@ function createMainProcessReporter (reporterState) {
 
     if (!testProperties.isAttemptToFix && task.result?.repeatCount > 0) {
       return getRepeatedTestReport(task, testName, testSuiteAbsolutePath, testProperties, status, {
+        browserEnvironment,
         finalStatus: () => status,
         state,
         statuses: getRepeatedTaskStatuses(task, status),
@@ -522,24 +809,14 @@ function createMainProcessReporter (reporterState) {
       result.state = 'pass'
     }
 
-    const errors = result?.errors || []
-    const finalErrorIndex = status === 'fail' ? errors.length - 1 : -1
-    const nonFinalAttempts = []
-
-    if (status !== 'skip') {
-      for (let index = 0; index < errors.length; index++) {
-        if (index === finalErrorIndex) continue
-        nonFinalAttempts.push({
-          error: errors[index],
-          isRetry: index > 0,
-          status: 'fail',
-        })
-      }
-    }
+    const errors = browserEnvironment
+      ? normalizeVitestBrowserErrors(result?.errors)
+      : result?.errors || []
 
     return {
+      browserEnvironment,
       errors,
-      nonFinalAttempts,
+      nonFinalAttempts: [],
       state,
       status,
       task,
@@ -643,6 +920,7 @@ function createTaskFromReportedTask (reportedTask, file, suite) {
     id: reportedTask.id,
     type: reportedTask.type,
     name: reportedTask.name || reportedTask.relativeModuleId || reportedTask.moduleId,
+    location: reportedTask.location,
     mode: reportedTask.options?.mode,
     meta: getReportedTaskMeta(reportedTask),
     result: getReportedTaskResult(reportedTask),
@@ -731,8 +1009,10 @@ function getTestModuleProjectName (testModule) {
 
 function getRepeatedTestReport (task, testName, testSuiteAbsolutePath, testProperties, status, options) {
   const result = task.result
-  const errors = result?.errors || []
-  const { errorCounts, finalStatus, state, statuses, testSuiteStore, type } = options
+  const { browserEnvironment, errorCounts, finalStatus, state, statuses, testSuiteStore, type } = options
+  const errors = browserEnvironment
+    ? normalizeVitestBrowserErrors(result?.errors)
+    : result?.errors || []
   const finalAttemptStatus = finalStatus(statuses)
   const hasFailure = finalAttemptStatus === 'fail'
   const attempts = []
@@ -757,7 +1037,9 @@ function getRepeatedTestReport (task, testName, testSuiteAbsolutePath, testPrope
       errorIndex++
     }
     const attempt = {
+      index,
       attemptToFixFailed: type === 'attempt_to_fix' && isFinalAttempt && hasFailure,
+      duration: task.meta?.__ddTestOptAttemptDurations?.[index],
       earlyFlakeAbortReason: type === 'early_flake_detection' && isFinalAttempt
         ? task.meta?.__ddTestOptEfdAbortReason
         : undefined,
@@ -783,6 +1065,7 @@ function getRepeatedTestReport (task, testName, testSuiteAbsolutePath, testPrope
   }
 
   return {
+    browserEnvironment,
     errors,
     finalAttempt: attempts.at(-1),
     nonFinalAttempts: attempts.slice(0, -1),
@@ -841,6 +1124,17 @@ function getEarlyFlakeDetectionFinalStatus (statuses) {
   return statuses.includes('pass') ? 'pass' : 'fail'
 }
 
+/**
+ * Returns the final status for user-configured retries and repeats.
+ *
+ * @param {string} status
+ * @param {{ isDisabled?: boolean, isQuarantined?: boolean }} testProperties
+ * @returns {string}
+ */
+function getExternalFinalStatus (status, testProperties) {
+  return testProperties.isDisabled || testProperties.isQuarantined ? 'skip' : status
+}
+
 function getRepeatedTaskStatuses (task, status) {
   const repeatedStatuses = []
   const repeatCount = task.result?.repeatCount || 0
@@ -850,8 +1144,27 @@ function getRepeatedTaskStatuses (task, status) {
   return repeatedStatuses
 }
 
+/**
+ * Completes reporter retry events with Vitest's final retry count and status.
+ *
+ * @param {string[]} recordedStatuses
+ * @param {number} retryCount
+ * @param {string} finalStatus
+ * @returns {string[]}
+ */
+function getRetriedTaskStatuses (recordedStatuses = [], retryCount, finalStatus) {
+  const statuses = [...recordedStatuses]
+  const attemptCount = Math.max(statuses.length, retryCount + 1)
+  while (statuses.length < attemptCount - 1) {
+    statuses.push('fail')
+  }
+  statuses[attemptCount - 1] = finalStatus
+  return statuses
+}
+
 function reportFinalTestAttempt (testReport) {
   const {
+    browserEnvironment,
     errors,
     state,
     status,
@@ -863,13 +1176,21 @@ function reportFinalTestAttempt (testReport) {
   } = testReport
 
   if (status === 'skip') {
+    const {
+      isRumActive,
+      testExecutionId,
+    } = getRumCorrelation(task)
     testSkipCh.publish({
+      ...browserEnvironment,
       testName,
       testSuiteAbsolutePath,
       isNew: testProperties.isNew,
       isDisabled: testProperties.isDisabled,
+      isRumActive,
       isTestFrameworkWorker: true,
       requestErrorTags: state.requestErrorTags,
+      testStartLine: task.location?.line,
+      testExecutionId,
       ...testSuiteStore,
     })
     return
@@ -880,7 +1201,7 @@ function reportFinalTestAttempt (testReport) {
   const finalAttempt = testReport.finalAttempt
 
   if (status === 'fail') {
-    const error = errors.at(-1) || errors[0]
+    const error = finalAttempt?.error || errors[0]
     reportTestAttempt(testReport, finalAttempt || {
       error,
       finalStatus,
@@ -892,7 +1213,7 @@ function reportFinalTestAttempt (testReport) {
         true,
         true
       ),
-      isRetry: errors.length > 1 || (result?.retryCount || 0) > 0 || (result?.repeatCount || 0) > 0,
+      isRetry: (result?.retryCount || 0) > 0 || (result?.repeatCount || 0) > 0,
       status: 'fail',
     })
     return finalStatus === 'skip' ? undefined : error
@@ -900,13 +1221,14 @@ function reportFinalTestAttempt (testReport) {
 
   reportTestAttempt(testReport, finalAttempt || {
     finalStatus,
-    isRetry: errors.length > 0 || (result?.retryCount || 0) > 0 || (result?.repeatCount || 0) > 0,
+    isRetry: (result?.retryCount || 0) > 0 || (result?.repeatCount || 0) > 0,
     status: 'pass',
   })
 }
 
 function reportTestAttempt (testReport, attempt) {
   const {
+    browserEnvironment,
     state,
     task,
     testName,
@@ -916,7 +1238,27 @@ function reportTestAttempt (testReport, attempt) {
   } = testReport
   const result = task.result
   const status = attempt.status
+  const {
+    isRumActive,
+    testExecutionId,
+  } = getRumCorrelation(task, attempt.index)
+  const attemptStartTimes = task.meta?.__ddTestOptAttemptStartTimes
+  const attemptStartIndex = attempt.index ?? (attemptStartTimes?.length || 1) - 1
+  const attemptStartTime = attemptStartTimes?.[attemptStartIndex]
+  let duration
+  if (status === 'pass') {
+    if (
+      attempt.duration !== undefined ||
+      (!attempt.isRetry && isFinalTestAttempt(testReport, attempt) && result?.duration !== undefined)
+    ) {
+      duration = attempt.duration ?? result.duration
+    }
+  } else {
+    duration = attempt.duration ??
+      (shouldUseTaskDurationForFailure(testReport, attempt) ? result?.duration : undefined)
+  }
   const testCtx = {
+    ...browserEnvironment,
     currentStore: testSuiteStore,
     testName,
     testSuiteAbsolutePath,
@@ -931,8 +1273,14 @@ function reportTestAttempt (testReport, attempt) {
     isRetryReasonAttemptToFix: testProperties.isAttemptToFix && attempt.isRetry,
     isRetryReasonAtr: !testProperties.isAttemptToFix && !testProperties.isEarlyFlakeDetection &&
       testProperties.isFlakyTestRetries,
+    isRumActive,
     isTestFrameworkWorker: true,
     requestErrorTags: state.requestErrorTags,
+    startTime: Number.isFinite(attemptStartTime)
+      ? attemptStartTime
+      : (Number.isFinite(duration) && duration >= 0 ? Date.now() - duration : undefined),
+    testStartLine: task.location?.line,
+    testExecutionId,
   }
   if (testProperties.isAttemptToFix) {
     recordAttemptToFixExecution(state.attemptToFixExecutions, {
@@ -954,13 +1302,8 @@ function reportTestAttempt (testReport, attempt) {
   testStartCh.runStores(testCtx, () => {})
   testCtx.status = status
   testCtx.task = task
-  if (
-    status === 'pass' &&
-    !attempt.isRetry &&
-    isFinalTestAttempt(testReport, attempt) &&
-    result?.duration !== undefined
-  ) {
-    testCtx.duration = result.duration
+  if (status === 'pass' && duration !== undefined) {
+    testCtx.duration = duration
   }
   testFinishTimeCh.runStores(testCtx, () => {})
 
@@ -975,7 +1318,7 @@ function reportTestAttempt (testReport, attempt) {
   }
 
   testErrorCh.publish({
-    duration: shouldUseTaskDurationForFailure(testReport, attempt) ? result?.duration : undefined,
+    duration,
     error: attempt.error,
     earlyFlakeAbortReason: attempt.earlyFlakeAbortReason,
     finalStatus: attempt.finalStatus,
@@ -985,6 +1328,24 @@ function reportTestAttempt (testReport, attempt) {
   })
 }
 
+/**
+ * Returns the browser RUM correlation metadata for a test attempt.
+ *
+ * @param {object} task
+ * @param {number|undefined} attemptIndex
+ * @returns {{ isRumActive?: boolean, testExecutionId?: string }}
+ */
+function getRumCorrelation (task, attemptIndex) {
+  const testExecutionIds = task.meta?.__ddTestOptRumTestExecutionIds
+  if (!Array.isArray(testExecutionIds) || testExecutionIds.length === 0) return {}
+
+  attemptIndex ??= testExecutionIds.length - 1
+  return {
+    isRumActive: task.meta?.__ddTestOptRumActive?.[attemptIndex] === true,
+    testExecutionId: testExecutionIds[attemptIndex],
+  }
+}
+
 function isFinalTestAttempt (testReport, attempt) {
   return attempt.finalStatus !== undefined || testReport.finalAttempt === undefined
 }
@@ -1207,10 +1568,11 @@ function getTestSpecificationPool (testSpecification) {
   const options = getTestSpecificationOptions(testSpecification)
   const file = getTestSpecificationFile(testSpecification)
   const project = getTestSpecificationProject(testSpecification)
+  const projectConfig = safeConfig(project)
   return options?.pool ||
     file?.pool ||
     testSpecification?.pool ||
-    project?.config?.pool ||
+    projectConfig?.pool ||
     project?.serializedConfig?.pool ||
     project?.pool
 }
@@ -1243,15 +1605,16 @@ function getTestSpecificationIsolate (testSpecification, pool) {
   const options = getTestSpecificationOptions(testSpecification)
   const file = getTestSpecificationFile(testSpecification)
   const project = getTestSpecificationProject(testSpecification)
+  const projectConfig = safeConfig(project)
   return getPoolOptionsIsolate(options, pool) ??
     getPoolOptionsIsolate(file, pool) ??
-    getPoolOptionsIsolate(project?.config, pool) ??
+    getPoolOptionsIsolate(projectConfig, pool) ??
     getPoolOptionsIsolate(project?.serializedConfig, pool) ??
     getPoolOptionsIsolate(project, pool) ??
     getPoolOptionsIsolate(testSpecification, pool) ??
     options?.isolate ??
     file?.isolate ??
-    project?.config?.isolate ??
+    projectConfig?.isolate ??
     project?.serializedConfig?.isolate ??
     project?.isolate ??
     testSpecification?.isolate
@@ -1263,7 +1626,7 @@ function getEffectiveTestSpecificationIsolate (testSpecification, pool, defaultI
 }
 
 function getProjectName (project) {
-  return normalizeProjectName(project?.name || project?.config?.name || project?.test?.name)
+  return normalizeProjectName(project?.name || safeConfig(project)?.name || project?.test?.name)
 }
 
 function normalizeProjectName (name) {
@@ -1273,6 +1636,111 @@ function normalizeProjectName (name) {
   return typeof label === 'string' ? label : undefined
 }
 
+/**
+ * Returns whether a Vitest specification runs in Browser Mode.
+ *
+ * @param {object} testSpecification
+ * @returns {boolean}
+ */
+function isBrowserTestSpecification (testSpecification) {
+  return getTestSpecificationPool(testSpecification) === 'browser' ||
+    isBrowserProject(getTestSpecificationProject(testSpecification))
+}
+
+/**
+ * Returns whether a Vitest project has Browser Mode enabled.
+ *
+ * @param {object|undefined} project
+ * @returns {boolean}
+ */
+function isBrowserProject (project) {
+  try {
+    if (project?.isBrowserEnabled?.() === true) return true
+  } catch {}
+  return getProjectReportingConfig(project)?.browser?.enabled === true
+}
+
+/**
+ * Returns whether Vitest can overlap tests or their setup and teardown.
+ *
+ * @param {object|undefined} config
+ * @returns {boolean}
+ */
+function hasConcurrentTestExecution (config) {
+  const sequence = config?.sequence
+  return sequence?.concurrent === true ||
+    sequence?.hooks === 'parallel' ||
+    sequence?.setupFiles === 'parallel'
+}
+
+/**
+ * Returns whether Vitest can overlap browser execution that shares the RUM correlation cookie origin.
+ *
+ * @param {object} ctx
+ * @param {object[]|undefined} testSpecifications
+ * @returns {boolean}
+ */
+function canRaceRumCorrelation (ctx, testSpecifications) {
+  if (!Array.isArray(testSpecifications)) {
+    return hasConcurrentTestExecution(safeConfig(ctx))
+  }
+
+  let browserFileCount = 0
+  let hasBrowserProject = false
+  let project
+  for (const testSpecification of testSpecifications) {
+    const testProject = getTestSpecificationProject(testSpecification)
+    if (!isBrowserTestSpecification(testSpecification)) continue
+
+    const config = getProjectReportingConfig(testProject) || safeConfig(ctx)
+    if (hasConcurrentTestExecution(config)) return true
+
+    browserFileCount++
+    if (hasBrowserProject && testProject !== project) return true
+    project = testProject
+    hasBrowserProject = true
+  }
+  if (browserFileCount < 2) return false
+
+  const config = getProjectReportingConfig(project) || safeConfig(ctx)
+  const fileParallelism = config?.browser?.fileParallelism ?? config?.fileParallelism
+  return fileParallelism !== false && config?.maxWorkers !== 1
+}
+
+function getTestModuleBrowserEnvironment (testModule) {
+  const project = testModule?.project
+  const config = getProjectReportingConfig(project)
+  const isBrowserMode = testModule?.task?.pool === 'browser' ||
+    testModule?.pool === 'browser' ||
+    isBrowserProject(project)
+  if (!isBrowserMode) return
+
+  const provider = config?.browser?.provider
+  const browserDriver = typeof provider === 'string' ? provider : provider?.name
+
+  return {
+    browserDriver,
+    browserName: config?.browser?.name,
+    browserProjectName: getTestModuleProjectName(testModule),
+    isBrowserMode: true,
+  }
+}
+
+/**
+ * Returns the runtime or serialized project configuration used for read-only reporting metadata.
+ *
+ * @param {object|undefined} project
+ * @returns {object|undefined}
+ */
+function getProjectReportingConfig (project) {
+  const config = safeConfig(project)
+  if (config) return config
+
+  try {
+    return project?.serializedConfig
+  } catch {}
+}
+
 function safeConfig (project) {
   let config
   try {
@@ -1293,5 +1761,6 @@ module.exports = {
   configure,
   deactivate,
   configureWorkerEnv,
+  isSupportedVersion,
   shouldUse,
 }
diff --git a/packages/datadog-instrumentations/src/vitest-main.js b/packages/datadog-instrumentations/src/vitest-main.js
index aa4f05dfc1..b29b5a91c6 100644
--- a/packages/datadog-instrumentations/src/vitest-main.js
+++ b/packages/datadog-instrumentations/src/vitest-main.js
@@ -1,5 +1,6 @@
 'use strict'
 
+const fs = require('node:fs')
 const path = require('node:path')
 const { fileURLToPath } = require('node:url')
 const { MessagePort } = require('node:worker_threads')
@@ -67,6 +68,7 @@ let coverageRootDir
 let requestErrorTags = {}
 let isSessionStarted = false
 let isVitestNoWorkerInitActive = false
+let isVitestBrowserModeActive = false
 let vitestPool = null
 let isMessagePortWrapped = false
 const tinyPoolClassWrappers = new WeakMap()
@@ -197,7 +199,21 @@ function getTestFilepaths (ctx, testSpecifications) {
  */
 function getNormalizedTestSuitePath (testFilepath, repositoryRoot) {
   const testSuiteAbsolutePath = path.isAbsolute(testFilepath) ? testFilepath : path.join(repositoryRoot, testFilepath)
-  return getTestSuitePath(testSuiteAbsolutePath, repositoryRoot)
+  return getTestSuitePath(realpath(testSuiteAbsolutePath), realpath(repositoryRoot))
+}
+
+/**
+ * Resolves a path without failing Test Optimization when the path is unavailable.
+ *
+ * @param {string} filepath
+ * @returns {string}
+ */
+function realpath (filepath) {
+  try {
+    return fs.realpathSync(filepath)
+  } catch {
+    return filepath
+  }
 }
 
 /**
@@ -281,6 +297,10 @@ function getTestPropertiesByFilepath (
   for (const testFilepath of testFilepaths) {
     if (typeof testFilepath !== 'string') continue
 
+    const testSuiteAbsolutePath = path.isAbsolute(testFilepath)
+      ? testFilepath
+      : path.join(repositoryRoot, testFilepath)
+    const realTestFilepath = realpath(testSuiteAbsolutePath)
     const testSuite = getNormalizedTestSuitePath(testFilepath, repositoryRoot)
     const testProperties = { testSuite }
     const hasProperties = knownTestsBySuite !== undefined ||
@@ -299,6 +319,8 @@ function getTestPropertiesByFilepath (
 
     if (hasProperties) {
       testPropertiesByFilepath[testFilepath] = testProperties
+      testPropertiesByFilepath[testSuiteAbsolutePath] = testProperties
+      testPropertiesByFilepath[realTestFilepath] = testProperties
     }
   }
 
@@ -405,11 +427,18 @@ function mergeRequestErrorTags (requestResponse) {
   }
 }
 
-async function runMainProcessSetup (ctx, frameworkVersion, testSpecifications, shouldInstallNoWorkerInit) {
+async function runMainProcessSetup (
+  ctx,
+  frameworkVersion,
+  testSpecifications,
+  shouldInstallNoWorkerInit,
+  shouldInstallBrowserReporter
+) {
   if (!testSessionFinishCh.hasSubscribers) {
     return
   }
 
+  isVitestBrowserModeActive ||= shouldInstallBrowserReporter
   let repositoryRoot = process.cwd()
   let testSessionConfiguration
   let testFilepaths
@@ -435,7 +464,7 @@ async function runMainProcessSetup (ctx, frameworkVersion, testSpecifications, s
       requestErrorTags: receivedRequestErrorTags = {},
     } = await getChannelPromise(libraryConfigurationCh, {
       frameworkVersion,
-      isVitestNoWorkerInitActive: shouldInstallNoWorkerInit,
+      isVitestNoWorkerInitActive: shouldInstallNoWorkerInit || isVitestBrowserModeActive,
     })
     requestErrorTags = receivedRequestErrorTags
     if (err) {
@@ -459,7 +488,11 @@ async function runMainProcessSetup (ctx, frameworkVersion, testSpecifications, s
       repositoryRoot: receivedRepositoryRoot,
       codeOwnersEntries,
     } = testSessionConfiguration
-    repositoryRoot = receivedRepositoryRoot || repositoryRoot
+    repositoryRoot = realpath(receivedRepositoryRoot || repositoryRoot)
+    testSessionConfiguration = {
+      ...testSessionConfiguration,
+      repositoryRoot,
+    }
     if (!shouldInstallNoWorkerInit) {
       setProvidedContext(ctx, {
         _ddTestSessionId: testSessionId,
@@ -589,8 +622,11 @@ async function runMainProcessSetup (ctx, frameworkVersion, testSpecifications, s
     }
   }
 
-  if (shouldInstallNoWorkerInit) {
-    noWorkerInit.configure(ctx, frameworkVersion, testSpecifications, {
+  if (shouldInstallNoWorkerInit || shouldInstallBrowserReporter) {
+    const reporterTestSpecifications = shouldInstallNoWorkerInit
+      ? testSpecifications
+      : getBrowserTestSpecifications(testSpecifications)
+    noWorkerInit.configure(ctx, frameworkVersion, reporterTestSpecifications, {
       knownTests,
       knownTestsBySuite,
       modifiedFiles,
@@ -602,6 +638,7 @@ async function runMainProcessSetup (ctx, frameworkVersion, testSpecifications, s
       testSessionConfiguration,
     }, {
       getConfiguredEfdRetryCount,
+      shouldReportTestModule: shouldInstallBrowserReporter ? isBrowserTestModule : undefined,
       state: getNoWorkerInitState(),
     })
   }
@@ -628,18 +665,29 @@ function getNoWorkerInitState () {
 
 function ensureMainProcessSetup (ctx, frameworkVersion, testSpecifications, shouldDeactivateOnFallback = false) {
   const shouldInstallNoWorkerInit = shouldUseNoWorkerInit(ctx, frameworkVersion, testSpecifications)
+  const shouldInstallBrowserReporter = shouldUseBrowserReporter(frameworkVersion, testSpecifications)
+  const shouldInstallMainReporter = shouldInstallNoWorkerInit || shouldInstallBrowserReporter
   const specificationsKey = getTestSpecificationsKey(testSpecifications)
   let setupState = mainProcessSetupStates.get(ctx)
-  if (shouldDeactivateOnFallback && setupState?.shouldInstallNoWorkerInit && !shouldInstallNoWorkerInit) {
+  if (shouldDeactivateOnFallback && setupState?.shouldInstallMainReporter && !shouldInstallMainReporter) {
     noWorkerInit.deactivate(ctx)
   }
   if (
     !setupState ||
     setupState.specificationsKey !== specificationsKey ||
-    setupState.shouldInstallNoWorkerInit !== shouldInstallNoWorkerInit
+    setupState.shouldInstallNoWorkerInit !== shouldInstallNoWorkerInit ||
+    setupState.shouldInstallBrowserReporter !== shouldInstallBrowserReporter
   ) {
     setupState = {
-      setupPromise: runMainProcessSetup(ctx, frameworkVersion, testSpecifications, shouldInstallNoWorkerInit),
+      setupPromise: runMainProcessSetup(
+        ctx,
+        frameworkVersion,
+        testSpecifications,
+        shouldInstallNoWorkerInit,
+        shouldInstallBrowserReporter
+      ),
+      shouldInstallBrowserReporter,
+      shouldInstallMainReporter,
       shouldInstallNoWorkerInit,
       specificationsKey,
     }
@@ -655,6 +703,12 @@ function shouldUseNoWorkerInit (ctx, frameworkVersion, testSpecifications) {
   })
 }
 
+function shouldUseBrowserReporter (frameworkVersion, testSpecifications) {
+  return noWorkerInit.isSupportedVersion(frameworkVersion) &&
+    Array.isArray(testSpecifications) &&
+    testSpecifications.some(isBrowserTestSpecification)
+}
+
 function configureFlakyTestRetries (ctx, testSpecifications) {
   if (!isFlakyTestRetriesEnabled || flakyTestRetriesCount <= 0) return
 
@@ -828,7 +882,7 @@ function getFinishWrapper (exitOrClose) {
       isTestManagementTestsEnabled,
       requestErrorTags,
       vitestPool,
-      isVitestNoWorkerInitActive,
+      isVitestNoWorkerInitActive: isVitestNoWorkerInitActive || isVitestBrowserModeActive,
     })
 
     logTestOptimizationSummary({ attemptToFixExecutions, newTestsWithDynamicNames })
@@ -869,6 +923,15 @@ function isVitestWorkerPool (pool) {
   return isForkPool(pool) || isThreadPool(pool)
 }
 
+function isBrowserProject (project) {
+  try {
+    if (project?.isBrowserEnabled?.()) return true
+  } catch {}
+
+  return safeConfig(project)?.browser?.enabled === true ||
+    project?.serializedConfig?.browser?.enabled === true
+}
+
 function getTestSpecificationProject (testSpecification) {
   if (Array.isArray(testSpecification)) {
     return testSpecification[0]
@@ -890,6 +953,23 @@ function getTestSpecificationPool (testSpecification) {
     testSpecification?.pool
 }
 
+function isBrowserTestSpecification (testSpecification) {
+  return getTestSpecificationPool(testSpecification) === 'browser' ||
+    isBrowserProject(getTestSpecificationProject(testSpecification))
+}
+
+function getBrowserTestSpecifications (testSpecifications) {
+  if (!Array.isArray(testSpecifications)) return testSpecifications
+
+  return testSpecifications.filter(isBrowserTestSpecification)
+}
+
+function isBrowserTestModule (testModule) {
+  return testModule?.task?.pool === 'browser' ||
+    testModule?.pool === 'browser' ||
+    isBrowserProject(testModule?.project)
+}
+
 function hasVitestWorkerPoolTestSpecification (testSpecifications) {
   if (!Array.isArray(testSpecifications)) {
     return false
diff --git a/packages/datadog-instrumentations/test/vitest-main.spec.js b/packages/datadog-instrumentations/test/vitest-main.spec.js
new file mode 100644
index 0000000000..ff793f8fc3
--- /dev/null
+++ b/packages/datadog-instrumentations/test/vitest-main.spec.js
@@ -0,0 +1,123 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+
+const proxyquire = require('proxyquire').noPreserveCache()
+
+describe('vitest main instrumentation', () => {
+  it('keeps no-worker capabilities active after Browser Mode setup', async () => {
+    const hooks = []
+    const libraryConfigurationRequests = []
+    const libraryConfigurationCh = {}
+    const testSuiteFinishCh = {
+      hasSubscribers: true,
+    }
+    const testSessionFinishCh = {
+      hasSubscribers: true,
+    }
+    const testSessionConfigurationCh = {
+      hasSubscribers: false,
+    }
+    const channel = {
+      hasSubscribers: false,
+      publish () {},
+      runStores (store, callback) {
+        store.currentStore = {}
+        callback()
+      },
+    }
+    const realInstrument = require('../src/helpers/instrument')
+    const realVitestUtil = require('../src/vitest-util')
+
+    proxyquire('../src/vitest-main', {
+      './helpers/channel': {
+        getChannelPromise (currentChannel, data) {
+          if (currentChannel === libraryConfigurationCh) {
+            libraryConfigurationRequests.push(data)
+            return Promise.resolve({
+              libraryConfig: {
+                earlyFlakeDetectionSlowTestRetries: {},
+              },
+            })
+          }
+          return Promise.resolve()
+        },
+      },
+      './helpers/instrument': {
+        ...realInstrument,
+        addHook (target, hook) {
+          hooks.push({ hook, target })
+        },
+      },
+      './vitest-main-no-worker-init': {
+        configure () {},
+        deactivate () {},
+        isSupportedVersion () {
+          return true
+        },
+        shouldUse () {
+          return false
+        },
+      },
+      './vitest-util': {
+        ...realVitestUtil,
+        codeCoverageReportCh: channel,
+        findExportByName (vitestPackage, exportName) {
+          for (const [key, value] of Object.entries(vitestPackage)) {
+            if (value?.name === exportName) return { key, value }
+          }
+        },
+        getWorkspaceProject () {
+          return {
+            getProvidedContext () {
+              return {}
+            },
+          }
+        },
+        isEarlyFlakeDetectionFaultyCh: channel,
+        knownTestsCh: channel,
+        libraryConfigurationCh,
+        modifiedFilesCh: channel,
+        setProvidedContext () {},
+        testManagementTestsCh: channel,
+        testSessionConfigurationCh,
+        testSessionFinishCh,
+        testSuiteFinishCh,
+      },
+    })
+
+    class BaseSequencer {
+      async sort (specifications) {
+        return specifications
+      }
+    }
+    const sequencerHook = hooks.find(({ target }) => target.filePattern === 'dist/chunks/coverage.*').hook
+    sequencerHook({ BaseSequencer }, '4.1.10')
+
+    const ctx = {
+      close () {},
+      config: {},
+      exit () {},
+    }
+    const sequencer = new BaseSequencer()
+    sequencer.ctx = ctx
+    await sequencer.sort([{ filepath: '/repo/browser.mjs', pool: 'browser' }])
+
+    class Typechecker {
+      async prepareResults () {
+        return { files: [] }
+      }
+    }
+    const typecheckerHook = hooks.find(({ target }) => target.versions[0] === '>=4.0.0').hook
+    typecheckerHook({ Typechecker }, '4.1.10')
+
+    const typechecker = new Typechecker()
+    typechecker.ctx = ctx
+    await typechecker.prepareResults()
+
+    assert.deepStrictEqual(
+      libraryConfigurationRequests.map(request => request.isVitestNoWorkerInitActive),
+      [true, true]
+    )
+  })
+})
diff --git a/packages/datadog-plugin-vitest/src/index.js b/packages/datadog-plugin-vitest/src/index.js
index 0be4c5211d..1367bf930e 100644
--- a/packages/datadog-plugin-vitest/src/index.js
+++ b/packages/datadog-plugin-vitest/src/index.js
@@ -5,6 +5,7 @@ const { storage } = require('../../datadog-core')
 
 const {
   TEST_STATUS,
+  TEST_TYPE,
   VITEST_POOL,
   finishAllTraceSpans,
   getTestSuitePath,
@@ -36,6 +37,10 @@ const {
   TEST_HAS_DYNAMIC_NAME,
   TEST_FINAL_STATUS,
   TEST_IS_TEST_FRAMEWORK_WORKER,
+  TEST_BROWSER_DRIVER,
+  TEST_BROWSER_NAME,
+  TEST_IS_RUM_ACTIVE,
+  TEST_PARAMETERS,
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const {
@@ -50,6 +55,28 @@ const { DD_MAJOR } = require('../../../version')
 // This is because there's some loss of resolution.
 const MILLISECONDS_TO_SUBTRACT_FROM_FAILED_TEST_DURATION = 5
 
+function setBrowserTags (tags, browserEnvironment, includeParameters) {
+  if (!browserEnvironment.isBrowserMode) return
+
+  tags[TEST_TYPE] = 'browser'
+  if (browserEnvironment.browserDriver) {
+    tags[TEST_BROWSER_DRIVER] = browserEnvironment.browserDriver
+  }
+  if (browserEnvironment.browserName) {
+    tags[TEST_BROWSER_NAME] = browserEnvironment.browserName
+  }
+  if (includeParameters && (browserEnvironment.browserName || browserEnvironment.browserProjectName)) {
+    const parameters = {}
+    if (browserEnvironment.browserName) {
+      parameters.browser = browserEnvironment.browserName
+    }
+    if (browserEnvironment.browserProjectName) {
+      parameters.project = browserEnvironment.browserProjectName
+    }
+    tags[TEST_PARAMETERS] = JSON.stringify({ arguments: parameters, metadata: {} })
+  }
+}
+
 class VitestPlugin extends CiPlugin {
   static id = 'vitest'
 
@@ -100,6 +127,14 @@ class VitestPlugin extends CiPlugin {
         isModified,
         isTestFrameworkWorker,
         requestErrorTags,
+        isBrowserMode,
+        browserDriver,
+        browserName,
+        browserProjectName,
+        isRumActive,
+        testExecutionId,
+        testStartLine,
+        startTime,
       } = ctx
 
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
@@ -109,6 +144,7 @@ class VitestPlugin extends CiPlugin {
       const extraTags = {
         ...requestErrorTags,
         [TEST_SOURCE_FILE]: testSuite,
+        [TEST_SOURCE_START]: testStartLine || 1,
       }
       if (isRetry) {
         extraTags[TEST_IS_RETRY] = 'true'
@@ -143,12 +179,23 @@ class VitestPlugin extends CiPlugin {
       if (isTestFrameworkWorker) {
         extraTags[TEST_IS_TEST_FRAMEWORK_WORKER] = 'true'
       }
+      if (isRumActive) {
+        extraTags[TEST_IS_RUM_ACTIVE] = 'true'
+      }
+      setBrowserTags(extraTags, {
+        browserDriver,
+        browserName,
+        browserProjectName,
+        isBrowserMode,
+      }, true)
 
       const span = this.startTestSpan(
         testName,
         testSuite,
         testSuiteSpan,
-        extraTags
+        extraTags,
+        testExecutionId,
+        startTime
       )
 
       ctx.parentStore = store
@@ -297,25 +344,41 @@ class VitestPlugin extends CiPlugin {
       testSuiteAbsolutePath,
       isNew,
       isDisabled,
+      isRumActive,
       isTestFrameworkWorker,
       requestErrorTags,
       testSuiteSpan,
+      isBrowserMode,
+      browserDriver,
+      browserName,
+      browserProjectName,
+      testExecutionId,
+      testStartLine,
     }) => {
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
+      const extraTags = {
+        ...requestErrorTags,
+        [TEST_SOURCE_FILE]: testSuite,
+        [TEST_SOURCE_START]: testStartLine || 1,
+        [TEST_STATUS]: 'skip',
+        [TEST_FINAL_STATUS]: 'skip',
+        ...(isDisabled ? { [TEST_MANAGEMENT_IS_DISABLED]: 'true' } : {}),
+        ...(isNew ? { [TEST_IS_NEW]: 'true' } : {}),
+        ...(isRumActive ? { [TEST_IS_RUM_ACTIVE]: 'true' } : {}),
+        ...(isTestFrameworkWorker ? { [TEST_IS_TEST_FRAMEWORK_WORKER]: 'true' } : {}),
+      }
+      setBrowserTags(extraTags, {
+        browserDriver,
+        browserName,
+        browserProjectName,
+        isBrowserMode,
+      }, true)
       const testSpan = this.startTestSpan(
         testName,
         testSuite,
         testSuiteSpan || this.testSuiteSpan,
-        {
-          ...requestErrorTags,
-          [TEST_SOURCE_FILE]: testSuite,
-          [TEST_SOURCE_START]: 1, // we can't get the proper start line in vitest
-          [TEST_STATUS]: 'skip',
-          [TEST_FINAL_STATUS]: 'skip',
-          ...(isDisabled ? { [TEST_MANAGEMENT_IS_DISABLED]: 'true' } : {}),
-          ...(isNew ? { [TEST_IS_NEW]: 'true' } : {}),
-          ...(isTestFrameworkWorker ? { [TEST_IS_TEST_FRAMEWORK_WORKER]: 'true' } : {}),
-        }
+        extraTags,
+        testExecutionId
       )
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', this.getTestTelemetryTags(testSpan))
       testSpan.finish()
@@ -330,6 +393,10 @@ class VitestPlugin extends CiPlugin {
         frameworkVersion,
         isTestFrameworkWorker,
         isVitestNoWorkerInitActive,
+        isBrowserMode,
+        browserDriver,
+        browserName,
+        browserProjectName,
       } = ctx
 
       const testCommand = ctx.testCommand || 'vitest run'
@@ -377,6 +444,12 @@ class VitestPlugin extends CiPlugin {
       if (isTestFrameworkWorker) {
         testSuiteMetadata[TEST_IS_TEST_FRAMEWORK_WORKER] = 'true'
       }
+      setBrowserTags(testSuiteMetadata, {
+        browserDriver,
+        browserName,
+        browserProjectName,
+        isBrowserMode,
+      }, false)
 
       const codeOwners = this.getCodeOwners(testSuiteMetadata)
       if (codeOwners) {
diff --git a/packages/dd-trace/src/plugins/ci_plugin.js b/packages/dd-trace/src/plugins/ci_plugin.js
index 736a0b71da..624864b848 100644
--- a/packages/dd-trace/src/plugins/ci_plugin.js
+++ b/packages/dd-trace/src/plugins/ci_plugin.js
@@ -842,8 +842,8 @@ module.exports = class CiPlugin extends Plugin {
     return codeOwners
   }
 
-  startTestSpan (testName, testSuite, testSuiteSpan, extraTags = {}) {
-    const childOf = getTestParentSpan(this.tracer)
+  startTestSpan (testName, testSuite, testSuiteSpan, extraTags = {}, testExecutionId, startTime) {
+    const childOf = getTestParentSpan(this.tracer, testExecutionId)
 
     let testTags = {
       ...getTestCommonTags(
@@ -894,6 +894,7 @@ module.exports = class CiPlugin extends Plugin {
     const testSpan = this.tracer
       .startSpan(`${this.constructor.id}.test`, {
         childOf,
+        startTime,
         tags: {
           ...this.testEnvironmentMetadata,
           ...testTags,
diff --git a/packages/dd-trace/src/plugins/util/test.js b/packages/dd-trace/src/plugins/util/test.js
index 6e9c6e4b29..a843e32ebe 100644
--- a/packages/dd-trace/src/plugins/util/test.js
+++ b/packages/dd-trace/src/plugins/util/test.js
@@ -880,9 +880,16 @@ function setRumTestCorrelation (context, activeSpan) {
   return testSpan
 }
 
-function getTestParentSpan (tracer) {
+/**
+ * Returns the synthetic parent that makes a test event the root of its trace.
+ *
+ * @param {import('../../tracer')} tracer
+ * @param {string} [testExecutionId]
+ * @returns {import('../../opentracing/span_context')}
+ */
+function getTestParentSpan (tracer, testExecutionId) {
   return tracer.extract('text_map', {
-    'x-datadog-trace-id': id().toString(10),
+    'x-datadog-trace-id': testExecutionId || id().toString(10),
     'x-datadog-parent-id': '0000000000000000',
   })
 }
diff --git a/packages/dd-trace/test/plugins/util/test.spec.js b/packages/dd-trace/test/plugins/util/test.spec.js
index 6d9ac805f4..1d765f93fa 100644
--- a/packages/dd-trace/test/plugins/util/test.spec.js
+++ b/packages/dd-trace/test/plugins/util/test.spec.js
@@ -46,6 +46,7 @@ const {
   logAttemptToFixTestExecution,
   logTestOptimizationSummary,
   getTestOptimizationRequestResults,
+  getTestParentSpan,
   setRumTestCorrelation,
   setRumTestTags,
   TEST_BROWSER_VERSION,
@@ -146,6 +147,17 @@ describe('RUM test correlation', () => {
     assert.strictEqual(testSpan.context().getTag(TEST_IS_RUM_ACTIVE), 'true')
     assert.strictEqual(testSpan.context().getTag(TEST_BROWSER_VERSION), undefined)
   })
+
+  it('uses a preallocated test execution ID for the test trace', () => {
+    const parentSpan = {}
+    const extract = sinon.stub().returns(parentSpan)
+
+    assert.strictEqual(getTestParentSpan({ extract }, '123456789'), parentSpan)
+    sinon.assert.calledOnceWithExactly(extract, 'text_map', {
+      'x-datadog-trace-id': '123456789',
+      'x-datadog-parent-id': '0000000000000000',
+    })
+  })
 })
 
 describe('getTestOptimizationRequestResults', () => {

From def33e1317e9782592d4f05e0832b06e3adade90 Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Wed, 29 Jul 2026 17:03:43 +0200
Subject: [PATCH 33/43] fix(test-optimization): detect swapped directories when
 inode numbers exceed 2^53 (#9580)

The fail-closed filesystem guards pin a directory identity as `{ dev, ino }` read
from a number-typed `fs.Stats`. Windows reports a 64-bit file reference number
that packs a 16-bit sequence number above the 48-bit file index, so once a volume
reuses index numbers the value passes 2^53 and two distinct directories round to
the same double. The Windows tracing job therefore rejected a swapped payload
directory on most runs and accepted it on others. An accepted swap lets the
exporter write payloads into a directory it no longer owns, and lets
generated-file cleanup delete a customer file it never created.
---
 .../command-output-policy.js                  | 10 ++--
 .../generated-files.js                        | 16 +++----
 .../offline-output.js                         | 12 ++---
 ci/test-optimization-validation/safe-files.js |  8 ++--
 .../exporters/ci-validation/sink.js           | 13 +++---
 .../exporters/ci-validation.spec.js           | 24 ++++++++++
 .../ci-visibility/generated-files.spec.js     | 27 +++++++++++
 .../validation-execution-phases.spec.js       | 46 +++++++++++++++++++
 .../ci-visibility/validation-test-helpers.js  | 37 +++++++++++++++
 9 files changed, 164 insertions(+), 29 deletions(-)

diff --git a/ci/test-optimization-validation/command-output-policy.js b/ci/test-optimization-validation/command-output-policy.js
index 004049abd4..80b0d52c1d 100644
--- a/ci/test-optimization-validation/command-output-policy.js
+++ b/ci/test-optimization-validation/command-output-policy.js
@@ -71,21 +71,21 @@ function cleanupCommandOutputs (states) {
  *
  * @param {string} outputPath output path
  * @param {string} repositoryRoot repository root
- * @returns {{path: string, dev: number, ino: number}[]} parent identities
+ * @returns {{path: string, dev: bigint, ino: bigint}[]} parent identities
  */
 function captureExistingParentIdentities (outputPath, repositoryRoot) {
   const identities = []
   const relative = path.relative(repositoryRoot, path.dirname(outputPath))
   let current = repositoryRoot
   for (const segment of relative ? relative.split(path.sep) : []) {
-    const stat = fs.lstatSync(current)
+    const stat = fs.lstatSync(current, { bigint: true })
     assertRegularDirectory(stat, current)
     identities.push({ path: current, dev: stat.dev, ino: stat.ino })
     current = path.join(current, segment)
     if (!pathExists(current)) return identities
   }
 
-  const stat = fs.lstatSync(current)
+  const stat = fs.lstatSync(current, { bigint: true })
   assertRegularDirectory(stat, current)
   identities.push({ path: current, dev: stat.dev, ino: stat.ino })
   return identities
@@ -98,7 +98,7 @@ function captureExistingParentIdentities (outputPath, repositoryRoot) {
  */
 function assertOutputParentsUnchanged (state) {
   for (const identity of state.parentIdentities) {
-    const stat = fs.lstatSync(identity.path)
+    const stat = fs.lstatSync(identity.path, { bigint: true })
     assertRegularDirectory(stat, identity.path)
     if (stat.dev !== identity.dev || stat.ino !== identity.ino) {
       throw new Error(`Refusing command output cleanup because a parent directory changed: ${identity.path}`)
@@ -118,7 +118,7 @@ function assertOutputParentsUnchanged (state) {
 /**
  * Refuses symbolic links and non-directory parent components.
  *
- * @param {fs.Stats} stat path status
+ * @param {fs.Stats | fs.BigIntStats} stat path status
  * @param {string} directory directory path
  */
 function assertRegularDirectory (stat, directory) {
diff --git a/ci/test-optimization-validation/generated-files.js b/ci/test-optimization-validation/generated-files.js
index a8d0e5af6b..32ad84281b 100644
--- a/ci/test-optimization-validation/generated-files.js
+++ b/ci/test-optimization-validation/generated-files.js
@@ -1,7 +1,7 @@
 'use strict'
 
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 
 const {
   MAX_GENERATED_FILES,
@@ -251,7 +251,7 @@ function forgetWrittenGeneratedFiles (filenames) {
 function authorizePathForCleanup (root, filename) {
   const lexicalRoot = path.resolve(root)
   const physicalRoot = fs.realpathSync(lexicalRoot)
-  const rootStat = fs.statSync(physicalRoot)
+  const rootStat = fs.statSync(physicalRoot, { bigint: true })
   const authorization = {
     lexicalRoot,
     physicalRoot,
@@ -276,7 +276,7 @@ function pinCleanupParent (authorization, filename) {
   try {
     const physicalParent = fs.realpathSync(path.dirname(filename))
     if (!isPathInside(authorization.physicalRoot, physicalParent)) return
-    const parentStat = fs.statSync(physicalParent)
+    const parentStat = fs.statSync(physicalParent, { bigint: true })
     authorization.physicalParent = physicalParent
     authorization.parentDevice = parentStat.dev
     authorization.parentInode = parentStat.ino
@@ -285,7 +285,7 @@ function pinCleanupParent (authorization, filename) {
 
 function pinCleanupTarget (authorization, filename) {
   try {
-    const targetStat = fs.lstatSync(filename)
+    const targetStat = fs.lstatSync(filename, { bigint: true })
     authorization.targetDevice = targetStat.dev
     authorization.targetInode = targetStat.ino
   } catch {}
@@ -294,7 +294,7 @@ function pinCleanupTarget (authorization, filename) {
 function isCleanupAuthorizationValid (filename, authorization) {
   try {
     const currentPhysicalRoot = fs.realpathSync(authorization.lexicalRoot)
-    const rootStat = fs.statSync(currentPhysicalRoot)
+    const rootStat = fs.statSync(currentPhysicalRoot, { bigint: true })
     if (currentPhysicalRoot !== authorization.physicalRoot ||
       rootStat.dev !== authorization.rootDevice || rootStat.ino !== authorization.rootInode) {
       return false
@@ -302,14 +302,14 @@ function isCleanupAuthorizationValid (filename, authorization) {
 
     if (authorization.physicalParent === undefined) return false
     const physicalParent = fs.realpathSync(path.dirname(filename))
-    const parentStat = fs.statSync(physicalParent)
+    const parentStat = fs.statSync(physicalParent, { bigint: true })
     if (physicalParent !== authorization.physicalParent ||
       parentStat.dev !== authorization.parentDevice || parentStat.ino !== authorization.parentInode) {
       return false
     }
 
     if (authorization.targetDevice !== undefined) {
-      const targetStat = fs.lstatSync(filename)
+      const targetStat = fs.lstatSync(filename, { bigint: true })
       if (targetStat.dev !== authorization.targetDevice || targetStat.ino !== authorization.targetInode) {
         return false
       }
diff --git a/ci/test-optimization-validation/offline-output.js b/ci/test-optimization-validation/offline-output.js
index 690c06120e..1866b337aa 100644
--- a/ci/test-optimization-validation/offline-output.js
+++ b/ci/test-optimization-validation/offline-output.js
@@ -57,8 +57,8 @@ function readOfflineOutput (outputRoot) {
   if (!exporterInitialized) return emptyOutput()
 
   const state = {
-    bytes: 0,
-    completionBytes: 0,
+    bytes: 0n,
+    completionBytes: 0n,
     decodedEntries: 0,
     files: 0,
   }
@@ -150,7 +150,7 @@ function readPayloadFiles (payloadsRoot, kind, state, consume) {
 }
 
 function readRegularFile (filename, individualLimit, state, completion) {
-  const stat = fs.lstatSync(filename)
+  const stat = fs.lstatSync(filename, { bigint: true })
   if (!stat.isFile() || stat.isSymbolicLink() || stat.nlink > 1) {
     throw new Error('Offline validation artifact must be a regular, unlinked file.')
   }
@@ -163,16 +163,16 @@ function readRegularFile (filename, individualLimit, state, completion) {
 
   const file = fs.openSync(filename, fs.constants.O_RDONLY | (fs.constants.O_NOFOLLOW || 0))
   try {
-    const opened = fs.fstatSync(file)
+    const opened = fs.fstatSync(file, { bigint: true })
     if (!opened.isFile() || opened.nlink > 1 || opened.dev !== stat.dev || opened.ino !== stat.ino) {
       throw new Error('Offline validation artifact changed while it was opened.')
     }
     const buffer = fs.readFileSync(file)
-    const completed = fs.fstatSync(file)
+    const completed = fs.fstatSync(file, { bigint: true })
     if (completed.size !== opened.size || completed.mtimeMs !== opened.mtimeMs) {
       throw new Error('Offline validation artifact changed while it was read.')
     }
-    state[totalKey] += buffer.length
+    state[totalKey] += BigInt(buffer.length)
     return buffer
   } finally {
     fs.closeSync(file)
diff --git a/ci/test-optimization-validation/safe-files.js b/ci/test-optimization-validation/safe-files.js
index b5d2d5ece3..002fa751a6 100644
--- a/ci/test-optimization-validation/safe-files.js
+++ b/ci/test-optimization-validation/safe-files.js
@@ -129,10 +129,10 @@ function openAndWrite (root, filename, data, label, creationFlag) {
  *
  * @param {string} directory directory path
  * @param {string} label customer-facing path label
- * @returns {{dev: number, ino: number}} directory identity
+ * @returns {{dev: bigint, ino: bigint}} directory identity
  */
 function getDirectoryIdentity (directory, label) {
-  const stat = fs.lstatSync(directory)
+  const stat = fs.lstatSync(directory, { bigint: true })
   if (!stat.isDirectory() || stat.isSymbolicLink()) {
     throw new Error(`Refusing ${label} because its parent is not a regular directory: ${directory}`)
   }
@@ -143,7 +143,7 @@ function getDirectoryIdentity (directory, label) {
  * Refuses replacement of a parent directory between safe creation and publication.
  *
  * @param {string} directory directory path
- * @param {{dev: number, ino: number}} expected expected identity
+ * @param {{dev: bigint, ino: bigint}} expected expected identity
  * @param {string} label customer-facing path label
  */
 function assertDirectoryIdentity (directory, expected, label) {
@@ -158,7 +158,7 @@ function assertDirectoryIdentity (directory, expected, label) {
  *
  * @param {string} filename temporary filename
  * @param {string} parent expected parent directory
- * @param {{dev: number, ino: number}} parentIdentity expected parent identity
+ * @param {{dev: bigint, ino: bigint}} parentIdentity expected parent identity
  */
 function removeTemporaryFile (filename, parent, parentIdentity) {
   try {
diff --git a/packages/dd-trace/src/ci-visibility/exporters/ci-validation/sink.js b/packages/dd-trace/src/ci-visibility/exporters/ci-validation/sink.js
index 6a8a10ac76..2657eb8c44 100644
--- a/packages/dd-trace/src/ci-visibility/exporters/ci-validation/sink.js
+++ b/packages/dd-trace/src/ci-visibility/exporters/ci-validation/sink.js
@@ -303,10 +303,11 @@ function writeNewFile (filename, payload) {
  *
  * @param {string} directory directory path
  * @param {string} label directory label
- * @returns {{dev: number, ino: number}} stable directory identity
+ * @returns {{dev: bigint, ino: bigint}} stable directory identity
  */
 function captureDirectory (directory, label) {
-  const stat = fs.lstatSync(directory)
+  // Windows file reference numbers exceed 2^53, where distinct directories round to one number.
+  const stat = fs.lstatSync(directory, { bigint: true })
   if (!stat.isDirectory() || stat.isSymbolicLink()) {
     throw new Error(`Offline Test Optimization validation ${label} must be a regular directory.`)
   }
@@ -317,10 +318,10 @@ function captureDirectory (directory, label) {
  * Creates or validates one child directory without accepting symbolic links.
  *
  * @param {string} parent parent directory path
- * @param {{dev: number, ino: number}} parentIdentity expected parent identity
+ * @param {{dev: bigint, ino: bigint}} parentIdentity expected parent identity
  * @param {string} directory child directory path
  * @param {string} label directory label
- * @returns {{dev: number, ino: number}} stable child identity
+ * @returns {{dev: bigint, ino: bigint}} stable child identity
  */
 function createDirectory (parent, parentIdentity, directory, label) {
   assertDirectoryUnchanged(parent, parentIdentity, 'parent output')
@@ -336,7 +337,7 @@ function createDirectory (parent, parentIdentity, directory, label) {
  * Rejects a directory that changed after sink construction.
  *
  * @param {string} directory directory path
- * @param {{dev: number, ino: number}} identity expected directory identity
+ * @param {{dev: bigint, ino: bigint}} identity expected directory identity
  * @param {string} label directory label
  */
 function assertDirectoryUnchanged (directory, identity, label) {
@@ -351,7 +352,7 @@ function assertDirectoryUnchanged (directory, identity, label) {
  *
  * @param {string} filename partial payload path
  * @param {string} directory expected parent directory
- * @param {{dev: number, ino: number}} identity expected parent identity
+ * @param {{dev: bigint, ino: bigint}} identity expected parent identity
  */
 function removePartialFile (filename, directory, identity) {
   try {
diff --git a/packages/dd-trace/test/ci-visibility/exporters/ci-validation.spec.js b/packages/dd-trace/test/ci-visibility/exporters/ci-validation.spec.js
index e7723b698f..ed607e50cb 100644
--- a/packages/dd-trace/test/ci-visibility/exporters/ci-validation.spec.js
+++ b/packages/dd-trace/test/ci-visibility/exporters/ci-validation.spec.js
@@ -11,6 +11,7 @@ const path = require('node:path')
 
 const msgpack = require('@msgpack/msgpack')
 const { afterEach, beforeEach, describe, it } = require('mocha')
+const proxyquire = require('proxyquire')
 const sinon = require('sinon')
 
 require('../../setup/core')
@@ -26,6 +27,7 @@ const { CiValidationSink, MAX_OUTPUT_FILES, SUMMARY_PREFIX } =
   require('../../../src/ci-visibility/exporters/ci-validation/sink')
 const CiValidationWriter = require('../../../src/ci-visibility/exporters/ci-validation/writer')
 const CiValidationExporter = require('../../../src/ci-visibility/exporters/ci-validation')
+const { createWindowsFileReferenceFs } = require('../validation-test-helpers')
 
 const VALIDATION_MANIFEST_ENV = '_DD_TEST_OPTIMIZATION_VALIDATION_MANIFEST_FILE'
 const VALIDATION_OUTPUT_ENV = '_DD_TEST_OPTIMIZATION_VALIDATION_OUTPUT_DIR'
@@ -139,6 +141,28 @@ describe('CI validation offline output', () => {
     assert.deepStrictEqual(summary.errors, ['output_write_failed'])
   })
 
+  it('fails closed when a swapped payload directory reuses a file reference above 2^53', () => {
+    const { CiValidationSink: WindowsCiValidationSink } =
+      proxyquire('../../../src/ci-visibility/exporters/ci-validation/sink', {
+        'node:fs': createWindowsFileReferenceFs(),
+      })
+
+    const sink = new WindowsCiValidationSink(outputRoot)
+    const writer = new CiValidationWriter({ sink, tags: {} })
+    const testsDirectory = path.join(outputRoot, 'payloads', 'tests')
+    fs.renameSync(testsDirectory, `${testsDirectory}-original`)
+    fs.mkdirSync(testsDirectory)
+
+    writer.append([createTestSpan()])
+    writer.flush()
+    sink.writeSummary()
+
+    assert.strictEqual(getPayloadFiles(outputRoot, 'tests').length, 0)
+    assert.strictEqual(process.exitCode, 1)
+    const summary = JSON.parse(stderrWrite.firstCall.args[0].slice(SUMMARY_PREFIX.length))
+    assert.deepStrictEqual(summary.errors, ['output_write_failed'])
+  })
+
   it('reports bounded cache input results in one summary', () => {
     const sink = new CiValidationSink(outputRoot)
 
diff --git a/packages/dd-trace/test/ci-visibility/generated-files.spec.js b/packages/dd-trace/test/ci-visibility/generated-files.spec.js
index 18964cbbe7..a13387255d 100644
--- a/packages/dd-trace/test/ci-visibility/generated-files.spec.js
+++ b/packages/dd-trace/test/ci-visibility/generated-files.spec.js
@@ -5,11 +5,14 @@ const fs = require('node:fs')
 const os = require('node:os')
 const path = require('node:path')
 
+const proxyquire = require('proxyquire')
+
 const {
   cleanupGeneratedFiles,
   cleanupGeneratedRuntimeFiles,
   writeGeneratedFiles,
 } = require('../../../../ci/test-optimization-validation/generated-files')
+const { createWindowsFileReferenceFs } = require('./validation-test-helpers')
 
 describe('test optimization validation generated files', () => {
   it('allows existing generated files when the content matches', () => {
@@ -274,6 +277,30 @@ describe('test optimization validation generated files', () => {
     }
   })
 
+  it('retains a replaced generated file that reuses a file reference above 2^53', () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), 'dd-generated-files-windows-'))
+    const filename = path.join(root, 'dd-test-optimization-validation.test.js')
+    const original = path.join(root, 'original-generated.test.js')
+    const framework = getFramework(root, filename)
+    const windowsGeneratedFiles = proxyquire('../../../../ci/test-optimization-validation/generated-files', {
+      'node:fs': createWindowsFileReferenceFs(),
+    })
+
+    try {
+      windowsGeneratedFiles.writeGeneratedFiles(framework)
+      fs.renameSync(filename, original)
+      fs.writeFileSync(filename, 'customer replacement\n')
+
+      const cleanup = windowsGeneratedFiles.cleanupGeneratedFiles({ frameworks: [framework] })
+
+      assert.strictEqual(cleanup.status, 'incomplete')
+      assert.strictEqual(cleanup.filesRetained, 1)
+      assert.strictEqual(fs.readFileSync(filename, 'utf8'), 'customer replacement\n')
+    } finally {
+      fs.rmSync(root, { recursive: true, force: true })
+    }
+  })
+
   it('reports temporary files intentionally retained by the approved plan', () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), 'dd-generated-files-kept-'))
     const filename = path.join(root, 'dd-test-optimization-validation.test.js')
diff --git a/packages/dd-trace/test/ci-visibility/validation-execution-phases.spec.js b/packages/dd-trace/test/ci-visibility/validation-execution-phases.spec.js
index 85a19d1292..a939f1f75b 100644
--- a/packages/dd-trace/test/ci-visibility/validation-execution-phases.spec.js
+++ b/packages/dd-trace/test/ci-visibility/validation-execution-phases.spec.js
@@ -25,6 +25,7 @@ const { getBasicCommand } = require('../../../../ci/test-optimization-validation
 const {
   createLoadedManifest,
   createRepositoryFixture,
+  createWindowsFileReferenceFs,
   removeFixture,
 } = require('./validation-test-helpers')
 
@@ -404,6 +405,51 @@ describe('test optimization validation execution boundary', () => {
     assert.match(withCiPreloads('', framework).replaceAll('\\', '/'), /-r "?[^"]*\/ci\/init\.js"?$/)
   })
 
+  it('refuses command output cleanup when a parent is swapped and reuses a file reference above 2^53', () => {
+    const { cleanupCommandOutputs, prepareCommandOutputs } =
+      proxyquire('../../../../ci/test-optimization-validation/command-output-policy', {
+        'node:fs': createWindowsFileReferenceFs(),
+      })
+    const outputParent = path.join(fixture.root, 'command-output')
+    fs.mkdirSync(outputParent)
+    const states = prepareCommandOutputs({
+      artifactRoot: out,
+      command: { cwd: fixture.root, outputPaths: [path.join(outputParent, 'result.json')] },
+      repositoryRoot: fixture.root,
+    })
+
+    fs.renameSync(outputParent, `${outputParent}-original`)
+    fs.mkdirSync(outputParent)
+
+    assert.throws(() => cleanupCommandOutputs(states), /parent directory changed/)
+  })
+
+  it('refuses to publish a report when its parent is swapped and reuses a file reference above 2^53', () => {
+    const parent = path.join(fixture.root, 'safe-write')
+    fs.mkdirSync(parent)
+    let swapped = false
+    const { writeFileSafely } = proxyquire('../../../../ci/test-optimization-validation/safe-files', {
+      'node:fs': createWindowsFileReferenceFs({
+        // Windows refuses to rename a directory that still holds an open handle, so the swap waits
+        // until the temporary file is closed.
+        closeSync: (file) => {
+          fs.closeSync(file)
+          if (!swapped) {
+            swapped = true
+            fs.renameSync(parent, `${parent}-original`)
+            fs.mkdirSync(parent)
+          }
+        },
+      }),
+    })
+
+    assert.throws(
+      () => writeFileSafely(fixture.root, path.join(parent, 'report.json'), '{}', 'validation report'),
+      /parent directory changed during the write/
+    )
+    assert.strictEqual(swapped, true)
+  })
+
   /**
    * Executes a direct command with standard test artifacts.
    *
diff --git a/packages/dd-trace/test/ci-visibility/validation-test-helpers.js b/packages/dd-trace/test/ci-visibility/validation-test-helpers.js
index c3b93b1ef1..97183179ca 100644
--- a/packages/dd-trace/test/ci-visibility/validation-test-helpers.js
+++ b/packages/dd-trace/test/ci-visibility/validation-test-helpers.js
@@ -7,6 +7,8 @@ const path = require('node:path')
 const { createManifestScaffold } = require('../../../../ci/test-optimization-validation/manifest-scaffold')
 const { loadManifest } = require('../../../../ci/test-optimization-validation/manifest-loader')
 
+const WINDOWS_SEQUENCE_NUMBER = 1024n
+
 const FRAMEWORKS = {
   cucumber: {
     bin: 'cucumber-js',
@@ -121,9 +123,44 @@ function removeFixture (root) {
   fs.rmSync(root, { force: true, recursive: true })
 }
 
+/**
+ * Emulates a volume whose file reference numbers carry a Windows sequence number above the 48-bit
+ * file index, so distinct paths round to one number outside the safe integer range.
+ *
+ * @param {Partial<import('node:fs')>} [overrides] further `node:fs` members to replace
+ * @returns {Partial<import('node:fs')>} `node:fs` replacement for proxyquire
+ */
+function createWindowsFileReferenceFs (overrides) {
+  const references = new Map()
+
+  /**
+   * @param {import('node:fs').Stats | import('node:fs').BigIntStats} stat real path status
+   * @param {boolean} [bigint] whether the caller asked for bigint values
+   */
+  const toWindowsStat = (stat, bigint) => {
+    const key = String(stat.ino)
+    if (!references.has(key)) {
+      references.set(key, (WINDOWS_SEQUENCE_NUMBER << 48n) + BigInt(references.size))
+    }
+    const reference = references.get(key)
+    const windowsStat = { ...stat, ino: bigint ? reference : Number(reference) }
+    windowsStat.isDirectory = () => stat.isDirectory()
+    windowsStat.isFile = () => stat.isFile()
+    windowsStat.isSymbolicLink = () => stat.isSymbolicLink()
+    return windowsStat
+  }
+
+  return {
+    lstatSync: (target, options) => toWindowsStat(fs.lstatSync(target, options), options?.bigint),
+    statSync: (target, options) => toWindowsStat(fs.statSync(target, options), options?.bigint),
+    ...overrides,
+  }
+}
+
 module.exports = {
   FRAMEWORKS,
   createLoadedManifest,
   createRepositoryFixture,
+  createWindowsFileReferenceFs,
   removeFixture,
 }

From e511d8a60f9519aae91c410695110ab0e103319b Mon Sep 17 00:00:00 2001
From: Leo Romanovsky <leo.romanovsky@datadoghq.com>
Date: Wed, 29 Jul 2026 10:28:47 -0600
Subject: [PATCH 34/43] fix(openfeature): disable the provider for unsupported
 sources (#9482)

* fix(openfeature): support custom agentless endpoints

* fix(openfeature): preserve unsupported configuration sources

* fix(openfeature): never send API keys to custom endpoints

* fix(openfeature): disable unsupported configuration sources

* fix(openfeature): clarify default endpoint error

* fix(openfeature): address configuration source feedback

---------

Co-authored-by: Ruben Bridgewater <ruben@bridgewater.de>
---
 .../openfeature-configuration-sources.spec.js |  7 +--
 packages/dd-trace/src/config/defaults.js      | 20 ++++---
 .../src/config/generated-config-types.d.ts    |  4 +-
 packages/dd-trace/src/config/index.js         | 15 ++++++
 packages/dd-trace/src/config/parsers.js       | 11 ++++
 .../src/config/supported-configurations.json  | 11 ++--
 packages/dd-trace/test/config/index.spec.js   | 53 +++++++++++++++----
 .../openfeature/configuration_source.spec.js  | 12 +++++
 8 files changed, 105 insertions(+), 28 deletions(-)

diff --git a/integration-tests/openfeature/openfeature-configuration-sources.spec.js b/integration-tests/openfeature/openfeature-configuration-sources.spec.js
index 9923933241..084ea88561 100644
--- a/integration-tests/openfeature/openfeature-configuration-sources.spec.js
+++ b/integration-tests/openfeature/openfeature-configuration-sources.spec.js
@@ -135,9 +135,9 @@ describe('OpenFeature configuration source contract', () => {
 
     assert.strictEqual(configurationCases.length, 63)
     assert.deepStrictEqual(countDeliveries(configurationCases), {
-      agentless: 16,
-      remote_config: 16,
-      disabled: 31,
+      agentless: 12,
+      remote_config: 12,
+      disabled: 39,
     })
 
     await runCases(configurationCases)
@@ -677,6 +677,7 @@ function expectedDelivery (stable, source, legacy) {
   if (stable === 'false') return 'disabled'
   if (source.name === 'agentless') return 'agentless'
   if (source.name === 'remote_config') return 'remote_config'
+  if (source.name === 'offline' || source.name === 'invalid') return 'disabled'
   if (legacy === 'true') return 'remote_config'
   if (legacy === 'false') return 'disabled'
   return 'agentless'
diff --git a/packages/dd-trace/src/config/defaults.js b/packages/dd-trace/src/config/defaults.js
index d5b1f2e882..bc1e0c9482 100644
--- a/packages/dd-trace/src/config/defaults.js
+++ b/packages/dd-trace/src/config/defaults.js
@@ -32,18 +32,26 @@ const parseErrors = new Map()
  * @param {string} source - The source of the value.
  * @param {string} baseMessage - The base message to use for the warning.
  * @param {Error} [error] - An error that was thrown while parsing the value.
+ * @param {string} [outcome] - The outcome after the invalid value is rejected.
  */
-function warnInvalidValue (value, optionName, source, baseMessage, error) {
-  const canonicalName = (optionsTable[optionName]?.canonicalName ?? optionName) + source
+function warnInvalidValue (value, optionName, source, baseMessage, error, outcome = 'picked default') {
+  const canonicalName = optionsTable[optionName]?.canonicalName ?? optionName
+  const telemetryKey = canonicalName + source
+  const telemetryEntry = configWithOrigin.get(telemetryKey)
   // Lazy load log module to avoid circular dependency
-  if (!parseErrors.has(canonicalName)) {
-    // TODO: Rephrase: It will fallback to former source (or default if not set)
-    let message = `${baseMessage}: ${util.inspect(value)} for ${optionName} (source: ${source}), picked default`
+  if (!parseErrors.has(telemetryKey) && !telemetryEntry?.error) {
+    // TODO: Report the prior source when an invalid value does not use the default.
+    let message = `${baseMessage}: ${util.inspect(value)} for ${optionName} (source: ${source})`
+    if (outcome) message += `, ${outcome}`
     if (error) {
       error.stack = error.toString()
       message += `\n\n${util.inspect(error)}`
     }
-    parseErrors.set(canonicalName, { message })
+    if (telemetryEntry) {
+      telemetryEntry.error = { message }
+    } else {
+      parseErrors.set(telemetryKey, { message })
+    }
     log ??= require('../log')
     const logLevel = error ? 'error' : 'warn'
     log[logLevel](message)
diff --git a/packages/dd-trace/src/config/generated-config-types.d.ts b/packages/dd-trace/src/config/generated-config-types.d.ts
index 8a386bd45d..7e12c208f7 100644
--- a/packages/dd-trace/src/config/generated-config-types.d.ts
+++ b/packages/dd-trace/src/config/generated-config-types.d.ts
@@ -434,7 +434,7 @@ export interface GeneratedConfig {
     };
   };
   featureFlags: {
-    DD_FEATURE_FLAGS_CONFIGURATION_SOURCE: "agentless" | "remote_config";
+    DD_FEATURE_FLAGS_CONFIGURATION_SOURCE: string;
     DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL: string | undefined;
     DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS: number;
     DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS: number;
@@ -700,7 +700,7 @@ export interface GeneratedEnvVarConfig {
   DD_EXPERIMENTAL_TEST_OPT_VITEST_NO_WORKER_INIT: boolean | undefined;
   DD_EXPERIMENTAL_TEST_REQUESTS_FS_CACHE: boolean;
   DD_EXTERNAL_ENV: string | undefined;
-  DD_FEATURE_FLAGS_CONFIGURATION_SOURCE: "agentless" | "remote_config";
+  DD_FEATURE_FLAGS_CONFIGURATION_SOURCE: string;
   DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL: string | undefined;
   DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS: number;
   DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS: number;
diff --git a/packages/dd-trace/src/config/index.js b/packages/dd-trace/src/config/index.js
index 5e952a6653..4ee295e072 100644
--- a/packages/dd-trace/src/config/index.js
+++ b/packages/dd-trace/src/config/index.js
@@ -343,6 +343,21 @@ class Config extends ConfigBase {
       }
     }
 
+    const configurationSource = this.featureFlags.DD_FEATURE_FLAGS_CONFIGURATION_SOURCE
+    if (this.featureFlags.DD_FEATURE_FLAGS_ENABLED &&
+        configurationSource !== 'agentless' &&
+        configurationSource !== 'remote_config') {
+      warnInvalidValue(
+        configurationSource,
+        'DD_FEATURE_FLAGS_CONFIGURATION_SOURCE',
+        this.getOrigin('featureFlags.DD_FEATURE_FLAGS_CONFIGURATION_SOURCE'),
+        'Unsupported Feature Flagging configuration source',
+        undefined,
+        'provider disabled'
+      )
+      setAndTrack(this, 'featureFlags.DD_FEATURE_FLAGS_ENABLED', false)
+    }
+
     if (this.url ||
         os.type() !== 'Windows_NT' &&
         !trackedConfigOrigins.has('hostname') &&
diff --git a/packages/dd-trace/src/config/parsers.js b/packages/dd-trace/src/config/parsers.js
index beb5a59a17..7b2897c8cd 100644
--- a/packages/dd-trace/src/config/parsers.js
+++ b/packages/dd-trace/src/config/parsers.js
@@ -58,6 +58,17 @@ const transformers = {
   toLowerCase (value) {
     return toCase(value, 'toLowerCase')
   },
+  /**
+   * Normalizes a Feature Flagging configuration source.
+   * A blank value is treated as unset so legacy configuration can still apply.
+   *
+   * @param {string} value
+   * @returns {string | undefined}
+   */
+  configurationSource (value) {
+    const normalized = value.trim().toLowerCase()
+    return normalized || undefined
+  },
   toUpperCase (value) {
     return toCase(value, 'toUpperCase')
   },
diff --git a/packages/dd-trace/src/config/supported-configurations.json b/packages/dd-trace/src/config/supported-configurations.json
index ad34c141bf..44db55b489 100644
--- a/packages/dd-trace/src/config/supported-configurations.json
+++ b/packages/dd-trace/src/config/supported-configurations.json
@@ -849,10 +849,9 @@
         "implementation": "A",
         "type": "string",
         "default": "agentless",
-        "allowed": "agentless|remote_config",
-        "description": "Experimental: Select where Feature Flagging loads Universal Flag Configuration. Supported values are agentless and remote_config.",
+        "description": "Select where Feature Flagging loads Universal Flag Configuration. Supported values are agentless and remote_config; offline is reserved and currently unsupported.",
         "namespace": "featureFlags",
-        "transform": "toLowerCase"
+        "transform": "configurationSource"
       }
     ],
     "DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL": [
@@ -860,7 +859,7 @@
         "implementation": "A",
         "type": "string",
         "default": null,
-        "description": "Experimental: Override the agentless Feature Flagging UFC endpoint or base URL.",
+        "description": "Override the agentless Feature Flagging UFC endpoint or base URL.",
         "namespace": "featureFlags",
         "sensitive": true
       }
@@ -870,7 +869,7 @@
         "implementation": "A",
         "type": "int",
         "default": "30",
-        "description": "Experimental: Set the agentless Feature Flagging UFC polling interval in seconds, capped at one hour.",
+        "description": "Set the agentless Feature Flagging UFC polling interval in seconds, capped at one hour.",
         "allowed": "[1-9]\\d*",
         "namespace": "featureFlags"
       }
@@ -880,7 +879,7 @@
         "implementation": "A",
         "type": "int",
         "default": "5",
-        "description": "Experimental: Set the agentless Feature Flagging UFC request timeout in seconds.",
+        "description": "Set the agentless Feature Flagging UFC request timeout in seconds.",
         "allowed": "[1-9]\\d*",
         "namespace": "featureFlags"
       }
diff --git a/packages/dd-trace/test/config/index.spec.js b/packages/dd-trace/test/config/index.spec.js
index 5f2643c819..bd92831a54 100644
--- a/packages/dd-trace/test/config/index.spec.js
+++ b/packages/dd-trace/test/config/index.spec.js
@@ -5070,16 +5070,26 @@ rules:
           expected: { enabled: true, source: 'remote_config' },
         },
         {
-          name: 'falls back from an invalid source to legacy enablement',
+          name: 'disables the provider for an invalid source',
+          source: 'other',
+          expected: { enabled: false },
+        },
+        {
+          name: 'disables the provider for the reserved offline source',
+          source: 'offline',
+          expected: { enabled: false },
+        },
+        {
+          name: 'disables the provider for an invalid source despite legacy enablement',
           source: 'other',
           legacyEnabled: 'true',
-          expected: { enabled: true, source: 'remote_config' },
+          expected: { enabled: false },
         },
         {
-          name: 'falls back from the reserved offline source to legacy enablement',
+          name: 'disables the provider for the reserved offline source despite legacy enablement',
           source: 'offline',
           legacyEnabled: 'true',
-          expected: { enabled: true, source: 'remote_config' },
+          expected: { enabled: false },
         },
       ]) {
       it(name, () => {
@@ -5105,27 +5115,48 @@ rules:
       })
     }
 
-    it('falls back from an invalid source through calculated legacy precedence', () => {
+    it('disables an explicit unsupported source while preserving diagnostic context', () => {
       process.env.DD_FEATURE_FLAGS_ENABLED = 'true'
       process.env.DD_FEATURE_FLAGS_CONFIGURATION_SOURCE = 'offline'
       process.env.DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED = 'true'
 
       const config = getConfig()
+      const warning = 'Unsupported Feature Flagging configuration source: ' +
+        "'offline' for DD_FEATURE_FLAGS_CONFIGURATION_SOURCE (source: env_var), provider disabled"
 
-      assert.strictEqual(config.featureFlags.DD_FEATURE_FLAGS_ENABLED, true)
-      assert.strictEqual(config.featureFlags.DD_FEATURE_FLAGS_CONFIGURATION_SOURCE, 'remote_config')
+      assert.strictEqual(config.featureFlags.DD_FEATURE_FLAGS_ENABLED, false)
+      assert.strictEqual(config.featureFlags.DD_FEATURE_FLAGS_CONFIGURATION_SOURCE, 'offline')
       assert.strictEqual(config.experimental.flaggingProvider.enabled, true)
-      assert.strictEqual(config.getOrigin('featureFlags.DD_FEATURE_FLAGS_ENABLED'), 'env_var')
-      assert.strictEqual(config.getOrigin('featureFlags.DD_FEATURE_FLAGS_CONFIGURATION_SOURCE'), 'calculated')
+      assert.strictEqual(config.getOrigin('featureFlags.DD_FEATURE_FLAGS_ENABLED'), 'calculated')
+      assert.strictEqual(config.getOrigin('featureFlags.DD_FEATURE_FLAGS_CONFIGURATION_SOURCE'), 'env_var')
       assert.strictEqual(config.getOrigin('experimental.flaggingProvider.enabled'), 'env_var')
       assertConfigUpdateContains(updateConfig.getCall(0).args[0], [
-        { name: 'DD_FEATURE_FLAGS_ENABLED', value: true, origin: 'env_var' },
-        { name: 'DD_FEATURE_FLAGS_CONFIGURATION_SOURCE', value: 'remote_config', origin: 'calculated' },
+        { name: 'DD_FEATURE_FLAGS_ENABLED', value: false, origin: 'calculated' },
+        {
+          name: 'DD_FEATURE_FLAGS_CONFIGURATION_SOURCE',
+          value: 'offline',
+          origin: 'env_var',
+          error: { message: warning },
+        },
         { name: 'DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED', value: true, origin: 'env_var' },
       ])
+      sinon.assert.calledOnceWithExactly(log.warn, warning)
 
       config.setRemoteConfig({})
 
+      sinon.assert.calledOnce(log.warn)
+      sinon.assert.notCalled(log.error)
+    })
+
+    it('does not warn for an unsupported source when the stable kill switch disables the provider', () => {
+      process.env.DD_FEATURE_FLAGS_ENABLED = 'false'
+      process.env.DD_FEATURE_FLAGS_CONFIGURATION_SOURCE = 'offline'
+
+      const config = getConfig()
+
+      assert.strictEqual(config.featureFlags.DD_FEATURE_FLAGS_ENABLED, false)
+      assert.strictEqual(config.featureFlags.DD_FEATURE_FLAGS_CONFIGURATION_SOURCE, 'offline')
+      sinon.assert.notCalled(log.warn)
       sinon.assert.notCalled(log.error)
     })
 
diff --git a/packages/dd-trace/test/openfeature/configuration_source.spec.js b/packages/dd-trace/test/openfeature/configuration_source.spec.js
index 17aa2ae9b3..1a78d73687 100644
--- a/packages/dd-trace/test/openfeature/configuration_source.spec.js
+++ b/packages/dd-trace/test/openfeature/configuration_source.spec.js
@@ -225,6 +225,18 @@ describe('OpenFeature configuration source', () => {
     sinon.assert.notCalled(AgentlessConfigurationSource)
   })
 
+  for (const source of ['offline', 'invalid']) {
+    it(`does not create a source for the unsupported ${source} source`, () => {
+      config.featureFlags.DD_FEATURE_FLAGS_CONFIGURATION_SOURCE = source
+
+      const resolved = configurationSource.create(config, sinon.spy())
+
+      assert.strictEqual(resolved, undefined)
+      sinon.assert.notCalled(AgentlessConfigurationSource)
+      sinon.assert.notCalled(log.error)
+    })
+  }
+
   it('does not create an agentless source when Feature Flags are disabled', () => {
     config.featureFlags.DD_FEATURE_FLAGS_ENABLED = false
     delete config.site

From 2d9e7adc1cdfa7fbb9c7cde8ba27f88b9c088556 Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Wed, 29 Jul 2026 18:53:28 +0200
Subject: [PATCH 35/43] chore(tsconfig): drop deprecated alwaysStrict and
 baseUrl options (#9557)

TypeScript 6 reports `alwaysStrict=false` (TS5107) and `baseUrl`
(TS5101) as errors, so `npm run type:check` exits 2 before it
type-checks a single file. Both options can go instead of being silenced
with `ignoreDeprecations`:

1. `alwaysStrict: false` only relaxes strict-mode syntax diagnostics,
   and no file in the checked set uses syntax that strict mode rejects.
2. `baseUrl` resolved exactly one specifier, the `import('index')` in
   `plugins/util/llm.js`, which now points at the package root the way
   `sampler.js` already annotates the same union.

`tsc` emits an identical diagnostic set before and after, so the command
runs again without changing what gets checked. It still exits non-zero
on pre-existing errors in the checked sources.
---
 packages/dd-trace/src/plugins/util/llm.js | 4 ++--
 tsconfig.dev.json                         | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/dd-trace/src/plugins/util/llm.js b/packages/dd-trace/src/plugins/util/llm.js
index 548ddc78cd..e30c911d12 100644
--- a/packages/dd-trace/src/plugins/util/llm.js
+++ b/packages/dd-trace/src/plugins/util/llm.js
@@ -28,7 +28,7 @@ function normalize (text, limit = 128) {
  * Determines whether a prompt completion should be sampled based on the configured sampling rate.
  *
  * @param {Sampler} sampler
- * @param {import('index').Span|import('index').SpanContext} span
+ * @param {import('../../../../..').Span|import('../../../../..').SpanContext} span
  * @returns {boolean} `true` if the prompt completion should be sampled, otherwise `false`.
  */
 function isPromptCompletionSampled (sampler, span) {
@@ -51,7 +51,7 @@ module.exports = function makeUtilities (integrationName, tracerConfig) {
     /**
      * Determines whether a prompt completion should be sampled based on the configured sampling rate.
      *
-     * @param {import('index').Span|import('index').SpanContext} span
+     * @param {import('../../../../..').Span|import('../../../../..').SpanContext} span
      * @returns {boolean} `true` if the prompt completion should be sampled, otherwise `false`.
      */
     isPromptCompletionSampled: (span) => isPromptCompletionSampled(sampler, span),
diff --git a/tsconfig.dev.json b/tsconfig.dev.json
index 6aa832234a..b4b1c72faa 100644
--- a/tsconfig.dev.json
+++ b/tsconfig.dev.json
@@ -10,7 +10,6 @@
     "strictBuiltinIteratorReturn": true,
     "strictFunctionTypes": true,
 
-    "alwaysStrict": false,
     "exactOptionalPropertyTypes": false,
     "forceConsistentCasingInFileNames": false,
     "noFallthroughCasesInSwitch": false,
@@ -28,7 +27,6 @@
     "moduleDetection": "force",
     "resolveJsonModule": true,
     "verbatimModuleSyntax": true,
-    "baseUrl": ".",
 
     "types": ["node"],
     "typeRoots": ["./types", "./node_modules/@types"],

From 296648e693a3fca72bccfa43f1fe5d4cd25fab6b Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Wed, 29 Jul 2026 20:49:45 +0200
Subject: [PATCH 36/43] test(plugins): drop the removed agent.close options
 argument (#9583)

`agent.close()` takes no parameters, so every `{ ritmReset: false }` argument was
silently ignored while documenting an option the helper no longer accepts. The
dns comment describing a per-test ritm reset went with it, because `close()` no
longer resets ritm.
---
 packages/datadog-plugin-azure-cosmos/test/index.spec.js   | 2 +-
 packages/datadog-plugin-dns/test/index.spec.js            | 5 +----
 packages/datadog-plugin-electron/test/index.spec.js       | 2 +-
 packages/datadog-plugin-mercurius/test/index.spec.js      | 8 ++++----
 packages/datadog-plugin-mongodb-core/test/mongodb.spec.js | 4 ++--
 packages/datadog-plugin-nats/test/index.spec.js           | 4 ++--
 packages/datadog-plugin-rhea/test/dsm.spec.js             | 4 ++--
 packages/datadog-plugin-router/test/index.spec.js         | 2 +-
 8 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/packages/datadog-plugin-azure-cosmos/test/index.spec.js b/packages/datadog-plugin-azure-cosmos/test/index.spec.js
index 046a89d1b9..aab77b4578 100644
--- a/packages/datadog-plugin-azure-cosmos/test/index.spec.js
+++ b/packages/datadog-plugin-azure-cosmos/test/index.spec.js
@@ -21,7 +21,7 @@ describe('Plugin', () => {
 
       afterEach(async () => {
         await teardown(client)
-        return agent.close({ ritmReset: false })
+        return agent.close()
       })
 
       it('should create a span', async () => {
diff --git a/packages/datadog-plugin-dns/test/index.spec.js b/packages/datadog-plugin-dns/test/index.spec.js
index bfb24e4569..33ab2e661b 100644
--- a/packages/datadog-plugin-dns/test/index.spec.js
+++ b/packages/datadog-plugin-dns/test/index.spec.js
@@ -436,10 +436,7 @@ describe('Plugin', () => {
 
         // Loading both `dns` and `dns/promises` reaches the same exports object through
         // two ritm hooks. Without a WeakSet guard, the second hook to fire would stack a
-        // second wrap layer and publish `apm:dns:*` events twice per call. The mocha test
-        // agent resets ritm between tests (default `ritmReset: true` in `agent.close`),
-        // so the assertions that prove "one hook fire per call" have to run inside a
-        // single `it` body to share one ritm lifecycle.
+        // second wrap layer and publish `apm:dns:*` events twice per call.
         it('does not double-wrap when both dns and dns/promises are loaded', async () => {
           const startCh = dc.channel('apm:dns:lookup:start')
           let startCount = 0
diff --git a/packages/datadog-plugin-electron/test/index.spec.js b/packages/datadog-plugin-electron/test/index.spec.js
index 83f3452099..61f6f429a4 100644
--- a/packages/datadog-plugin-electron/test/index.spec.js
+++ b/packages/datadog-plugin-electron/test/index.spec.js
@@ -66,7 +66,7 @@ describe('Plugin', () => {
           startApp(done)
         })
 
-        afterEach(() => agent.close({ ritmReset: false }))
+        afterEach(() => agent.close())
         afterEach(done => {
           const proc = child
           child = undefined
diff --git a/packages/datadog-plugin-mercurius/test/index.spec.js b/packages/datadog-plugin-mercurius/test/index.spec.js
index 515f07dabd..d0267de1df 100644
--- a/packages/datadog-plugin-mercurius/test/index.spec.js
+++ b/packages/datadog-plugin-mercurius/test/index.spec.js
@@ -78,7 +78,7 @@ describe('Plugin', () => {
 
       after(async () => {
         await app?.close()
-        await agent.close({ ritmReset: false })
+        await agent.close()
       })
 
       withNamingSchema(
@@ -407,7 +407,7 @@ describe('Plugin', () => {
 
         after(async () => {
           await plainApp?.close()
-          await agent.close({ ritmReset: false })
+          await agent.close()
         })
 
         it('omits graphql.source unless source is enabled', () => {
@@ -447,7 +447,7 @@ describe('Plugin', () => {
 
         after(async () => {
           await extApp?.close()
-          await agent.close({ ritmReset: false })
+          await agent.close()
         })
 
         it('copies the configured error extension onto the request span error event', () => {
@@ -500,7 +500,7 @@ describe('Plugin', () => {
 
         after(async () => {
           await batchApp?.close()
-          await agent.close({ ritmReset: false })
+          await agent.close()
         })
 
         it('opens one graphql.request span per operation in the batch', () => {
diff --git a/packages/datadog-plugin-mongodb-core/test/mongodb.spec.js b/packages/datadog-plugin-mongodb-core/test/mongodb.spec.js
index e570dbe90b..c489d6d63c 100644
--- a/packages/datadog-plugin-mongodb-core/test/mongodb.spec.js
+++ b/packages/datadog-plugin-mongodb-core/test/mongodb.spec.js
@@ -700,7 +700,7 @@ describe('Plugin', () => {
         })
 
         after(() => {
-          return agent.close({ ritmReset: false })
+          return agent.close()
         })
 
         beforeEach(async () => {
@@ -740,7 +740,7 @@ describe('Plugin', () => {
         })
 
         after(() => {
-          return agent.close({ ritmReset: false })
+          return agent.close()
         })
 
         beforeEach(async () => {
diff --git a/packages/datadog-plugin-nats/test/index.spec.js b/packages/datadog-plugin-nats/test/index.spec.js
index 8cde0068ba..da123317d2 100644
--- a/packages/datadog-plugin-nats/test/index.spec.js
+++ b/packages/datadog-plugin-nats/test/index.spec.js
@@ -56,7 +56,7 @@ describe('Plugin', () => {
           connection = await connect({ servers: '127.0.0.1:4222' })
         })
 
-        afterEach(() => agent.close({ ritmReset: false }))
+        afterEach(() => agent.close())
 
         it('should run commands normally without a plugin loaded', async () => {
           // Sanity: published message must round-trip even when only producer spans matter.
@@ -436,7 +436,7 @@ describe('Plugin', () => {
           connection = await connect({ servers: '127.0.0.1:4222' })
         })
 
-        afterEach(() => agent.close({ ritmReset: false }))
+        afterEach(() => agent.close())
 
         it('skips the publish wrapper fast-path', () => {
           // The wrap's `!hasSubscribers` branch returns the original immediately,
diff --git a/packages/datadog-plugin-rhea/test/dsm.spec.js b/packages/datadog-plugin-rhea/test/dsm.spec.js
index 93417851d7..7f5ce6f287 100644
--- a/packages/datadog-plugin-rhea/test/dsm.spec.js
+++ b/packages/datadog-plugin-rhea/test/dsm.spec.js
@@ -15,7 +15,7 @@ describe('Plugin', () => {
       process.env.DD_DATA_STREAMS_ENABLED = 'true'
     })
 
-    after(() => agent.close({ ritmReset: false }))
+    after(() => agent.close())
 
     withVersions('rhea', 'rhea', version => {
       describe('data stream monitoring', function () {
@@ -31,7 +31,7 @@ describe('Plugin', () => {
           container?.removeAllListeners('message')
           connection?.close()
           connection = null
-          return agent.close({ ritmReset: false })
+          return agent.close()
         })
 
         describe('concurrent context isolation', () => {
diff --git a/packages/datadog-plugin-router/test/index.spec.js b/packages/datadog-plugin-router/test/index.spec.js
index eea1685976..446d46cf2d 100644
--- a/packages/datadog-plugin-router/test/index.spec.js
+++ b/packages/datadog-plugin-router/test/index.spec.js
@@ -40,7 +40,7 @@ describe('Plugin', () => {
         })
 
         after(() => {
-          return agent.close({ ritmReset: false })
+          return agent.close()
         })
 
         beforeEach(() => {

From 9e5c47b03b2767fbd002017082b5187925b63447 Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Wed, 29 Jul 2026 23:13:45 +0200
Subject: [PATCH 37/43] test(jest): gather known-tests payloads until the child
 exits (#9590)

Both cases in `known tests without early flake detection` asserted on whatever
the intake had received after a fixed 15 s window, and that window opens before
the child is spawned: one budget covers node boot, a `--no-cache` Jest cold
start, both suites and the tracer flush. Under load the window expires first and
the timer runs the assertion on a buffer that is still empty, so the run fails
with `TypeError: Cannot read properties of undefined (reading 'content')` thrown
from `Timeout._onTimeout`, naming neither the assertion nor the slow child.
Waiting for the child's exit ties the collection to the run it asserts on and
leaves the wall clock as a backstop for a child that never exits.
---
 integration-tests/jest/jest.tia-efd.spec.js | 73 ++++++++++-----------
 1 file changed, 34 insertions(+), 39 deletions(-)

diff --git a/integration-tests/jest/jest.tia-efd.spec.js b/integration-tests/jest/jest.tia-efd.spec.js
index 2242d8a25d..7ca129e579 100644
--- a/integration-tests/jest/jest.tia-efd.spec.js
+++ b/integration-tests/jest/jest.tia-efd.spec.js
@@ -4042,7 +4042,7 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
   })
 
   context('known tests without early flake detection', () => {
-    it('detects new tests without retrying them', (done) => {
+    it('detects new tests without retrying them', async () => {
       receiver.setInfoResponse({ endpoints: ['/evp_proxy/v4'] })
       // Tests from ci-visibility/test/ci-visibility-test-2.js will be considered new
       receiver.setKnownTests({
@@ -4057,8 +4057,18 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
         known_tests_enabled: true,
       })
 
-      const eventsPromise = receiver
-        .gatherPayloadsMaxTimeout(({ url }) => url.endsWith('/api/v2/citestcycle'), (payloads) => {
+      childProcess = exec(
+        runTestsCommand,
+        {
+          cwd,
+          env: { ...getCiVisEvpProxyConfig(receiver.port), TESTS_TO_RUN: 'test/ci-visibility-test' },
+        }
+      )
+
+      await receiver.gatherPayloadsUntilChildExit(
+        childProcess,
+        ({ url }) => url.endsWith('/api/v2/citestcycle'),
+        (payloads) => {
           const events = payloads.flatMap(({ payload }) => payload.events)
 
           const testSession = events.find(event => event.type === 'test_session_end').content
@@ -4084,21 +4094,8 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
           const retriedTests = newTests.filter(test => test.meta[TEST_IS_RETRY] === 'true')
           // no test has been retried
           assert.strictEqual(retriedTests.length, 0)
-        })
-
-      childProcess = exec(
-        runTestsCommand,
-        {
-          cwd,
-          env: { ...getCiVisEvpProxyConfig(receiver.port), TESTS_TO_RUN: 'test/ci-visibility-test' },
         }
       )
-
-      childProcess.on('exit', () => {
-        eventsPromise.then(() => {
-          done()
-        }).catch(done)
-      })
     })
 
     // Regression test: without the fix, _ddKnownTests is not injected after worker restart,
@@ -4117,8 +4114,27 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
         known_tests_enabled: true,
       })
 
-      const eventsPromise = receiver
-        .gatherPayloadsMaxTimeout(({ url }) => url.endsWith('/api/v2/citestcycle'), (payloads) => {
+      childProcess = exec(
+        runTestsCommand,
+        {
+          cwd,
+          env: {
+            ...getCiVisEvpProxyConfig(receiver.port),
+            // 4 suites: 2 spacers from test-management/ (sort first), then ci-visibility-test-2
+            // and ci-visibility-test. The new test (ci-visibility-test-2) is the 3rd suite,
+            // running on a child process that has been replaced twice by workerIdleMemoryLimit.
+            TESTS_TO_RUN: '(test/ci-visibility-test|test-management/test-worker-restart-(spacer|known-tests-spacer))',
+            RUN_IN_PARALLEL: 'true',
+            MAX_WORKERS: '1',
+            WORKER_IDLE_MEMORY_LIMIT: '0',
+          },
+        }
+      )
+
+      await receiver.gatherPayloadsUntilChildExit(
+        childProcess,
+        ({ url }) => url.endsWith('/api/v2/citestcycle'),
+        (payloads) => {
           const events = payloads.flatMap(({ payload }) => payload.events)
           const tests = events.filter(event => event.type === 'test').map(event => event.content)
 
@@ -4142,29 +4158,8 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
 
           const retriedTests = newTests.filter(test => test.meta[TEST_IS_RETRY] === 'true')
           assert.strictEqual(retriedTests.length, 0)
-        })
-
-      childProcess = exec(
-        runTestsCommand,
-        {
-          cwd,
-          env: {
-            ...getCiVisEvpProxyConfig(receiver.port),
-            // 4 suites: 2 spacers from test-management/ (sort first), then ci-visibility-test-2
-            // and ci-visibility-test. The new test (ci-visibility-test-2) is the 3rd suite,
-            // running on a child process that has been replaced twice by workerIdleMemoryLimit.
-            TESTS_TO_RUN: '(test/ci-visibility-test|test-management/test-worker-restart-(spacer|known-tests-spacer))',
-            RUN_IN_PARALLEL: 'true',
-            MAX_WORKERS: '1',
-            WORKER_IDLE_MEMORY_LIMIT: '0',
-          },
         }
       )
-
-      await Promise.all([
-        once(childProcess, 'exit'),
-        eventsPromise,
-      ])
     })
   })
 })

From 0c40a9f26e8a9483ad08b4edfc6840e783d37fa3 Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Wed, 29 Jul 2026 23:22:09 +0200
Subject: [PATCH 38/43] fix(test-optimization): keep playwright summary counts
 on one line (#9587)

The `^`-anchored summary matchers separated the count from its outcome with
`\s`, which spans line terminators under the `m` flag. Output where a bare
number ended one line and `passed` / `failed` / `flaky` / `skipped` opened the
next was read as a summary, so validation reported a test count the runner never
printed. Bounding the separator to spaces and tabs keeps each match on the line
its anchor matched.
---
 .../framework-adapters/playwright.js             | 10 +++++-----
 .../validation-execution-phases.spec.js          | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ci/test-optimization-validation/framework-adapters/playwright.js b/ci/test-optimization-validation/framework-adapters/playwright.js
index 834da3f763..3d903f3028 100644
--- a/ci/test-optimization-validation/framework-adapters/playwright.js
+++ b/ci/test-optimization-validation/framework-adapters/playwright.js
@@ -3,7 +3,7 @@
 const path = require('node:path')
 
 const CONFIG_PATTERN = /^playwright\.config\.[cm]?[jt]s$/
-const TEST_FILE_PATTERN = /(?:\.(?:spec|test)\.[cm]?[jt]sx?)$/
+const TEST_FILE_PATTERN = /\.(?:spec|test)\.[cm]?[jt]sx?$/
 const GENERATED_CONFIG_FILENAME = 'dd-test-optimization-validation.playwright.config.cjs'
 const VALIDATION_OUTPUT_DIRECTORY = '.dd-test-optimization-validation-playwright-output'
 const PLAYWRIGHT_PACKAGE = '@playwright/test'
@@ -139,12 +139,12 @@ function getOutputPath (filename) {
  */
 function getObservedTestCount (output) {
   const observed = sumLastMatchCounts(output, [
-    /^\s*(\d+)\s+passed\b/gim,
-    /^\s*(\d+)\s+failed\b/gim,
-    /^\s*(\d+)\s+flaky\b/gim,
+    /^[ \t]*(\d+)[ \t]+passed\b/gim,
+    /^[ \t]*(\d+)[ \t]+failed\b/gim,
+    /^[ \t]*(\d+)[ \t]+flaky\b/gim,
   ])
   if (observed !== null) return observed
-  return /^\s*\d+\s+skipped\b/im.test(output) ? 0 : null
+  return /^[ \t]*\d+[ \t]+skipped\b/im.test(output) ? 0 : null
 }
 
 /**
diff --git a/packages/dd-trace/test/ci-visibility/validation-execution-phases.spec.js b/packages/dd-trace/test/ci-visibility/validation-execution-phases.spec.js
index a939f1f75b..caaa54dcd1 100644
--- a/packages/dd-trace/test/ci-visibility/validation-execution-phases.spec.js
+++ b/packages/dd-trace/test/ci-visibility/validation-execution-phases.spec.js
@@ -22,6 +22,7 @@ const {
 } = require('../../../../ci/test-optimization-validation/generated-verifier')
 const { runFrameworkPreflight } = require('../../../../ci/test-optimization-validation/preflight-runner')
 const { getBasicCommand } = require('../../../../ci/test-optimization-validation/runner-command')
+const { getObservedTestCount } = require('../../../../ci/test-optimization-validation/test-output')
 const {
   createLoadedManifest,
   createRepositoryFixture,
@@ -468,6 +469,21 @@ describe('test optimization validation execution boundary', () => {
   }
 })
 
+describe('test optimization validation observed test counts', () => {
+  it('reads playwright summaries per line and treats a skipped-only run as zero', () => {
+    const summary = ['Running 3 tests using 1 worker', '', '  2 passed (1.2s)', '  1 flaky (0.4s)'].join('\n')
+
+    assert.strictEqual(getObservedTestCount('playwright', summary), 3)
+    assert.strictEqual(getObservedTestCount('playwright', '  4 skipped (0.1s)'), 0)
+    assert.strictEqual(getObservedTestCount('playwright', 'no summary here'), null)
+  })
+
+  it('does not join a count and its outcome across a line break', () => {
+    assert.strictEqual(getObservedTestCount('playwright', '2\npassed'), null)
+    assert.strictEqual(getObservedTestCount('playwright', '2\nskipped'), null)
+  })
+})
+
 /**
  * Restores an environment variable.
  *

From 021c1a56415ca1eb3bcf78e88dedc89260172996 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Jul 2026 01:10:38 +0000
Subject: [PATCH 39/43] chore(deps): bump @hono/node-server (#9603)

Bumps the web-frameworks group with 1 update in the /packages/dd-trace/test/plugins/versions directory: [@hono/node-server](https://github.com/honojs/node-server).


Updates `@hono/node-server` from 2.0.11 to 2.0.12
- [Release notes](https://github.com/honojs/node-server/releases)
- [Commits](https://github.com/honojs/node-server/compare/v2.0.11...v2.0.12)

---
updated-dependencies:
- dependency-name: "@hono/node-server"
  dependency-version: 2.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: web-frameworks
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 packages/dd-trace/test/plugins/versions/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dd-trace/test/plugins/versions/package.json b/packages/dd-trace/test/plugins/versions/package.json
index 9a297197f5..7a0e263a99 100644
--- a/packages/dd-trace/test/plugins/versions/package.json
+++ b/packages/dd-trace/test/plugins/versions/package.json
@@ -48,7 +48,7 @@
     "@hapi/boom": "10.0.1",
     "@hapi/hapi": "21.4.10",
     "@happy-dom/jest-environment": "20.11.1",
-    "@hono/node-server": "2.0.11",
+    "@hono/node-server": "2.0.12",
     "@jest/core": "30.4.2",
     "@jest/globals": "30.4.1",
     "@jest/reporters": "30.4.1",

From 93608925359f9d5c3e43797efd8fe6d7e5e88cdf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Jul 2026 01:11:06 +0000
Subject: [PATCH 40/43] chore(deps): bump the ai-and-llm group across 1
 directory with 2 updates (#9602)

Bumps the ai-and-llm group with 2 updates in the /packages/dd-trace/test/plugins/versions directory: [@ai-sdk/amazon-bedrock](https://github.com/vercel/ai/tree/HEAD/packages/amazon-bedrock) and [@ai-sdk/anthropic](https://github.com/vercel/ai/tree/HEAD/packages/anthropic).


Updates `@ai-sdk/amazon-bedrock` from 5.0.31 to 5.0.32
- [Release notes](https://github.com/vercel/ai/releases)
- [Changelog](https://github.com/vercel/ai/blob/main/packages/amazon-bedrock/CHANGELOG.md)
- [Commits](https://github.com/vercel/ai/commits/@ai-sdk/amazon-bedrock@5.0.32/packages/amazon-bedrock)

Updates `@ai-sdk/anthropic` from 4.0.20 to 4.0.21
- [Release notes](https://github.com/vercel/ai/releases)
- [Changelog](https://github.com/vercel/ai/blob/main/packages/anthropic/CHANGELOG.md)
- [Commits](https://github.com/vercel/ai/commits/@ai-sdk/anthropic@4.0.21/packages/anthropic)

---
updated-dependencies:
- dependency-name: "@ai-sdk/amazon-bedrock"
  dependency-version: 5.0.32
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ai-and-llm
- dependency-name: "@ai-sdk/anthropic"
  dependency-version: 4.0.21
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ai-and-llm
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 packages/dd-trace/test/plugins/versions/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/dd-trace/test/plugins/versions/package.json b/packages/dd-trace/test/plugins/versions/package.json
index 7a0e263a99..bca687acae 100644
--- a/packages/dd-trace/test/plugins/versions/package.json
+++ b/packages/dd-trace/test/plugins/versions/package.json
@@ -4,8 +4,8 @@
   "license": "BSD-3-Clause",
   "private": true,
   "dependencies": {
-    "@ai-sdk/amazon-bedrock": "5.0.31",
-    "@ai-sdk/anthropic": "4.0.20",
+    "@ai-sdk/amazon-bedrock": "5.0.32",
+    "@ai-sdk/anthropic": "4.0.21",
     "@ai-sdk/google": "4.0.24",
     "@ai-sdk/openai": "4.0.20",
     "@anthropic-ai/claude-agent-sdk": "0.3.220",

From 4182984ae0c9cdf3eb17b6beada259e2755f5bd2 Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Thu, 30 Jul 2026 05:26:16 +0200
Subject: [PATCH 41/43] refactor(lint): clear shellcheck and regexp findings
 ahead of enabling the rules (#9586)

* ci(workflows): quote shell expansions in workflow steps

Unquoted expansions split on whitespace, so a runner path, a packed filename, or
a version string containing a space becomes two words. `rm -rf *` additionally
hands any dash-prefixed filename to `rm` as an option.

The redundant `exit` in the actionlint summary step goes too: `fail-on-error`
already fails the job, and the step only runs once the exit code is nonzero, so
the extra `exit` could only pass a value outside 0-255 back to the shell.

* refactor(regexp): drop no-op flags, groups, and escapes

The removed pieces cannot affect which strings match: `m` needs an anchor, `i`
needs a letter, a non-capturing group around a whole pattern or a single
alternative adds nothing, `.*` padding inside a lookahead reached only through
`test()` is unreachable work, a lazy quantifier immediately before `$` has one
possible length, and `{` / `]` are literals either way.

The URL segment matcher gains a case for the 20-character `{param:str}`
threshold, which nothing pinned.

* refactor(regexp): match delimiters without repeated rescanning

Each of these matchers walks the same characters again for every start position
the engine tries, on values whose length is set by whatever produced them. The
replacements examine each character once.

1. Trailing-delimiter trims (`kebabcase` dashes, the cypress source-map query
   strip) drop their quantifiers.
2. `stripColonWhitespace` and `splitHeader` split once and trim each part.
   `splitHeader` now also trims the first and last entry, which the previous
   pattern left alone.
3. The telemetry stack-frame filter bounds its indent to spaces and tabs, so a
   frame can no longer be matched starting from an earlier line.
4. The `@fast-check/jest` seed suffix and the cucumber attempt suffix bound
   their separator to the single space each library emits.
---
 .github/workflows/flakiness.yml               |  4 +--
 .github/workflows/mirror-image.yml            |  2 +-
 .github/workflows/platform.yml                |  4 +--
 .github/workflows/project.yml                 | 13 ++++---
 .github/workflows/release.yml                 | 22 ++++++------
 .github/workflows/system-tests.yml            |  2 +-
 .github/workflows/test-optimization.yml       | 14 ++++----
 .../workflows/update-3rdparty-licenses.yml    | 14 ++++----
 integration-tests/esbuild/index.spec.js       | 10 +++---
 integration-tests/package-guardrails.spec.js  |  2 +-
 .../datadog-core/src/utils/src/kebabcase.js   | 10 ++++--
 .../test/utils/src/kebabcase.spec.js          | 34 +++++++++++++++++++
 .../datadog-instrumentations/src/cucumber.js  |  4 +--
 .../src/scrub-cmd-params.js                   |  2 +-
 .../src/source-map-utils.js                   |  2 +-
 .../datadog-plugin-graphql/test/index.spec.js |  6 ++--
 packages/datadog-plugin-jest/src/util.js      |  3 +-
 .../test-optimization-http-cache-schema.js    |  2 +-
 packages/dd-trace/src/config/parsers.js       |  9 ++++-
 .../llmobs/plugins/claude-agent-sdk/index.js  |  2 +-
 packages/dd-trace/src/plugins/util/ci.js      |  6 ++--
 packages/dd-trace/src/plugins/util/git.js     |  2 +-
 packages/dd-trace/src/plugins/util/url.js     | 10 +++---
 .../src/plugins/util/user-provided-git.js     |  2 +-
 packages/dd-trace/src/plugins/util/web.js     |  2 +-
 .../src/telemetry/logs/log-collector.js       |  4 ++-
 packages/dd-trace/test/config/index.spec.js   |  5 +++
 packages/dd-trace/test/log.spec.js            |  2 +-
 .../test/plugins/plugin-structure.spec.js     |  2 +-
 .../dd-trace/test/plugins/util/url.spec.js    |  6 ++++
 .../dd-trace/test/plugins/util/web.spec.js    | 16 +++++++++
 scripts/verify-exercised-tests.js             |  2 +-
 32 files changed, 149 insertions(+), 71 deletions(-)
 create mode 100644 packages/datadog-core/test/utils/src/kebabcase.spec.js

diff --git a/.github/workflows/flakiness.yml b/.github/workflows/flakiness.yml
index 20b691d794..29a5c290de 100644
--- a/.github/workflows/flakiness.yml
+++ b/.github/workflows/flakiness.yml
@@ -49,9 +49,9 @@ jobs:
       - run: node scripts/flakiness.mjs
         env:
           GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
-      - run: cat flakiness.md >> $GITHUB_STEP_SUMMARY
+      - run: cat flakiness.md >> "$GITHUB_STEP_SUMMARY"
       - id: slack
-        run: echo "report=$(cat flakiness.txt)" >> $GITHUB_OUTPUT
+        run: echo "report=$(cat flakiness.txt)" >> "$GITHUB_OUTPUT"
       - uses: slackapi/slack-github-action@dcb1066f776dd043e64d0e8ba94ca15cc7e1875d # v2.1.0
         if: github.event_name == 'schedule'
         with:
diff --git a/.github/workflows/mirror-image.yml b/.github/workflows/mirror-image.yml
index 2f720e0490..f4be3c20fa 100644
--- a/.github/workflows/mirror-image.yml
+++ b/.github/workflows/mirror-image.yml
@@ -40,7 +40,7 @@ jobs:
           REPOSITORY: ${{ github.repository }}
         run: |
           GHCR_TARGET="$(echo "ghcr.io/${REPOSITORY}/${IMAGE}" | tr '[:upper:]' '[:lower:]')"
-          echo "GHCR_TARGET=${GHCR_TARGET}" >> $GITHUB_ENV
+          echo "GHCR_TARGET=${GHCR_TARGET}" >> "$GITHUB_ENV"
 
       - name: Mirror manifest to GHCR
         env:
diff --git a/.github/workflows/platform.yml b/.github/workflows/platform.yml
index c0e97a897f..ab4779462e 100644
--- a/.github/workflows/platform.yml
+++ b/.github/workflows/platform.yml
@@ -56,7 +56,7 @@ jobs:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - uses: ./.github/actions/node/active-lts
       - uses: ./.github/actions/install
-      - run: FILENAME=$(npm pack --silent --pack-destination /tmp) && mv /tmp/$FILENAME /tmp/dd-trace.tgz
+      - run: FILENAME=$(npm pack --silent --pack-destination /tmp) && mv "/tmp/$FILENAME" /tmp/dd-trace.tgz
       - run: mkdir -p /tmp/app
       - run: npm i -g pnpm
         if: matrix.manager.name == 'pnpm'
@@ -71,7 +71,7 @@ jobs:
       - uses: ./.github/actions/node/active-lts
       - uses: ./.github/actions/install
       - run: mkdir npm bun
-      - run: FILENAME=$(npm pack --silent) && tar -zxf $FILENAME -C npm
+      - run: FILENAME=$(npm pack --silent) && tar -zxf "$FILENAME" -C npm
       - run: ./node_modules/.bin/bun pm pack --gzip-level 0 --filename bun.tgz && tar -zxf bun.tgz -C bun
       - run: diff -r npm bun
 
diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index ed0b2e630d..2656ef063a 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -34,7 +34,6 @@ jobs:
           echo "actionlint found ${{ steps.actionlint.outputs.total-errors }} errors"
           echo "actionlint checked ${{ steps.actionlint.outputs.total-files }} files"
           echo "actionlint cache used: ${{ steps.actionlint.outputs.cache-hit }}"
-          exit ${{ steps.actionlint.outputs.exit-code }}
 
   lint:
     runs-on: ubuntu-latest
@@ -48,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - run: docker build -q -t ec .github/editorconfig-checker && docker run --rm --volume=$PWD:/check ec
+      - run: docker build -q -t ec .github/editorconfig-checker && docker run --rm --volume="$PWD":/check ec
 
   release-scripts:
     runs-on: ubuntu-latest
@@ -96,9 +95,9 @@ jobs:
           policy: package-size-report
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - uses: ./.github/actions/node/latest
-      - run: FILENAME=$(npm pack --silent --pack-destination /tmp) && mv /tmp/$FILENAME /tmp/dd-trace.tgz
-      - run: rm -rf *
-      - run: tar -zxf /tmp/dd-trace.tgz -C $(pwd) --strip-components=1
+      - run: FILENAME=$(npm pack --silent --pack-destination /tmp) && mv /tmp/"$FILENAME" /tmp/dd-trace.tgz
+      - run: rm -rf ./*
+      - run: tar -zxf /tmp/dd-trace.tgz -C "$(pwd)" --strip-components=1
       - run: yarn --prod --ignore-optional
       - run: ls -lisa
       - name: Compute module size tree and report
@@ -174,7 +173,7 @@ jobs:
           set -euo pipefail
 
           if git diff --quiet; then
-            echo "has_changes=false" >> $GITHUB_OUTPUT
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
             exit 0
           fi
 
@@ -211,7 +210,7 @@ jobs:
           fi
 
           cp yarn.lock "${RUNNER_TEMP}/yarn.lock"
-          echo "has_changes=true" >> $GITHUB_OUTPUT
+          echo "has_changes=true" >> "$GITHUB_OUTPUT"
 
       - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         if: steps.diff.outputs.has_changes == 'true'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bcbd2a70b7..7ea746c0c6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -87,8 +87,8 @@ jobs:
           registry-url: https://registry.npmjs.org
       - id: pkg
         run: |
-          content=`cat ./package.json | tr '\n' ' '`
-          echo "json=$content" >> $GITHUB_OUTPUT
+          content=$(tr '\n' ' ' < ./package.json)
+          echo "json=$content" >> "$GITHUB_OUTPUT"
       - name: Publish
         run: |
           version="${{ fromJson(steps.pkg.outputs.json).version }}"
@@ -159,8 +159,8 @@ jobs:
       - uses: ./.github/actions/node
       - id: pkg
         run: |
-          content=`cat ./package.json | tr '\n' ' '`
-          echo "json=$content" >> $GITHUB_OUTPUT
+          content=$(tr '\n' ' ' < ./package.json)
+          echo "json=$content" >> "$GITHUB_OUTPUT"
       - run: yarn
       - name: Build
         working-directory: docs
@@ -173,7 +173,7 @@ jobs:
           ref: gh-pages
       - name: Deploy
         run: |
-          rm -rf *
+          rm -rf ./*
           mv /tmp/out/* .
           git config user.name github-actions
           git config user.email github-actions@github.com
@@ -205,9 +205,9 @@ jobs:
       - uses: ./.github/actions/install
       - id: pkg
         run: |
-          content=`cat ./package.json | tr '\n' ' '`
-          echo "json=$content" >> $GITHUB_OUTPUT
-      - run: npm version --no-git-tag-version ${{ fromJson(steps.pkg.outputs.json).version }}-$(git rev-parse --short HEAD)+${{ github.run_id }}.${{ github.run_attempt }}
+          content=$(tr '\n' ' ' < ./package.json)
+          echo "json=$content" >> "$GITHUB_OUTPUT"
+      - run: npm version --no-git-tag-version "${{ fromJson(steps.pkg.outputs.json).version }}-$(git rev-parse --short HEAD)+${{ github.run_id }}.${{ github.run_attempt }}"
       - run: npm publish --tag dev
       - run: |
           git tag --force dev
@@ -233,7 +233,7 @@ jobs:
       - uses: ./.github/actions/install
       - id: pkg
         run: |
-          content=`cat ./package.json | tr '\n' ' '`
-          echo "json=$content" >> $GITHUB_OUTPUT
-      - run: npm version --no-git-tag-version ${{ fromJson(steps.pkg.outputs.json).version }}-$(git rev-parse --short HEAD)+${{ github.run_id }}.${{ github.run_attempt }}
+          content=$(tr '\n' ' ' < ./package.json)
+          echo "json=$content" >> "$GITHUB_OUTPUT"
+      - run: npm version --no-git-tag-version "${{ fromJson(steps.pkg.outputs.json).version }}-$(git rev-parse --short HEAD)+${{ github.run_id }}.${{ github.run_attempt }}"
       - run: node scripts/release/publish-electron.js --tag dev
diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml
index 710db17450..46b0d193f4 100644
--- a/.github/workflows/system-tests.yml
+++ b/.github/workflows/system-tests.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           path: dd-trace-js
       - name: Pack dd-trace-js
-        run: mkdir -p ./binaries && echo /binaries/$(npm pack --silent --pack-destination ./binaries ./dd-trace-js) > ./binaries/nodejs-load-from-npm
+        run: mkdir -p ./binaries && echo "/binaries/$(npm pack --silent --pack-destination ./binaries ./dd-trace-js)" > ./binaries/nodejs-load-from-npm
       - name: Upload artifact
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
diff --git a/.github/workflows/test-optimization.yml b/.github/workflows/test-optimization.yml
index 7185d249ce..bd8e378441 100644
--- a/.github/workflows/test-optimization.yml
+++ b/.github/workflows/test-optimization.yml
@@ -61,7 +61,7 @@ jobs:
             versions.getLatestPlaywrightSpecifier() === 'latest' \
               ? versions.latest \
               : versions.latestSupportedByNode18")
-          echo "version=$PLAYWRIGHT_VERSION" >> $GITHUB_OUTPUT
+          echo "version=$PLAYWRIGHT_VERSION" >> "$GITHUB_OUTPUT"
           echo "Playwright version: $PLAYWRIGHT_VERSION"
       - name: Cache Playwright browsers
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
@@ -117,9 +117,11 @@ jobs:
               IMAGE_TAG="$OLDEST_TAG"
               ;;
           esac
-          echo "images=$IMAGES" >> $GITHUB_OUTPUT
-          echo "pw-version=$PW_VERSION" >> $GITHUB_OUTPUT
-          echo "image-tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
+          {
+            echo "images=$IMAGES"
+            echo "pw-version=$PW_VERSION"
+            echo "image-tag=$IMAGE_TAG"
+          } >> "$GITHUB_OUTPUT"
       - name: Log in to GHCR
         uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
         with:
@@ -352,7 +354,7 @@ jobs:
         run: |
           DOCKER_HASH=$(sha256sum .github/selenium/Dockerfile | cut -c1-8)
           IMAGE="ghcr.io/datadog/dd-trace-js/selenium-tools:${DOCKER_HASH}"
-          echo "image=$IMAGE" >> $GITHUB_OUTPUT
+          echo "image=$IMAGE" >> "$GITHUB_OUTPUT"
       - name: Log in to GHCR
         uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
         with:
@@ -472,7 +474,7 @@ jobs:
           else
             RESOLVED="${{ matrix.cypress-version }}"
           fi
-          echo "resolved=$RESOLVED" >> $GITHUB_OUTPUT
+          echo "resolved=$RESOLVED" >> "$GITHUB_OUTPUT"
       - name: Cache Cypress binary
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
diff --git a/.github/workflows/update-3rdparty-licenses.yml b/.github/workflows/update-3rdparty-licenses.yml
index dd2399eb7a..c67346aef5 100644
--- a/.github/workflows/update-3rdparty-licenses.yml
+++ b/.github/workflows/update-3rdparty-licenses.yml
@@ -90,20 +90,20 @@ jobs:
         run: |
           set -e
 
-          echo "head_oid=${{ github.event.pull_request.head.sha }}" >> $GITHUB_OUTPUT
+          echo "head_oid=${{ github.event.pull_request.head.sha }}" >> "$GITHUB_OUTPUT"
 
           if git diff --ignore-space-at-eol --exit-code LICENSE-3rdparty.csv; then
             echo "✅ LICENSE-3rdparty.csv is already up to date"
-            echo "needs_update=false" >> $GITHUB_OUTPUT
+            echo "needs_update=false" >> "$GITHUB_OUTPUT"
           else
             echo "📝 LICENSE-3rdparty.csv was modified by license attribution command"
-            echo "needs_update=true" >> $GITHUB_OUTPUT
+            echo "needs_update=true" >> "$GITHUB_OUTPUT"
           fi
 
           if [[ "$PR_USER_TYPE" == "Bot" ]] && [[ "$PR_HEAD_REPO" == "$BASE_REPO" ]]; then
-            echo "is_bot_same_repo=true" >> $GITHUB_OUTPUT
+            echo "is_bot_same_repo=true" >> "$GITHUB_OUTPUT"
           else
-            echo "is_bot_same_repo=false" >> $GITHUB_OUTPUT
+            echo "is_bot_same_repo=false" >> "$GITHUB_OUTPUT"
           fi
 
           # Release proposal branches are built by cherry-picking master onto a release
@@ -113,9 +113,9 @@ jobs:
           # fail loudly instead — the license CSV is already correct on master and should
           # never need attribution work done directly on a proposal branch.
           if [[ "$HEAD_REF" =~ ^v[0-9]+\.[0-9]+\.[0-9]+-proposal$ ]]; then
-            echo "is_release_proposal=true" >> $GITHUB_OUTPUT
+            echo "is_release_proposal=true" >> "$GITHUB_OUTPUT"
           else
-            echo "is_release_proposal=false" >> $GITHUB_OUTPUT
+            echo "is_release_proposal=false" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Upload updated LICENSE-3rdparty.csv
diff --git a/integration-tests/esbuild/index.spec.js b/integration-tests/esbuild/index.spec.js
index 359ca4b235..ad1a26ff03 100755
--- a/integration-tests/esbuild/index.spec.js
+++ b/integration-tests/esbuild/index.spec.js
@@ -145,7 +145,7 @@ esbuildVersions.forEach((version) => {
         })
 
         const builtFile = readFileSync('./out.mjs').toString()
-        assert.match(builtFile, /\/\* js test \*\//m)
+        assert.match(builtFile, /\/\* js test \*\//)
       })
 
       it('should contain the definitions when esm is inferred from outfile', () => {
@@ -154,7 +154,7 @@ esbuildVersions.forEach((version) => {
         })
 
         const builtFile = readFileSync('./out.mjs').toString()
-        assert.match(builtFile, /globalThis\.__filename \?\?= \$dd_fileURLToPath\(import\.meta\.url\);/m)
+        assert.match(builtFile, /globalThis\.__filename \?\?= \$dd_fileURLToPath\(import\.meta\.url\);/)
       })
 
       it('should contain the definitions when esm is inferred from format', () => {
@@ -163,7 +163,7 @@ esbuildVersions.forEach((version) => {
         })
 
         const builtFile = readFileSync('./out.mjs').toString()
-        assert.match(builtFile, /globalThis\.__filename \?\?= \$dd_fileURLToPath\(import\.meta\.url\);/m)
+        assert.match(builtFile, /globalThis\.__filename \?\?= \$dd_fileURLToPath\(import\.meta\.url\);/)
       })
 
       it('should contain the definitions when format is inferred from out extension', () => {
@@ -172,7 +172,7 @@ esbuildVersions.forEach((version) => {
         })
 
         const builtFile = readFileSync('./basic-test.mjs').toString()
-        assert.match(builtFile, /globalThis\.__filename \?\?= \$dd_fileURLToPath\(import\.meta\.url\);/m)
+        assert.match(builtFile, /globalThis\.__filename \?\?= \$dd_fileURLToPath\(import\.meta\.url\);/)
       })
 
       it('should not contain the definitions when no esm is specified', () => {
@@ -181,7 +181,7 @@ esbuildVersions.forEach((version) => {
         })
 
         const builtFile = readFileSync('./out.js').toString()
-        assert.doesNotMatch(builtFile, /globalThis\.__filename \?\?= \$dd_fileURLToPath\(import\.meta\.url\);/m)
+        assert.doesNotMatch(builtFile, /globalThis\.__filename \?\?= \$dd_fileURLToPath\(import\.meta\.url\);/)
       })
 
       it('should not crash when it is already patched using global', () => {
diff --git a/integration-tests/package-guardrails.spec.js b/integration-tests/package-guardrails.spec.js
index 563a5beab4..26d2d20387 100644
--- a/integration-tests/package-guardrails.spec.js
+++ b/integration-tests/package-guardrails.spec.js
@@ -136,7 +136,7 @@ addHook({ name: 'bluebird', versions: ['*'] }, Promise => {
           log => {
             assert.match(
               log,
-              /\nError during ddtrace instrumentation of application, aborting.\nReferenceError: this is a test error\n {4}at /m
+              /\nError during ddtrace instrumentation of application, aborting.\nReferenceError: this is a test error\n {4}at /
             )
             assert.match(log, /\nfalse\n/)
           }, []))
diff --git a/packages/datadog-core/src/utils/src/kebabcase.js b/packages/datadog-core/src/utils/src/kebabcase.js
index ae2a1dc1d7..d4ecf92241 100644
--- a/packages/datadog-core/src/utils/src/kebabcase.js
+++ b/packages/datadog-core/src/utils/src/kebabcase.js
@@ -5,10 +5,16 @@ module.exports = function kebabcase (str) {
     throw new TypeError('Expected a string')
   }
 
-  return str
+  const kebab = str
     .trim()
     .replaceAll(/([a-z])([A-Z])/g, '$1-$2') // Convert camelCase to kebab-case
     .replaceAll(/[\s_]+/g, '-') // Replace spaces and underscores with a single dash
-    .replaceAll(/^-+|-+$/g, '') // Trim leading and trailing dashes
     .toLowerCase()
+
+  // Trim by index; a `/-+$/` regex re-examines the dash run once per start position.
+  let start = 0
+  let end = kebab.length
+  while (kebab.charCodeAt(start) === 45) start++ // '-'
+  while (end > start && kebab.charCodeAt(end - 1) === 45) end--
+  return kebab.slice(start, end)
 }
diff --git a/packages/datadog-core/test/utils/src/kebabcase.spec.js b/packages/datadog-core/test/utils/src/kebabcase.spec.js
new file mode 100644
index 0000000000..d4c83d0f57
--- /dev/null
+++ b/packages/datadog-core/test/utils/src/kebabcase.spec.js
@@ -0,0 +1,34 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+
+const { describe, it } = require('mocha')
+
+require('../../../../dd-trace/test/setup/core')
+const kebabcase = require('../../../src/utils/src/kebabcase')
+
+describe('kebabcase', () => {
+  it('converts camelCase and collapses spaces/underscores', () => {
+    assert.strictEqual(kebabcase('fooBar'), 'foo-bar')
+    assert.strictEqual(kebabcase('foo_bar baz'), 'foo-bar-baz')
+    assert.strictEqual(kebabcase('XMLHttpRequest'), 'xmlhttp-request')
+  })
+
+  it('trims leading and trailing dashes but keeps internal ones', () => {
+    assert.strictEqual(kebabcase('-a-'), 'a')
+    assert.strictEqual(kebabcase('--a--'), 'a')
+    assert.strictEqual(kebabcase('_a_'), 'a')
+    assert.strictEqual(kebabcase('a-b'), 'a-b')
+    assert.strictEqual(kebabcase('a--b'), 'a--b')
+  })
+
+  it('handles all-dash and empty inputs', () => {
+    assert.strictEqual(kebabcase('---'), '')
+    assert.strictEqual(kebabcase(''), '')
+    assert.strictEqual(kebabcase('   '), '')
+  })
+
+  it('throws on non-string input', () => {
+    assert.throws(() => kebabcase(42), { name: 'TypeError', message: 'Expected a string' })
+  })
+})
diff --git a/packages/datadog-instrumentations/src/cucumber.js b/packages/datadog-instrumentations/src/cucumber.js
index 0971c18e02..a304e3a32a 100644
--- a/packages/datadog-instrumentations/src/cucumber.js
+++ b/packages/datadog-instrumentations/src/cucumber.js
@@ -696,7 +696,7 @@ function publishRetriedAttempt (runner, state) {
 
   // ATR: record this attempt as failed so when run().finally runs (after retry) we have all statuses
   if (isFlakyTestRetriesEnabled) {
-    const nameForKey = runner.pickle.name.replace(/\s*\(attempt \d+(?:, retried)?\)\s*$/, '')
+    const nameForKey = runner.pickle.name.replace(/ ?\(attempt \d+(?:, retried)?\) ?$/, '')
     const atrKey = `${runner.pickle.uri}:${nameForKey}`
     if (atrStatusesByScenarioKey.has(atrKey)) {
       atrStatusesByScenarioKey.get(atrKey).push('fail')
@@ -889,7 +889,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) {
-          const nameForKey = this.pickle.name.replace(/\s*\(attempt \d+(?:, retried)?\)\s*$/, '')
+          const nameForKey = this.pickle.name.replace(/ ?\(attempt \d+(?:, retried)?\) ?$/, '')
           const atrKey = `${this.pickle.uri}:${nameForKey}`
           if (atrStatusesByScenarioKey.has(atrKey)) {
             atrStatusesByScenarioKey.get(atrKey).push(status)
diff --git a/packages/datadog-plugin-child_process/src/scrub-cmd-params.js b/packages/datadog-plugin-child_process/src/scrub-cmd-params.js
index 0ee58361ec..642ae3517c 100644
--- a/packages/datadog-plugin-child_process/src/scrub-cmd-params.js
+++ b/packages/datadog-plugin-child_process/src/scrub-cmd-params.js
@@ -5,7 +5,7 @@ const shellParser = require('../../../vendor/dist/shell-quote').parse
 const ALLOWED_ENV_VARIABLES = new Set(['LD_PRELOAD', 'LD_LIBRARY_PATH', 'PATH'])
 const PROCESS_DENYLIST = new Set(['md5'])
 
-const VARNAMES_REGEX = /\$(\w*)(?:[^\w]|$)/gmi
+const VARNAMES_REGEX = /\$(\w*)(?:[^\w]|$)/gm
 // eslint-disable-next-line @stylistic/max-len
 const PARAM_PATTERN = '^-{0,2}(?:p(?:ass(?:w(?:or)?d)?)?|address|api[-_]?key|e?mail|secret(?:[-_]?key)?|a(?:ccess|uth)[-_]?token|mysql_pwd|credentials|(?:stripe)?token)$'
 const regexParam = new RegExp(PARAM_PATTERN, 'i')
diff --git a/packages/datadog-plugin-cypress/src/source-map-utils.js b/packages/datadog-plugin-cypress/src/source-map-utils.js
index 233c149166..52b6ea25f1 100644
--- a/packages/datadog-plugin-cypress/src/source-map-utils.js
+++ b/packages/datadog-plugin-cypress/src/source-map-utils.js
@@ -61,7 +61,7 @@ function decodeVLQ (str, cursor) {
  * @returns {string | null}
  */
 function resolveSourcePath (mapDir, sourceRoot, sourcePath) {
-  const cleanSourcePath = sourcePath.replace(/[?#].*$/, '')
+  const cleanSourcePath = sourcePath.split(/[?#]/)[0]
   if (/^[A-Za-z][A-Za-z\d+.-]*:\/\//.test(cleanSourcePath)) {
     // Virtual sources may use URL-like schemes (e.g. file://, webpack://, vite://).
     // If they encode an absolute local path in the URL pathname, use it.
diff --git a/packages/datadog-plugin-graphql/test/index.spec.js b/packages/datadog-plugin-graphql/test/index.spec.js
index 67d551ad60..26a04fc85d 100644
--- a/packages/datadog-plugin-graphql/test/index.spec.js
+++ b/packages/datadog-plugin-graphql/test/index.spec.js
@@ -996,7 +996,7 @@ describe('Plugin', () => {
                   'user span must be contained within its live parent, not start after it finished',
                 )
               }
-            }, { spanResourceMatch: /items:\[Item]/ }),
+            }, { spanResourceMatch: /items:\[Item\]/ }),
             graphql.graphql({ schema: localSchema, source: '{ items { name } }' }),
           ])
 
@@ -1069,7 +1069,7 @@ describe('Plugin', () => {
               },
             })
             assert.strictEqual(petsName.parent_id.toString(), pets.span_id.toString())
-          }, { spanResourceMatch: /friends:\[Human]/ })
+          }, { spanResourceMatch: /friends:\[Human\]/ })
 
           return Promise.all([assertion, graphql.graphql({ schema, source })])
         })
@@ -2775,7 +2775,7 @@ describe('Plugin', () => {
               },
             })
             assert.strictEqual(friend1Name.parent_id.toString(), friends.span_id.toString())
-          }, { spanResourceMatch: /friends:\[Human]/ })
+          }, { spanResourceMatch: /friends:\[Human\]/ })
 
           return Promise.all([assertion, graphql.graphql({ schema, source })])
         })
diff --git a/packages/datadog-plugin-jest/src/util.js b/packages/datadog-plugin-jest/src/util.js
index 00fc8c490d..93c0f31acd 100644
--- a/packages/datadog-plugin-jest/src/util.js
+++ b/packages/datadog-plugin-jest/src/util.js
@@ -43,7 +43,8 @@ function getFormattedJestTestParameters (testParameters) {
 
 // @fast-check/jest appends a random seed to the reported test name. A test name that keeps changing
 // breaks some Test Optimization features, so normalize this narrow suffix regardless of import style.
-const SEED_SUFFIX_RE = /\s*\(with seed=-?\d+\)\s*$/i
+// fast-check emits exactly one space before the suffix.
+const SEED_SUFFIX_RE = / ?\(with seed=-?\d+\) ?$/i
 
 function removeSeedSuffixFromTestName (testName) {
   return testName.replace(SEED_SUFFIX_RE, '')
diff --git a/packages/dd-trace/src/ci-visibility/test-optimization-http-cache-schema.js b/packages/dd-trace/src/ci-visibility/test-optimization-http-cache-schema.js
index 9ee8c89a53..bd5bfae33d 100644
--- a/packages/dd-trace/src/ci-visibility/test-optimization-http-cache-schema.js
+++ b/packages/dd-trace/src/ci-visibility/test-optimization-http-cache-schema.js
@@ -26,7 +26,7 @@ const SETTINGS_BOOLEAN_KEYS = [
 ]
 const EARLY_FLAKE_DETECTION_KEYS = ['enabled', 'faulty_session_threshold', 'slow_test_retries']
 const TEST_MANAGEMENT_KEYS = ['attempt_to_fix_retries', 'enabled']
-const RETRY_THRESHOLD_PATTERN = /^\d+(?:ms|s|m|h)$/
+const RETRY_THRESHOLD_PATTERN = /^\d+(?:ms|[smh])$/
 const MAX_VALIDATION_MODULES = 1000
 const MAX_VALIDATION_SUITES = 10_000
 const MAX_VALIDATION_TESTS = 100_000
diff --git a/packages/dd-trace/src/config/parsers.js b/packages/dd-trace/src/config/parsers.js
index 7b2897c8cd..9e29d3b773 100644
--- a/packages/dd-trace/src/config/parsers.js
+++ b/packages/dd-trace/src/config/parsers.js
@@ -172,7 +172,14 @@ const transformers = {
         return transformers.stripColonWhitespace(item)
       })
     }
-    return value.replaceAll(/\s*:\s*/g, ':')
+    // Only whitespace adjacent to a colon is removed; the outer whitespace of the first and
+    // last segment stays.
+    const parts = value.split(':')
+    for (let i = 0; i < parts.length; i++) {
+      if (i !== 0) parts[i] = parts[i].trimStart()
+      if (i !== parts.length - 1) parts[i] = parts[i].trimEnd()
+    }
+    return parts.join(':')
   },
   /**
    * @param {string} value
diff --git a/packages/dd-trace/src/llmobs/plugins/claude-agent-sdk/index.js b/packages/dd-trace/src/llmobs/plugins/claude-agent-sdk/index.js
index f36e6482c6..ca6ccfcefa 100644
--- a/packages/dd-trace/src/llmobs/plugins/claude-agent-sdk/index.js
+++ b/packages/dd-trace/src/llmobs/plugins/claude-agent-sdk/index.js
@@ -8,7 +8,7 @@ const { splitModel } = require('../../../../../datadog-plugin-claude-agent-sdk/s
 const subagentToolIds = new Set()
 
 function normalizeToolOutputString (raw) {
-  const footerIndex = raw.search(/\s*agentId: [^\s]+ \(use SendMessage\b/)
+  const footerIndex = raw.search(/agentId: \S+ \(use SendMessage\b/)
   if (footerIndex === -1) return raw
 
   return raw.slice(0, footerIndex).trimEnd()
diff --git a/packages/dd-trace/src/plugins/util/ci.js b/packages/dd-trace/src/plugins/util/ci.js
index 1160ecae3d..b39008bbf6 100644
--- a/packages/dd-trace/src/plugins/util/ci.js
+++ b/packages/dd-trace/src/plugins/util/ci.js
@@ -76,7 +76,7 @@ function normalizeRef (ref) {
   if (!ref) {
     return ref
   }
-  return ref.replaceAll(/origin\/|refs\/heads\/|tags\//gm, '')
+  return ref.replaceAll(/origin\/|refs\/heads\/|tags\//g, '')
 }
 
 function resolveTilde (filePath) {
@@ -216,7 +216,7 @@ const githubWellKnownDiagnosticDirPatternsUnix = [
 ]
 const githubWellKnownDiagnosticDirPatternsWin = ['C:/actions-runner/*/_diag', 'C:/actions-runner/*/*/_diag']
 
-const githubJobIDRegex = /"job":\s*{[\s\S]*?"v"\s*:\s*(\d+)(?:\.0)?/
+const githubJobIDRegex = /"job":\s*\{[\s\S]*?"v"\s*:\s*(\d+)(?:\.0)?/
 
 function getJobIDFromDiagFile () {
   const runnerTemp = getEnvironmentVariable('RUNNER_TEMP')
@@ -650,7 +650,7 @@ module.exports = {
         [GIT_TAG]: BITBUCKET_TAG,
         [GIT_REPOSITORY_URL]: BITBUCKET_GIT_SSH_ORIGIN || BITBUCKET_GIT_HTTP_ORIGIN,
         [CI_WORKSPACE_PATH]: BITBUCKET_CLONE_DIR,
-        [CI_PIPELINE_ID]: BITBUCKET_PIPELINE_UUID && BITBUCKET_PIPELINE_UUID.replaceAll(/[{}]/gm, ''),
+        [CI_PIPELINE_ID]: BITBUCKET_PIPELINE_UUID && BITBUCKET_PIPELINE_UUID.replaceAll(/[{}]/g, ''),
         [GIT_PULL_REQUEST_BASE_BRANCH]: BITBUCKET_PR_DESTINATION_BRANCH,
         [PR_NUMBER]: BITBUCKET_PR_ID,
       }
diff --git a/packages/dd-trace/src/plugins/util/git.js b/packages/dd-trace/src/plugins/util/git.js
index ba408ba74c..bdd4060720 100644
--- a/packages/dd-trace/src/plugins/util/git.js
+++ b/packages/dd-trace/src/plugins/util/git.js
@@ -62,7 +62,7 @@ function sanitizedExec (
       let result = cachedExec(cmd, flags, { stdio: 'pipe' }).toString()
 
       if (shouldTrim) {
-        result = result.replaceAll(/(\r\n|\n|\r)/gm, '')
+        result = result.replaceAll(/(\r\n|\n|\r)/g, '')
       }
 
       if (durationMetric) {
diff --git a/packages/dd-trace/src/plugins/util/url.js b/packages/dd-trace/src/plugins/util/url.js
index 6fa71b5cf4..c03ecec31e 100644
--- a/packages/dd-trace/src/plugins/util/url.js
+++ b/packages/dd-trace/src/plugins/util/url.js
@@ -8,13 +8,13 @@ const HTTP2_HEADER_AUTHORITY = ':authority'
 const HTTP2_HEADER_SCHEME = ':scheme'
 const HTTP2_HEADER_PATH = ':path'
 
-const PATH_REGEX = /^(?:[a-z]+:\/\/(?:[^?/]+))?(?<path>\/[^?]*)(?:(\?).*)?$/
+const PATH_REGEX = /^(?:[a-z]+:\/\/[^?/]+)?(?<path>\/[^?]*)(?:(\?).*)?$/
 
 const INT_SEGMENT = /^[1-9][0-9]+$/ // Integer of size at least 2 (>=10)
-const INT_ID_SEGMENT = /^(?=.*[0-9].*)[0-9._-]{3,}$/ // Mixed string with digits and delimiters
-const HEX_SEGMENT = /^(?=.*[0-9].*)[A-Fa-f0-9]{6,}$/ // Hexadecimal digits of size at least 6 with at least one decimal digit
-const HEX_ID_SEGMENT = /^(?=.*[0-9].*)[A-Fa-f0-9._-]{6,}$/ // Mixed string with hex digits and delimiters
-const STRING_SEGMENT = /^.{20,}|.*[%&'()*+,:=@].*$/ // Long string or a string containing special characters
+const INT_ID_SEGMENT = /^(?=.*[0-9])[0-9._-]{3,}$/ // Mixed string with digits and delimiters
+const HEX_SEGMENT = /^(?=.*[0-9])[A-Fa-f0-9]{6,}$/ // Hexadecimal digits of size at least 6 with at least one decimal digit
+const HEX_ID_SEGMENT = /^(?=.*[0-9])[A-Fa-f0-9._-]{6,}$/ // Mixed string with hex digits and delimiters
+const STRING_SEGMENT = /^.{20,}|[%&'()*+,:=@]/ // Long string or a string containing special characters
 
 /**
  * Extract full URL from HTTP request
diff --git a/packages/dd-trace/src/plugins/util/user-provided-git.js b/packages/dd-trace/src/plugins/util/user-provided-git.js
index 25c40e3c92..d5d41d6240 100644
--- a/packages/dd-trace/src/plugins/util/user-provided-git.js
+++ b/packages/dd-trace/src/plugins/util/user-provided-git.js
@@ -36,7 +36,7 @@ function removeEmptyValues (tagsAndValues) {
 // https://github.com/jonschlinkert/is-git-url/blob/396965ffabf2f46656c8af4c47bef1d69f09292e/index.js#L9C15-L9C87
 // The `.git` suffix is optional in this version
 function validateGitRepositoryUrl (repoUrl) {
-  return /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\/?|#[-\w.]+?)$/.test(repoUrl)
+  return /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\/?|#[-\w.]+)$/.test(repoUrl)
 }
 
 function validateGitCommitSha (gitCommitSha) {
diff --git a/packages/dd-trace/src/plugins/util/web.js b/packages/dd-trace/src/plugins/util/web.js
index 96acdeab06..cb3baaec39 100644
--- a/packages/dd-trace/src/plugins/util/web.js
+++ b/packages/dd-trace/src/plugins/util/web.js
@@ -376,7 +376,7 @@ function isOriginAllowed (req, headers) {
 }
 
 function splitHeader (str) {
-  return typeof str === 'string' ? str.split(/\s*,\s*/) : []
+  return typeof str === 'string' ? str.split(',').map((header) => header.trim()) : []
 }
 
 function addRequestTags (context, spanType) {
diff --git a/packages/dd-trace/src/telemetry/logs/log-collector.js b/packages/dd-trace/src/telemetry/logs/log-collector.js
index cce0273609..2ce9d29bf2 100644
--- a/packages/dd-trace/src/telemetry/logs/log-collector.js
+++ b/packages/dd-trace/src/telemetry/logs/log-collector.js
@@ -31,7 +31,9 @@ function isValid (logEntry) {
 }
 
 const EOL = '\n'
-const STACK_FRAME_LINE_REGEX = /^\s*at\s/gm
+// `[ \t]*` (horizontal whitespace) cannot span line terminators, so under `m` the `^`-anchored
+// match runs once per line instead of rescanning across lines. Stack frames indent with spaces.
+const STACK_FRAME_LINE_REGEX = /^[ \t]*at\s/gm
 
 function sanitize (logEntry) {
   const stack = logEntry.stack_trace
diff --git a/packages/dd-trace/test/config/index.spec.js b/packages/dd-trace/test/config/index.spec.js
index bd92831a54..f354d467e3 100644
--- a/packages/dd-trace/test/config/index.spec.js
+++ b/packages/dd-trace/test/config/index.spec.js
@@ -4743,6 +4743,11 @@ rules:
       ])
     })
 
+    it('collapses only whitespace adjacent to a colon in header tags', () => {
+      const config = getConfig({ headerTags: ['  a : b  ', 'k : : v'] })
+      assert.deepStrictEqual(config.headerTags, ['  a:b  ', 'k::v'])
+    })
+
     it('should map tracing_tags to tags', () => {
       const config = getConfig({ tags: { foo: 'bar' } })
       assertObjectContains(config.tags, { foo: 'bar' })
diff --git a/packages/dd-trace/test/log.spec.js b/packages/dd-trace/test/log.spec.js
index 0db89b911b..0d98ac5451 100644
--- a/packages/dd-trace/test/log.spec.js
+++ b/packages/dd-trace/test/log.spec.js
@@ -305,7 +305,7 @@ describe('log', () => {
         sinon.assert.calledOnce(console.debug)
         const debugMessage = console.debug.firstCall.args[0]
         assert.match(debugMessage,
-          /^Trace: Context.foo\('argument', { hello: 'world' }, Foo { bar: 'baz' }\)/
+          /^Trace: Context.foo\('argument', \{ hello: 'world' \}, Foo \{ bar: 'baz' \}\)/
         )
         const lineCount = debugMessage.split('\n').length
         assert.ok(lineCount >= 3, `Expected at least 3 lines in trace, got ${lineCount}: ${inspect(debugMessage)}`)
diff --git a/packages/dd-trace/test/plugins/plugin-structure.spec.js b/packages/dd-trace/test/plugins/plugin-structure.spec.js
index 6ec5fed18f..15dc5222ad 100644
--- a/packages/dd-trace/test/plugins/plugin-structure.spec.js
+++ b/packages/dd-trace/test/plugins/plugin-structure.spec.js
@@ -57,7 +57,7 @@ function extractPluginIds (source, re, index) {
 }
 
 function extractPluginsInterfaceKeys (dtsSource) {
-  const m = dtsSource.match(/interface Plugins\s*\{([\s\S]*?)\n\}/m)
+  const m = dtsSource.match(/interface Plugins\s*\{([\s\S]*?)\n\}/)
   assert.ok(m, 'Could not find `interface Plugins { ... }` in index.d.ts')
 
   const body = m[1]
diff --git a/packages/dd-trace/test/plugins/util/url.spec.js b/packages/dd-trace/test/plugins/util/url.spec.js
index df9261a5c9..4aa3386d61 100644
--- a/packages/dd-trace/test/plugins/util/url.spec.js
+++ b/packages/dd-trace/test/plugins/util/url.spec.js
@@ -341,6 +341,12 @@ describe('plugins/util/url', () => {
         )
       })
 
+      it('should treat 20 chars as the {param:str} length boundary', () => {
+        // 19 plain chars (no digit, no special) stay verbatim; 20 cross into {param:str}.
+        assert.strictEqual(url.calculateHttpEndpoint('/x/abcdefghijklmnopqrs'), '/x/abcdefghijklmnopqrs')
+        assert.strictEqual(url.calculateHttpEndpoint('/x/abcdefghijklmnopqrst'), '/x/{param:str}')
+      })
+
       it('should replace strings with special characters as {param:str}', () => {
         assert.strictEqual(url.calculateHttpEndpoint('/search/hello%20world'), '/search/{param:str}')
         assert.strictEqual(url.calculateHttpEndpoint('/filter/foo&bar'), '/filter/{param:str}')
diff --git a/packages/dd-trace/test/plugins/util/web.spec.js b/packages/dd-trace/test/plugins/util/web.spec.js
index 95a4bd4372..2f88466d6b 100644
--- a/packages/dd-trace/test/plugins/util/web.spec.js
+++ b/packages/dd-trace/test/plugins/util/web.spec.js
@@ -834,5 +834,21 @@ describe('plugins/util/web', () => {
         [204, 'No Content', { 'x-test': '1' }]
       )
     })
+
+    it('trims whitespace surrounding each requested header entry', () => {
+      req.method = 'OPTIONS'
+      req.headers.origin = 'https://example.com'
+      req.headers['access-control-request-headers'] = '  x-datadog-parent-id  ,x-datadog-trace-id  '
+      res.getHeaders.returns({ [ALLOW_ORIGIN]: '*' })
+
+      const wrapped = web.wrapWriteHead(context)
+      wrapped.call(res, 200)
+
+      assert.ok(res.setHeader.calledOnce)
+      assert.deepStrictEqual(
+        res.setHeader.firstCall.args,
+        [ALLOW_HEADERS, 'x-datadog-parent-id,x-datadog-trace-id']
+      )
+    })
   })
 })
diff --git a/scripts/verify-exercised-tests.js b/scripts/verify-exercised-tests.js
index 64fac64292..5bf1aa1bb3 100644
--- a/scripts/verify-exercised-tests.js
+++ b/scripts/verify-exercised-tests.js
@@ -218,7 +218,7 @@ function splitPlugins (value) {
   const raw = unwrapLiteralEnvValue(value)
   if (!raw) return []
   return raw
-    .split(/[,\s|]+/g)
+    .split(/[,\s|]+/)
     .map(s => s.trim())
     .filter(Boolean)
 }

From 71bd6f9c3b47b59bccae09bf5b68e06a81461fd6 Mon Sep 17 00:00:00 2001
From: mehulsonowal <46061187+mehulsonowal@users.noreply.github.com>
Date: Thu, 30 Jul 2026 11:47:12 -0400
Subject: [PATCH 42/43] feat(llmobs): emit experiment traces (#9479)

* feat(llmobs): add experiments dataset operations

* feat(llmobs): add CSV dataset creation

* chore(llmobs): use csv parser for dataset import

* chore(llmobs): add csv parser license

* feat(llmobs): include dataset version in experiments

* fix(llmobs): address dataset review feedback

* create jsontype to replace any

* remove dataset operations from llmobs

* remove csv dataset func

* noops produce warn logs instead of error throwing

* use vcr testing instead

* Update packages/dd-trace/src/llmobs/experiments/index.js

Co-authored-by: Sam Brenner <106700075+sabrenner@users.noreply.github.com>

* fix(llmobs): address experiments ci failures

* test(llmobs): cover experiments noop accessors

* fix(llmobs): refresh experiments facade on config changes

* feat(llmobs): emit experiment traces

* fix(llmobs): preserve dataset record ids for experiments

* create utils, double check comments

* fix(llmobs): align experiments noop tests

* fix(llmobs): address experiment review feedback

* fix(llmobs): remove async experiment alias

* address comments

* fix(llmobs): align experiment type definitions

* Update packages/dd-trace/src/llmobs/experiments/experiment.js

Co-authored-by: Sam Brenner <106700075+sabrenner@users.noreply.github.com>

* assign output to task execution

* revert span condition

* revert tagging changes

---------

Co-authored-by: Sam Brenner <106700075+sabrenner@users.noreply.github.com>
---
 index.d.ts                                    |  44 +-
 index.d.v5.ts                                 |  44 +-
 .../dd-trace/src/llmobs/constants/tags.js     |   2 +-
 .../src/llmobs/experiments/experiment.js      | 382 +++++++++++++-----
 .../dd-trace/src/llmobs/experiments/index.js  |  10 +-
 .../dd-trace/src/llmobs/experiments/result.js |  15 +-
 .../dd-trace/src/llmobs/experiments/util.js   | 218 ++++++++++
 packages/dd-trace/src/llmobs/sdk.js           |   9 +-
 .../dd-trace/src/llmobs/span_processor.js     |  16 +-
 packages/dd-trace/src/llmobs/writers/spans.js |  18 +-
 .../llmobs/experiments/experiment.spec.js     | 165 +++++++-
 .../test/llmobs/experiments/util.spec.js      |  84 ++++
 .../dd-trace/test/llmobs/sdk/index.spec.js    |  48 +++
 .../test/llmobs/span_processor.spec.js        |  35 ++
 .../test/llmobs/writers/spans.spec.js         |  13 +
 15 files changed, 965 insertions(+), 138 deletions(-)
 create mode 100644 packages/dd-trace/src/llmobs/experiments/util.js
 create mode 100644 packages/dd-trace/test/llmobs/experiments/util.spec.js

diff --git a/index.d.ts b/index.d.ts
index 0048417a75..9e2c9edf32 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -3742,12 +3742,13 @@ declare namespace tracer {
      */
     type ExperimentTask = (
       input: JSONType,
-      config: Record<string, JSONType>
+      config: Record<string, JSONType>,
+      metadata?: Record<string, JSONType>
     ) => JSONType | Promise<JSONType>
 
     /**
      * Scores a single task output. The return type selects the metric:
-     * `boolean` -> boolean, `number` -> score, anything else -> categorical.
+     * `boolean` -> boolean, `number` -> score, `string` -> categorical, anything else -> json.
      */
     type ExperimentEvaluator = (
       input: JSONType,
@@ -3755,6 +3756,17 @@ declare namespace tracer {
       expectedOutput: JSONType
     ) => JSONType | Promise<JSONType>
 
+    /**
+     * Scores all rows in an experiment run and emits a summary metric.
+     */
+    type ExperimentSummaryEvaluator = (
+      inputs: any[],
+      outputs: any[],
+      expectedOutputs: any[],
+      evaluatorResults: Record<string, any[]>,
+      metadata?: Array<Record<string, any>>
+    ) => any | Promise<any>
+
     interface CreateDatasetOptions {
       description?: string
       records?: Array<{
@@ -3769,13 +3781,24 @@ declare namespace tracer {
       name: string
       dataset: Dataset
       task: ExperimentTask
-      /** Evaluators keyed by metric label. */
-      evaluators?: Record<string, ExperimentEvaluator>
+      /** Evaluators keyed by metric label, or named functions. */
+      evaluators?: Record<string, ExperimentEvaluator> | ExperimentEvaluator[]
+      /** Summary evaluators keyed by metric label, or named functions. */
+      summaryEvaluators?: Record<string, ExperimentSummaryEvaluator> | ExperimentSummaryEvaluator[]
       description?: string
       config?: Record<string, JSONType>
       tags?: Record<string, string>
     }
 
+    interface ExperimentRunOptions {
+      /** Maximum retries for task and evaluator failures. Default 0. */
+      maxRetries?: number
+      /** Delay before a retry, in milliseconds. Default 100 * (attempt + 1). */
+      retryDelay?: (attempt: number) => number
+      /** Reject on the first task/evaluator error instead of capturing it. Default false. */
+      throwOnErrors?: boolean
+    }
+
     interface PullDatasetOptions {
       /** Dataset version to pull. Defaults to latest. */
       version?: number
@@ -3801,9 +3824,20 @@ declare namespace tracer {
       evaluationErrors: Record<string, string>
     }
 
+    interface ExperimentRun {
+      runId: string
+      runIteration: number
+      rows: ExperimentResultRow[]
+      summaryEvaluations: Record<string, { value: any, error: string | null }>
+    }
+
     interface ExperimentResult {
       experimentId: string
       rows: ExperimentResultRow[]
+      /** Single-run summary evaluator results. */
+      summaryEvaluations: Record<string, { value: any, error: string | null }>
+      /** Experiment runs. P0 Node experiments currently return one run. */
+      runs: ExperimentRun[]
       /** Dashboard URL for the experiment. */
       url: string
     }
@@ -3838,7 +3872,7 @@ declare namespace tracer {
       name (): string
       experimentId (): string | null
       url (): string | null
-      run (): Promise<ExperimentResult>
+      run (options?: ExperimentRunOptions): Promise<ExperimentResult>
     }
 
     interface Experiments {
diff --git a/index.d.v5.ts b/index.d.v5.ts
index b5041d9116..9dfdcc36cd 100644
--- a/index.d.v5.ts
+++ b/index.d.v5.ts
@@ -3939,12 +3939,13 @@ declare namespace tracer {
      */
     type ExperimentTask = (
       input: JSONType,
-      config: Record<string, JSONType>
+      config: Record<string, JSONType>,
+      metadata?: Record<string, JSONType>
     ) => JSONType | Promise<JSONType>
 
     /**
      * Scores a single task output. The return type selects the metric:
-     * `boolean` -> boolean, `number` -> score, anything else -> categorical.
+     * `boolean` -> boolean, `number` -> score, `string` -> categorical, anything else -> json.
      */
     type ExperimentEvaluator = (
       input: JSONType,
@@ -3952,6 +3953,17 @@ declare namespace tracer {
       expectedOutput: JSONType
     ) => JSONType | Promise<JSONType>
 
+    /**
+     * Scores all rows in an experiment run and emits a summary metric.
+     */
+    type ExperimentSummaryEvaluator = (
+      inputs: any[],
+      outputs: any[],
+      expectedOutputs: any[],
+      evaluatorResults: Record<string, any[]>,
+      metadata?: Array<Record<string, any>>
+    ) => any | Promise<any>
+
     interface CreateDatasetOptions {
       description?: string
       records?: Array<{
@@ -3966,13 +3978,24 @@ declare namespace tracer {
       name: string
       dataset: Dataset
       task: ExperimentTask
-      /** Evaluators keyed by metric label. */
-      evaluators?: Record<string, ExperimentEvaluator>
+      /** Evaluators keyed by metric label, or named functions. */
+      evaluators?: Record<string, ExperimentEvaluator> | ExperimentEvaluator[]
+      /** Summary evaluators keyed by metric label, or named functions. */
+      summaryEvaluators?: Record<string, ExperimentSummaryEvaluator> | ExperimentSummaryEvaluator[]
       description?: string
       config?: Record<string, JSONType>
       tags?: Record<string, string>
     }
 
+    interface ExperimentRunOptions {
+      /** Maximum retries for task and evaluator failures. Default 0. */
+      maxRetries?: number
+      /** Delay before a retry, in milliseconds. Default 100 * (attempt + 1). */
+      retryDelay?: (attempt: number) => number
+      /** Reject on the first task/evaluator error instead of capturing it. Default false. */
+      throwOnErrors?: boolean
+    }
+
     interface PullDatasetOptions {
       /** Dataset version to pull. Defaults to latest. */
       version?: number
@@ -3998,9 +4021,20 @@ declare namespace tracer {
       evaluationErrors: Record<string, string>
     }
 
+    interface ExperimentRun {
+      runId: string
+      runIteration: number
+      rows: ExperimentResultRow[]
+      summaryEvaluations: Record<string, { value: any, error: string | null }>
+    }
+
     interface ExperimentResult {
       experimentId: string
       rows: ExperimentResultRow[]
+      /** Single-run summary evaluator results. */
+      summaryEvaluations: Record<string, { value: any, error: string | null }>
+      /** Experiment runs. P0 Node experiments currently return one run. */
+      runs: ExperimentRun[]
       /** Dashboard URL for the experiment. */
       url: string
     }
@@ -4035,7 +4069,7 @@ declare namespace tracer {
       name (): string
       experimentId (): string | null
       url (): string | null
-      run (): Promise<ExperimentResult>
+      run (options?: ExperimentRunOptions): Promise<ExperimentResult>
     }
 
     interface Experiments {
diff --git a/packages/dd-trace/src/llmobs/constants/tags.js b/packages/dd-trace/src/llmobs/constants/tags.js
index da3a21a0cf..a0659d6bfe 100644
--- a/packages/dd-trace/src/llmobs/constants/tags.js
+++ b/packages/dd-trace/src/llmobs/constants/tags.js
@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  SPAN_KINDS: ['llm', 'agent', 'workflow', 'task', 'tool', 'embedding', 'retrieval'],
+  SPAN_KINDS: ['llm', 'agent', 'workflow', 'task', 'tool', 'embedding', 'retrieval', 'experiment'],
   SPAN_KIND: '_ml_obs.meta.span.kind',
   SESSION_ID: '_ml_obs.session_id',
   SESSION_ID_TRACE_DEFAULT_KEY: '_ml_obs.trace_session_id',
diff --git a/packages/dd-trace/src/llmobs/experiments/experiment.js b/packages/dd-trace/src/llmobs/experiments/experiment.js
index 8a2c603468..5088dabec5 100644
--- a/packages/dd-trace/src/llmobs/experiments/experiment.js
+++ b/packages/dd-trace/src/llmobs/experiments/experiment.js
@@ -3,35 +3,19 @@
 const id = require('../../id')
 
 const { API_BASE_PATH } = require('./client')
-const { Row, ExperimentResult } = require('./result')
-
-// Mirrors dd-trace-py's _generate_metric_from_evaluation: plain objects are
-// json, everything else falls through to the lowercased categorical fallback.
-function inferMetricType (value) {
-  if (typeof value === 'boolean') return 'boolean'
-  if (typeof value === 'number' && Number.isFinite(value)) return 'score'
-  if (value !== null && typeof value === 'object' && !Array.isArray(value)) return 'json'
-  return 'categorical'
-}
-
-function stringify (value) {
-  if (value === null || value === undefined) return ''
-  if (typeof value === 'string') return value.toLowerCase()
-  if (typeof value === 'object') return JSON.stringify(value).toLowerCase()
-  return String(value).toLowerCase()
-}
-
-// Build the tag list, letting auto tags win over user tags on key conflict.
-function buildTags (userTags, autoTags) {
-  const tags = new Map()
-  for (const [k, v] of Object.entries(userTags ?? {})) {
-    tags.set(k, `${k}:${v}`)
-  }
-  for (const [k, v] of Object.entries(autoTags)) {
-    tags.set(k, `${k}:${v}`)
-  }
-  return [...tags.values()]
-}
+const { Row, ExperimentResult, ExperimentRun } = require('./result')
+const {
+  buildExperimentTagObject,
+  buildSpanMetadata,
+  buildTags,
+  hasEntries,
+  inferMetricType,
+  normalizeEvaluators,
+  normalizeJsonMetricValue,
+  sleep,
+  stringify,
+  validateEvaluatorName,
+} = require('./util')
 
 // One span per experiment row (LLM Obs experiment span wire format).
 function toSpan (row, metadata, ids, spanName, userTags) {
@@ -40,7 +24,7 @@ function toSpan (row, metadata, ids, spanName, userTags) {
     output: row.output ?? null,
     expected_output: row.expectedOutput ?? null,
   }
-  if (metadata && Object.keys(metadata).length > 0) {
+  if (hasEntries(metadata)) {
     meta.metadata = metadata
   }
   if (row.isError) {
@@ -59,19 +43,26 @@ function toSpan (row, metadata, ids, spanName, userTags) {
     meta,
     tags: buildTags(userTags, {
       experiment_id: ids.experimentId,
+      run_id: ids.runId,
+      run_iteration: ids.runIteration,
       dataset_id: ids.datasetId,
       dataset_record_id: ids.datasetRecordId,
     }),
   }
 }
 
-// One metric per evaluator per row.
-function toMetric (label, value, errorMessage, spanId, timestampMs, experimentId, userTags) {
+// One metric per evaluator per row or summary evaluator.
+function toMetric (
+  label, value, errorMessage, spanId, traceId, timestampMs, experimentId, userTags, source = 'custom'
+) {
   const metric = {
+    metric_source: source,
     label,
     span_id: spanId,
+    trace_id: traceId,
     timestamp_ms: timestampMs,
     tags: buildTags(userTags, { experiment_id: experimentId }),
+    experiment_id: experimentId,
   }
 
   if (errorMessage !== null) {
@@ -84,35 +75,50 @@ function toMetric (label, value, errorMessage, spanId, timestampMs, experimentId
   metric.metric_type = type
   if (type === 'boolean') metric.boolean_value = value
   else if (type === 'score') metric.score_value = value
-  else if (type === 'json') metric.json_value = value
+  else if (type === 'json') metric.json_value = normalizeJsonMetricValue(value)
   else metric.categorical_value = stringify(value)
   return metric
 }
 
+function createFallbackSpanContext (startNs) {
+  // Root-span id generation, same convention as opentracing/span.js: a single
+  // random 64-bit id for the span, reused as the trace id's low 64 bits with a
+  // start-time-derived high 64 bits (like the `_dd.p.tid` 128-bit trace id tag).
+  const spanIdentifier = id()
+  const traceIdHigh = Math.floor(startNs / 1e9).toString(16).padStart(8, '0').padEnd(16, '0')
+  const spanId = spanIdentifier.toString(16).padStart(16, '0')
+  const traceId = spanIdentifier.toTraceIdHex(traceIdHigh).padStart(32, '0')
+  return { spanId, traceId }
+}
+
 // Builder + run() orchestration: runs rows sequentially, emits one root span
-// per dataset row, and posts all spans + metrics in a single events call.
+// per dataset row, and posts spans + metrics to the experiments events API.
 class Experiment {
   #client
+  #llmobs
   #name
   #description
   #dataset
   #task
   #evaluators
+  #summaryEvaluators
   #config
   #tags
   #experimentId
 
-  constructor (client, options = {}) {
+  constructor (client, options = {}, llmobs) {
     if (!options.name) throw new Error('Experiment name is required')
     if (!options.dataset) throw new Error('Experiment dataset is required')
     if (typeof options.task !== 'function') throw new Error('Experiment task is required')
 
     this.#client = client
+    this.#llmobs = llmobs
     this.#name = options.name
     this.#description = options.description ?? ''
     this.#dataset = options.dataset
     this.#task = options.task
-    this.#evaluators = new Map(Object.entries(options.evaluators ?? {}))
+    this.#evaluators = normalizeEvaluators(options.evaluators, 'row')
+    this.#summaryEvaluators = normalizeEvaluators(options.summaryEvaluators, 'summary')
     this.#config = { ...options.config }
     this.#tags = { ...options.tags }
     this.#experimentId = null
@@ -131,7 +137,16 @@ class Experiment {
     return `${this.#client.appBase}/llm/experiments/${this.#experimentId}`
   }
 
-  async run () {
+  async run (options = {}) {
+    const {
+      maxRetries = 0,
+      retryDelay = (attempt) => 100 * (attempt + 1),
+      throwOnErrors = false,
+    } = options
+
+    if (maxRetries < 0) throw new Error('maxRetries must be >= 0')
+    if (typeof retryDelay !== 'function') throw new TypeError('retryDelay must be a function')
+
     const projectId = await this.#client.ensureProjectId()
 
     await this.#dataset.ensureCreatedAndPushed(projectId)
@@ -148,6 +163,8 @@ class Experiment {
       dataset_id: datasetId,
       description: this.#description,
       ensure_unique: true,
+      run_count: 1,
+      metadata: { tags: buildTags(this.#tags, {}) },
     }
     const datasetVersion = this.#dataset.version()
     if (datasetVersion !== null) attributes.dataset_version = datasetVersion
@@ -163,6 +180,8 @@ class Experiment {
     }
     this.#experimentId = created?.data?.id ?? null
     const experimentId = this.#experimentId
+    const runId = id().toString(16).padStart(16, '0')
+    const runIteration = 0
 
     try {
       const records = this.#dataset.records()
@@ -170,83 +189,87 @@ class Experiment {
       const rows = []
       const spans = []
       const metrics = []
+      const evaluatorResults = {}
+      const usesLLMObsTrace = Boolean(this.#llmobs?.enabled)
       let hasRowError = false
 
       for (let i = 0; i < records.length; i++) {
         const record = records[i]
         const datasetRecordId = i < recordIds.length ? recordIds[i] : ''
-        const startNs = Date.now() * 1e6
-        const startHr = process.hrtime.bigint()
-
-        // Root-span id generation, same convention as opentracing/span.js: a single
-        // random 64-bit id for the span, reused as the trace id's low 64 bits with a
-        // start-time-derived high 64 bits (like the `_dd.p.tid` 128-bit trace id tag).
-        const spanIdentifier = id()
-        const traceIdHigh = Math.floor(startNs / 1e9).toString(16).padStart(8, '0').padEnd(16, '0')
-        const spanId = spanIdentifier.toString(16).padStart(16, '0')
-        const traceId = spanIdentifier.toTraceIdHex(traceIdHigh).padStart(32, '0')
-
-        let output = null
-        let errorType = null
-        let errorMessage = null
-        try {
-          // Rows run one at a time by design.
-          // eslint-disable-next-line no-await-in-loop
-          output = await this.#task(record.input, this.#config)
-        } catch (err) {
-          errorType = err.name || 'Error'
-          errorMessage = err.message ?? String(err)
-        }
+        // Rows currently run sequentially by design; jobs/concurrency is a P1 follow-up.
+        // eslint-disable-next-line no-await-in-loop
+        const row = await this.#processRecord({
+          index: i,
+          record,
+          datasetRecordId,
+          projectId,
+          datasetId,
+          experimentId,
+          runId,
+          runIteration,
+          maxRetries,
+          retryDelay,
+          throwOnErrors,
+        })
 
-        const durationNs = Number(process.hrtime.bigint() - startHr)
-        const evaluations = {}
-        const evaluationErrors = {}
         const timestampMs = Date.now()
-
         for (const [label, evaluator] of this.#evaluators) {
-          if (errorType !== null) {
+          if (!evaluatorResults[label]) evaluatorResults[label] = []
+          if (row.isError) {
             const msg = 'task error; evaluation skipped'
-            evaluationErrors[label] = msg
-            metrics.push(toMetric(label, null, msg, spanId, timestampMs, experimentId, this.#tags))
+            row.evaluationErrors[label] = msg
+            evaluatorResults[label].push(null)
+            metrics.push(toMetric(label, null, msg, row.spanId, row.traceId, timestampMs, experimentId, this.#tags))
             continue
           }
           try {
             // eslint-disable-next-line no-await-in-loop
-            const value = await evaluator(record.input, output, record.expectedOutput)
-            evaluations[label] = value
-            metrics.push(toMetric(label, value, null, spanId, timestampMs, experimentId, this.#tags))
+            const value = await this.#runWithRetries(
+              () => evaluator(record.input, row.output, record.expectedOutput),
+              maxRetries,
+              retryDelay
+            )
+            row.evaluations[label] = value
+            evaluatorResults[label].push(value)
+            metrics.push(toMetric(label, value, null, row.spanId, row.traceId, timestampMs, experimentId, this.#tags))
           } catch (err) {
+            if (throwOnErrors) throw err
             const msg = err.message ?? String(err)
-            evaluationErrors[label] = msg
-            metrics.push(toMetric(label, null, msg, spanId, timestampMs, experimentId, this.#tags))
+            row.evaluationErrors[label] = msg
+            evaluatorResults[label].push(null)
+            metrics.push(toMetric(label, null, msg, row.spanId, row.traceId, timestampMs, experimentId, this.#tags))
           }
         }
 
-        const row = new Row({
-          index: i,
-          spanId,
-          traceId,
-          startNs,
-          durationNs,
-          input: record.input,
-          output,
-          expectedOutput: record.expectedOutput,
-          errorType,
-          errorMessage,
-          evaluations,
-          evaluationErrors,
-        })
         rows.push(row)
-        if (row.isError || Object.keys(evaluationErrors).length > 0) hasRowError = true
-        spans.push(toSpan(row, record.metadata, {
-          experimentId,
-          projectId,
-          datasetId,
-          datasetRecordId,
-        }, this.#name, this.#tags))
+        if (row.isError || hasEntries(row.evaluationErrors)) hasRowError = true
+        if (!usesLLMObsTrace) {
+          spans.push(toSpan(row, record.metadata, {
+            experimentId,
+            projectId,
+            datasetId,
+            datasetRecordId,
+            runId,
+            runIteration,
+          }, this.#task.name || this.#name, this.#tags))
+        }
+      }
+
+      const summaryEvaluations = await this.#runSummaryEvaluators(rows, records, evaluatorResults, {
+        maxRetries,
+        retryDelay,
+        throwOnErrors,
+        experimentId,
+        metrics,
+      })
+      if (hasEntries(summaryEvaluations)) {
+        for (const value of Object.values(summaryEvaluations)) {
+          if (value?.error) hasRowError = true
+        }
       }
 
       await this.#postEvents(experimentId, spans, metrics)
+      this.#llmobs?.flush?.()
       // A row error doesn't abort the run, but the experiment didn't succeed cleanly.
       await this.#updateStatus(
         experimentId,
@@ -254,16 +277,185 @@ class Experiment {
         hasRowError ? 'one or more rows failed' : null
       )
 
-      return new ExperimentResult(experimentId, rows, this.url())
+      const run = new ExperimentRun({ runId, runIteration, rows, summaryEvaluations })
+      return new ExperimentResult(experimentId, rows, this.url(), [run], summaryEvaluations)
     } catch (err) {
       await this.#updateStatus(experimentId, 'failed', err.message ?? String(err))
       throw err
     }
   }
 
+  async #processRecord ({
+    index,
+    record,
+    datasetRecordId,
+    projectId,
+    datasetId,
+    experimentId,
+    runId,
+    runIteration,
+    maxRetries,
+    retryDelay,
+    throwOnErrors,
+  }) {
+    const startNs = Date.now() * 1e6
+    const startHr = process.hrtime.bigint()
+    const fallbackContext = createFallbackSpanContext(startNs)
+    let spanContext = fallbackContext
+    let output = null
+    let errorType = null
+    let errorMessage = null
+
+    const autoTags = {
+      experiment_id: experimentId,
+      run_id: runId,
+      run_iteration: runIteration,
+      project_id: projectId,
+      dataset_id: datasetId,
+      dataset_record_id: datasetRecordId,
+      dataset_name: this.#dataset.name(),
+      experiment_name: this.#name,
+    }
+    const tags = buildExperimentTagObject(this.#tags, autoTags)
+
+    const execute = () => this.#runWithRetries(
+      () => this.#task(record.input, this.#config, record.metadata),
+      maxRetries,
+      retryDelay
+    )
+
+    if (this.#llmobs?.enabled) {
+      try {
+        await this.#llmobs.trace({
+          kind: 'experiment',
+          name: this.#task.name || this.#name,
+        }, async (span) => {
+          spanContext = this.#llmobs.exportSpan(span)
+          try {
+            output = await execute()
+          } catch (err) {
+            this.#llmobs.annotate(span, {
+              inputData: record.input,
+              outputData: output,
+              metadata: buildSpanMetadata(record.metadata, this.#config),
+              tags,
+            })
+            throw err
+          }
+          this.#llmobs.annotate(span, {
+            inputData: record.input,
+            outputData: output,
+            metadata: buildSpanMetadata(record.metadata, this.#config),
+            tags,
+          })
+        })
+      } catch (err) {
+        if (throwOnErrors) throw err
+        errorType = err.name || 'Error'
+        errorMessage = err.message ?? String(err)
+      }
+    } else {
+      try {
+        output = await execute()
+      } catch (err) {
+        if (throwOnErrors) throw err
+        errorType = err.name || 'Error'
+        errorMessage = err.message ?? String(err)
+      }
+    }
+
+    const durationNs = Number(process.hrtime.bigint() - startHr)
+    return new Row({
+      index,
+      spanId: spanContext?.spanId ?? fallbackContext.spanId,
+      traceId: spanContext?.traceId ?? fallbackContext.traceId,
+      startNs,
+      durationNs,
+      input: record.input,
+      output,
+      expectedOutput: record.expectedOutput,
+      errorType,
+      errorMessage,
+      evaluations: {},
+      evaluationErrors: {},
+    })
+  }
+
+  async #runWithRetries (fn, maxRetries, retryDelay) {
+    let lastError
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+      try {
+        // eslint-disable-next-line no-await-in-loop
+        return await fn()
+      } catch (err) {
+        lastError = err
+        if (attempt >= maxRetries) break
+        const delayMs = retryDelay(attempt)
+        if (typeof delayMs !== 'number' || delayMs < 0 || !Number.isFinite(delayMs)) {
+          throw new TypeError('retryDelay must return a non-negative finite number of milliseconds')
+        }
+        // eslint-disable-next-line no-await-in-loop
+        await sleep(delayMs)
+      }
+    }
+    throw lastError
+  }
+
+  async #runSummaryEvaluators (rows, records, evaluatorResults, options) {
+    if (this.#summaryEvaluators.length === 0) return {}
+
+    const inputs = rows.map(row => row.input)
+    const outputs = rows.map(row => row.output)
+    const expectedOutputs = rows.map(row => row.expectedOutput)
+    const metadata = records.map(record => buildSpanMetadata(record.metadata, this.#config))
+    const summaryEvaluations = {}
+    const timestampMs = Date.now()
+
+    for (const [label, evaluator] of this.#summaryEvaluators) {
+      try {
+        // eslint-disable-next-line no-await-in-loop
+        const value = await this.#runWithRetries(
+          () => evaluator(inputs, outputs, expectedOutputs, evaluatorResults, metadata),
+          options.maxRetries,
+          options.retryDelay
+        )
+        summaryEvaluations[label] = { value, error: null }
+        options.metrics.push(toMetric(
+          label,
+          value,
+          null,
+          '',
+          '',
+          timestampMs,
+          options.experimentId,
+          this.#tags,
+          'summary'
+        ))
+      } catch (err) {
+        if (options.throwOnErrors) throw err
+        const msg = err.message ?? String(err)
+        summaryEvaluations[label] = { value: null, error: msg }
+        options.metrics.push(toMetric(
+          label,
+          null,
+          msg,
+          '',
+          '',
+          timestampMs,
+          options.experimentId,
+          this.#tags,
+          'summary'
+        ))
+      }
+    }
+    return summaryEvaluations
+  }
+
   async #postEvents (experimentId, spans, metrics) {
+    const attributes = { metrics }
+    if (spans.length > 0) attributes.spans = spans
     await this.#client.request('POST', `${API_BASE_PATH}/experiments/${experimentId}/events`, {
-      data: { type: 'experiments', attributes: { spans, metrics } },
+      data: { type: 'experiments', attributes },
     })
   }
 
@@ -282,4 +474,4 @@ class Experiment {
   }
 }
 
-module.exports = { Experiment }
+module.exports = { Experiment, normalizeEvaluators, validateEvaluatorName }
diff --git a/packages/dd-trace/src/llmobs/experiments/index.js b/packages/dd-trace/src/llmobs/experiments/index.js
index b7b34edcb5..9eb5ee282a 100644
--- a/packages/dd-trace/src/llmobs/experiments/index.js
+++ b/packages/dd-trace/src/llmobs/experiments/index.js
@@ -26,9 +26,11 @@ async function retryWithBackoff (attempt, { maxTotalMs = 30_000, baseDelayMs = 2
 // experiments against the LLM Obs backend using the tracer's own config.
 class Experiments {
   #client
+  #llmobs
   #projectName
 
-  constructor (config) {
+  constructor (config, llmobs) {
+    this.#llmobs = llmobs
     this.#projectName = config.llmobs?.mlApp || config.service
     this.#client = new ExperimentsClient({
       apiKey: config.DD_API_KEY,
@@ -161,13 +163,13 @@ class Experiments {
 
   // Build an experiment: { name, dataset, task, evaluators, description?, config?, tags? }.
   experiment (options) {
-    return new Experiment(this.#client, options)
+    return new Experiment(this.#client, options, this.#llmobs)
   }
 }
 
 // Factory used by the LLMObs SDK: returns a real Experiments instance when
 // enabled and credentialed, otherwise a no-op that explains what's missing.
-function createExperiments (config) {
+function createExperiments (config, llmobs) {
   if (!config.llmobs?.DD_LLMOBS_ENABLED) {
     return new NoopExperiments('LLM Observability is not enabled')
   }
@@ -183,7 +185,7 @@ function createExperiments (config) {
       'then retry'
     )
   }
-  return new Experiments(config)
+  return new Experiments(config, llmobs)
 }
 
 module.exports = { Experiments, createExperiments }
diff --git a/packages/dd-trace/src/llmobs/experiments/result.js b/packages/dd-trace/src/llmobs/experiments/result.js
index 1fe87e2fb1..956ecbf17c 100644
--- a/packages/dd-trace/src/llmobs/experiments/result.js
+++ b/packages/dd-trace/src/llmobs/experiments/result.js
@@ -22,13 +22,24 @@ class Row {
   }
 }
 
+class ExperimentRun {
+  constructor (fields) {
+    this.runId = fields.runId
+    this.runIteration = fields.runIteration
+    this.rows = fields.rows
+    this.summaryEvaluations = fields.summaryEvaluations
+  }
+}
+
 // Returned by Experiment.run().
 class ExperimentResult {
-  constructor (experimentId, rows, url) {
+  constructor (experimentId, rows, url, runs = [], summaryEvaluations = {}) {
     this.experimentId = experimentId
     this.rows = rows
     this.url = url
+    this.runs = runs
+    this.summaryEvaluations = summaryEvaluations
   }
 }
 
-module.exports = { Row, ExperimentResult }
+module.exports = { Row, ExperimentRun, ExperimentResult }
diff --git a/packages/dd-trace/src/llmobs/experiments/util.js b/packages/dd-trace/src/llmobs/experiments/util.js
new file mode 100644
index 0000000000..9236f9098c
--- /dev/null
+++ b/packages/dd-trace/src/llmobs/experiments/util.js
@@ -0,0 +1,218 @@
+'use strict'
+
+const log = require('../../log')
+
+// Matches the backend and dd-trace-py evaluator metric label contract.
+const EVALUATOR_NAME_PATTERN = /^[a-zA-Z0-9_-]+$/
+
+/**
+ * @typedef {null | string | number | boolean | NormalizedJsonValue[] | { [key: string]: NormalizedJsonValue }}
+ *   NormalizedJsonValue
+ */
+
+/**
+ * @param {object | null | undefined} value
+ * @returns {boolean}
+ */
+function hasEntries (value) {
+  if (!value) return false
+  for (const key of Object.keys(value)) {
+    if (Object.hasOwn(value, key)) return true
+  }
+  return false
+}
+
+/**
+ * @param {string} name
+ */
+function validateEvaluatorName (name) {
+  if (typeof name !== 'string') throw new TypeError('Evaluator name must be a string')
+  if (name.length === 0) throw new Error('Evaluator name cannot be empty')
+  if (!EVALUATOR_NAME_PATTERN.test(name)) {
+    throw new Error(
+      `Evaluator name '${name}' is invalid. Name must contain only alphanumeric characters, underscores, and hyphens.`
+    )
+  }
+}
+
+/**
+ * @param {(...args: unknown[]) => unknown} fn
+ * @param {string} fallback
+ * @returns {string}
+ */
+function functionName (fn, fallback) {
+  return typeof fn.name === 'string' && fn.name.length > 0 ? fn.name : fallback
+}
+
+/**
+ * @param {unknown} evaluators
+ * @param {string} kind
+ * @returns {Array<[string, (...args: unknown[]) => unknown]>}
+ */
+function normalizeEvaluators (evaluators, kind) {
+  if (evaluators == null) return []
+
+  const normalized = []
+  if (Array.isArray(evaluators)) {
+    const indexesByName = new Map()
+    for (let i = 0; i < evaluators.length; i++) {
+      const evaluator = evaluators[i]
+      if (typeof evaluator !== 'function') throw new TypeError(`${kind} evaluator must be a function`)
+      const name = functionName(evaluator, `${kind}_evaluator_${i}`)
+      validateEvaluatorName(name)
+      if (indexesByName.has(name)) {
+        log.warn('Duplicate %s evaluator name %s; previous evaluator will be overwritten', kind, name)
+        normalized[indexesByName.get(name)] = [name, evaluator]
+      } else {
+        indexesByName.set(name, normalized.length)
+        normalized.push([name, evaluator])
+      }
+    }
+    return normalized
+  }
+
+  if (typeof evaluators !== 'object') {
+    throw new TypeError(`${kind} evaluators must be an array of functions or an object keyed by evaluator name`)
+  }
+
+  for (const [name, evaluator] of Object.entries(evaluators)) {
+    validateEvaluatorName(name)
+    if (typeof evaluator !== 'function') throw new TypeError(`${kind} evaluator '${name}' must be a function`)
+    normalized.push([name, evaluator])
+  }
+  return normalized
+}
+
+/**
+ * @param {unknown} value
+ * @returns {string}
+ */
+function inferMetricType (value) {
+  if (typeof value === 'boolean') return 'boolean'
+  if (typeof value === 'number' && Number.isFinite(value)) return 'score'
+  if (typeof value === 'string') return 'categorical'
+  return 'json'
+}
+
+/**
+ * @param {unknown} value
+ * @param {WeakSet<object>} seen
+ * @returns {NormalizedJsonValue}
+ */
+function normalizeJsonValue (value, seen) {
+  if (value === null) return null
+
+  const valueType = typeof value
+  if (valueType === 'string' || valueType === 'boolean') return value
+  if (valueType === 'number') return Number.isFinite(value) ? value : String(value)
+  if (valueType === 'bigint') return value.toString()
+  if (valueType === 'undefined') return null
+  if (valueType === 'symbol') return value.toString()
+  if (valueType === 'function') return { type: 'function', name: value.name || '<anonymous>' }
+
+  if (value instanceof Date) return value.toISOString()
+  if (value instanceof Error) {
+    return { type: value.name, message: value.message, stack: value.stack ?? '' }
+  }
+
+  if (seen.has(value)) return '[Circular]'
+  seen.add(value)
+
+  if (Array.isArray(value)) {
+    const normalized = new Array(value.length)
+    for (let i = 0; i < value.length; i++) normalized[i] = normalizeJsonValue(value[i], seen)
+    seen.delete(value)
+    return normalized
+  }
+
+  const normalized = {}
+  for (const [key, nestedValue] of Object.entries(value)) {
+    normalized[key] = normalizeJsonValue(nestedValue, seen)
+  }
+  seen.delete(value)
+  return normalized
+}
+
+/**
+ * @param {unknown} value
+ * @returns {{ [key: string]: NormalizedJsonValue }}
+ */
+function normalizeJsonMetricValue (value) {
+  const normalized = normalizeJsonValue(value, new WeakSet())
+  if (normalized !== null && typeof normalized === 'object' && !Array.isArray(normalized)) return normalized
+  return { value: normalized }
+}
+
+/**
+ * @param {unknown} value
+ * @returns {string}
+ */
+function stringify (value) {
+  if (value == null) return ''
+  if (typeof value === 'string') return value.toLowerCase()
+  if (typeof value === 'object') {
+    try {
+      const stringified = JSON.stringify(value)
+      if (stringified !== undefined) return stringified.toLowerCase()
+    } catch {}
+  }
+  return String(value).toLowerCase()
+}
+
+/**
+ * @param {Record<string, unknown> | undefined} userTags
+ * @param {Record<string, unknown>} autoTags
+ * @returns {string[]}
+ */
+function buildTags (userTags, autoTags) {
+  const tags = new Map()
+  for (const [key, value] of Object.entries(userTags ?? {})) {
+    tags.set(key, `${key}:${value}`)
+  }
+  for (const [key, value] of Object.entries(autoTags)) {
+    if (value !== undefined && value !== null && value !== '') tags.set(key, `${key}:${value}`)
+  }
+  return [...tags.values()]
+}
+
+/**
+ * @param {Record<string, unknown> | undefined} userTags
+ * @param {Record<string, unknown>} autoTags
+ * @returns {Record<string, unknown>}
+ */
+function buildExperimentTagObject (userTags, autoTags) {
+  return userTags ? { ...userTags, ...autoTags } : { ...autoTags }
+}
+
+/**
+ * @param {number} ms
+ * @returns {Promise<void>}
+ */
+function sleep (ms) {
+  if (ms <= 0) return Promise.resolve()
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
+
+/**
+ * @param {Record<string, unknown> | undefined} recordMetadata
+ * @param {Record<string, unknown>} config
+ * @returns {Record<string, unknown>}
+ */
+function buildSpanMetadata (recordMetadata, config) {
+  return recordMetadata
+    ? { ...recordMetadata, experiment_config: config }
+    : { experiment_config: config }
+}
+
+module.exports = {
+  buildExperimentTagObject,
+  buildSpanMetadata,
+  buildTags,
+  hasEntries,
+  inferMetricType,
+  normalizeEvaluators,
+  normalizeJsonMetricValue,
+  sleep,
+  stringify,
+  validateEvaluatorName,
+}
diff --git a/packages/dd-trace/src/llmobs/sdk.js b/packages/dd-trace/src/llmobs/sdk.js
index 0e2b2a1a19..efc161aafa 100644
--- a/packages/dd-trace/src/llmobs/sdk.js
+++ b/packages/dd-trace/src/llmobs/sdk.js
@@ -35,12 +35,6 @@ class LLMObs extends NoopLLMObs {
    */
   #hasUserSpanProcessor = false
 
-  /**
-   * Lazily-created experiments facade (see ./experiments).
-   * @type {import('./experiments').Experiments | undefined}
-   */
-  #experiments
-
   /**
    * @param {import('../tracer')} tracer - Tracer instance
    * @param {import('./index')} llmobsModule - LLMObs module instance
@@ -66,8 +60,7 @@ class LLMObs extends NoopLLMObs {
    * a clear message on use.
    */
   get experiments () {
-    this.#experiments ??= createExperiments(this._config)
-    return this.#experiments
+    return createExperiments(this._config, this)
   }
 
   enable (options = {}) {
diff --git a/packages/dd-trace/src/llmobs/span_processor.js b/packages/dd-trace/src/llmobs/span_processor.js
index d22eef4a86..531b5f025a 100644
--- a/packages/dd-trace/src/llmobs/span_processor.js
+++ b/packages/dd-trace/src/llmobs/span_processor.js
@@ -239,6 +239,14 @@ class LLMObsSpanProcessor {
 
     const apmTraceId = span.context().toTraceId(true)
     const llmobsTraceId = mlObsTags[TRACE_ID] ?? apmTraceId
+    const dd = {
+      span_id: span.context().toSpanId(),
+      trace_id: apmTraceId,
+      sample_rate: mlObsTags[SAMPLE_RATE],
+      sampling_decision: mlObsTags[SAMPLING_DECISION],
+      apm_trace_id: apmTraceId,
+    }
+    if (tags.experiment_id) dd.scope = 'experiments'
 
     const llmObsSpanEvent = {
       trace_id: llmobsTraceId,
@@ -251,13 +259,7 @@ class LLMObsSpanProcessor {
       status: error ? 'error' : 'ok',
       meta,
       metrics,
-      _dd: {
-        span_id: span.context().toSpanId(),
-        trace_id: apmTraceId,
-        sample_rate: mlObsTags[SAMPLE_RATE],
-        sampling_decision: mlObsTags[SAMPLING_DECISION],
-        apm_trace_id: apmTraceId,
-      },
+      _dd: dd,
     }
 
     if (sessionId) llmObsSpanEvent.session_id = sessionId
diff --git a/packages/dd-trace/src/llmobs/writers/spans.js b/packages/dd-trace/src/llmobs/writers/spans.js
index 39b0426e5b..40e00131e3 100644
--- a/packages/dd-trace/src/llmobs/writers/spans.js
+++ b/packages/dd-trace/src/llmobs/writers/spans.js
@@ -49,12 +49,18 @@ class LLMObsSpanWriter extends BaseWriter {
   }
 
   makePayload (events) {
-    return events.map(event => ({
-      '_dd.stage': 'raw',
-      '_dd.tracer_version': tracerVersion,
-      event_type: this._eventType,
-      spans: [event],
-    }))
+    return events.map(event => {
+      const eventData = {
+        '_dd.stage': 'raw',
+        '_dd.tracer_version': tracerVersion,
+        event_type: this._eventType,
+        spans: [event],
+      }
+      if (event?._dd?.scope === 'experiments') {
+        eventData['_dd.scope'] = 'experiments'
+      }
+      return eventData
+    })
   }
 
   _truncateSpanEvent (event) {
diff --git a/packages/dd-trace/test/llmobs/experiments/experiment.spec.js b/packages/dd-trace/test/llmobs/experiments/experiment.spec.js
index 2a7fd6b82a..7bb63d8fd1 100644
--- a/packages/dd-trace/test/llmobs/experiments/experiment.spec.js
+++ b/packages/dd-trace/test/llmobs/experiments/experiment.spec.js
@@ -77,12 +77,44 @@ describe('LLMObs Experiments — dataset + experiment run', () => {
     assert.equal(result.rows[0].evaluations.nonempty, true)
     assert.equal(result.rows[0].evaluations.len, 5)
     assert.equal(result.rows[0].evaluations.label, 'match')
+    assert.equal(result.runs.length, 1)
     assert.equal(dataset.id(), 'ds')
     assert.equal(dataset.version(), 2)
     assert.deepEqual(dataset.recordIds(), ['rec-0', 'rec-1'])
     assert.equal(dataset.url(), 'https://app.datadoghq.com/llm/datasets/ds')
   })
 
+  it('runs task inside an LLMObs experiment span', async () => {
+    const c = stubClient()
+    const dataset = new Dataset(c, 'demo').addRecord({ q: 'apple' }, 'apple', { row: 0 })
+    const callsToLlmobs = []
+    const llmobs = {
+      enabled: true,
+      trace: (options, fn) => {
+        callsToLlmobs.push(['trace', options])
+        return fn({ name: 'span' })
+      },
+      exportSpan: () => ({ spanId: '000000000000abcd', traceId: '0000000000000000000000000000abcd' }),
+      annotate: (_span, options) => callsToLlmobs.push(['annotate', options]),
+      flush: () => callsToLlmobs.push(['flush']),
+    }
+
+    const result = await new Experiment(c, {
+      name: 'exp-demo',
+      dataset,
+      task: (input) => input.q,
+      evaluators: { ok: () => true },
+    }, llmobs).run()
+
+    assert.equal(callsToLlmobs[0][0], 'trace')
+    assert.equal(callsToLlmobs[0][1].kind, 'experiment')
+    assert.equal(callsToLlmobs[0][1].name, 'task')
+    assert.equal(callsToLlmobs[1][1].tags.experiment_id, 'exp')
+    assert.equal(callsToLlmobs[1][1].tags.dataset_record_id, 'rec-0')
+    assert.equal(result.rows[0].spanId, '000000000000abcd')
+    assert.equal(result.rows[0].traceId, '0000000000000000000000000000abcd')
+  })
+
   it('submits custom record ids with append responses', async () => {
     const dataset = new Dataset(stubClient(), 'demo')
       .addRecord(new DatasetRecord('a', null, {}, 'custom-a'))
@@ -107,15 +139,135 @@ describe('LLMObs Experiments — dataset + experiment run', () => {
     )
   })
 
+  it('clears the pinned dataset version when append responses omit a new version', async () => {
+    const c = stubClient({ appendRecordAttributes: () => ({}) })
+    const dataset = new Dataset(c, 'demo').addRecord('a')
+
+    await dataset.push()
+
+    assert.equal(dataset.version(), null)
+    assert.equal(dataset.latestVersion(), 1)
+  })
+
+  it('keeps evaluator results aligned for summary evaluators when rows fail', async () => {
+    const c = stubClient()
+    const dataset = new Dataset(c, 'demo')
+      .addRecord('good', 'good')
+      .addRecord('eval-bad', 'eval-bad')
+      .addRecord('task-bad', 'task-bad')
+    let summaryInputs
+    let summaryOutputs
+    let summaryEvaluatorResults
+
+    const result = await new Experiment(c, {
+      name: 'exp-demo',
+      dataset,
+      task: (input) => {
+        if (input === 'task-bad') throw new Error('boom')
+        return input
+      },
+      evaluators: {
+        exactMatch: (input, output, expectedOutput) => {
+          if (input === 'eval-bad') throw new Error('eval boom')
+          return output === expectedOutput
+        },
+      },
+      summaryEvaluators: {
+        passRate: (inputs, outputs, _expectedOutputs, evaluatorResults) => {
+          summaryInputs = inputs
+          summaryOutputs = outputs
+          summaryEvaluatorResults = evaluatorResults
+          return evaluatorResults.exactMatch.filter(Boolean).length / evaluatorResults.exactMatch.length
+        },
+      },
+    }).run()
+
+    assert.deepEqual(summaryInputs, ['good', 'eval-bad', 'task-bad'])
+    assert.deepEqual(summaryOutputs, ['good', 'eval-bad', null])
+    assert.deepEqual(summaryEvaluatorResults.exactMatch, [true, null, null])
+    assert.equal(result.summaryEvaluations.passRate.value, 1 / 3)
+  })
+
+  it('throws task and evaluator errors when throwOnErrors is true', async () => {
+    const taskClient = stubClient()
+    await assert.rejects(
+      () => new Experiment(taskClient, {
+        name: 'exp-demo',
+        dataset: new Dataset(taskClient, 'demo').addRecord('bad'),
+        task: () => { throw new Error('task-fail') },
+      }).run({ throwOnErrors: true }),
+      /task-fail/
+    )
+
+    const evaluatorClient = stubClient()
+    await assert.rejects(
+      () => new Experiment(evaluatorClient, {
+        name: 'exp-demo',
+        dataset: new Dataset(evaluatorClient, 'demo').addRecord('bad'),
+        task: (input) => input,
+        evaluators: { bad: () => { throw new Error('eval-fail') } },
+      }).run({ throwOnErrors: true }),
+      /eval-fail/
+    )
+  })
+
+  it('normalizes fallback JSON evaluator metrics', async () => {
+    const c = stubClient()
+    const dataset = new Dataset(c, 'demo').addRecord('x')
+    await new Experiment(c, {
+      name: 'exp-demo',
+      dataset,
+      task: () => 'out',
+      evaluators: {
+        obj: () => ({ x: 1 }),
+        arr: () => ['Pass', 'FAIL'],
+        nul: () => null,
+        nonfinite: () => Number.POSITIVE_INFINITY,
+        str: () => 'MATCH',
+      },
+    }).run()
+
+    const metrics = c.requests.find(request => request.path.endsWith('/experiments/exp/events'))
+      .body.data.attributes.metrics
+    const byLabel = (label) => metrics.find(metric => metric.label === label)
+
+    assert.deepEqual(byLabel('obj').json_value, { x: 1 })
+    assert.deepEqual(byLabel('arr').json_value, { value: ['Pass', 'FAIL'] })
+    assert.deepEqual(byLabel('nul').json_value, { value: null })
+    assert.deepEqual(byLabel('nonfinite').json_value, { value: 'Infinity' })
+    assert.equal(byLabel('str').metric_type, 'categorical')
+    assert.equal(byLabel('str').categorical_value, 'match')
+  })
+
   it('validates required options', () => {
-    const dataset = new Dataset(client(), 'demo')
-    assert.throws(() => new Experiment(client(), { dataset, task: (input) => input }), /name/)
-    assert.throws(() => new Experiment(client(), { name: 'n', task: (input) => input }), /dataset/)
-    assert.throws(() => new Experiment(client(), { name: 'n', dataset }), /task/)
+    const c = client()
+    const dataset = new Dataset(c, 'demo')
+    assert.throws(() => new Experiment(c, { dataset, task: (input) => input }), /name/)
+    assert.throws(() => new Experiment(c, { name: 'n', task: (input) => input }), /dataset/)
+    assert.throws(() => new Experiment(c, { name: 'n', dataset }), /task/)
+    const experiment = new Experiment(
+      c,
+      { name: 'n', dataset, task: (input) => input, evaluators: { 'ok_Name-1': () => true } }
+    )
+    assert.equal(experiment.name(), 'n')
+    assert.throws(
+      () => new Experiment(c, { name: 'n', dataset, task: (input) => input, evaluators: { 'bad name': () => true } }),
+      /invalid/
+    )
+    assert.throws(
+      () => new Experiment(c, { name: 'n', dataset, task: (input) => input, evaluators: { 'bad.name': () => true } }),
+      /invalid/
+    )
+    assert.throws(
+      () => new Experiment(c, { name: 'n', dataset, task: (input) => input, summaryEvaluators: [true] }),
+      /summary evaluator must be a function/
+    )
   })
 
   it('exposes dataset getters and accepts a DatasetRecord instance', () => {
-    const dataset = new Dataset(client(), 'my-name', 'desc').addRecord(new DatasetRecord('in', 'out', { m: 1 }))
+    const dataset = new Dataset(client(), 'my-name', 'desc')
+      .addRecord(new DatasetRecord('in', 'out', { m: 1 }))
+      .addRecord({ inputData: 'payload' }, 'expected', { explicit: true })
     assert.equal(dataset.name(), 'my-name')
     assert.equal(dataset.id(), null)
     assert.equal(dataset.url(), null)
@@ -123,5 +275,8 @@ describe('LLMObs Experiments — dataset + experiment run', () => {
     assert.equal(record.input, 'in')
     assert.equal(record.expectedOutput, 'out')
     assert.deepEqual(record.metadata, { m: 1 })
+    assert.deepEqual(dataset.records()[1].input, { inputData: 'payload' })
+    assert.equal(dataset.records()[1].expectedOutput, 'expected')
+    assert.deepEqual(dataset.records()[1].metadata, { explicit: true })
   })
 })
diff --git a/packages/dd-trace/test/llmobs/experiments/util.spec.js b/packages/dd-trace/test/llmobs/experiments/util.spec.js
new file mode 100644
index 0000000000..d1cd069649
--- /dev/null
+++ b/packages/dd-trace/test/llmobs/experiments/util.spec.js
@@ -0,0 +1,84 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+const { afterEach, describe, it } = require('mocha')
+const sinon = require('sinon')
+
+const log = require('../../../src/log')
+
+const {
+  inferMetricType,
+  normalizeEvaluators,
+  normalizeJsonMetricValue,
+  validateEvaluatorName,
+} = require('../../../src/llmobs/experiments/util')
+
+describe('LLMObs Experiments util', () => {
+  afterEach(() => {
+    sinon.restore()
+  })
+
+  it('validates evaluator names against the backend contract', () => {
+    validateEvaluatorName('ok_Name-1')
+
+    assert.throws(() => validateEvaluatorName('bad name'), /invalid/)
+    assert.throws(() => validateEvaluatorName('bad.name'), /invalid/)
+    assert.throws(() => validateEvaluatorName(''), /empty/)
+    assert.throws(() => validateEvaluatorName(1), /must be a string/)
+  })
+
+  it('normalizes evaluator maps and arrays', () => {
+    function namedEvaluator () {}
+
+    assert.deepEqual(normalizeEvaluators({ ok: namedEvaluator }, 'row'), [['ok', namedEvaluator]])
+    assert.deepEqual(normalizeEvaluators([namedEvaluator], 'summary'), [['namedEvaluator', namedEvaluator]])
+    assert.throws(() => normalizeEvaluators({ 'bad.name': namedEvaluator }, 'row'), /invalid/)
+    assert.throws(() => normalizeEvaluators([true], 'summary'), /summary evaluator must be a function/)
+  })
+
+  it('warns and keeps the last array evaluator when inferred names collide', () => {
+    const warn = sinon.spy(log, 'warn')
+    function duplicate () {}
+    const last = function duplicate () {}
+
+    assert.deepEqual(normalizeEvaluators([duplicate, last], 'row'), [['duplicate', last]])
+    sinon.assert.calledWith(
+      warn,
+      'Duplicate %s evaluator name %s; previous evaluator will be overwritten',
+      'row',
+      'duplicate'
+    )
+  })
+
+  it('infers metric types with a normalized JSON fallback', () => {
+    assert.equal(inferMetricType({ x: 1 }), 'json')
+    assert.equal(inferMetricType(Object.create(null)), 'json')
+    assert.equal(inferMetricType(['Pass']), 'json')
+    assert.equal(inferMetricType(new Date()), 'json')
+    assert.equal(inferMetricType(null), 'json')
+    assert.equal(inferMetricType(Number.NaN), 'json')
+    assert.equal(inferMetricType(Number.POSITIVE_INFINITY), 'json')
+    assert.equal(inferMetricType('label'), 'categorical')
+    assert.equal(inferMetricType(true), 'boolean')
+    assert.equal(inferMetricType(0.5), 'score')
+  })
+
+  it('normalizes JSON metric values into backend-safe objects', () => {
+    const circular = { ok: true }
+    circular.self = circular
+    const error = new TypeError('bad')
+
+    assert.deepEqual(normalizeJsonMetricValue({ nested: { value: 1 }, circular }), {
+      nested: { value: 1 },
+      circular: { ok: true, self: '[Circular]' },
+    })
+    assert.deepEqual(normalizeJsonMetricValue(['Pass', undefined, 1n]), { value: ['Pass', null, '1'] })
+    assert.deepEqual(normalizeJsonMetricValue(Number.NaN), { value: 'NaN' })
+    assert.deepEqual(normalizeJsonMetricValue(null), { value: null })
+    assert.deepEqual(normalizeJsonMetricValue(error), {
+      type: 'TypeError',
+      message: 'bad',
+      stack: error.stack,
+    })
+  })
+})
diff --git a/packages/dd-trace/test/llmobs/sdk/index.spec.js b/packages/dd-trace/test/llmobs/sdk/index.spec.js
index c622b9c098..f239ea1f7d 100644
--- a/packages/dd-trace/test/llmobs/sdk/index.spec.js
+++ b/packages/dd-trace/test/llmobs/sdk/index.spec.js
@@ -121,6 +121,29 @@ describe('sdk', () => {
       disabledLLMObs.disable() // unsubscribe
     })
 
+    it('recreates experiments after enabling llmobs', () => {
+      const config = getConfigFresh({})
+      config.DD_API_KEY = 'api-key'
+      config.DD_APP_KEY = 'app-key'
+      config.service = 'service'
+      const llmobsModule = {
+        enable: sinon.stub(),
+        disable () {},
+      }
+
+      const disabledLLMObs = new LLMObsSDK(tracer._tracer, llmobsModule, config)
+
+      assert.strictEqual(disabledLLMObs.experiments.createDataset('d').name(), 'd')
+
+      disabledLLMObs.enable({
+        mlApp: 'mlApp',
+      })
+
+      assert.strictEqual(typeof disabledLLMObs.experiments.createDataset('d').addRecord, 'function')
+
+      disabledLLMObs.disable() // unsubscribe
+    })
+
     it('does not enable llmobs if it is already enabled', () => {
       sinon.spy(llmobs._llmobsModule, 'enable')
       llmobs.enable({})
@@ -169,6 +192,31 @@ describe('sdk', () => {
       sinon.assert.called(llmobsModule.disable)
     })
 
+    it('recreates experiments after disabling llmobs', () => {
+      const llmobsModule = {
+        disable: sinon.stub(),
+      }
+
+      const config = getConfigFresh({
+        llmobs: {
+          agentlessEnabled: false,
+          mlApp: 'mlApp',
+        },
+      })
+      config.DD_API_KEY = 'api-key'
+      config.DD_APP_KEY = 'app-key'
+      config.service = 'service'
+
+      const enabledLLMObs = new LLMObsSDK(tracer._tracer, llmobsModule, config)
+
+      assert.strictEqual(typeof enabledLLMObs.experiments.createDataset('d').addRecord, 'function')
+
+      enabledLLMObs.disable()
+
+      assert.strictEqual(enabledLLMObs.experiments.createDataset('d').name(), 'd')
+      sinon.assert.called(llmobsModule.disable)
+    })
+
     it('does not disable llmobs if it is already disabled', () => {
       // do not fully enable a disabled llmobs
       const disabledLLMObs = new LLMObsSDK(null, { disable () {} }, { llmobs: { DD_LLMOBS_ENABLED: false } })
diff --git a/packages/dd-trace/test/llmobs/span_processor.spec.js b/packages/dd-trace/test/llmobs/span_processor.spec.js
index 0311a671b5..b0291c7ce3 100644
--- a/packages/dd-trace/test/llmobs/span_processor.spec.js
+++ b/packages/dd-trace/test/llmobs/span_processor.spec.js
@@ -124,6 +124,41 @@ describe('span processor', () => {
       sinon.assert.calledOnce(writer.append)
     })
 
+    it('marks spans with experiment_id tags as experiment-scoped', () => {
+      span = {
+        _name: 'experiment-row',
+        _startTime: 0,
+        _duration: 1,
+        context () {
+          return {
+            _tags: {},
+            getTags () { return this._tags },
+            getTag (key) { return this._tags[key] },
+            setTag (key, value) { this._tags[key] = value },
+            toTraceId () { return '123' },
+            toSpanId () { return '456' },
+          }
+        },
+      }
+      LLMObsTagger.tagMap.set(span, {
+        '_ml_obs.meta.span.kind': 'experiment',
+        '_ml_obs.meta.ml_app': 'myApp',
+        '_ml_obs.meta.input.value': 'input',
+        '_ml_obs.meta.output.value': 'output',
+        '_ml_obs.tags': { experiment_id: 'exp-1', run_id: 'run-1' },
+        '_ml_obs.llmobs_parent_id': 'undefined',
+        '_ml_obs.sample_rate': '1',
+        '_ml_obs.sampling_decision': '1',
+      })
+
+      processor.process(span)
+      const payload = writer.append.getCall(0).firstArg
+
+      assert.equal(payload._dd.scope, 'experiments')
+      assert.ok(payload.tags.includes('experiment_id:exp-1'))
+      assert.ok(payload.tags.includes('run_id:run-1'))
+    })
+
     it('removes problematic fields from the metadata', () => {
       // problematic fields are circular references or bigints
       const metadata = {
diff --git a/packages/dd-trace/test/llmobs/writers/spans.spec.js b/packages/dd-trace/test/llmobs/writers/spans.spec.js
index 33ac5793ac..daf98c4076 100644
--- a/packages/dd-trace/test/llmobs/writers/spans.spec.js
+++ b/packages/dd-trace/test/llmobs/writers/spans.spec.js
@@ -117,4 +117,17 @@ describe('LLMObsSpanWriter', () => {
     assert.strictEqual(payload[0].event_type, 'span')
     assert.deepStrictEqual(payload[0].spans, events)
   })
+
+  it('marks experiment-scoped payload envelopes', () => {
+    writer = new LLMObsSpanWriter(config)
+
+    const events = [
+      { name: 'experiment-row', _dd: { scope: 'experiments' } },
+    ]
+
+    const payload = writer.makePayload(events)
+
+    assert.strictEqual(payload[0]['_dd.scope'], 'experiments')
+    assert.deepStrictEqual(payload[0].spans, events)
+  })
 })

From 01455a626e6676b6227d93f371d8bf0f04c87345 Mon Sep 17 00:00:00 2001
From: sabrenner <sabrenner@users.noreply.github.com>
Date: Thu, 30 Jul 2026 16:35:02 +0000
Subject: [PATCH 43/43] v5.119.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ae41ead68e..c70c60ee72 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.118.0",
+  "version": "5.119.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",