dd-trace 6.16.0 → 6.18.0

package/packages/datadog-instrumentations/src/{azure-cosmos.js → postgres.js}

@@ -2,6 +2,6 @@
 
 const { addHook, getHooks } = require('./helpers/instrument')
 
-for (const hook of getHooks('@azure/cosmos').values()) {
+for (const hook of getHooks('postgres').values()) {
   addHook(hook, exports => exports)
 }

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

@@ -36,7 +36,6 @@ function isFastSlash (layer, matchers) {
  * @param {{ handle: Function, name?: string, path?: string,
  *   regexp?: { fast_star?: boolean, fast_slash?: boolean } }} layer
  * @param {Array<{ path?: string, regex?: RegExp }> & { hasStarPath?: boolean, hasSlashPath?: boolean }} matchers
- * @returns {void}
  */
 function annotateLayer (layer, matchers) {
   const handle = layer.handle
@@ -382,7 +381,6 @@ function createLayerDispatchWrappers (name) {
 
 /**
  * @param {{ handle_request?: unknown, handleRequest?: unknown }} layer
- * @returns {boolean}
  */
 function hasLayerDispatch (layer) {
   return typeof layer.handle_request === 'function' || typeof layer.handleRequest === 'function'

package/packages/datadog-instrumentations/src/rum-browser-scripts.js

@@ -16,7 +16,6 @@ function detectRum () {
   return { isRumInstrumented, isRumActive, rumSamplingRate }
 }
 
-/** @returns {boolean} */
 function stopRumSession () {
   if (window.DD_RUM && window.DD_RUM.stopSession) {
     window.DD_RUM.stopSession()
@@ -25,7 +24,6 @@ function stopRumSession () {
   return false
 }
 
-/** @returns {boolean} */
 function stopRumSessionAndReportActivity () {
   if (window.DD_RUM && window.DD_RUM.stopSession) {
     const isRumActive = window.DD_RUM.getInternalContext

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

@@ -95,7 +95,6 @@ addHook({ name: 'sequelize', versions: ['>=4'], file: 'lib/transaction.js' }, Tr
 /**
  * @param {{ pool: SequelizePool & { read?: SequelizePool, write?: SequelizePool } }} manager
  * @param {[{ type?: string, useMaster?: boolean }?]} args
- * @returns {boolean}
  */
 function sequelizeHasIdleConnection (manager, args) {
   const pool = manager.pool

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

@@ -0,0 +1,15 @@
+'use strict'
+
+const { addHook, getHooks } = require('./helpers/instrument')
+
+addHook({ name: '@supabase/supabase-js', versions: ['>=2.112.2'] }, exports => exports)
+
+for (const hook of getHooks([
+  '@supabase/auth-js',
+  '@supabase/storage-js',
+  '@supabase/realtime-js',
+  '@supabase/functions-js',
+  '@supabase/postgrest-js',
+]).values()) {
+  addHook(hook, exports => exports)
+}

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

@@ -45,9 +45,13 @@ function wrapRequestUpgrade (Request) {
   const method = Request.prototype[methodName]
 
   // Orchestrion cannot leave fixed source byte-for-byte untouched after a conditional AST match.
-  if (typeof method !== 'function' ||
-      !requestSource.includes('channels.trailers.publish') ||
-      Function.prototype.toString.call(method).includes('channels.trailers.publish')) {
+  if (typeof method !== 'function' || !requestSource.includes('channels.trailers.publish')) {
+    return Request
+  }
+
+  const methodSource = Function.prototype.toString.call(method)
+  // Undici 6.29 delegates native upgrade completion to a private helper.
+  if (methodSource.includes('channels.trailers.publish') || methodSource.includes('#publishUpgradeTrailers')) {
     return Request
   }
 

package/packages/datadog-instrumentations/src/vitest-main-no-worker-init.js

@@ -4,7 +4,8 @@ const path = require('node:path')
 
 const satisfies = require('../../../vendor/dist/semifies')
 
-const { hasEfdRetries } = require('../../dd-trace/src/ci-visibility/efd-retry-policy')
+const { getDynamicAtrRetryCount } = require('../../dd-trace/src/ci-visibility/dynamic-atr-retries')
+const { EMPTY_EFD_RETRY_POLICY, hasEfdRetries } = require('../../dd-trace/src/ci-visibility/efd-retry-policy')
 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')
@@ -94,7 +95,6 @@ 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)
@@ -129,7 +129,6 @@ function removeVitestBrowserUrlMetadata (url) {
  * 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)
@@ -139,7 +138,6 @@ function normalizeVitestBrowserErrorText (value) {
  * 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)
@@ -152,7 +150,6 @@ function normalizeVitestBrowserStackUrl (url) {
  * 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)
@@ -330,7 +327,6 @@ function isNoWorkerInitPool (pool, isVitestWorkerPool) {
 
 /**
  * @param {object} state
- * @returns {boolean}
  */
 function isEarlyFlakeDetectionActive (state) {
   return state.isEarlyFlakeDetectionEnabled &&
@@ -354,7 +350,20 @@ function configure (ctx, frameworkVersion, testSpecifications, setupData, option
     testManagementTestsBySuite,
     testPropertiesByFilepath,
     testSessionConfiguration,
+    flakyTestRetriesConfiguration,
   } = setupData
+  const { earlyFlakeDetectionRetryPolicy, dynamicAtrBuckets } = state
+
+  // Resolve the shared policy in Node; Browser Mode receives only serializable duration/count pairs.
+  const dynamicAtrRetryPolicy = state.isDynamicAtrEnabled
+    ? [
+        ...EMPTY_EFD_RETRY_POLICY.durationRetryCounts.map(({ durationLimitMs }) => ({
+          durationLimitMs,
+          retryCount: getDynamicAtrRetryCount(durationLimitMs, earlyFlakeDetectionRetryPolicy, dynamicAtrBuckets),
+        })),
+        { retryCount: getDynamicAtrRetryCount(Infinity, earlyFlakeDetectionRetryPolicy, dynamicAtrBuckets) },
+      ]
+    : undefined
 
   setProvidedContext(ctx, {
     _ddVitestWorkerSetup: {
@@ -366,6 +375,8 @@ function configure (ctx, frameworkVersion, testSpecifications, setupData, option
       efdSuiteAdmissionBrowserCommand: VITEST_BROWSER_EFD_SUITE_ADMISSION_COMMAND,
       isEfdSuiteAdmissionEnabled: state.isEfdSuiteAdmissionEnabled,
       isEarlyFlakeDetectionEnabled: isEarlyFlakeDetectionActive(state),
+      dynamicAtrRetryPolicy,
+      flakyTestRetriesConfiguration,
       isRumCorrelationEnabled: !canRaceRumCorrelation(ctx, testSpecifications),
       knownTests: knownTestsBySuite || {},
       modifiedFiles: modifiedFiles || {},
@@ -456,7 +467,6 @@ function addSetupFileToVitestConfigs (ctx, setupFile, testSpecifications) {
  * @param {{
  *   resolve?: { dedupe?: string[] }
  * }} viteConfig
- * @returns {void}
  */
 function configureVitestBrowserSetupFile (viteConfig) {
   viteConfig.resolve ||= {}
@@ -473,7 +483,6 @@ function configureVitestBrowserSetupFile (viteConfig) {
  * @param {unknown} _context
  * @param {string} testSuite
  * @param {unknown} hasNewTest
- * @returns {boolean}
  */
 function handleBrowserEfdSuiteAdmission (_context, testSuite, hasNewTest) {
   return reserveEarlyFlakeDetectionSuite?.(testSuite, hasNewTest === true) === true
@@ -483,7 +492,6 @@ function handleBrowserEfdSuiteAdmission (_context, testSuite, hasNewTest) {
  * 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
@@ -505,7 +513,6 @@ function allowVitestBrowserSetupFile (viteConfig) {
  * 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
@@ -545,7 +552,6 @@ function addVitestBrowserRuntimeCommand (project) {
  * Adds the private EFD admission command to a Vitest Browser Mode configuration.
  *
  * @param {object|undefined} config
- * @returns {void}
  */
 function addVitestBrowserCommand (config) {
   const browserConfig = config?.browser
@@ -927,6 +933,7 @@ function createMainProcessReporter (reporterState) {
     const { flakyTestRetriesConfiguration } = testOptimizationData
     const isFlakyTestRetries = !!flakyTestRetriesConfiguration && isFlakyTestRetriesEnabledForTask({
       isFlakyTestRetriesEnabled: state.isFlakyTestRetriesEnabled,
+      isDynamicAtrEnabled: state.isDynamicAtrEnabled,
       flakyTestRetriesIncludesUnnamedProject: flakyTestRetriesConfiguration.includesUnnamedProject,
       flakyTestRetriesProjectNames: flakyTestRetriesConfiguration.projectNames,
     }, task)
@@ -1169,7 +1176,6 @@ function getRepeatedTestReport (task, testName, testSuiteAbsolutePath, testPrope
  * @param {'attempt_to_fix'|'early_flake_detection'|'external'} type
  * @param {string[]} statuses
  * @param {boolean} isFinalAttempt
- * @returns {boolean}
  */
 function hasFailedAllManagedRetries (task, testProperties, type, statuses, isFinalAttempt) {
   if (!isFinalAttempt || statuses.length === 0 || !statuses.every(status => status === 'fail')) {
@@ -1207,7 +1213,6 @@ function getEarlyFlakeDetectionFinalStatus (statuses, testProperties) {
  *
  * @param {string} status
  * @param {{ isDisabled?: boolean, isQuarantined?: boolean }} testProperties
- * @returns {string}
  */
 function getExternalFinalStatus (status, testProperties) {
   return testProperties.isDisabled || testProperties.isQuarantined ? 'skip' : status
@@ -1692,7 +1697,6 @@ function getEffectiveTestSpecificationPool (testSpecification, defaultPool) {
  * Resolves Vitest's default worker pool when the user did not configure one.
  *
  * @param {{ pool?: string }|undefined} config
- * @returns {string}
  */
 function getEffectiveConfigPool (config) {
   return config?.pool || VITEST_DEFAULT_POOL
@@ -1747,7 +1751,6 @@ function normalizeProjectName (name) {
  * Returns whether a Vitest specification runs in Browser Mode.
  *
  * @param {object} testSpecification
- * @returns {boolean}
  */
 function isBrowserTestSpecification (testSpecification) {
   return getTestSpecificationPool(testSpecification) === 'browser' ||
@@ -1758,7 +1761,6 @@ function isBrowserTestSpecification (testSpecification) {
  * Returns whether a Vitest project has Browser Mode enabled.
  *
  * @param {object|undefined} project
- * @returns {boolean}
  */
 function isBrowserProject (project) {
   try {
@@ -1771,7 +1773,6 @@ function isBrowserProject (project) {
  * Returns whether Vitest can overlap tests or their setup and teardown.
  *
  * @param {object|undefined} config
- * @returns {boolean}
  */
 function hasConcurrentTestExecution (config) {
   const sequence = config?.sequence
@@ -1785,7 +1786,6 @@ function hasConcurrentTestExecution (config) {
  *
  * @param {object} ctx
  * @param {object[]|undefined} testSpecifications
- * @returns {boolean}
  */
 function canRaceRumCorrelation (ctx, testSpecifications) {
   if (!Array.isArray(testSpecifications)) {

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

@@ -65,12 +65,17 @@ const workerProcesses = new WeakSet()
 const mainProcessSetupStates = new WeakMap()
 const coverageWrappedProviders = new WeakSet()
 const finishWrappedContexts = new WeakSet()
+const finishedSessionContexts = new WeakSet()
+const sessionWrappedPrototypes = new WeakSet()
+const emptyShardContexts = new WeakSet()
 const runFilesWrappedPrototypes = new WeakSet()
 const activeRunFilesContexts = new WeakSet()
 const runErrorsByContext = new WeakMap()
 const typecheckPoolWorkerRequests = new WeakMap()
 let isFlakyTestRetriesEnabled = false
 let flakyTestRetriesCount = 0
+let isDynamicAtrEnabled = false
+let dynamicAtrBuckets
 let isEarlyFlakeDetectionEnabled = false
 let earlyFlakeDetectionRetryPolicy = EMPTY_EFD_RETRY_POLICY
 let earlyFlakeDetectionFaultyThreshold = 0
@@ -161,16 +166,6 @@ function getThreadsPoolWorkerExport (vitestPackage) {
   return findExportByName(vitestPackage, 'ThreadsPoolWorker')
 }
 
-function getSessionStatus (state) {
-  if (state.getCountOfFailedTests() > 0) {
-    return 'fail'
-  }
-  if (state.pathsSet.size === 0) {
-    return 'skip'
-  }
-  return 'pass'
-}
-
 function getTestFilepathsFromSpecifications (testSpecifications) {
   if (!Array.isArray(testSpecifications) || !testSpecifications.length) {
     return
@@ -232,7 +227,6 @@ function getTestFilepaths (ctx, testSpecifications) {
  *
  * @param {string} testFilepath
  * @param {string} repositoryRoot
- * @returns {string}
  */
 function getNormalizedTestSuitePath (testFilepath, repositoryRoot) {
   const testSuiteAbsolutePath = path.isAbsolute(testFilepath) ? testFilepath : path.join(repositoryRoot, testFilepath)
@@ -242,7 +236,6 @@ function getNormalizedTestSuitePath (testFilepath, repositoryRoot) {
 /**
  * Resets suite-level EFD admission state between Vitest runs.
  *
- * @returns {void}
  */
 function resetEfdSuiteTracker () {
   activeNoWorkerInitState = undefined
@@ -255,7 +248,6 @@ function resetEfdSuiteTracker () {
  * Returns whether a Vitest pool has a transport for runtime EFD suite admission.
  *
  * @param {string|undefined} pool
- * @returns {boolean}
  */
 function isEfdSuiteAdmissionPool (pool) {
   return pool === undefined || pool === 'forks' || pool === 'threads' || pool === 'browser'
@@ -267,7 +259,6 @@ function isEfdSuiteAdmissionPool (pool) {
  * @param {string} frameworkVersion
  * @param {object[]|undefined} testSpecifications
  * @param {object} ctx
- * @returns {boolean}
  */
 function supportsEfdSuiteAdmission (frameworkVersion, testSpecifications, ctx) {
   if (!satisfies(frameworkVersion, '>=4.0.0')) return false
@@ -288,7 +279,6 @@ function supportsEfdSuiteAdmission (frameworkVersion, testSpecifications, ctx) {
  *
  * @param {string[]} testFilepaths
  * @param {string} repositoryRoot
- * @returns {void}
  */
 function configureEfdSuiteTracker (testFilepaths, repositoryRoot) {
   const testSuites = new Set()
@@ -308,7 +298,6 @@ function configureEfdSuiteTracker (testFilepaths, repositoryRoot) {
  *
  * @param {string} testSuite
  * @param {boolean} hasNewTest
- * @returns {boolean}
  */
 function reserveEarlyFlakeDetectionSuite (testSuite, hasNewTest) {
   if (!isEfdSuiteAdmissionEnabled || typeof testSuite !== 'string') return false
@@ -651,6 +640,8 @@ function wrapSessionFinish (ctx) {
 function resetLibraryConfig () {
   isFlakyTestRetriesEnabled = false
   flakyTestRetriesCount = 0
+  isDynamicAtrEnabled = false
+  dynamicAtrBuckets = undefined
   isEarlyFlakeDetectionEnabled = false
   earlyFlakeDetectionRetryPolicy = EMPTY_EFD_RETRY_POLICY
   earlyFlakeDetectionFaultyThreshold = 0
@@ -667,6 +658,8 @@ function resetLibraryConfig () {
 function applyLibraryConfig (libraryConfig) {
   isFlakyTestRetriesEnabled = libraryConfig.isFlakyTestRetriesEnabled
   flakyTestRetriesCount = libraryConfig.flakyTestRetriesCount
+  isDynamicAtrEnabled = libraryConfig.isDynamicAtrEnabled
+  dynamicAtrBuckets = libraryConfig.dynamicAtrBuckets
   isEarlyFlakeDetectionEnabled = libraryConfig.isEarlyFlakeDetectionEnabled
   earlyFlakeDetectionRetryPolicy = libraryConfig.earlyFlakeDetectionRetryPolicy ?? EMPTY_EFD_RETRY_POLICY
   earlyFlakeDetectionFaultyThreshold = libraryConfig.earlyFlakeDetectionFaultyThreshold ?? 0
@@ -688,6 +681,8 @@ function resetMainProcessProvidedContext (ctx) {
     _ddIsEfdSuiteAdmissionEnabled: false,
     _ddIsFlakyTestRetriesEnabled: false,
     _ddFlakyTestRetriesCount: 0,
+    _ddIsDynamicAtrEnabled: false,
+    _ddDynamicAtrBuckets: undefined,
     _ddFlakyTestRetriesIncludesUnnamedProject: false,
     _ddFlakyTestRetriesProjectNames: undefined,
     _ddIsImpactedTestsEnabled: false,
@@ -766,6 +761,8 @@ async function runMainProcessSetup (
       resetLibraryConfig()
     } else {
       applyLibraryConfig(libraryConfig)
+      // Older runners cache a numeric ceiling and cannot stop retries before the next lifecycle starts.
+      isDynamicAtrEnabled &&= satisfies(frameworkVersion, '>=4.1.0')
     }
   } catch {
     requestErrorTags = {}
@@ -832,6 +829,8 @@ async function runMainProcessSetup (
     setProvidedContext(ctx, {
       _ddIsFlakyTestRetriesEnabled: isFlakyTestRetriesEnabled,
       _ddFlakyTestRetriesCount: flakyTestRetriesCount,
+      _ddIsDynamicAtrEnabled: isDynamicAtrEnabled,
+      _ddDynamicAtrBuckets: dynamicAtrBuckets,
       _ddFlakyTestRetriesIncludesUnnamedProject: flakyTestRetriesConfiguration.includesUnnamedProject,
       _ddFlakyTestRetriesProjectNames: flakyTestRetriesConfiguration.projectNames,
     }, 'Could not send library configuration to workers.')
@@ -972,6 +971,8 @@ function getNoWorkerInitState () {
     isEarlyFlakeDetectionEnabled,
     isEarlyFlakeDetectionFaulty,
     isFlakyTestRetriesEnabled,
+    isDynamicAtrEnabled,
+    dynamicAtrBuckets,
     isKnownTestsEnabled,
     newTestsWithDynamicNames,
     requestErrorTags,
@@ -1039,14 +1040,21 @@ function shouldUseBrowserReporter (frameworkVersion, testSpecifications) {
 }
 
 function configureFlakyTestRetries (ctx, testSpecifications) {
-  if (!isFlakyTestRetriesEnabled || flakyTestRetriesCount <= 0) return
-
+  if (!isFlakyTestRetriesEnabled || (!isDynamicAtrEnabled && flakyTestRetriesCount <= 0)) return
+
+  const maximumDynamicAtrRetries = dynamicAtrBuckets
+    ? Math.max(...dynamicAtrBuckets)
+    : earlyFlakeDetectionRetryPolicy.schedulingRetryCount
+  const retryCount = isDynamicAtrEnabled
+    ? Math.max(1, maximumDynamicAtrRetries)
+    : flakyTestRetriesCount
   let configured = false
   let includesUnnamedProject = false
   const projectNames = []
   for (const { config, projectName } of getVitestProjectConfigs(ctx, testSpecifications)) {
-    if (!config.retry) {
-      config.retry = flakyTestRetriesCount
+    if (!config.retry || config.retry.__ddTestOptAtr) {
+      // The serializable marker survives task inheritance and setup refreshes, unlike numeric retry counts.
+      config.retry = isDynamicAtrEnabled ? { count: retryCount, __ddTestOptAtr: true } : retryCount
       configured = true
       if (projectName) {
         projectNames.push(projectName)
@@ -1179,6 +1187,9 @@ function safeWorkspaceProject (ctx) {
 
 function getSortWrapper (sort, frameworkVersion) {
   return async function () {
+    if (this.ctx.config.shard && this.ctx.state.pathsSet.size > 0 && arguments[0].length === 0) {
+      emptyShardContexts.add(this.ctx)
+    }
     if (!activeRunFilesContexts.has(this.ctx)) {
       const testSpecifications = arguments[0]
       await ensureMainProcessSetup(this.ctx, frameworkVersion, testSpecifications)
@@ -1189,18 +1200,18 @@ function getSortWrapper (sort, frameworkVersion) {
 }
 
 function getFinishWrapper (exitOrClose) {
-  let isClosed = false
   return async function () {
-    if (isClosed) { // needed because exit calls close
+    if (finishedSessionContexts.has(this)) {
       return exitOrClose.apply(this, arguments)
     }
-    isClosed = true
 
     if (!testSessionFinishCh.hasSubscribers) {
       return exitOrClose.apply(this, arguments)
     }
+    finishedSessionContexts.add(this)
 
     const failedSuites = this.state.getFailedFilepaths()
+    const hasRunError = runErrorsByContext.has(this)
     const runError = runErrorsByContext.get(this)
     runErrorsByContext.delete(this)
     let error = runError
@@ -1208,8 +1219,30 @@ function getFinishWrapper (exitOrClose) {
       error = new Error(`Test suites failed: ${failedSuites.length}.`)
     }
 
+    // pathsSet contains candidates before sharding, including files that never run.
+    const hasNoTestFiles = this.state.pathsSet.size === 0
+    const isEmptyShard = emptyShardContexts.has(this)
+    const hasUnexpectedEmptySession = hasNoTestFiles && !isEmptyShard &&
+      !areAllSuitesSkipped && !this.config.passWithNoTests
+    if (!error && hasUnexpectedEmptySession) {
+      error = new Error('No test files were found.')
+    }
+    const tests = getTypeTasks(this.state.getFiles())
+    const hasExecutedTests = tests.some(test =>
+      test.mode !== 'skip' && test.mode !== 'todo' &&
+      test.result?.state !== 'skip' && test.result?.state !== 'todo'
+    )
+    const hasErrors = hasRunError || error ||
+      this.state.getCountOfFailedTests() > 0 || this.state.getUnhandledErrors().length > 0
+    const testSessionEmptyReason = !hasErrors && !hasExecutedTests
+      ? (isEmptyShard
+          ? 'zero_test_shard'
+          : tests.length > 0 || skippedSuites.length > 0 ? 'all_tests_skipped' : 'zero_tests')
+      : undefined
+    const status = hasErrors ? 'fail' : (testSessionEmptyReason ? 'skip' : 'pass')
     const flushPromise = getChannelPromise(testSessionFinishCh, {
-      status: runError ? 'fail' : (areAllSuitesSkipped ? 'skip' : getSessionStatus(this.state)),
+      status,
+      testSessionEmptyReason,
       testCodeCoverageLinesTotal,
       error,
       isEarlyFlakeDetectionEnabled,
@@ -1306,7 +1339,6 @@ function getTestSpecificationPool (testSpecification) {
  * Detect whether Vitest selected only TypeScript typecheck specifications.
  *
  * @param {unknown} testSpecifications
- * @returns {boolean}
  */
 function hasOnlyTypecheckTestSpecifications (testSpecifications) {
   if (!Array.isArray(testSpecifications) || testSpecifications.length === 0) return false
@@ -1366,12 +1398,46 @@ function markVitestWorkerEnv (ctx, testSpecifications, shouldSkipWorkerInit = fa
   config.env = getVitestWorkerEnv(config.env, shouldSkipWorkerInit)
 }
 
+/**
+ * Installs completion hooks before discovery, which can bypass runFiles entirely.
+ * @param {Function} Vitest
+ */
+function wrapVitestSession (Vitest) {
+  if (!Vitest?.prototype?.start || sessionWrappedPrototypes.has(Vitest.prototype)) return
+  sessionWrappedPrototypes.add(Vitest.prototype)
+
+  // Empty discovery bypasses runFiles. Vitest 1 exits directly after reporting coverage,
+  // so its finalization must be awaited before that process.exit rather than only in close.
+  // Hashed bundle names prevent Orchestrion's exact-file matching.
+  shimmer.wrap(Vitest.prototype, 'start', start => function () {
+    if (!testSessionFinishCh.hasSubscribers) return start.apply(this, arguments)
+    wrapSessionFinish(this)
+    return start.apply(this, arguments).then(undefined, error => {
+      if (error?.code !== 'VITEST_FILES_NOT_FOUND') runErrorsByContext.set(this, error)
+      throw error
+    })
+  })
+  shimmer.wrap(Vitest.prototype, 'reportCoverage', reportCoverage => function () {
+    const result = reportCoverage.apply(this, arguments)
+    if (!testSessionFinishCh.hasSubscribers || !isSessionStarted || this.config.watch ||
+      mainProcessSetupStates.has(this) || this.state.pathsSet.size > 0) {
+      return result
+    }
+    return result.then(value => {
+      const finish = getFinishWrapper(() => value)
+      return finish.call(this)
+    })
+  })
+}
+
 function wrapVitestRunFiles (Vitest, frameworkVersion) {
   if (!Vitest?.prototype?.runFiles || runFilesWrappedPrototypes.has(Vitest.prototype)) {
     return
   }
   runFilesWrappedPrototypes.add(Vitest.prototype)
 
+  wrapVitestSession(Vitest)
+
   shimmer.wrap(Vitest.prototype, 'runFiles', runFiles => async function (testSpecifications) {
     if (activeRunFilesContexts.has(this)) {
       return runFiles.apply(this, arguments)
@@ -1413,7 +1479,6 @@ function getTypecheckTaskStatus (task) {
  *
  * @param {string|undefined} suiteName
  * @param {string} testSuiteAbsolutePath
- * @returns {boolean}
  */
 function isTypecheckFileSuiteName (suiteName, testSuiteAbsolutePath) {
   if (!suiteName || !testSuiteAbsolutePath) return false
@@ -1429,7 +1494,6 @@ function isTypecheckFileSuiteName (suiteName, testSuiteAbsolutePath) {
  *
  * @param {object} task
  * @param {string} testSuiteAbsolutePath
- * @returns {string}
  */
 function getTypecheckTestName (task, testSuiteAbsolutePath) {
   let testName = task.name || task.fullTestName
@@ -1508,7 +1572,6 @@ function updateTypecheckTaskResultForTestManagement (task, status, testManagemen
  * Recompute suite/file typecheck results after Test Management rewrites child test results.
  *
  * @param {object} task
- * @returns {string}
  */
 function updateTypecheckTaskTreeResult (task) {
   if (!Array.isArray(task.tasks)) return getTypecheckTaskStatus(task)
@@ -1552,7 +1615,6 @@ function updateTypecheckTaskTreeResult (task) {
  *   sourceErrors?: object[],
  *   state?: string
  * }} result
- * @returns {boolean}
  */
 function updateTypecheckResult (result) {
   if (result.sourceErrors?.length) return false
@@ -1945,7 +2007,6 @@ function getWrappedOn (on) {
  * @param {object} workerProcess
  * @param {number} interprocessCode
  * @param {object} data
- * @returns {boolean}
  */
 function handleEfdAdmissionMessage (workerProcess, interprocessCode, data) {
   if (interprocessCode !== VITEST_WORKER_EFD_SUITE_ADMISSION_REQUEST_CODE) return false
@@ -2060,6 +2121,36 @@ addHook({
   return wrapTinyPool(TinyPool)
 })
 
+/**
+ * Older Vitest versions expose their core instance through the logger constructor.
+ * @param {Record<string, Function>} vitestPackage
+ */
+function wrapVitestLogger (vitestPackage) {
+  const logger = findExportByName(vitestPackage, 'Logger')
+  if (logger) {
+    // Hashed bundle names prevent Orchestrion's exact-file matching.
+    shimmer.wrap(vitestPackage, logger.key, Logger => class extends Logger {
+      constructor (...args) {
+        super(...args)
+        if (testSessionFinishCh.hasSubscribers) wrapVitestSession(args[0]?.constructor)
+      }
+    })
+  }
+  return vitestPackage
+}
+
+addHook({
+  name: 'vitest',
+  versions: ['>=1.6.0 <2.0.5'],
+  filePattern: 'dist/vendor/index.*',
+}, wrapVitestLogger)
+
+addHook({
+  name: 'vitest',
+  versions: ['>=2.0.5 <3.0.0'],
+  filePattern: 'dist/chunks/index.*',
+}, wrapVitestLogger)
+
 // There are multiple index* files across different versions of vitest,
 // so we check for the existence of BaseSequencer to determine if we are in the right file
 addHook({

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

@@ -45,7 +45,6 @@ const codeCoverageReportCh = channel('ci:vitest:coverage-report')
  * Resolves a path without failing Test Optimization when the path is unavailable.
  *
  * @param {string} filepath
- * @returns {string}
  */
 function realpath (filepath) {
   try {
@@ -179,6 +178,8 @@ function getProvidedContext () {
       _ddTestManagementAttemptToFixRetries: testManagementAttemptToFixRetries,
       _ddIsFlakyTestRetriesEnabled: isFlakyTestRetriesEnabled,
       _ddFlakyTestRetriesCount: flakyTestRetriesCount,
+      _ddIsDynamicAtrEnabled: isDynamicAtrEnabled,
+      _ddDynamicAtrBuckets: dynamicAtrBuckets,
       _ddFlakyTestRetriesIncludesUnnamedProject: flakyTestRetriesIncludesUnnamedProject,
       _ddFlakyTestRetriesProjectNames: flakyTestRetriesProjectNames,
       _ddIsImpactedTestsEnabled: isImpactedTestsEnabled,
@@ -206,6 +207,8 @@ function getProvidedContext () {
       testManagementAttemptToFixRetries,
       isFlakyTestRetriesEnabled,
       flakyTestRetriesCount: flakyTestRetriesCount ?? 0,
+      isDynamicAtrEnabled,
+      dynamicAtrBuckets,
       flakyTestRetriesIncludesUnnamedProject,
       flakyTestRetriesProjectNames,
       isImpactedTestsEnabled,
@@ -232,6 +235,8 @@ function getProvidedContext () {
       testManagementAttemptToFixRetries: 0,
       isFlakyTestRetriesEnabled: false,
       flakyTestRetriesCount: 0,
+      isDynamicAtrEnabled: false,
+      dynamicAtrBuckets: undefined,
       flakyTestRetriesIncludesUnnamedProject: false,
       flakyTestRetriesProjectNames: undefined,
       isImpactedTestsEnabled: false,
@@ -250,6 +255,7 @@ function getProvidedContext () {
 
 function isFlakyTestRetriesEnabledForTask (providedContext, task) {
   if (!providedContext.isFlakyTestRetriesEnabled) return false
+  if (providedContext.isDynamicAtrEnabled && !task.retry?.__ddTestOptAtr) return false
 
   const { flakyTestRetriesProjectNames } = providedContext
   if (!Array.isArray(flakyTestRetriesProjectNames)) return true