dd-trace 6.16.0 → 6.18.0

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

@@ -8,6 +8,9 @@ const {
   hasEfdRetries,
   shouldSkipEfdRetry,
 } = require('../../../dd-trace/src/ci-visibility/efd-retry-policy')
+const {
+  getDynamicAtrRetryCount,
+} = require('../../../dd-trace/src/ci-visibility/dynamic-atr-retries')
 const {
   getTestSuitePath,
   DYNAMIC_NAME_RE,
@@ -51,6 +54,7 @@ const testsQuarantined = new Set()
 const testsStatuses = new Map()
 const efdRetryCountByTestFullName = new Map()
 const efdSlowAbortedTests = new Set()
+let dynamicAtrRetryCountByTest = new WeakMap()
 const attemptToFixExecutions = new Map()
 const isMochaWorker = !!getEnvironmentVariable('MOCHA_WORKER_ID')
 
@@ -65,7 +69,6 @@ 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) {
@@ -82,7 +85,6 @@ function isTestFailed (test) {
  *
  * @param {object} runner
  * @param {object} config
- * @returns {void}
  */
 function adjustRunnerFailuresForTestOptimization (runner, config) {
   if (config.isEarlyFlakeDetectionEnabled) {
@@ -212,7 +214,6 @@ function wrapOriginalEfdTest (test, retryPolicy) {
 /**
  * Disables Mocha's native retry mechanism for Datadog-managed clone retries.
  * @param {{ retries?: (count: number) => void }} test
- * @returns {void}
  */
 function disableMochaRetries (test) {
   if (typeof test.retries === 'function') {
@@ -232,7 +233,6 @@ function disableMochaRetries (test) {
  *   isEarlyFlakeDetectionEnabled?: boolean,
  *   earlyFlakeDetectionRetryPolicy?: import('../../../dd-trace/src/ci-visibility/efd-retry-policy').EfdRetryPolicy
  * }} config
- * @returns {boolean}
  */
 function isDatadogManagedRetryTest (test, config) {
   return test._ddIsAttemptToFix || isEarlyFlakeDetectionTest(test, config)
@@ -251,7 +251,6 @@ function isDatadogManagedRetryTest (test, config) {
  *   isEarlyFlakeDetectionEnabled?: boolean,
  *   earlyFlakeDetectionRetryPolicy?: import('../../../dd-trace/src/ci-visibility/efd-retry-policy').EfdRetryPolicy
  * }} config
- * @returns {boolean}
  */
 function isEarlyFlakeDetectionTest (test, config) {
   return !test._ddIsAttemptToFix &&
@@ -309,7 +308,6 @@ function retryTest (test, numRetries, tags, retryPolicy) {
  * Restores a runnable function wrapped with its Test Optimization context.
  *
  * @param {import('mocha').Runnable} runnable
- * @returns {void}
  */
 function restoreRunnableFunction (runnable) {
   const wrappedFunction = runnable.fn
@@ -322,7 +320,6 @@ function restoreRunnableFunction (runnable) {
  * Restores a test function wrapped to measure its EFD duration.
  *
  * @param {import('mocha').Test} test
- * @returns {void}
  */
 function restoreEfdTestFunction (test) {
   if (!originalEfdFns.has(test)) return
@@ -336,7 +333,6 @@ function restoreEfdTestFunction (test) {
  * Clears state that belongs to one Mocha runner execution and removes retry clones from prior executions.
  *
  * @param {import('mocha').Suite} rootSuite
- * @returns {void}
  */
 function resetRunState (rootSuite) {
   for (const key of Object.keys(newTests)) delete newTests[key]
@@ -347,6 +343,7 @@ function resetRunState (rootSuite) {
   testsStatuses.clear()
   efdRetryCountByTestFullName.clear()
   efdSlowAbortedTests.clear()
+  dynamicAtrRetryCountByTest = new WeakMap()
   attemptToFixExecutions.clear()
   loggedAttemptToFixTests.clear()
 
@@ -369,6 +366,7 @@ function resetRunState (rootSuite) {
       if (originalRetriesByTest.has(test)) {
         test.retries(originalRetriesByTest.get(test))
         originalRetriesByTest.delete(test)
+        if (test._retriedTest) originalRetriesByTest.delete(test._retriedTest)
       }
 
       delete test._ddIsAttemptToFix
@@ -381,6 +379,7 @@ function resetRunState (rootSuite) {
       delete test._ddTestFinishPublished
       delete test._ddIsFinalAttempt
       delete test._ddHookFailed
+      delete test._ddPendingRetry
       delete test._ddReporterStartFailed
       delete test._ddReporterTerminalFailed
       originalTests.push(test)
@@ -430,7 +429,6 @@ function getTestFullName (test) {
  * Records every attempt for a test grouped by its full test name.
  * @param {Record<string, Array<{ file: string, fullTitle: () => string }>>} testsByFullName
  * @param {{ file: string, fullTitle: () => string }} test
- * @returns {void}
  */
 function recordTestAttempt (testsByFullName, test) {
   const testFullName = getTestFullName(test)
@@ -470,7 +468,6 @@ function getTestContext (test) {
  * Claims publication of a test finish event across Mocha's terminal event paths.
  *
  * @param {object} test
- * @returns {boolean}
  */
 function startTestFinish (test) {
   if (test._ddTestFinishStarted || test._ddTestFinishPublished) return false
@@ -534,7 +531,27 @@ function runnableWrapper (RunnablePackage, libraryConfig) {
         }
       }
     } else if (libraryConfig?.isFlakyTestRetriesEnabled) {
-      this.retries(libraryConfig.flakyTestRetriesCount)
+      if (!originalRetriesByTest.has(test)) {
+        const originalRetries = originalRetriesByTest.get(test._retriedTest) ?? test.retries()
+        originalRetriesByTest.set(test, originalRetries)
+      }
+      if (libraryConfig.isDynamicAtrEnabled) {
+        // Dynamic ATR: set the max possible retries initially.
+        // The actual duration-based count is computed after the first attempt.
+        const dynamicCount = dynamicAtrRetryCountByTest.get(test._retriedTest || test)
+        if (dynamicCount === undefined) {
+          const maxRetries = libraryConfig.dynamicAtrBuckets
+            ? Math.max(...libraryConfig.dynamicAtrBuckets)
+            : libraryConfig.earlyFlakeDetectionRetryPolicy?.schedulingRetryCount ?? 0
+          // Dynamic ATR guarantees one retry, including the >5m EFD fallback bucket.
+          test.retries(Math.max(1, maxRetries))
+        } else {
+          // A beforeEach hook runs before the retry body; update the clone, not the hook.
+          test.retries(dynamicCount)
+        }
+      } else {
+        test.retries(libraryConfig.flakyTestRetriesCount)
+      }
     }
 
     if (isTestHook || this.type === 'test') {
@@ -704,6 +721,26 @@ function getTestFinishInfo (test, status, config, error) {
     setEfdRetryCountForTest(test, duration, config.earlyFlakeDetectionRetryPolicy)
   }
 
+  // Dynamic ATR: after the first attempt, compute the duration-based retry budget.
+  // Mocha's native retry clones point to the original test, independently of duplicate titles.
+  const originalTest = test._retriedTest || test
+  if (
+    config.isDynamicAtrEnabled &&
+    config.isFlakyTestRetriesEnabled &&
+    !test._ddIsAttemptToFix &&
+    !test._ddIsEfdRetry &&
+    !dynamicAtrRetryCountByTest.has(originalTest) &&
+    test._currentRetry === 0
+  ) {
+    const duration = test.duration > 0 ? test.duration : performance.now() - test._ddStartTime
+    const dynamicCount = getDynamicAtrRetryCount(
+      duration,
+      config.earlyFlakeDetectionRetryPolicy,
+      config.dynamicAtrBuckets
+    )
+    dynamicAtrRetryCountByTest.set(originalTest, dynamicCount)
+  }
+
   if (testsStatuses.get(testName)) {
     testsStatuses.get(testName).push(status)
   } else {
@@ -715,7 +752,10 @@ function getTestFinishInfo (test, status, config, error) {
   const efdRetryCount = efdRetryCountByTestFullName.get(testName) ??
     config.earlyFlakeDetectionRetryPolicy.schedulingRetryCount
   const isLastEfdRetry = testStatuses.length === efdRetryCount + 1
-  const isLastAtrAttempt = getIsLastRetry(test) || (config.isFlakyTestRetriesEnabled && status === 'pass')
+  // Mocha aborts native retries on hook failure, even when the retry budget is not exhausted.
+  const isTerminalHookFailure = test._ddHookFailed && !isDatadogManagedRetryTest(test, config)
+  const isLastAtrAttempt = isTerminalHookFailure || getIsLastRetry(test) ||
+    (config.isFlakyTestRetriesEnabled && status === 'pass')
 
   // Needed for the getFinalStatus call. This is because EFD does NOT tag as
   // EFD retry the first run of the test. It only tags as retries the clones
@@ -737,9 +777,9 @@ function getTestFinishInfo (test, status, config, error) {
     hasFailedAllRetries = true
   }
 
-  // ATR: set hasFailedAllRetries when all auto test retries were exhausted and every attempt failed
+  // ATR: mark terminal attempts when every executed attempt failed.
   if (config.isFlakyTestRetriesEnabled && !test._ddIsAttemptToFix && !test._ddIsEfdRetry &&
-    getIsLastRetry(test) && testStatuses.every(status => status === 'fail')) {
+    isLastAtrAttempt && testStatuses.every(status => status === 'fail')) {
     hasFailedAllRetries = true
   }
 
@@ -747,7 +787,7 @@ function getTestFinishInfo (test, status, config, error) {
   const isAtrRetry = config.isFlakyTestRetriesEnabled &&
     !test._ddIsAttemptToFix &&
     !test._ddIsEfdRetry
-  const isFinalAttempt = status !== 'fail' || test._currentRetry >= test._retries
+  const isFinalAttempt = isTerminalHookFailure || status !== 'fail' || test._currentRetry >= test._retries
 
   const { isFlakyTestRetriesEnabled } = config
   const { _ddIsAttemptToFix, _ddIsQuarantined, _ddIsDisabled } = test
@@ -872,7 +912,7 @@ function getOnHookEndHandler (config, finalAttemptHandlers) {
         const ctx = getTestContext(test)
         // Disabled tests are already finished in getOnTestEndHandler,
         // skip to avoid double-publishing
-        if (ctx && (!test._ddIsDisabled || test._ddIsAttemptToFix) && startTestFinish(test)) {
+        if (ctx && !test._ddPendingRetry && (!test._ddIsDisabled || test._ddIsAttemptToFix) && startTestFinish(test)) {
           const testFinishInfo = getTestFinishInfo(test, status, config, ctx.err || test.err)
           const isFinalAttempt = testFinishInfo.finalStatus !== undefined
           const publishTestFinish = () => {
@@ -938,6 +978,11 @@ function finishDeferredHookEnd (test) {
  * @returns {unknown}
  */
 function runFailedTestReplayHookUpCallback (fn, test, failedTestReplayPromise, hookThis, args) {
+  const pendingRetry = test._ddPendingRetry
+  if (pendingRetry) {
+    delete test._ddPendingRetry
+    failedTestReplayPromise = pendingRetry()
+  }
   const continueAfterProbe = () => {
     const deferredHookEndPromise = finishDeferredHookEnd(test)
     if (deferredHookEndPromise) {
@@ -1001,26 +1046,18 @@ function getOnFailHandler (isMain, config) {
     }
     if (testContext) {
       if (isHook && startTestFinish(test)) {
+        delete test._ddPendingRetry
         const hookError = new Error(`${testOrHook.fullTitle()}: ${err.message}`, { cause: err })
         hookError.name = err.name
         hookError.stack = err.stack
         testContext.err = hookError
         errorCh.runStores(testContext, () => {})
+        // Mocha marks the hook failed, so record the test failure before computing final metadata.
+        test._ddHookFailed = true
         const testFinishInfo = getTestFinishInfo(test, 'fail', config, hookError)
-        // ATR never retries hook failures: this.retries(N) is set in runnableWrapper
-        // which only runs when the test function executes — hooks bypass that path,
-        // so _retries stays at -1 and getIsLastRetry returns false, leaving finalStatus
-        // undefined. We must also mark the attempt final when no clone-based retry
-        // mechanism (EFD original, EFD clone, ATF) has queued further attempts.
-        const noCloneRetries = !test._ddIsEfdRetry &&
-          !((test._ddIsNew || test._ddIsModified) && config.isEarlyFlakeDetectionEnabled) &&
-          !test._ddIsAttemptToFix
-        if (testFinishInfo.finalStatus !== undefined || noCloneRetries) {
+        if (testFinishInfo.finalStatus !== undefined) {
           test._ddIsFinalAttempt = true
         }
-        // test.state is never set to 'failed' for hook failures (Mocha marks the hook,
-        // not the test). Flag it so finishRootSuiteForFile can compute the correct status.
-        test._ddHookFailed = true
         test._ddTestFinishPublished = true
         testFinishCh.publish({
           status: 'fail',
@@ -1052,31 +1089,64 @@ function getOnFailHandler (isMain, config) {
 
 function getOnTestRetryHandler (config) {
   return function (test, err) {
-    const ctx = getTestContext(test)
-    if (ctx) {
-      const isFirstAttempt = test._currentRetry === 0
-      const willBeRetried = test._currentRetry < test._retries
-      const isAtrRetry = !isFirstAttempt &&
-        config.isFlakyTestRetriesEnabled &&
-        !test._ddIsAttemptToFix &&
-        !test._ddIsEfdRetry
-      const promises = {}
-      testRetryCh.publish({
-        isFirstAttempt,
-        err,
-        willBeRetried,
-        test,
-        isAtrRetry,
-        promises,
-        ...ctx.currentStore,
-      })
-      test._ddFailedTestReplayPromise = getFailedTestReplayPromise(promises)
+    const isFirstAttempt = test._currentRetry === 0
+    const isDynamicAtrTest = config.isDynamicAtrEnabled &&
+      config.isFlakyTestRetriesEnabled &&
+      !test._ddIsAttemptToFix &&
+      !isEarlyFlakeDetectionTest(test, config)
+    if (isDynamicAtrTest && isFirstAttempt) {
+      const dynamicCount = getDynamicAtrRetryCount(
+        test.duration > 0 ? test.duration : performance.now() - test._ddStartTime,
+        config.earlyFlakeDetectionRetryPolicy,
+        config.dynamicAtrBuckets
+      )
+      dynamicAtrRetryCountByTest.set(test._retriedTest || test, dynamicCount)
+      // Mocha emits retry before its next attempt starts; narrow its ceiling here.
+      test._retries = dynamicCount
+    }
+
+    if (config.isFlakyTestRetriesEnabled && getAfterEachHooks(test).length) {
+      // Mocha queues retries before afterEach; a hook failure can still cancel the retry.
+      test._ddPendingRetry = () => publishTestRetry(test, err, config)
+      return
     }
-    const key = getTestToContextKey(test)
-    testToContext.delete(key)
+    test._ddFailedTestReplayPromise = publishTestRetry(test, err, config)
   }
 }
 
+/**
+ * Finishes a failed attempt once its afterEach hooks have allowed the retry to proceed.
+ * @param {import('mocha').Test} test
+ * @param {Error} err
+ * @param {{ isFlakyTestRetriesEnabled?: boolean }} config
+ */
+function publishTestRetry (test, err, config) {
+  const isFirstAttempt = test._currentRetry === 0
+  let failedTestReplayPromise
+  const ctx = getTestContext(test)
+  if (ctx) {
+    const willBeRetried = test._currentRetry < test._retries
+    const isAtrRetry = !isFirstAttempt &&
+      config.isFlakyTestRetriesEnabled &&
+      !test._ddIsAttemptToFix &&
+      !test._ddIsEfdRetry
+    const promises = {}
+    testRetryCh.publish({
+      isFirstAttempt,
+      err,
+      willBeRetried,
+      test,
+      isAtrRetry,
+      promises,
+      ...ctx.currentStore,
+    })
+    failedTestReplayPromise = getFailedTestReplayPromise(promises)
+  }
+  const key = getTestToContextKey(test)
+  testToContext.delete(key)
+  return failedTestReplayPromise
+}
+
 function getOnPendingHandler () {
   return function (test) {
     if (test._ddShouldSkipEfdRetry) {

package/packages/datadog-instrumentations/src/mocha/webdriverio-protocol.js

@@ -18,7 +18,6 @@ const SCREENSHOT_UPLOAD_TIMEOUT_MS = FINAL_FLUSH_TIMEOUT + 5000
  * @param {object} message
  * @param {(error?: Error) => void} [onError]
  * @param {() => void} [onDone]
- * @returns {void}
  */
 function sendWebdriverioWorkerMessage (message, onError, onDone) {
   if (!process.send || !process.connected) {
@@ -41,7 +40,6 @@ const screenshotUploadRequests = new Map()
 /**
  * Removes shared screenshot response listeners when there are no pending requests.
  *
- * @returns {void}
  */
 function removeScreenshotUploadListeners () {
   if (screenshotUploadRequests.size !== 0) return
@@ -55,7 +53,6 @@ function removeScreenshotUploadListeners () {
  *
  * @param {string} requestId
  * @param {Error} [error]
- * @returns {void}
  */
 function finishScreenshotUploadRequest (requestId, error) {
   const request = screenshotUploadRequests.get(requestId)
@@ -71,7 +68,6 @@ function finishScreenshotUploadRequest (requestId, error) {
  * Dispatches one coordinator screenshot response to its pending request.
  *
  * @param {object} message
- * @returns {void}
  */
 function onScreenshotUploadResponse (message) {
   if (message?.name !== SCREENSHOT_UPLOAD_RESPONSE) return
@@ -85,7 +81,6 @@ function onScreenshotUploadResponse (message) {
 /**
  * Fails every pending screenshot upload after coordinator disconnect.
  *
- * @returns {void}
  */
 function onScreenshotUploadDisconnect () {
   for (const requestId of screenshotUploadRequests.keys()) {
@@ -101,7 +96,6 @@ function onScreenshotUploadDisconnect () {
  *
  * @param {object} content - Screenshot upload metadata
  * @param {(error?: Error) => void} onDone - Upload completion callback
- * @returns {void}
  */
 function requestWebdriverioScreenshotUpload (content, onDone) {
   const requestId = `${process.pid}-${++screenshotUploadRequestId}`

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

@@ -39,6 +39,7 @@ const workerConfigurationCh = channel('ci:mocha:worker:configuration')
 const config = {
   earlyFlakeDetectionRetryPolicy: EMPTY_EFD_RETRY_POLICY,
 }
+const patchedRunners = new WeakSet()
 const runnerToFiles = new WeakMap()
 const runnerToFailedHooks = new WeakMap()
 const isWebdriverioWorker = !!getEnvironmentVariable(WEBDRIVERIO_WORKER_ENV)
@@ -50,7 +51,6 @@ let configurationRequestId = 0
  * @param {object} message
  * @param {() => void} [onError]
  * @param {() => void} [onDone]
- * @returns {void}
  */
 function sendWebdriverioMessage (message, onError, onDone) {
   sendWebdriverioWorkerMessage(message, error => {
@@ -65,7 +65,6 @@ function sendWebdriverioMessage (message, onError, onDone) {
  * Applies configuration encoded as private Mocha options by its parallel runner.
  *
  * @param {object} options
- * @returns {void}
  */
 function applyMochaOptions (options) {
   if (options._ddIsKnownTestsEnabled) {
@@ -95,8 +94,12 @@ function applyMochaOptions (options) {
   if (options._ddIsFlakyTestRetriesEnabled) {
     config.isFlakyTestRetriesEnabled = true
     config.flakyTestRetriesCount = options._ddFlakyTestRetriesCount
+    config.isDynamicAtrEnabled = options._ddIsDynamicAtrEnabled
+    config.dynamicAtrBuckets = options._ddDynamicAtrBuckets
     delete options._ddIsFlakyTestRetriesEnabled
     delete options._ddFlakyTestRetriesCount
+    delete options._ddIsDynamicAtrEnabled
+    delete options._ddDynamicAtrBuckets
   }
   if (options._ddIsFailedTestReplayEnabled) {
     config.isTestDynamicInstrumentationEnabled = true
@@ -110,7 +113,6 @@ function applyMochaOptions (options) {
  *
  * @param {object} runner
  * @param {string[]} skippedFiles
- * @returns {void}
  */
 function filterSkippedFiles (runner, skippedFiles) {
   if (!skippedFiles.length) {
@@ -128,7 +130,6 @@ function filterSkippedFiles (runner, skippedFiles) {
  * @param {string} frameworkVersion
  * @param {string[]} files
  * @param {(response: object) => void} onDone
- * @returns {void}
  */
 function requestWebdriverioConfiguration (frameworkVersion, files, onDone) {
   const requestId = `${process.pid}-${++configurationRequestId}`
@@ -138,7 +139,6 @@ function requestWebdriverioConfiguration (frameworkVersion, files, onDone) {
    * Finishes the configuration request exactly once.
    *
    * @param {object} response
-   * @returns {void}
    */
   function finish (response) {
     if (finished) {
@@ -155,7 +155,6 @@ function requestWebdriverioConfiguration (frameworkVersion, files, onDone) {
    * Receives the matching coordinator response.
    *
    * @param {object} message
-   * @returns {void}
    */
   function onMessage (message) {
     if (message?.name === CONFIGURATION_RESPONSE && message.content?.requestId === requestId) {
@@ -166,7 +165,6 @@ function requestWebdriverioConfiguration (frameworkVersion, files, onDone) {
   /**
    * Releases the runner if its parent disconnects.
    *
-   * @returns {void}
    */
   function onDisconnect () {
     finish({})
@@ -190,7 +188,6 @@ function requestWebdriverioConfiguration (frameworkVersion, files, onDone) {
  * Reports the Mocha version as soon as WebdriverIO loads its framework adapter.
  *
  * @param {string} frameworkVersion
- * @returns {void}
  */
 function reportWebdriverioWorkerReady (frameworkVersion) {
   if (!isWebdriverioWorker) {
@@ -208,7 +205,6 @@ 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) {
@@ -235,7 +231,6 @@ function getWebdriverioHookTest (hook) {
  * Removes managed hook failures from WebdriverIO's Mocha runner totals.
  *
  * @param {object} runner
- * @returns {void}
  */
 function adjustWebdriverioHookFailures (runner) {
   let suppressedFailures = 0
@@ -314,7 +309,6 @@ function getWebdriverioSuiteResults (runner) {
  *
  * @param {object} runner
  * @param {() => void} [onDone]
- * @returns {void}
  */
 function reportWebdriverioSuiteResults (runner, onDone) {
   if (!isWebdriverioWorker) {
@@ -336,7 +330,6 @@ function reportWebdriverioSuiteResults (runner, onDone) {
  *
  * @param {object} runner
  * @param {() => void} onDone
- * @returns {void}
  */
 function finishWebdriverioWorker (runner, onDone) {
   try {
@@ -385,7 +378,6 @@ function wrapMochaRun (Mocha, frameworkVersion) {
     /**
      * Restores the root suite method after both delayed-mode gates are open.
      *
-     * @returns {void}
      */
     function restoreRootSuiteRun () {
       if (hasOwnRootSuiteRun) {
@@ -424,7 +416,7 @@ function wrapMochaRun (Mocha, frameworkVersion) {
         })
       }
       filterSkippedFiles(runner, skippedFiles)
-      if (isFailedTestReplayEnabled()) {
+      if (isFailedTestReplayEnabled() || config.isFlakyTestRetriesEnabled) {
         patchFailedTestReplayHookUp(runner.constructor)
       }
       configurationReady = true
@@ -449,14 +441,19 @@ addHook({
   name: 'mocha',
   versions: [MINIMUM_MOCHA_VERSION],
   filePattern: String.raw`lib/runner\.(?:c?js)$`,
-}, function (Runner) {
+}, function (runnerPackage) {
+  const Runner = runnerPackage.Runner ?? runnerPackage.default ?? runnerPackage
+  if (typeof Runner !== 'function') return
+  if (patchedRunners.has(Runner)) return
+
+  patchedRunners.add(Runner)
   shimmer.wrap(Runner.prototype, 'runTests', runTests => getRunTestsWrapper(runTests, config))
 
   shimmer.wrap(Runner.prototype, 'run', run => function (...args) {
     if (!workerFinishCh.hasSubscribers) {
       return run.apply(this, args)
     }
-    if (isFailedTestReplayEnabled()) {
+    if (isFailedTestReplayEnabled() || config.isFlakyTestRetriesEnabled) {
       patchFailedTestReplayHookUp(Runner)
     }
     if (isWebdriverioWorker) {
@@ -512,7 +509,7 @@ addHook({
 
     return run.apply(this, args)
   })
-  return Runner
+  return runnerPackage
 })
 
 // Used both in serial and parallel mode, and by both the main process and the workers

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

@@ -185,7 +185,6 @@ function wrapConnection (Connection, version) {
   /**
    * @param {object} cmd
    * @param {object} ctx
-   * @returns {void}
    */
   function wrapCommandOnResult (cmd, ctx) {
     const onResult = cmd?.onResult
@@ -383,7 +382,6 @@ function wrapPool (Pool, version) {
 /**
  * @param {Function} Pool
  * @param {'query'|'execute'} method
- * @returns {boolean}
  */
 function defersPoolAcquire (Pool, method) {
   return !dispatchesAcquireSynchronously(