dd-trace 6.4.0 → 6.6.0

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

@@ -419,7 +419,7 @@ function createMainProcessReporter (reporterState) {
     testSuiteFinishCh.publish({
       status: getDatadogStatus(testSuiteResult),
       deferFlush: true,
-      onFinish: noop,
+      onDone: noop,
       ...testSuiteCtx.currentStore,
     })
     testSuiteContexts.delete(testModuleId)
@@ -784,7 +784,7 @@ function getRepeatedTestReport (task, testName, testSuiteAbsolutePath, testPrope
 
   return {
     errors,
-    finalAttempt: attempts[attempts.length - 1],
+    finalAttempt: attempts.at(-1),
     nonFinalAttempts: attempts.slice(0, -1),
     state,
     status,
@@ -880,7 +880,7 @@ function reportFinalTestAttempt (testReport) {
   const finalAttempt = testReport.finalAttempt
 
   if (status === 'fail') {
-    const error = errors[errors.length - 1] || errors[0]
+    const error = errors.at(-1) || errors[0]
     reportTestAttempt(testReport, finalAttempt || {
       error,
       finalStatus,

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

@@ -16,6 +16,7 @@ const {
   getTestSuitePath,
   isModifiedTest,
 } = require('../../dd-trace/src/plugins/util/test')
+const { getChannelPromise } = require('./helpers/channel')
 const { addHook } = require('./helpers/instrument')
 const noWorkerInit = require('./vitest-main-no-worker-init')
 const {
@@ -38,7 +39,6 @@ const {
   workerReportLogsCh,
   codeCoverageReportCh,
   findExportByName,
-  getChannelPromise,
   getTypeTasks,
   getWorkspaceProject,
   setProvidedContext,
@@ -433,7 +433,8 @@ async function runMainProcessSetup (ctx, frameworkVersion, testSpecifications, s
       err,
       libraryConfig,
       requestErrorTags: receivedRequestErrorTags = {},
-    } = await getChannelPromise(libraryConfigurationCh, frameworkVersion, {
+    } = await getChannelPromise(libraryConfigurationCh, {
+      frameworkVersion,
       isVitestNoWorkerInitActive: shouldInstallNoWorkerInit,
     })
     requestErrorTags = receivedRequestErrorTags
@@ -450,7 +451,7 @@ async function runMainProcessSetup (ctx, frameworkVersion, testSpecifications, s
   resetMainProcessProvidedContext(ctx)
 
   if (testSessionConfigurationCh.hasSubscribers) {
-    testSessionConfiguration = await getChannelPromise(testSessionConfigurationCh, frameworkVersion)
+    testSessionConfiguration = await getChannelPromise(testSessionConfigurationCh, { frameworkVersion }) || {}
     const {
       testSessionId,
       testModuleId,
@@ -494,7 +495,7 @@ async function runMainProcessSetup (ctx, frameworkVersion, testSpecifications, s
 
   if (isKnownTestsEnabled) {
     const currentKnownTestsResponse = knownTestsResponse || await getChannelPromise(knownTestsCh)
-    if (currentKnownTestsResponse.err) {
+    if (!currentKnownTestsResponse || currentKnownTestsResponse.err) {
       isEarlyFlakeDetectionEnabled = false
     } else {
       knownTests = currentKnownTestsResponse.knownTests
@@ -538,12 +539,13 @@ async function runMainProcessSetup (ctx, frameworkVersion, testSpecifications, s
   }
 
   if (isTestManagementTestsEnabled) {
-    const { err, testManagementTests: receivedTestManagementTests } =
+    const testManagementResponse =
       testManagementTestsResponse || await getChannelPromise(testManagementTestsCh)
-    if (err) {
+    if (!testManagementResponse || testManagementResponse.err) {
       isTestManagementTestsEnabled = false
       log.error('Could not get test management tests.')
     } else {
+      const { testManagementTests: receivedTestManagementTests } = testManagementResponse
       testManagementTests = receivedTestManagementTests
       testManagementTestsBySuite = getTestManagementTestsBySuite(receivedTestManagementTests)
       shouldSendTestProperties = true
@@ -558,8 +560,7 @@ async function runMainProcessSetup (ctx, frameworkVersion, testSpecifications, s
 
   if (isImpactedTestsEnabled) {
     const modifiedFilesResponse = await getChannelPromise(modifiedFilesCh)
-    const { err } = modifiedFilesResponse
-    if (err) {
+    if (!modifiedFilesResponse || modifiedFilesResponse.err) {
       log.error('Could not get modified tests.')
     } else {
       modifiedFiles = modifiedFilesResponse.modifiedFiles
@@ -812,18 +813,13 @@ function getFinishWrapper (exitOrClose) {
       return exitOrClose.apply(this, arguments)
     }
 
-    let onFinish
-
-    const flushPromise = new Promise(resolve => {
-      onFinish = resolve
-    })
     const failedSuites = this.state.getFailedFilepaths()
     let error
     if (failedSuites.length) {
       error = new Error(`Test suites failed: ${failedSuites.length}.`)
     }
 
-    testSessionFinishCh.publish({
+    const flushPromise = getChannelPromise(testSessionFinishCh, {
       status: getSessionStatus(this.state),
       testCodeCoverageLinesTotal,
       error,
@@ -833,7 +829,6 @@ function getFinishWrapper (exitOrClose) {
       requestErrorTags,
       vitestPool,
       isVitestNoWorkerInitActive,
-      onFinish,
     })
 
     logTestOptimizationSummary({ attemptToFixExecutions, newTestsWithDynamicNames })
@@ -842,9 +837,7 @@ function getFinishWrapper (exitOrClose) {
 
     // If coverage was generated, publish coverage report channel for upload
     if (coverageRootDir && codeCoverageReportCh.hasSubscribers) {
-      await new Promise((resolve) => {
-        codeCoverageReportCh.publish({ rootDir: coverageRootDir, onDone: resolve })
-      })
+      await getChannelPromise(codeCoverageReportCh, { rootDir: coverageRootDir })
     }
 
     return exitOrClose.apply(this, arguments)
@@ -1213,16 +1206,11 @@ async function reportTypecheckFile (file, sessionConfiguration, frameworkVersion
     testSuiteErrorCh.runStores(testSuiteCtx, () => {})
   }
 
-  let onFinish
-  const onFinishPromise = new Promise(resolve => {
-    onFinish = resolve
-  })
-  testSuiteFinishCh.publish({
+  await getChannelPromise(testSuiteFinishCh, {
+    frameworkVersion,
     status: getTypecheckTaskStatus(file),
-    onFinish,
     ...testSuiteCtx.currentStore,
   })
-  await onFinishPromise
 }
 
 async function reportTypecheckResults (result, frameworkVersion, ctx, typechecker) {
@@ -1234,7 +1222,7 @@ async function reportTypecheckResults (result, frameworkVersion, ctx, typechecke
   }
   const providedContext = getMainProcessProvidedContext(ctx)
   const sessionConfiguration = testSessionConfigurationCh.hasSubscribers
-    ? await getChannelPromise(testSessionConfigurationCh, frameworkVersion)
+    ? await getChannelPromise(testSessionConfigurationCh, { frameworkVersion }) || {}
     : {}
 
   await Promise.all(result.files.map(file => reportTypecheckFile(
@@ -1343,10 +1331,8 @@ function wrapTinyPoolRun (TinyPool) {
 
   shimmer.wrap(TinyPool.prototype, 'run', run => async function () {
     // We have to do this before and after because the threads list gets recycled, that is, the processes are re-created
-    // eslint-disable-next-line unicorn/no-array-for-each
     this.threads.forEach(threadHandler)
     const runResult = await run.apply(this, arguments)
-    // eslint-disable-next-line unicorn/no-array-for-each
     this.threads.forEach(threadHandler)
     return runResult
   })

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

@@ -39,12 +39,6 @@ function findExportByName (pkg, name) {
   }
 }
 
-function getChannelPromise (channelToPublishTo, frameworkVersion, payload) {
-  return new Promise(resolve => {
-    channelToPublishTo.publish({ ...payload, onDone: resolve, frameworkVersion })
-  })
-}
-
 function getTestRunnerExport (testPackage) {
   return findExportByName(testPackage, 'VitestTestRunner') || findExportByName(testPackage, 'TestRunner')
 }
@@ -239,7 +233,6 @@ module.exports = {
   workerReportLogsCh,
   codeCoverageReportCh,
   findExportByName,
-  getChannelPromise,
   getTestRunnerExport,
   getTypeTasks,
   getTestName,

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

@@ -9,6 +9,7 @@ const {
   recordAttemptToFixExecution,
   logAttemptToFixTestExecution,
 } = require('../../dd-trace/src/plugins/util/test')
+const { getChannelPromise } = require('./helpers/channel')
 const { addHook } = require('./helpers/instrument')
 const {
   testStartCh,
@@ -661,11 +662,6 @@ addHook({
     testSuiteStartCh.runStores(testSuiteCtx, () => {})
     const startTestsResponse = await startTests.apply(this, arguments)
 
-    let onFinish = null
-    const onFinishPromise = new Promise(resolve => {
-      onFinish = resolve
-    })
-
     const testTasks = getTypeTasks(startTestsResponse[0].tasks)
     const testEventPromises = []
 
@@ -811,9 +807,10 @@ addHook({
       testSuiteErrorCh.runStores(testSuiteCtx, () => {})
     }
 
-    testSuiteFinishCh.publish({ status: testSuiteResult.state, onFinish, ...testSuiteCtx.currentStore })
-
-    await onFinishPromise
+    await getChannelPromise(testSuiteFinishCh, {
+      status: testSuiteResult.state,
+      ...testSuiteCtx.currentStore,
+    })
 
     return startTestsResponse
   })

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

@@ -3,6 +3,7 @@
 const { tracingChannel } = /** @type {import('node:diagnostics_channel')} */ (require('dc-polyfill'))
 
 const shimmer = require('../../datadog-shimmer')
+const { getSegment } = require('../../dd-trace/src/util')
 const {
   addHook,
   channel,
@@ -106,7 +107,7 @@ function createWrapEmit (emit) {
     }
 
     const ctx = { req }
-    ctx.req.resStatus = headers[0].split(' ')[1]
+    ctx.req.resStatus = getSegment(headers[0], ' ', 1)
 
     emitCh.runStores(ctx, () => {
       try {

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

@@ -94,7 +94,7 @@ class RunInChildContextPlugin extends BaseContextPlugin {
   static retryable = false
 
   bindStart (ctx) {
-    if (SUPPRESSED_CHILD_CONTEXT_SUBTYPES.has(getRunInChildContextSubType(ctx))) {
+    if (SUPPRESSED_CHILD_CONTEXT_SUBTYPES.has(getRunInChildContextSubtype(ctx))) {
       // Pass the active store through unchanged so any nested spans
       // remain parented to the surrounding map/parallel span
       ctx.suppressed = true
@@ -105,7 +105,7 @@ class RunInChildContextPlugin extends BaseContextPlugin {
 }
 
 // runInChildContext has two overloads: `(name, fn, options)` and `(fn, options)`.
-function getRunInChildContextSubType (ctx) {
+function getRunInChildContextSubtype (ctx) {
   const args = ctx.arguments || []
   const opts = typeof args[0] === 'function' ? args[1] : args[2]
   return opts?.subType

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

@@ -16,7 +16,8 @@ const REPLAYED_STATUSES = new Set(['SUCCEEDED', 'FAILED'])
  * @returns {{ stepId: string | undefined, stepData: object | undefined }}
  */
 function getStepDataForNext (ctxImpl) {
-  const stepId = ctxImpl?.getNextStepId?.()
+  // @aws/durable-execution-sdk-js@2.2.0 renames .getNextStepId() to .peekStepId()
+  const stepId = ctxImpl?.peekStepId?.() ?? ctxImpl?.getNextStepId?.()
   const stepData = stepId ? ctxImpl?._executionContext?.getStepData?.(stepId) : undefined
   return { stepId, stepData }
 }

package/packages/datadog-plugin-aws-sdk/src/util.js

@@ -120,8 +120,8 @@ const extractQueueMetadata = queueURL => {
 
   if (parts.length < minParts) return null
 
-  const accountId = parts[parts.length - 2]
-  const queueName = parts[parts.length - 1]
+  const accountId = parts.at(-2)
+  const queueName = parts.at(-1)
   const host = hasScheme ? parts[1] : parts[0]
 
   let region = 'us-east-1' // Default region if not found in URL

package/packages/datadog-plugin-cucumber/src/index.js

@@ -72,6 +72,7 @@ class CucumberPlugin extends CiPlugin {
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
       isParallel,
+      onDone,
     }) => {
       this._exportPendingWorkerTraces()
       const {
@@ -127,7 +128,7 @@ class CucumberPlugin extends CiPlugin {
       })
 
       this.libraryConfig = null
-      this.tracer._exporter.flush()
+      this.tracer._exporter.flush(onDone)
     })
 
     this.addSub('ci:cucumber:test-suite:start', ({
@@ -438,7 +439,7 @@ class CucumberPlugin extends CiPlugin {
         const isModified = isModifiedTest(
           testScenarioPath,
           scenario.location.line,
-          scenario.steps[scenario.steps.length - 1].location.line,
+          scenario.steps.at(-1).location.line,
           modifiedFiles,
           'cucumber'
         )

package/packages/datadog-plugin-cypress/src/cypress-plugin.js

@@ -2,15 +2,15 @@
 
 // Capture real timers at module load, before any test can install fake timers.
 const { performance } = require('perf_hooks')
-const { statSync } = require('node:fs')
 const { basename } = require('node:path')
 const dateNow = Date.now
 
 const { createCoverageMap } = require('../../../vendor/dist/istanbul-lib-coverage')
 const satisfies = require('../../../vendor/dist/semifies')
+const { RUM_TEST_EXECUTION_ID_COOKIE_NAME } = require('../../dd-trace/src/ci-visibility/rum')
 const {
   TEST_STATUS,
-  TEST_IS_RUM_ACTIVE,
+  setRumTestTags,
   TEST_CODE_OWNERS,
   getTestEnvironmentMetadata,
   getTestLevelsMetadataTags,
@@ -79,14 +79,19 @@ const {
   getMaxEfdRetryCount,
   getPullRequestBaseBranch,
   TEST_FINAL_STATUS,
-  TEST_FAILURE_SCREENSHOT_UPLOADED,
-  TEST_FAILURE_SCREENSHOT_UPLOAD_ERROR,
   getTestOptimizationRequestResults,
 } = require('../../dd-trace/src/plugins/util/test')
 const { isMarkedAsUnskippable } = require('../../datadog-plugin-jest/src/util')
 const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const getConfig = require('../../dd-trace/src/config')
+const {
+  SCREENSHOT_UPLOAD_RESULT_ERROR,
+  SCREENSHOT_UPLOAD_RESULT_UPLOADED,
+  getScreenshotCapturedAtMs,
+  getScreenshotUploadResult,
+  setScreenshotUploadTags,
+} = require('../../dd-trace/src/ci-visibility/test-screenshot')
 const { appClosing: appClosingTelemetry } = require('../../dd-trace/src/telemetry')
 const log = require('../../dd-trace/src/log')
 
@@ -141,8 +146,6 @@ const CYPRESS_STATUS_TO_TEST_STATUS = {
 }
 
 const SCREENSHOT_ATTEMPT_RE = /\(attempt \d+\)/
-const SCREENSHOT_UPLOAD_RESULT_UPLOADED = 'uploaded'
-const SCREENSHOT_UPLOAD_RESULT_ERROR = 'error'
 
 function getScreenshotFilePath (screenshot) {
   return typeof screenshot === 'string' ? screenshot : screenshot?.path
@@ -155,31 +158,6 @@ function isFailureScreenshotByMetadata (screenshot, screenshotFilePath) {
   return screenshotFilePath.includes('(failed)')
 }
 
-/**
- * Resolves a screenshot's capture time (epoch ms) for the media upload. Cypress
- * screenshot objects carry an ISO `takenAt`; falls back to the file's mtime, then
- * to the current time. Stamped once here and reused on retry via the idempotency
- * key, so the stored object is overwritten rather than duplicated.
- *
- * @param {object|string} screenshot - Cypress screenshot object or path
- * @param {string} filePath - Resolved screenshot file path
- * @returns {number} Capture time in epoch milliseconds
- */
-function getScreenshotCapturedAtMs (screenshot, filePath) {
-  const takenAt = screenshot !== null && typeof screenshot === 'object' ? screenshot.takenAt : undefined
-  if (takenAt) {
-    const parsedMs = new Date(takenAt).getTime()
-    if (Number.isInteger(parsedMs) && parsedMs > 0) {
-      return parsedMs
-    }
-  }
-  try {
-    return Math.floor(statSync(filePath).mtimeMs)
-  } catch {
-    return dateNow()
-  }
-}
-
 function isFailureScreenshotForUpload (screenshot) {
   const screenshotFilePath = getScreenshotFilePath(screenshot)
   if (!screenshotFilePath) {
@@ -240,27 +218,6 @@ function getTestScreenshots (cypressTest, attemptIndex, specScreenshots) {
   return specScreenshots.filter(screenshot => isScreenshotForTestAttempt(screenshot, titleParts, attemptIndex))
 }
 
-function getScreenshotUploadResult (uploadResults) {
-  let hasUploaded = false
-  for (const uploadResult of uploadResults) {
-    if (uploadResult === SCREENSHOT_UPLOAD_RESULT_ERROR) {
-      return SCREENSHOT_UPLOAD_RESULT_ERROR
-    }
-    if (uploadResult === SCREENSHOT_UPLOAD_RESULT_UPLOADED) {
-      hasUploaded = true
-    }
-  }
-  return hasUploaded ? SCREENSHOT_UPLOAD_RESULT_UPLOADED : undefined
-}
-
-function setScreenshotUploadTags (testSpan, uploadResult) {
-  if (uploadResult === SCREENSHOT_UPLOAD_RESULT_ERROR) {
-    testSpan.setTag(TEST_FAILURE_SCREENSHOT_UPLOAD_ERROR, 'true')
-  } else if (uploadResult === SCREENSHOT_UPLOAD_RESULT_UPLOADED) {
-    testSpan.setTag(TEST_FAILURE_SCREENSHOT_UPLOADED, 'true')
-  }
-}
-
 function getSessionStatus (summary) {
   if (summary.totalFailed !== undefined && summary.totalFailed > 0) {
     return 'fail'
@@ -901,6 +858,12 @@ class CypressPlugin {
           if (isFlakyTestRetriesEnabled && this.isTestIsolationEnabled) {
             this.isFlakyTestRetriesEnabled = true
             this.flakyTestRetriesCount = flakyTestRetriesCount ?? 0
+            if (typeof this.cypressConfig.retries === 'number') {
+              this.cypressConfig.retries = {
+                openMode: this.cypressConfig.retries,
+                runMode: this.cypressConfig.retries,
+              }
+            }
             this.cypressConfig.retries.runMode = this.flakyTestRetriesCount
           } else {
             this.flakyTestRetriesCount = 0
@@ -1444,13 +1407,13 @@ class CypressPlugin {
     // and create a skipped test span for each of them
     for (const { title } of cypressTests) {
       const cypressTestName = title.join(' ')
-      const isTestFinished = finishedTests.find(({ testName }) => cypressTestName === testName)
+      const isTestFinished = finishedTests.some(({ testName }) => cypressTestName === testName)
 
       if (isTestFinished) {
         continue
       }
 
-      const isSkippedByItr = this.testsToSkip.find(test =>
+      const isSkippedByItr = this.testsToSkip.some(test =>
         cypressTestName === test.name && spec.relative === test.suite
       )
       const testSourceFile = spec.absolute && this.repositoryRoot
@@ -1721,6 +1684,7 @@ class CypressPlugin {
           repositoryRoot: this.repositoryRoot,
           isTestIsolationEnabled: this.isTestIsolationEnabled,
           rumFlushWaitMillis: this.rumFlushWaitMillis,
+          rumTestExecutionIdCookieName: RUM_TEST_EXECUTION_ID_COOKIE_NAME,
         }
 
         this.testSuiteSpan ||= this.getTestSuiteSpan({ testSuite, testSuiteAbsolutePath })
@@ -1847,9 +1811,7 @@ class CypressPlugin {
         if (error) {
           this.activeTestSpan.setTag('error', error)
         }
-        if (isRUMActive) {
-          this.activeTestSpan.setTag(TEST_IS_RUM_ACTIVE, 'true')
-        }
+        setRumTestTags(this.activeTestSpan, isRUMActive)
         // Source-line resolution strategy:
         // 1. If plain JS and no source map, trust invocationDetails.line directly.
         // 2. Otherwise, try invocationDetails.stack line mapped through source map.

package/packages/datadog-plugin-cypress/src/index.js

@@ -80,7 +80,12 @@ class CypressPlugin extends Plugin {
         // Already initialized by manual plugin call — just chain user handlers.
         // Pass the plugin's afterScreenshot so chaining a user handler doesn't drop the upload
         // (the chained registration replaces the one plugin.js set, so it must include it).
-        for (const h of userAfterSpecHandlers) on('after:spec', h)
+        if (userAfterSpecHandlers.length > 0) {
+          on('after:spec', (spec, results) => userAfterSpecHandlers.reduce(
+            (chain, handler) => chain.then(() => handler(spec, results)),
+            Promise.resolve()
+          ))
+        }
         registerAfterScreenshot(datadogAfterScreenshotHandler)
         registerAfterRunWithCleanup()
         payload.registered = true

package/packages/datadog-plugin-cypress/src/support.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const DD_CIVISIBILITY_TEST_EXECUTION_ID_COOKIE_NAME = 'datadog-ci-visibility-test-execution-id'
 let rumFlushWaitMillis = 500
+let rumTestExecutionIdCookieName
 
 let isEarlyFlakeDetectionEnabled = false
 let isKnownTestsEnabled = false
@@ -129,6 +129,89 @@ function runBeforeEachTask (test) {
   })
 }
 
+/**
+ * @param {string} message
+ * @param {unknown} error
+ * @returns {false}
+ */
+function logRumCorrelationCookieError (message, error) {
+  try {
+    Cypress.log({
+      name: 'dd-trace',
+      message,
+      consoleProps: () => ({ Error: error }),
+    })
+  } catch (loggingError) {
+    // eslint-disable-next-line no-console
+    console.error(message, error, loggingError)
+  }
+  return false
+}
+
+/**
+ * @param {unknown} error
+ * @returns {false}
+ */
+function handleRumCorrelationCookieError (error) {
+  return logRumCorrelationCookieError('Could not set the RUM correlation cookie', error)
+}
+
+/**
+ * @param {unknown} error
+ * @returns {false}
+ */
+function handleRumCorrelationCookieCleanupError (error) {
+  return logRumCorrelationCookieError('Could not clear the previous RUM correlation cookie', error)
+}
+
+/**
+ * @param {string} traceId
+ * @returns {Promise<boolean>}
+ */
+function setRumCorrelationCookie (traceId) {
+  if (typeof cy.now !== 'function') {
+    return Cypress.Promise.resolve(handleRumCorrelationCookieError(new Error('Cypress cy.now is not available')))
+  }
+
+  let clearCookiePromise = Cypress.Promise.resolve()
+  if (!isTestIsolationEnabled) {
+    clearCookiePromise = Cypress.Promise.try(() => {
+      return cy.now('clearCookie', rumTestExecutionIdCookieName, { log: false })
+    }).then(undefined, handleRumCorrelationCookieCleanupError)
+  }
+
+  return clearCookiePromise.then(() => {
+    return Cypress.Promise.try(() => {
+      return cy.now('setCookie', rumTestExecutionIdCookieName, traceId, { log: false })
+    })
+  }).then(() => true, handleRumCorrelationCookieError)
+}
+
+/**
+ * @param {boolean} isCookieSet
+ * @returns {void}
+ */
+function restartRumSession (isCookieSet) {
+  if (!isCookieSet || isTestIsolationEnabled || !originalWindow) {
+    return
+  }
+
+  const rum = safeGetRum(originalWindow)
+  if (rum) {
+    try {
+      const evt = new originalWindow.MouseEvent('click', { bubbles: true, cancelable: true })
+      // The browser-sdk addEventListener wrapper filters out untrusted synthetic events
+      // unless __ddIsTrusted is set. Set it so the click triggers expandOrRenewSession().
+      // See: https://github.com/DataDog/browser-sdk/blob/v6.27.1/packages/core/src/browser/addEventListener.ts#L119
+      Object.defineProperty(evt, '__ddIsTrusted', { value: true })
+      originalWindow.dispatchEvent(evt)
+    } catch {}
+    if (rum.startView) {
+      rum.startView()
+    }
+  }
+}
+
 // Catch test failures for quarantined tests and suppress them
 // By not re-throwing the error, Cypress marks the test as passed
 // This allows quarantined tests to run but not affect the exit code
@@ -150,6 +233,8 @@ Cypress.on('fail', (err, runnable) => {
   // If command:end fired for all commands (none in-flight) but the last command
   // has no error, it means command:end fired before the error was attached to it.
   if (!hadInFlightCommands && currentTestCommands.length > 0) {
+    // We have to support very old cypress versions in v5
+    // eslint-disable-next-line unicorn/prefer-at
     const lastCommand = currentTestCommands[currentTestCommands.length - 1]
     if (!lastCommand.error) {
       lastCommand.error = { message: err.message, stack: err.stack, name: err.name }
@@ -316,36 +401,16 @@ beforeEach(function () {
     if (shouldDiscard) {
       this.currentTest._ddShouldDiscard = true
     }
+    let rumCookiePromise
     if (traceId) {
-      cy.setCookie(DD_CIVISIBILITY_TEST_EXECUTION_ID_COOKIE_NAME, traceId).then(() => {
-        // When testIsolation:false, the page is not reset between tests, so the RUM session
-        // stopped in afterEach must be explicitly restarted so events in this test are
-        // associated with the new testExecutionId.
-        //
-        // After stopSession(), the RUM SDK creates a new session upon a user interaction
-        // (click, scroll, keydown, or touchstart). We dispatch a synthetic click on the window
-        // to trigger session renewal, then call startView() to establish a view boundary.
-        if (!isTestIsolationEnabled && originalWindow) {
-          const rum = safeGetRum(originalWindow)
-          if (rum) {
-            try {
-              const evt = new originalWindow.MouseEvent('click', { bubbles: true, cancelable: true })
-              // The browser-sdk addEventListener wrapper filters out untrusted synthetic events
-              // unless __ddIsTrusted is set. Set it so the click triggers expandOrRenewSession().
-              // See: https://github.com/DataDog/browser-sdk/blob/v6.27.1/packages/core/src/browser/addEventListener.ts#L119
-              Object.defineProperty(evt, '__ddIsTrusted', { value: true })
-              originalWindow.dispatchEvent(evt)
-            } catch {}
-            if (rum.startView) {
-              rum.startView()
-            }
-          }
-        }
-      })
+      rumCookiePromise = setRumCorrelationCookie(traceId)
     }
     if (shouldSkip) {
       this.skip()
     }
+    if (rumCookiePromise) {
+      return rumCookiePromise.then(restartRumSession)
+    }
   }).then(() => {
     // Clear any commands accumulated during DD-owned setup (e.g. setCookie, RUM restart)
     // so they are not reported as user test steps.
@@ -370,6 +435,7 @@ before(function () {
       isImpactedTestsEnabled = suiteConfig.isImpactedTestsEnabled
       isModifiedTest = suiteConfig.isModifiedTest
       isTestIsolationEnabled = suiteConfig.isTestIsolationEnabled
+      rumTestExecutionIdCookieName = suiteConfig.rumTestExecutionIdCookieName
       if (Number.isFinite(suiteConfig.rumFlushWaitMillis)) {
         rumFlushWaitMillis = suiteConfig.rumFlushWaitMillis
       }

package/packages/datadog-plugin-electron/src/ipc.js

@@ -46,7 +46,7 @@ class ElectronRendererReceivePlugin extends ConsumerPlugin {
 
     if (channel?.startsWith('datadog:')) return
 
-    const childOf = this._tracer.extract('text_map', args[args.length - 1])
+    const childOf = this._tracer.extract('text_map', args.at(-1))
 
     if (childOf) {
       args.pop()