dd-trace 6.15.0 → 6.17.0

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/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

@@ -71,6 +71,8 @@ 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
@@ -232,7 +234,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 +243,6 @@ function getNormalizedTestSuitePath (testFilepath, repositoryRoot) {
 /**
  * Resets suite-level EFD admission state between Vitest runs.
  *
- * @returns {void}
  */
 function resetEfdSuiteTracker () {
   activeNoWorkerInitState = undefined
@@ -255,7 +255,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 +266,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 +286,6 @@ function supportsEfdSuiteAdmission (frameworkVersion, testSpecifications, ctx) {
  *
  * @param {string[]} testFilepaths
  * @param {string} repositoryRoot
- * @returns {void}
  */
 function configureEfdSuiteTracker (testFilepaths, repositoryRoot) {
   const testSuites = new Set()
@@ -308,7 +305,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 +647,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 +665,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 +688,8 @@ function resetMainProcessProvidedContext (ctx) {
     _ddIsEfdSuiteAdmissionEnabled: false,
     _ddIsFlakyTestRetriesEnabled: false,
     _ddFlakyTestRetriesCount: 0,
+    _ddIsDynamicAtrEnabled: false,
+    _ddDynamicAtrBuckets: undefined,
     _ddFlakyTestRetriesIncludesUnnamedProject: false,
     _ddFlakyTestRetriesProjectNames: undefined,
     _ddIsImpactedTestsEnabled: false,
@@ -766,6 +768,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 +836,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 +978,8 @@ function getNoWorkerInitState () {
     isEarlyFlakeDetectionEnabled,
     isEarlyFlakeDetectionFaulty,
     isFlakyTestRetriesEnabled,
+    isDynamicAtrEnabled,
+    dynamicAtrBuckets,
     isKnownTestsEnabled,
     newTestsWithDynamicNames,
     requestErrorTags,
@@ -1039,14 +1047,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)
@@ -1208,8 +1223,19 @@ function getFinishWrapper (exitOrClose) {
       error = new Error(`Test suites failed: ${failedSuites.length}.`)
     }
 
+    const hasNoTestFiles = this.state.pathsSet.size === 0
+    const hasUnexpectedEmptySession = hasNoTestFiles && !areAllSuitesSkipped && !this.config.passWithNoTests
+    if (!error && hasUnexpectedEmptySession) {
+      error = new Error('No test files were found.')
+    }
+    const status = runError || hasUnexpectedEmptySession
+      ? 'fail'
+      : (areAllSuitesSkipped ? 'skip' : getSessionStatus(this.state))
+    const isExpectedEmptySession = !runError && !hasUnexpectedEmptySession &&
+      (areAllSuitesSkipped || hasNoTestFiles)
     const flushPromise = getChannelPromise(testSessionFinishCh, {
-      status: runError ? 'fail' : (areAllSuitesSkipped ? 'skip' : getSessionStatus(this.state)),
+      status,
+      isExpectedEmptySession,
       testCodeCoverageLinesTotal,
       error,
       isEarlyFlakeDetectionEnabled,
@@ -1306,7 +1332,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
@@ -1413,7 +1438,6 @@ function getTypecheckTaskStatus (task) {
  *
  * @param {string|undefined} suiteName
  * @param {string} testSuiteAbsolutePath
- * @returns {boolean}
  */
 function isTypecheckFileSuiteName (suiteName, testSuiteAbsolutePath) {
   if (!suiteName || !testSuiteAbsolutePath) return false
@@ -1429,7 +1453,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 +1531,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 +1574,6 @@ function updateTypecheckTaskTreeResult (task) {
  *   sourceErrors?: object[],
  *   state?: string
  * }} result
- * @returns {boolean}
  */
 function updateTypecheckResult (result) {
   if (result.sourceErrors?.length) return false
@@ -1945,7 +1966,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

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

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

@@ -9,7 +9,11 @@ const { isMainThread, parentPort } = require('node:worker_threads')
 const { channel } = require('dc-polyfill')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
-const { getEfdRetryCountForDuration } = require('../../dd-trace/src/ci-visibility/efd-retry-policy')
+const {
+  getEfdRetryCountForDuration,
+  EMPTY_EFD_RETRY_POLICY,
+} = require('../../dd-trace/src/ci-visibility/efd-retry-policy')
+const { getDynamicAtrRetryCount } = require('../../dd-trace/src/ci-visibility/dynamic-atr-retries')
 const {
   DYNAMIC_NAME_RE,
   getTestSuitePath,
@@ -63,6 +67,8 @@ const modifiedTasks = new WeakSet()
 const efdRetryTasks = new WeakSet()
 const efdDeterminedRetries = new WeakMap()
 const efdSlowAbortedTasks = new WeakSet()
+// Each native repetition selects its own budget from its first attempt.
+const dynamicAtrStateByTask = new WeakMap()
 const efdExecutionStartByTask = new WeakMap()
 const efdSkippedRetryResults = new WeakMap()
 const attemptToFixExecutions = new Map()
@@ -184,7 +190,6 @@ function getVitestCoverageOptions () {
 /**
  * Check whether the current Vitest worker reuses its module cache across test suites.
  *
- * @returns {boolean}
  */
 function isNonIsolatedRun () {
   const config = globalThis.__vitest_worker__?.config
@@ -287,7 +292,6 @@ function getFinalAttemptToFixStatus (task, state, isSwitchedStatus, testCtx) {
  * Return the normalized test suite path prepared by the main process for a Vitest task.
  *
  * @param {{ file: { filepath: string } }} task
- * @returns {string}
  */
 function getTaskTestSuite (task) {
   return taskToTestProperties.get(task)?.testSuite || task.file.filepath
@@ -343,7 +347,6 @@ function wrapBeforeEachCleanupResult (task, result) {
  * Returns whether a Vitest task tree includes any concurrent task.
  *
  * @param {Array<{ type?: string, concurrent?: boolean, tasks?: object[] }>|undefined} tasks
- * @returns {boolean}
  */
 function hasConcurrentTask (tasks) {
   if (!tasks) return false
@@ -360,7 +363,6 @@ function hasConcurrentTask (tasks) {
  * Returns whether a Vitest file includes any concurrent test.
  *
  * @param {{ tasks?: object[] }} file
- * @returns {boolean}
  */
 function hasConcurrentTests (file) {
   const cached = fileToHasConcurrentTests.get(file)
@@ -376,7 +378,6 @@ function hasConcurrentTests (file) {
  *
  * @param {{ filepath: string, tasks?: object[] }} file
  * @param {object} providedContext
- * @returns {boolean}
  */
 function hasRunnableNewTest (file, providedContext) {
   for (const task of getTypeTasks(file.tasks)) {
@@ -395,7 +396,6 @@ function hasRunnableNewTest (file, providedContext) {
  *
  * @param {number} requestId
  * @param {boolean} allowed
- * @returns {void}
  */
 function finishEfdSuiteAdmissionRequest (requestId, allowed) {
   const request = pendingEfdSuiteAdmissionRequests.get(requestId)
@@ -410,7 +410,6 @@ function finishEfdSuiteAdmissionRequest (requestId, allowed) {
  * Handles an EFD suite admission response from the Vitest main process.
  *
  * @param {unknown} message
- * @returns {void}
  */
 function handleEfdSuiteAdmissionResponse (message) {
   if (!Array.isArray(message) || message[0] !== VITEST_WORKER_EFD_SUITE_ADMISSION_RESPONSE_CODE) return
@@ -591,6 +590,31 @@ function wrapVitestTestRunner (VitestTestRunner) {
       }
     }
 
+    if (
+      providedContext.isDynamicAtrEnabled &&
+      isFlakyTestRetriesEnabledForTask(providedContext, task) &&
+      !attemptToFixTasks.has(task) &&
+      !efdRetryTasks.has(task) &&
+      task.retry?.__ddTestOptAtr && task.retry.count > 0
+    ) {
+      const state = { executionStart: process.uptime(), retryOffset: 0, retryCount: undefined }
+      dynamicAtrStateByTask.set(task, state)
+      // The runner caches count, but evaluates condition after hooks and fixture cleanup.
+      task.retry = {
+        ...task.retry,
+        condition () {
+          if (state.retryCount === undefined) {
+            state.retryCount = getDynamicAtrRetryCount(
+              (process.uptime() - state.executionStart) * 1000,
+              earlyFlakeDetectionRetryPolicy ?? EMPTY_EFD_RETRY_POLICY,
+              providedContext.dynamicAtrBuckets
+            )
+          }
+          return task.result.retryCount - state.retryOffset < state.retryCount
+        },
+      }
+    }
+
     return onBeforeRunTask.apply(this, arguments)
   })
 
@@ -653,6 +677,13 @@ function wrapVitestTestRunner (VitestTestRunner) {
     }
 
     const { retry: numAttempt, repeats: numRepetition } = retryInfo
+    const dynamicAtrState = dynamicAtrStateByTask.get(task)
+    if (dynamicAtrState && numAttempt === 0) {
+      if (numRepetition > 0) dynamicAtrState.executionStart = process.uptime()
+      // Vitest accumulates result.retryCount across native repetitions.
+      dynamicAtrState.retryOffset = task.result.retryCount
+      dynamicAtrState.retryCount = undefined
+    }
     const isFailedTestReplayAllowed = !hasConcurrentTests(task.file)
     const isEfdManagedTask = efdRetryTasks.has(task)
 
@@ -718,7 +749,7 @@ function wrapVitestTestRunner (VitestTestRunner) {
     const isAtf = attemptToFixTasks.has(task)
     const isEfd = efdRetryTasks.has(task)
     const shouldTrackStatuses = isEfd || isAtf
-    const shouldFlipStatus = isEfd || isAtf
+    const shouldResetStatus = isEfd || isAtf
     const statuses = isAtf ? attemptToFixTaskToStatuses.get(task) : taskToStatuses.get(task)
 
     // These clauses handle task.repeats, whether EFD is enabled or not
@@ -738,13 +769,10 @@ function wrapVitestTestRunner (VitestTestRunner) {
         if (shouldTrackStatuses && statuses) {
           statuses.push(lastExecutionStatus)
         }
-        if (shouldFlipStatus) {
-          // If we don't "reset" the result.state to "pass", once a repetition fails,
-          // vitest will always consider the test as failed, so we can't read the actual status
-          // This means that we change vitest's behavior:
-          // if the last attempt passes, vitest would consider the test as failed
-          // but after this change, it will consider the test as passed
-          task.result.state = 'pass'
+        if (shouldResetStatus) {
+          // Reset to Vitest's neutral state so a previous failure does not affect the next repetition.
+          // A terminal pass state can leak into reporters before the next repetition determines its status.
+          task.result.state = 'run'
         }
       }
     } else if (numRepetition === task.repeats) {
@@ -759,8 +787,8 @@ function wrapVitestTestRunner (VitestTestRunner) {
       } else {
         testPassCh.publish({ task, ...ctx.currentStore })
       }
-      if (shouldFlipStatus) {
-        task.result.state = 'pass'
+      if (shouldResetStatus) {
+        task.result.state = 'run'
       }
     }
 
@@ -839,15 +867,16 @@ function wrapVitestTestRunner (VitestTestRunner) {
       }
       const result = await onAfterTryTask.apply(this, arguments)
 
+      const providedContext = getProvidedContext()
       const {
         testManagementAttemptToFixRetries,
         earlyFlakeDetectionRetryPolicy,
-      } = getProvidedContext()
+      } = providedContext
 
       const status = getVitestTestStatus(task, retryInfo.retry)
       const ctx = taskToCtx.get(task)
 
-      const { isDiEnabled } = getProvidedContext()
+      const { isDiEnabled } = providedContext
       const isFailedTestReplayAllowed = !hasConcurrentTests(task.file)
 
       if (efdSkippedRetryResults.has(task)) {
@@ -1116,10 +1145,14 @@ function getStartTestsWrapper (frameworkVersion) {
 
           // ATR: set hasFailedAllRetries when all auto test retries were exhausted and every attempt failed
           const isAtrRetry = isFlakyTestRetriesEnabledForTask(providedContext, task) && !attemptToFixTasks.has(task) &&
-            !newTasks.has(task) && !modifiedTasks.has(task)
+            !efdRetryTasks.has(task)
           if (isAtrRetry) {
-            const maxRetries = providedContext.flakyTestRetriesCount ?? 0
-            if (maxRetries > 0 && task.result?.retryCount === maxRetries) {
+            // Dynamic ATR: use the per-test duration-based count instead of the flat limit.
+            const dynamicAtrState = dynamicAtrStateByTask.get(task)
+            const maxRetries = dynamicAtrState?.retryCount === undefined
+              ? (providedContext.flakyTestRetriesCount ?? 0)
+              : dynamicAtrState.retryOffset + dynamicAtrState.retryCount
+            if (maxRetries > 0 && task.result?.retryCount >= maxRetries) {
               hasFailedAllRetries = true
             }
           }