dd-trace 6.16.0 → 6.18.0

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)
 
@@ -836,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)) {
@@ -1113,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
             }
           }

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

@@ -63,6 +63,7 @@ const baseReporterWaitForSyncCh = tracingChannel('orchestrion:@wdio/runner:BaseR
 const runnerRunCh = tracingChannel('orchestrion:@wdio/runner:Runner_run')
 const executeAsyncCh = tracingChannel('orchestrion:@wdio/utils:executeAsync')
 const launcherStartInstanceCh = tracingChannel('orchestrion:@wdio/cli:Launcher_startInstance')
+const configParserShardCh = tracingChannel('orchestrion:@wdio/config:ConfigParser_shard')
 const localRunnerRunCh = tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_run')
 const localRunnerShutdownCh = tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_shutdown')
 const testFrameworkFnWrapperCh = tracingChannel('orchestrion:@wdio/utils:testFrameworkFnWrapper')
@@ -87,6 +88,7 @@ if (loadCh.hasSubscribers) {
 }
 
 const coordinatorStates = new WeakMap()
+const emptyShardConfigurations = new WeakSet()
 const localRunnerVersions = new WeakMap()
 const rumBrowsers = new Set()
 const rumCorrelationBrowsers = new Set()
@@ -119,7 +121,6 @@ addHook({
  * Returns whether this browser can preload and clean correlation across every browsing context.
  *
  * @param {object} browser
- * @returns {boolean}
  */
 function canCorrelateRumBrowser (browser) {
   return browser?.isBidi &&
@@ -132,7 +133,6 @@ function canCorrelateRumBrowser (browser) {
  * Releases retained state when a WebDriver session ends.
  *
  * @param {object} browser
- * @returns {void}
  */
 function releaseRumBrowser (browser) {
   rumBrowsers.delete(browser)
@@ -152,7 +152,6 @@ function releaseRumBrowser (browser) {
  * Retains a browser and watches for WebDriver's deleteSession result event.
  *
  * @param {object} browser
- * @returns {void}
  */
 function retainRumBrowser (browser) {
   rumBrowsers.add(browser)
@@ -171,7 +170,6 @@ function retainRumBrowser (browser) {
  * Returns whether RUM is inactive because its configured sampling rate is below 100%.
  *
  * @param {{isRumActive: boolean, isRumInstrumented: boolean, rumSamplingRate: number|null}} rumState
- * @returns {boolean}
  */
 function isRumSampledOut (rumState) {
   return rumState.isRumInstrumented && !rumState.isRumActive &&
@@ -652,7 +650,6 @@ function handleRumProtocolCommand (command) {
  * Wraps only WebDriver commands that need to wait for RUM work before their request starts.
  *
  * @param {{arguments?: unknown[], result?: Function}} context
- * @returns {void}
  */
 function wrapRumProtocolCommand (context) {
   const command = context.arguments?.[2]?.command
@@ -675,7 +672,6 @@ function wrapRumProtocolCommand (context) {
  * A tracing-channel start subscriber is synchronous and cannot delay the static async handler itself.
  *
  * @param {{result?: {_bidiHandler?: {value?: object}}}} context
- * @returns {void}
  */
 function wrapRumBidiNavigation (context) {
   const bidiHandler = context.result?._bidiHandler?.value
@@ -844,7 +840,6 @@ async function retryRumBrowsers (testExecutionId) {
  * Delays BiDi navigation until its RUM correlation preload is installed.
  *
  * @param {{rumPreloadCallback?: () => Promise<void>}} context
- * @returns {void}
  */
 function waitForRumNavigationStart (context) {
   if (!rumPageNavigateCh.hasSubscribers) return
@@ -860,7 +855,6 @@ function waitForRumNavigationStart (context) {
  * }} context
  * @param {() => Promise<unknown>} operation
  * @param {boolean} [waitForResolve]
- * @returns {void}
  */
 function setRumWaitCallbacks (context, operation, waitForResolve = true) {
   const waitForOperation = onDone => operation().then(onDone, onDone)
@@ -872,7 +866,6 @@ function setRumWaitCallbacks (context, operation, waitForResolve = true) {
  * Delays URL completion until RUM detection and correlation settle.
  *
  * @param {object} context
- * @returns {void}
  */
 function waitForRumNavigation (context) {
   if (!rumPageNavigateCh.hasSubscribers) return
@@ -884,7 +877,6 @@ function waitForRumNavigation (context) {
  * Correlation remains active until every afterEach hook has run.
  *
  * @param {{arguments?: unknown[]}} context
- * @returns {void}
  */
 function waitForRumCleanup (context) {
   const type = context.arguments?.[1]
@@ -904,7 +896,6 @@ function waitForRumCleanup (context) {
  * Correlation remains active until every afterEach hook has run.
  *
  * @param {{arguments?: unknown[]}} context
- * @returns {void}
  */
 function waitForFailedRumCleanup (context) {
   const type = context.arguments?.[1]
@@ -928,7 +919,6 @@ function waitForFailedRumCleanup (context) {
  * Prepares retained RUM state before the next test or non-afterEach hook starts.
  *
  * @param {{arguments?: unknown[], rumCleanupCallback?: () => Promise<void>}} context
- * @returns {void}
  */
 function waitForRumTestStart (context) {
   const type = context.arguments?.[1]
@@ -948,6 +938,7 @@ function waitForRumTestStart (context) {
  * @property {string} framework
  * @property {string|undefined} rootDir
  * @property {typeof process.env|undefined} runnerEnv
+ * @property {{total: number}|undefined} shard
  */
 
 /**
@@ -1014,12 +1005,14 @@ function waitForRumTestStart (context) {
  */
 function createWorkerConfiguration () {
   return {
+    dynamicAtrBuckets: undefined,
     earlyFlakeDetectionFaultyThreshold: 30,
     earlyFlakeDetectionRetryPolicy: EMPTY_EFD_RETRY_POLICY,
     flakyTestRetriesCount: 0,
     isCodeCoverageEnabled: false,
     isCoverageReportUploadEnabled: false,
     isDiEnabled: false,
+    isDynamicAtrEnabled: false,
     isEarlyFlakeDetectionEnabled: false,
     isFlakyTestRetriesEnabled: false,
     isImpactedTestsEnabled: false,
@@ -1046,7 +1039,6 @@ function createWorkerConfiguration () {
  *   resolveCallback?: (onDone: () => void) => void,
  *   rejectCallback?: (onDone: () => void) => void
  * }} context
- * @returns {void}
  */
 function initializeJasmineWorker (adapter, context) {
   if (!isWebdriverioWorker) {
@@ -1061,7 +1053,6 @@ function initializeJasmineWorker (adapter, context) {
        * Publishes run-level failures that are absent from suiteDone.
        *
        * @param {object} result
-       * @returns {void}
        */
       jasmineDone (result) {
         jasmineDoneCh.publish({ result })
@@ -1073,7 +1064,6 @@ function initializeJasmineWorker (adapter, context) {
    * Waits until the coordinator has started this worker's parent spans.
    *
    * @param {() => void} onDone
-   * @returns {void}
    */
   const waitForCoordinator = onDone => {
     const requestId = `${process.pid}-${++jasmineWorkerRequestId}`
@@ -1083,7 +1073,6 @@ function initializeJasmineWorker (adapter, context) {
      * Releases Jasmine initialization exactly once.
      *
      * @param {object} [configuration]
-     * @returns {void}
      */
     function finish (configuration = createWorkerConfiguration()) {
       if (finished) {
@@ -1107,7 +1096,6 @@ function initializeJasmineWorker (adapter, context) {
      * Receives coordinator readiness for this worker.
      *
      * @param {object} message
-     * @returns {void}
      */
     function onMessage (message) {
       if (message?.name === WORKER_READY_RESPONSE && message.content?.requestId === requestId) {
@@ -1190,7 +1178,6 @@ function getCoordinatorState (localRunner) {
  * Normalizes a WebdriverIO spec identifier to a filesystem path.
  *
  * @param {string} file
- * @returns {string}
  */
 function normalizeFile (file) {
   return file.startsWith('file://') ? fileURLToPath(file) : file
@@ -1201,7 +1188,6 @@ function normalizeFile (file) {
  *
  * @param {CoordinatorState} state
  * @param {string[]} files
- * @returns {void}
  */
 function addScheduledFiles (state, files) {
   for (const file of files) {
@@ -1214,7 +1200,6 @@ function addScheduledFiles (state, files) {
  *
  * @param {string|undefined} workerNodeOptions
  * @param {string} launcherNodeOptions
- * @returns {boolean}
  */
 function includesNodeOptions (workerNodeOptions, launcherNodeOptions) {
   if (!workerNodeOptions) {
@@ -1240,7 +1225,6 @@ function includesNodeOptions (workerNodeOptions, launcherNodeOptions) {
  * Starts the single test session owned by the WebdriverIO launcher.
  *
  * @param {CoordinatorState} state
- * @returns {void}
  */
 function startSession (state) {
   if (state.sessionStarted) {
@@ -1264,7 +1248,6 @@ function startSession (state) {
  * Completes coordinator initialization and releases waiting workers.
  *
  * @param {CoordinatorState} state
- * @returns {void}
  */
 function completeCoordinatorInitialization (state) {
   if (state.initialized) {
@@ -1288,7 +1271,6 @@ function completeCoordinatorInitialization (state) {
  * @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) {
@@ -1320,7 +1302,6 @@ function getMochaFrameworkData (frameworkData) {
  * Applies the worker configuration for an EFD session with faulty known-tests data.
  *
  * @param {object} configuration
- * @returns {void}
  */
 function setEarlyFlakeDetectionFaulty (configuration) {
   configuration.isEarlyFlakeDetectionEnabled = false
@@ -1333,7 +1314,6 @@ function setEarlyFlakeDetectionFaulty (configuration) {
  *
  * @param {CoordinatorState} state
  * @param {object|undefined} response
- * @returns {void}
  */
 function configureCoordinator (state, response) {
   const { configuration } = state
@@ -1354,10 +1334,14 @@ function configureCoordinator (state, response) {
     return
   }
 
+  configuration.dynamicAtrBuckets = libraryConfig.isDynamicAtrEnabled === true
+    ? libraryConfig.dynamicAtrBuckets
+    : undefined
   configuration.earlyFlakeDetectionFaultyThreshold = libraryConfig.earlyFlakeDetectionFaultyThreshold
   configuration.earlyFlakeDetectionRetryPolicy = libraryConfig.earlyFlakeDetectionRetryPolicy ?? EMPTY_EFD_RETRY_POLICY
   configuration.flakyTestRetriesCount = libraryConfig.flakyTestRetriesCount
   configuration.isDiEnabled = libraryConfig.isDiEnabled
+  configuration.isDynamicAtrEnabled = libraryConfig.isDynamicAtrEnabled === true
   configuration.isEarlyFlakeDetectionEnabled = libraryConfig.isEarlyFlakeDetectionEnabled
   configuration.isFlakyTestRetriesEnabled = libraryConfig.isFlakyTestRetriesEnabled
   configuration.isImpactedTestsEnabled = libraryConfig.isImpactedTestsEnabled
@@ -1371,7 +1355,6 @@ function configureCoordinator (state, response) {
   /**
    * Completes initialization after all enabled requests settle.
    *
-   * @returns {void}
    */
   function finishRequest () {
     pendingRequests--
@@ -1430,7 +1413,6 @@ function configureCoordinator (state, response) {
  *
  * @param {CoordinatorState} state
  * @param {(configuration: object) => void} [onDone]
- * @returns {void}
  */
 function initializeCoordinator (state, onDone) {
   if (state.initialized) {
@@ -1474,7 +1456,6 @@ function initializeCoordinator (state, onDone) {
  *
  * @param {WorkerRecord} workerRecord
  * @param {string[]} files
- * @returns {void}
  */
 function startWorkerSuites (workerRecord, files) {
   for (const rawFile of files) {
@@ -1502,7 +1483,6 @@ function startWorkerSuites (workerRecord, files) {
  * @param {WorkerRecord} workerRecord
  * @param {string} rawFile
  * @param {string} status
- * @returns {void}
  */
 function finishWorkerSuite (state, workerRecord, rawFile, status) {
   const file = normalizeFile(rawFile)
@@ -1524,7 +1504,6 @@ function finishWorkerSuite (state, workerRecord, rawFile, status) {
  * @param {CoordinatorState} state
  * @param {WorkerRecord} workerRecord
  * @param {string} status
- * @returns {void}
  */
 function finishAllWorkerSuites (state, workerRecord, status) {
   let hasFailedSuite = false
@@ -1549,7 +1528,6 @@ function finishAllWorkerSuites (state, workerRecord, status) {
  *
  * @param {WorkerRecord} workerRecord
  * @param {object} message
- * @returns {void}
  */
 function sendWorkerMessage (workerRecord, message) {
   const childProcess = workerRecord.worker.childProcess
@@ -1570,7 +1548,6 @@ function sendWorkerMessage (workerRecord, message) {
  * @param {CoordinatorState} state
  * @param {WorkerRecord} workerRecord
  * @param {object} message
- * @returns {void}
  */
 function handleConfigurationRequest (state, workerRecord, message) {
   const { files = [], requestId } = message.content || {}
@@ -1594,7 +1571,6 @@ function handleConfigurationRequest (state, workerRecord, message) {
  *
  * @param {CoordinatorState} state
  * @param {string[]} files
- * @returns {void}
  */
 function updateEarlyFlakeDetectionFaultyState (state, files) {
   const { configuration } = state
@@ -1641,7 +1617,6 @@ function getWebdriverioSuiteError (error) {
  *
  * @param {WorkerRecord} workerRecord
  * @param {object} message
- * @returns {void}
  */
 function handleSuiteResults (workerRecord, message) {
   const { results = [] } = message.content || {}
@@ -1662,7 +1637,6 @@ function handleSuiteResults (workerRecord, message) {
  * @param {CoordinatorState} state
  * @param {WorkerRecord} workerRecord
  * @param {object|unknown[]} message
- * @returns {void}
  */
 function handleWorkerMessage (state, workerRecord, message) {
   if (message?.origin === WEBDRIVERIO_WORKER_ORIGIN && message.name === WEBDRIVERIO_WORKER_EVENT) {
@@ -1756,7 +1730,6 @@ function handleWorkerMessage (state, workerRecord, message) {
  * @param {CoordinatorState} state
  * @param {WorkerRecord} workerRecord
  * @param {object} exit
- * @returns {void}
  */
 function handleWorkerExit (state, workerRecord, exit) {
   state.activeWorkers--
@@ -1779,7 +1752,6 @@ function handleWorkerExit (state, workerRecord, exit) {
  * @param {CoordinatorState} state
  * @param {object} worker
  * @param {string[]} specs
- * @returns {void}
  */
 function registerWorker (state, worker, specs) {
   const normalizedSpecs = []
@@ -1811,7 +1783,6 @@ function registerWorker (state, worker, specs) {
  * Calculates the final status for the coordinated session.
  *
  * @param {CoordinatorState} state
- * @returns {string}
  */
 function getSessionStatus (state) {
   let hasPassingSuite = false
@@ -1837,13 +1808,27 @@ function getSessionStatus (state) {
   return hasPassingSuite ? 'pass' : 'skip'
 }
 
+/**
+ * Explains a skipped session using the workers' discovery results.
+ *
+ * @param {CoordinatorState} state
+ */
+function getTestSessionEmptyReason (state) {
+  if (state.workers.size === 0 && emptyShardConfigurations.has(getRunnerConfiguration(state.localRunner))) {
+    return 'zero_test_shard'
+  }
+  for (const workerRecord of state.workers) {
+    if (workerRecord.hasTests !== false) return 'all_tests_skipped'
+  }
+  return 'zero_tests'
+}
+
 /**
  * Finishes the single WebdriverIO-owned test session.
  *
  * @param {CoordinatorState} state
  * @param {unknown} error
  * @param {() => void} onDone
- * @returns {void}
  */
 function finishCoordinator (state, error, onDone) {
   if (state.finished) {
@@ -1851,9 +1836,9 @@ function finishCoordinator (state, error, onDone) {
     return
   }
   if (!state.sessionStarted) {
-    if (!error && getSessionStatus(state) !== 'fail') {
-      onDone()
-      return
+    if (!error && state.workers.size === 0 &&
+      !emptyShardConfigurations.has(getRunnerConfiguration(state.localRunner))) {
+      error = new Error('No test files were found.')
     }
     initializeCoordinator(state, () => finishCoordinator(state, error, onDone))
     return
@@ -1877,8 +1862,10 @@ function finishCoordinator (state, error, onDone) {
     return
   }
 
+  const status = error ? 'fail' : getSessionStatus(state)
   testSessionFinishCh.publish({
-    status: error ? 'fail' : getSessionStatus(state),
+    status,
+    testSessionEmptyReason: status === 'skip' ? getTestSessionEmptyReason(state) : undefined,
     error,
     isEarlyFlakeDetectionEnabled: state.configuration.isEarlyFlakeDetectionEnabled,
     isEarlyFlakeDetectionFaulty: state.configuration.isEarlyFlakeDetectionFaulty,
@@ -1901,7 +1888,6 @@ function finishCoordinator (state, error, onDone) {
  *   resolveCallback?: (onDone: () => void) => void,
  *   rejectCallback?: (onDone: () => void) => void
  * }} context
- * @returns {void}
  */
 function waitForLogSubmissionAtWorkerExit (context) {
   const shouldCleanRum = rumBrowsers.size > 0
@@ -1926,7 +1912,6 @@ function waitForLogSubmissionAtWorkerExit (context) {
  * Cleans retained RUM browsers before WebdriverIO deletes the worker session.
  *
  * @param {{rumCleanupCallback?: () => Promise<void>}} context
- * @returns {void}
  */
 function waitForRumCleanupBeforeSessionEnd (context) {
   context.rumCleanupCallback = cleanupAllRumBrowsers
@@ -1995,6 +1980,17 @@ jasmineAdapterInitCh.subscribe({
 
 // dc-polyfill supports partial tracing-channel subscribers, unlike the Node.js type definition.
 // @ts-expect-error
+configParserShardCh.subscribe({
+  end (context) {
+    const config = context.self._config
+    if (testFinishCh.hasSubscribers && config?.shard?.total > 1 &&
+      context.arguments[0].length > 0 && context.result?.length === 0) {
+      emptyShardConfigurations.add(config)
+    }
+  },
+})
+
+// @ts-expect-error See the partial tracing-channel subscriber above.
 launcherStartInstanceCh.subscribe({
   start (context) {
     const localRunner = context.self?.runner
@@ -2069,10 +2065,11 @@ localRunnerRunCh.subscribe({
 // @ts-expect-error See the partial tracing-channel subscriber above.
 localRunnerShutdownCh.subscribe({
   asyncEnd (context) {
-    const state = coordinatorStates.get(context.self)
-    if (!state) {
+    const runnerConfiguration = getRunnerConfiguration(context.self)
+    if (!testFinishCh.hasSubscribers || !SUPPORTED_FRAMEWORK_ADAPTERS.has(runnerConfiguration?.framework)) {
       return
     }
+    const state = getCoordinatorState(context.self)
 
     // Orchestrion uses the callback for the matching settlement path to delay LocalRunner.shutdown.
     const waitForCoordinator = onDone => {

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

@@ -94,9 +94,22 @@ function wrapSend (send) {
       return send.apply(this, arguments)
     }
 
+    const socket = this._sender?._socket
+    // No socket is attached before the handshake completes or after it is torn down.
+    if (!socket) {
+      return send.apply(this, arguments)
+    }
+
     const [data, options, cb] = arguments
 
-    const ctx = { data, socket: this._sender?._socket }
+    // `ws` stringifies numbers, then spreads `options` over its own inferred default, so an
+    // explicitly passed `binary` wins even when it is nullish and the frame goes out as text.
+    const payload = typeof data === 'number' ? data.toString() : data
+    const binary = options != null && Object.hasOwn(options, 'binary')
+      ? Boolean(options.binary)
+      : typeof payload !== 'string'
+    const byteLength = sentDataLength(payload)
+    const ctx = { data, binary, socket, byteLength }
 
     return typeof cb === 'function'
       ? producerCh.traceCallback(send, undefined, ctx, this, data, options, cb)
@@ -241,9 +254,35 @@ addHook({
   return Receiver
 })
 
+/**
+ * Byte length of an outgoing payload, following the coercion `ws` applies in `Sender.send`:
+ * strings and blobs are measured directly and everything else goes through `toBuffer()`, which
+ * yields one byte per element for plain arrays rather than concatenating them. Blob-likes carry
+ * neither a `byteLength` nor an array shape, so they are matched last to keep the common
+ * buffer path first.
+ *
+ * @param {WebSocketMessageData | number | undefined} data
+ */
+function sentDataLength (data) {
+  if (typeof data === 'string') {
+    return Buffer.byteLength(data)
+  }
+  // An array is one byte per element even when it carries an unrelated `byteLength`.
+  if (Array.isArray(data)) {
+    return data.length
+  }
+  // Covers views as well as `ArrayBuffer` and `SharedArrayBuffer`.
+  if (typeof (/** @type {{ byteLength?: unknown }} */ (data)?.byteLength) === 'number') {
+    return /** @type {{ byteLength: number }} */ (data).byteLength
+  }
+  // Blobs and files, detected the way `ws` does: structurally, so shimmed and cross-realm
+  // implementations it accepts are measured instead of silently reported as empty.
+  const { size } = /** @type {{ size?: unknown }} */ (data) ?? {}
+  return typeof size === 'number' ? size : 0
+}
+
 /**
  * @param {WebSocketMessageData} data
- * @returns {number}
  */
 function dataLength (data) {
   if (typeof data === 'string') {

package/packages/datadog-plugin-ai/src/utils.js

@@ -7,7 +7,6 @@ const { parseModelId: parseBedrockModelId } = require('../../datadog-plugin-aws-
  * This is normalized to LLM Observability model provider standards.
  *
  * @param {Record<string, string>} tags
- * @returns {string}
  */
 function getModelProvider (tags) {
   const modelProviderTag = tags['ai.model.provider']
@@ -21,7 +20,6 @@ function getModelProvider (tags) {
  *
  * @param {string} rawProvider
  * @param {string} modelId
- * @returns {string}
  */
 function parseModelProvider (rawProvider, modelId) {
   const providerParts = rawProvider?.split('.')

package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/trace-checkpoint.js

@@ -66,7 +66,6 @@ function overrideParentId (headers, parentId) {
  * Whether the current trace context warrants a new checkpoint over the previously-saved one.
  * @param {Record<string, string>} currentHeaders
  * @param {Record<string, string>} previousHeaders
- * @returns {boolean}
  */
 function needsCheckpointUpdate (currentHeaders, previousHeaders) {
   for (const key of Object.keys(currentHeaders)) {