dd-trace 6.20.1 → 6.22.0

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

@@ -25,7 +25,7 @@ function wrapAddCommand (addCommand) {
     return startCh.runStores(ctx, () => {
       const res = addCommand.apply(this, arguments)
 
-      res.then(() => finish(finishCh, errorCh, ctx), err => finish(finishCh, errorCh, ctx, err))
+      res.then(() => finish(ctx), err => finish(ctx, err))
 
       return res
     })
@@ -85,13 +85,11 @@ addHook({ name: '@redis/client', file: 'dist/lib/client/commands-queue.js', vers
 
 addHook({ name: 'redis', versions: ['>=2.6 <4'] }, redis => {
   shimmer.wrap(redis.RedisClient.prototype, 'internal_send_command', internalSendCommand => function (options) {
-    if (!startCh.hasSubscribers) return internalSendCommand.apply(this, arguments)
-
-    if (!options.callback) return internalSendCommand.apply(this, arguments)
+    if (!startCh.hasSubscribers || !options.callback) return internalSendCommand.apply(this, arguments)
 
     const ctx = getStartCtx(this, options.command, options.args)
     return startCh.runStores(ctx, () => {
-      options.callback = wrapCallback(finishCh, errorCh, ctx, options.callback)
+      options.callback = wrapCallback(ctx, options.callback)
 
       try {
         return internalSendCommand.apply(this, arguments)
@@ -114,11 +112,11 @@ addHook({ name: 'redis', versions: ['>=0.12 <2.6'] }, redis => {
     const ctx = getStartCtx(this, command, args)
     return startCh.runStores(ctx, () => {
       if (typeof callback === 'function') {
-        arguments[2] = wrapCallback(finishCh, errorCh, ctx, callback)
+        arguments[2] = wrapCallback(ctx, callback)
       } else if (Array.isArray(args) && typeof args.at(-1) === 'function') {
-        args[args.length - 1] = wrapCallback(finishCh, errorCh, ctx, args.at(-1))
+        args[args.length - 1] = wrapCallback(ctx, args.at(-1))
       } else {
-        arguments[2] = wrapCallback(finishCh, errorCh, ctx)
+        arguments[2] = wrapCallback(ctx)
       }
 
       try {
@@ -155,20 +153,36 @@ function getStartCtx (client, command, args, argsStartIndex) {
   }
 }
 
-function wrapCallback (finishCh, errorCh, ctx, callback) {
+/**
+ * @param {Record<string, unknown> & { error?: Error }} ctx
+ * @param {Function} [callback]
+ */
+function wrapCallback (ctx, callback) {
   if (typeof callback !== 'function') return callback
   return function (err) {
-    return finish(finishCh, errorCh, ctx, err, callback, this, arguments)
+    return finish(ctx, err, callback, this, arguments)
   }
 }
 
-function finish (finishCh, errorCh, ctx, error, callback, thisArg, args) {
+/**
+ * @param {Record<string, unknown> & { error?: Error }} ctx
+ * @param {Error} [error]
+ * @param {Function} [callback]
+ * @param {object} [thisArg]
+ * @param {Iterable<unknown>} [args]
+ */
+function finish (ctx, error, callback, thisArg, args) {
   if (error) {
     ctx.error = error
     errorCh.publish(ctx)
   }
   if (callback) {
-    return finishCh.runStores(ctx, callback, thisArg, ...args)
+    return finishCh.runStores(
+      ctx,
+      /** @type {Parameters<typeof finishCh.runStores>[1]} */ (callback),
+      thisArg,
+      ...(/** @type {Iterable<unknown>} */ (args))
+    )
   }
-  finishCh.publish(ctx)
+  return finishCh.publish(ctx)
 }

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

@@ -91,6 +91,28 @@ function resolveLayerRouteOrForwardError (meta, layer, next) {
   }
 }
 
+// Wrapped `next` -> the host continuation it calls.
+const hostNexts = new WeakMap()
+
+/**
+ * Routers store their continuation on `req.next` once per `handle()`, and host
+ * APIs call it directly (express `res.format`, `res.sendFile` and `res.render`
+ * errors). Point it at the wrapper the current handler receives when that
+ * wrapper wraps the same continuation: `req.next` is the host continuation
+ * itself, or an earlier layer's wrapper of it. Route handlers receive a
+ * route-local continuation from `Route.dispatch`, so `req.next` keeps the
+ * router-level one there. A nested router restores its parent's `req.next`
+ * when it finishes.
+ *
+ * @param {import('node:http').IncomingMessage | undefined} req
+ * @param {Function} hostNext
+ * @param {Function} wrappedNext
+ */
+function adoptRequestNext (req, hostNext, wrappedNext) {
+  hostNexts.set(wrappedNext, hostNext)
+  if (req && (req.next === hostNext || hostNexts.get(req.next) === hostNext)) req.next = wrappedNext
+}
+
 /**
  * Build the request/error dispatch wrappers for one host (`express` / `router`).
  * They wrap the layer's prototype dispatch and read the side-table metadata, so
@@ -171,6 +193,7 @@ function createLayerDispatchWrappers (name) {
       }
 
       const wrappedNext = typeof next === 'function' ? wrapNext(req, meta.name, next) : next
+      if (wrappedNext !== next) adoptRequestNext(req, next, wrappedNext)
       enterChannel.publish({ name: meta.name, req, route, layer: this })
 
       try {
@@ -199,6 +222,7 @@ function createLayerDispatchWrappers (name) {
       }
 
       const wrappedNext = typeof next === 'function' ? wrapNext(req, meta.name, next) : next
+      if (wrappedNext !== next) adoptRequestNext(req, next, wrappedNext)
       enterChannel.publish({ name: meta.name, req, route, layer: this })
 
       try {
@@ -223,6 +247,7 @@ function createLayerDispatchWrappers (name) {
 
       let calls = 0
       if (typeof next === 'function') {
+        const hostNext = next
         next = shimmer.wrapCallback(next, originalNext => function next (error) {
           calls++
           if (calls === 1) {
@@ -238,6 +263,7 @@ function createLayerDispatchWrappers (name) {
 
           originalNext.apply(this, arguments)
         })
+        adoptRequestNext(req, hostNext, next)
       }
 
       const route = needMultiMatch ? resolveLayerRoute(meta, layer) : captureRoute
@@ -273,6 +299,7 @@ function createLayerDispatchWrappers (name) {
 
       let calls = 0
       if (typeof next === 'function') {
+        const hostNext = next
         next = shimmer.wrapCallback(next, originalNext => function next (nextError) {
           calls++
           if (calls === 1) {
@@ -288,6 +315,7 @@ function createLayerDispatchWrappers (name) {
 
           originalNext.apply(this, arguments)
         })
+        adoptRequestNext(req, hostNext, next)
       }
 
       const route = needMultiMatch ? resolveLayerRoute(meta, layer) : captureRoute
@@ -336,6 +364,7 @@ function createLayerDispatchWrappers (name) {
       const nextIndex = isErrorHandler ? 3 : 2
       let calls = 0
       if (typeof args[nextIndex] === 'function') {
+        const hostNext = args[nextIndex]
         args[nextIndex] = shimmer.wrapCallback(args[nextIndex], originalNext => function next (error) {
           calls++
           if (calls === 1) {
@@ -351,6 +380,7 @@ function createLayerDispatchWrappers (name) {
 
           originalNext.apply(this, arguments)
         })
+        adoptRequestNext(req, hostNext, args[nextIndex])
       }
 
       const route = needMultiMatch ? resolveLayerRoute(meta, layer) : captureRoute

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

@@ -5,9 +5,7 @@
 /** @returns {{ isRumInstrumented: boolean, isRumActive: boolean, rumSamplingRate: number | null }} */
 function detectRum () {
   const isRumInstrumented = !!window.DD_RUM
-  const isRumActive = window.DD_RUM && window.DD_RUM.getInternalContext
-    ? !!window.DD_RUM.getInternalContext()
-    : false
+  const isRumActive = !!(window.DD_RUM && window.DD_RUM.getInternalContext && window.DD_RUM.getInternalContext())
   const rumInitConfiguration = window.DD_RUM && window.DD_RUM.getInitConfiguration
     ? window.DD_RUM.getInitConfiguration()
     : undefined
@@ -26,9 +24,7 @@ function stopRumSession () {
 
 function stopRumSessionAndReportActivity () {
   if (window.DD_RUM && window.DD_RUM.stopSession) {
-    const isRumActive = window.DD_RUM.getInternalContext
-      ? !!window.DD_RUM.getInternalContext()
-      : false
+    const isRumActive = !!(window.DD_RUM.getInternalContext && window.DD_RUM.getInternalContext())
     window.DD_RUM.stopSession()
     return isRumActive
   }

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

@@ -659,8 +659,7 @@ function createMainProcessReporter (reporterState) {
     },
 
     onTaskUpdate (packs, events) {
-      if (!isReporterActive()) return
-      if (!events) return
+      if (!isReporterActive() || !events) return
 
       for (const event of events) {
         if (event[1] === 'test-retried') {
@@ -685,8 +684,7 @@ function createMainProcessReporter (reporterState) {
     },
 
     onFinished (files) {
-      if (!isReporterActive()) return
-      if (!files) return
+      if (!isReporterActive() || !files) return
 
       for (const file of files) {
         const testModule = createTestModuleFromFile(file)
@@ -1276,10 +1274,12 @@ function reportFinalTestAttempt (testReport) {
         isQuarantined: testProperties.isQuarantined,
       })
     }
+    const attemptIndex = task.meta?.__ddTestOptCurrentAttemptIndex ?? 0
+    const attemptStartTime = task.meta?.__ddTestOptAttemptStartTimes?.[attemptIndex]
     const {
       isRumActive,
       testExecutionId,
-    } = getRumCorrelation(task)
+    } = getRumCorrelation(task, attemptIndex)
     testSkipCh.publish({
       ...browserEnvironment,
       testName,
@@ -1291,6 +1291,8 @@ function reportFinalTestAttempt (testReport) {
       isRumActive,
       isTestFrameworkWorker: true,
       requestErrorTags: state.requestErrorTags,
+      startTime: Number.isFinite(attemptStartTime) ? attemptStartTime : undefined,
+      duration: task.meta?.__ddTestOptAttemptDurations?.[attemptIndex],
       testStartLine: task.location?.line,
       testExecutionId,
       ...testSuiteStore,

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

@@ -300,8 +300,7 @@ function configureEfdSuiteTracker (testFilepaths, repositoryRoot) {
  * @param {boolean} hasNewTest
  */
 function reserveEarlyFlakeDetectionSuite (testSuite, hasNewTest) {
-  if (!isEfdSuiteAdmissionEnabled || typeof testSuite !== 'string') return false
-  if (isEarlyFlakeDetectionFaulty) return false
+  if (!isEfdSuiteAdmissionEnabled || typeof testSuite !== 'string' || isEarlyFlakeDetectionFaulty) return false
 
   if (hasNewTest) {
     suitesWithNewTests.add(testSuite)
@@ -1201,11 +1200,7 @@ function getSortWrapper (sort, frameworkVersion) {
 
 function getFinishWrapper (exitOrClose) {
   return async function () {
-    if (finishedSessionContexts.has(this)) {
-      return exitOrClose.apply(this, arguments)
-    }
-
-    if (!testSessionFinishCh.hasSubscribers) {
+    if (finishedSessionContexts.has(this) || !testSessionFinishCh.hasSubscribers) {
       return exitOrClose.apply(this, arguments)
     }
     finishedSessionContexts.add(this)
@@ -1230,15 +1225,15 @@ function getFinishWrapper (exitOrClose) {
     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'
+      (test.result?.state === 'pass' || test.result?.state === 'fail')
     )
     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 testSessionEmptyReason = hasErrors || hasExecutedTests
+      ? undefined
+      : isEmptyShard
+        ? 'zero_test_shard'
+        : tests.length > 0 || skippedSuites.length > 0 ? 'all_tests_skipped' : 'zero_tests'
     const status = hasErrors ? 'fail' : (testSessionEmptyReason ? 'skip' : 'pass')
     const flushPromise = getChannelPromise(testSessionFinishCh, {
       status,
@@ -1758,8 +1753,7 @@ async function reportTypecheckFile (file, sessionConfiguration, frameworkVersion
 }
 
 async function reportTypecheckResults (result, frameworkVersion, ctx, typechecker, files = result?.files) {
-  if (!testSuiteFinishCh.hasSubscribers) return
-  if (!Array.isArray(result?.files) || !Array.isArray(files)) return
+  if (!testSuiteFinishCh.hasSubscribers || !Array.isArray(result?.files) || !Array.isArray(files)) return
 
   const setupState = ctx && mainProcessSetupStates.get(ctx)
   if (
@@ -2239,8 +2233,6 @@ addHook({
   versions: ['>=5.0.0'],
   filePattern: 'dist/chunks/index.*',
 }, (vitestPackage, frameworkVersion) => {
-  if (!getVitestExport(vitestPackage)) return vitestPackage
-
   wrapVitestInternals(vitestPackage, frameworkVersion)
 
   const typecheckPoolWorker = getTypecheckPoolWorkerExport(vitestPackage)

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

@@ -33,7 +33,7 @@ const testManagementTestsCh = channel('ci:vitest:test-management-tests')
 const modifiedFilesCh = channel('ci:vitest:modified-files')
 
 const CLOSING_SCRIPT_TAG_RE = /<\/script/i
-const SERIALIZED_CONTEXT_PREFIX = '\u0000dd-vitest-context:'
+const SERIALIZED_CONTEXT_PREFIX = '\0dd-vitest-context:'
 
 const workerReportTraceCh = channel('ci:vitest:worker-report:trace')
 const workerReportCoverageCh = channel('ci:vitest:worker-report:coverage')
@@ -299,7 +299,7 @@ function getVitestTestProperties (providedContext, testSuiteAbsolutePath, testNa
 
   return {
     testSuite: testProperties?.testSuite,
-    isNew: Array.isArray(knownTests) ? !knownTests.includes(testName) : false,
+    isNew: Array.isArray(knownTests) && !knownTests.includes(testName),
     isModified: testProperties?.isModified === true,
     isAttemptToFix: testManagementProperties.isAttemptToFix,
     isDisabled: testManagementProperties.isDisabled,

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

@@ -354,8 +354,7 @@ function hasConcurrentTask (tasks) {
   if (!tasks) return false
 
   for (const task of tasks) {
-    if (task.concurrent === true) return true
-    if (hasConcurrentTask(task.tasks)) return true
+    if (task.concurrent === true || hasConcurrentTask(task.tasks)) return true
   }
 
   return false

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

@@ -3,9 +3,9 @@
 const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const { isTrue } = require('../../dd-trace/src/util')
 
-const VITEST_NO_WORKER_INIT_ACTIVE_ENV = 'DD_TEST_OPT_VITEST_NO_WORKER_INIT_ACTIVE'
-
 if (getEnvironmentVariable('DD_VITEST_WORKER') === '1') {
+  const VITEST_NO_WORKER_INIT_ACTIVE_ENV = 'DD_TEST_OPT_VITEST_NO_WORKER_INIT_ACTIVE'
+
   // In no-worker-init mode the main process reports Vitest events from reporter hooks.
   // Loading worker instrumentation here would reintroduce the worker tracer path.
   // eslint-disable-next-line eslint-rules/eslint-process-env

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

@@ -6,6 +6,7 @@ const realSetTimeout = setTimeout
 const { AsyncResource } = require('node:async_hooks')
 const { fileURLToPath } = require('node:url')
 
+const { createFinalFlushTimeoutError, FINAL_FLUSH_TIMEOUT } = require('../../dd-trace/src/ci-visibility/final-flush')
 const { EMPTY_EFD_RETRY_POLICY } = require('../../dd-trace/src/ci-visibility/efd-retry-policy')
 const { RUM_TEST_EXECUTION_ID_COOKIE_NAME } = require('../../dd-trace/src/ci-visibility/rum')
 const { getEnvironmentVariable, getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
@@ -30,6 +31,9 @@ const {
   SCREENSHOT_UPLOAD_RESPONSE,
   sendWebdriverioWorkerMessage,
   SUITE_FINISH,
+  VIDEO_UPLOAD,
+  VIDEO_UPLOAD_FLUSH,
+  VIDEO_UPLOAD_RESPONSE,
   WEBDRIVERIO_WORKER_ENV,
   WEBDRIVERIO_WORKER_EVENT,
   WEBDRIVERIO_WORKER_ORIGIN,
@@ -52,6 +56,8 @@ const logSubmissionFlushCh = channel('ci:log-submission:flush')
 const modifiedFilesCh = channel('ci:mocha:modified-files')
 const screenshotCapabilitiesCh = channel('ci:webdriverio:screenshot:capabilities')
 const screenshotUploadCh = channel('ci:webdriverio:screenshot:upload')
+const videoCapabilitiesCh = channel('ci:webdriverio:video:capabilities')
+const videoUploadCh = channel('ci:webdriverio:video:upload')
 const testManagementTestsCh = channel('ci:mocha:test-management-tests')
 const workerConfigurationCh = channel('ci:mocha:worker:configuration')
 const workerReportLogsCh = channel('ci:mocha:worker-report:logs')
@@ -59,8 +65,10 @@ const workerReportTelemetryCh = channel('ci:mocha:worker-report:telemetry')
 const workerReportTraceCh = channel('ci:mocha:worker-report:trace')
 
 const jasmineAdapterInitCh = tracingChannel('orchestrion:@wdio/jasmine-framework:JasmineAdapter_init')
+const mochaAdapterInitCh = tracingChannel('orchestrion:@wdio/mocha-framework:MochaAdapter_init')
 const baseReporterWaitForSyncCh = tracingChannel('orchestrion:@wdio/runner:BaseReporter_waitForSync')
 const runnerRunCh = tracingChannel('orchestrion:@wdio/runner:Runner_run')
+const runnerStartSessionCh = tracingChannel('orchestrion:@wdio/runner:Runner_startSession')
 const executeAsyncCh = tracingChannel('orchestrion:@wdio/utils:executeAsync')
 const launcherStartInstanceCh = tracingChannel('orchestrion:@wdio/cli:Launcher_startInstance')
 const configParserShardCh = tracingChannel('orchestrion:@wdio/config:ConfigParser_shard')
@@ -80,7 +88,7 @@ const TEST_FRAMEWORK = 'webdriverio'
 const SET_RUM_COOKIE_SCRIPT = 'cookie => { globalThis.document.cookie = cookie }'
 const RUM_FLUSH_WAIT_TIME = getValueFromEnvSources('DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS')
 const isWebdriverioWorker = !!getEnvironmentVariable(WEBDRIVERIO_WORKER_ENV)
-let jasmineWorkerRequestId = 0
+let workerRequestId = 0
 
 const loadCh = channel('dd-trace:instrumentation:load')
 if (loadCh.hasSubscribers) {
@@ -289,8 +297,7 @@ async function preloadRumNavigation () {
   try {
     const browser = this
     const testExecutionId = getRumTestExecutionId(browser)
-    if (!canCorrelateRumBrowser(browser)) return
-    if (!rumRunnerBrowsers.has(browser)) return
+    if (!canCorrelateRumBrowser(browser) || !rumRunnerBrowsers.has(browser)) return
 
     retainRumBrowser(browser)
     if (!testExecutionId) return
@@ -363,9 +370,7 @@ async function handleRumNavigation (context) {
       log.debug("RUM was detected on the page, but it isn't active because the sampling rate is below 100%")
     }
     const testExecutionId = getRumTestExecutionId(browser, isRumActive)
-    if (sampledOut) return
-
-    if (!testExecutionId) {
+    if (sampledOut || !testExecutionId) {
       return
     }
     if (!isRumActive && browser.isBidi) return
@@ -957,6 +962,8 @@ function waitForRumTestStart (context) {
  * @property {boolean|undefined} hasTests
  * @property {number|undefined} exitCode
  * @property {number|undefined} retries
+ * @property {AbortController|undefined} videoController
+ * @property {ReturnType<typeof setTimeout>|undefined} videoFlushTimer
  */
 
 /**
@@ -1019,6 +1026,7 @@ function createWorkerConfiguration () {
     isItrEnabled: false,
     isKnownTestsEnabled: false,
     isTestFailureScreenshotsEnabled: false,
+    isTestFailureVideosEnabled: false,
     isSuitesSkippingEnabled: false,
     isTestDynamicInstrumentationEnabled: false,
     isTestManagementTestsEnabled: false,
@@ -1032,22 +1040,23 @@ function createWorkerConfiguration () {
 }
 
 /**
- * Configures a Jasmine worker and waits for its coordinator-owned optimization settings.
+ * Configures a framework worker before browser session creation using its coordinator-owned settings.
  *
  * @param {{_jrunner?: {env?: {addReporter?: (reporter: object) => void}}, _specs?: string[]}} adapter
  * @param {{
  *   resolveCallback?: (onDone: () => void) => void,
  *   rejectCallback?: (onDone: () => void) => void
  * }} context
+ * @param {'mocha'|'jasmine'} testFrameworkAdapter
  */
-function initializeJasmineWorker (adapter, context) {
+function initializeFrameworkWorker (adapter, context, testFrameworkAdapter) {
   if (!isWebdriverioWorker) {
     return
   }
 
   const specs = adapter?._specs || []
 
-  if (jasmineDoneCh.hasSubscribers) {
+  if (testFrameworkAdapter === JASMINE_FRAMEWORK_ADAPTER && jasmineDoneCh.hasSubscribers) {
     adapter?._jrunner?.env?.addReporter?.({
       /**
        * Publishes run-level failures that are absent from suiteDone.
@@ -1066,11 +1075,11 @@ function initializeJasmineWorker (adapter, context) {
    * @param {() => void} onDone
    */
   const waitForCoordinator = onDone => {
-    const requestId = `${process.pid}-${++jasmineWorkerRequestId}`
+    const requestId = `${process.pid}-${++workerRequestId}`
     let finished = false
 
     /**
-     * Releases Jasmine initialization exactly once.
+     * Releases framework initialization exactly once.
      *
      * @param {object} [configuration]
      */
@@ -1087,7 +1096,7 @@ function initializeJasmineWorker (adapter, context) {
         repositoryRoot: configuration.repositoryRoot,
         specs,
         testFramework: TEST_FRAMEWORK,
-        testFrameworkAdapter: JASMINE_FRAMEWORK_ADAPTER,
+        testFrameworkAdapter,
       })
       onDone()
     }
@@ -1111,7 +1120,7 @@ function initializeJasmineWorker (adapter, context) {
       name: WORKER_READY,
       content: {
         requestId,
-        testFrameworkAdapter: JASMINE_FRAMEWORK_ADAPTER,
+        testFrameworkAdapter,
       },
     }, error => {
       if (error) {
@@ -1327,6 +1336,9 @@ function configureCoordinator (state, response) {
   const screenshotCapabilities = {}
   screenshotCapabilitiesCh.publish(screenshotCapabilities)
   configuration.isTestFailureScreenshotsEnabled = screenshotCapabilities.enabled === true
+  const videoCapabilities = {}
+  videoCapabilitiesCh.publish(videoCapabilities)
+  configuration.isTestFailureVideosEnabled = videoCapabilities.enabled === true
 
   configuration.repositoryRoot = repositoryRoot
   if (err || !libraryConfig) {
@@ -1667,6 +1679,13 @@ function handleWorkerMessage (state, workerRecord, message) {
     return
   }
 
+  if (message.name === WORKER_READY || message.name === CONFIGURATION_REQUEST) {
+    // Watch mode reuses the worker. Keep old requests cancelled while the new run gets a fresh signal.
+    clearTimeout(workerRecord.videoFlushTimer)
+    workerRecord.videoFlushTimer = undefined
+    workerRecord.videoController?.abort(new Error('WebdriverIO video run completed'))
+    workerRecord.videoController = undefined
+  }
   if (message.name === WORKER_READY) {
     initializeCoordinator(state, configuration => {
       if (state.testFrameworkAdapter === JASMINE_FRAMEWORK_ADAPTER) {
@@ -1687,25 +1706,51 @@ function handleWorkerMessage (state, workerRecord, message) {
     handleConfigurationRequest(state, workerRecord, message)
     return
   }
-  if (message.name === SCREENSHOT_UPLOAD) {
+  if (message.name === VIDEO_UPLOAD_FLUSH) {
+    if (message.content?.complete) {
+      clearTimeout(workerRecord.videoFlushTimer)
+      workerRecord.videoFlushTimer = undefined
+      // The worker may have reached its own deadline before the coordinator's timer fires.
+      workerRecord.videoController?.abort(new Error('WebdriverIO video flush completed'))
+      return
+    }
+    const controller = workerRecord.videoController ??= new AbortController()
+    workerRecord.videoFlushTimer ??= setTimeout(() => {
+      controller.abort(createFinalFlushTimeoutError())
+    }, FINAL_FLUSH_TIMEOUT)
+    workerRecord.videoFlushTimer.unref?.()
+    return
+  }
+  if (message.name === SCREENSHOT_UPLOAD || message.name === VIDEO_UPLOAD) {
+    const isVideo = message.name === VIDEO_UPLOAD
+    const uploadCh = isVideo ? videoUploadCh : screenshotUploadCh
     const { requestId, ...content } = message.content || {}
     const respond = (error) => sendWorkerMessage(workerRecord, {
       origin: 'datadog',
-      name: SCREENSHOT_UPLOAD_RESPONSE,
+      name: isVideo ? VIDEO_UPLOAD_RESPONSE : SCREENSHOT_UPLOAD_RESPONSE,
       content: {
         error: error?.message,
         requestId,
       },
     })
-    if (!requestId || !screenshotUploadCh.hasSubscribers) {
-      respond(new Error('WebdriverIO screenshot upload is not available'))
-    } else {
+    if (requestId && uploadCh.hasSubscribers) {
       try {
-        screenshotUploadCh.publish({ ...content, onDone: respond })
+        let signal
+        if (isVideo) {
+          workerRecord.videoController ??= new AbortController()
+          signal = workerRecord.videoController.signal
+        }
+        uploadCh.publish({
+          ...content,
+          signal,
+          onDone: respond,
+        })
       } catch (error) {
-        log.error('WebdriverIO screenshot upload error: %s', error?.message || String(error))
+        log.error('WebdriverIO media upload error: %s', error?.message || String(error))
         respond(error)
       }
+    } else {
+      respond(new Error('WebdriverIO media upload is not available'))
     }
     return
   }
@@ -1732,6 +1777,8 @@ function handleWorkerMessage (state, workerRecord, message) {
  * @param {object} exit
  */
 function handleWorkerExit (state, workerRecord, exit) {
+  clearTimeout(workerRecord.videoFlushTimer)
+  workerRecord.videoController?.abort(new Error('WebdriverIO worker exited during video upload'))
   state.activeWorkers--
   workerRecord.exitCode = exit.exitCode
   workerRecord.retries = exit.retries
@@ -1768,6 +1815,8 @@ function registerWorker (state, worker, specs) {
     hasTests: undefined,
     exitCode: undefined,
     retries: undefined,
+    videoController: undefined,
+    videoFlushTimer: undefined,
   }
   state.activeWorkers++
   if (state.activeWorkers > state.maxActiveWorkers) {
@@ -1917,6 +1966,44 @@ function waitForRumCleanupBeforeSessionEnd (context) {
   context.rumCleanupCallback = cleanupAllRumBrowsers
 }
 
+/**
+ * Opted-in background screenshots must not dismiss dialogs. Preserve explicit customer policies.
+ *
+ * @param {{
+ *   arguments: [{framework?: string, sessionId?: string, automationProtocol?: string}, object],
+ *   self: {_isMultiremote?: boolean, _isMultiRemote?: boolean}
+ * }} context
+ */
+function configureVideoPromptBehavior (context) {
+  if (!testFinishCh.hasSubscribers || getValueFromEnvSources('DD_TEST_FAILURE_VIDEOS_ENABLED', true) !== true) return
+  const [config, capabilities] = context.arguments
+  if (!SUPPORTED_FRAMEWORK_ADAPTERS.has(config?.framework) || 'sessionId' in config ||
+    config.automationProtocol === './protocol-stub.js') return
+  try {
+    const videoCapabilities = {}
+    videoCapabilitiesCh.publish(videoCapabilities)
+    if (!videoCapabilities.enabled) return
+    /** @param {{unhandledPromptBehavior?: unknown}} caps - Capabilities for one browser session. */
+    const withDefault = caps => caps && caps.unhandledPromptBehavior === undefined
+      ? { ...caps, unhandledPromptBehavior: 'ignore' }
+      : caps
+    // Prepare every session before replacing the argument, so a read failure cannot leave partial defaults.
+    context.arguments[1] = (context.self._isMultiremote || context.self._isMultiRemote)
+      ? Object.fromEntries(Object.entries(capabilities).map(([name, options]) => {
+        const session = { ...options }
+        session.capabilities = withDefault(session.capabilities)
+        return [name, session]
+      }))
+      : withDefault(capabilities)
+  } catch (error) {
+    log.error('Error configuring WebdriverIO video prompt handling: %s', error?.message || String(error))
+  }
+}
+
+runnerStartSessionCh.start.subscribe(
+  /** @type {import('node:diagnostics_channel').ChannelListener} */ (configureVideoPromptBehavior)
+)
+
 baseReporterWaitForSyncCh.asyncEnd.subscribe(
   /** @type {import('node:diagnostics_channel').ChannelListener} */ (waitForLogSubmissionAtWorkerExit)
 )
@@ -1974,7 +2061,17 @@ executeAsyncCh.subscribe({
 // @ts-expect-error See the partial tracing-channel subscriber above.
 jasmineAdapterInitCh.subscribe({
   asyncEnd (context) {
-    initializeJasmineWorker(context.result || context.self, context)
+    initializeFrameworkWorker(context.result || context.self, context, JASMINE_FRAMEWORK_ADAPTER)
+  },
+})
+
+// @ts-expect-error See the partial tracing-channel subscriber above.
+mochaAdapterInitCh.subscribe({
+  asyncEnd (context) {
+    // Mocha normally receives worker settings in run(), after WebdriverIO creates its browser session.
+    if (getValueFromEnvSources('DD_TEST_FAILURE_VIDEOS_ENABLED', true) === true) {
+      initializeFrameworkWorker(context.result || context.self, context, MOCHA_FRAMEWORK_ADAPTER)
+    }
   },
 })
 

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

@@ -291,10 +291,7 @@ function dataLength (data) {
   if (data instanceof Blob) {
     return data.size
   }
-  if (ArrayBuffer.isView(data)) {
-    return data.byteLength
-  }
-  if (data instanceof ArrayBuffer) {
+  if (ArrayBuffer.isView(data) || data instanceof ArrayBuffer) {
     return data.byteLength
   }
   let total = 0

package/packages/datadog-plugin-amqplib/src/client.js

@@ -13,8 +13,7 @@ class AmqplibClientPlugin extends ClientPlugin {
   bindStart (ctx) {
     const { channel = {}, method, fields } = ctx
 
-    if (method === 'basic.deliver' || method === 'basic.get') return
-    if (method === 'basic.publish') return
+    if (method === 'basic.deliver' || method === 'basic.get' || method === 'basic.publish') return
 
     const stream = (channel.connection && channel.connection.stream) || {}
     const span = this.startSpan(this.operationName(), {