dd-trace 6.6.0 → 6.8.0

package/packages/datadog-plugin-rhea/src/consumer.js

@@ -15,12 +15,27 @@ class RheaConsumerPlugin extends ConsumerPlugin {
     })
   }
 
+  start (ctx) {
+    if (!this.config.dsmEnabled) return
+    const { msgObj } = ctx
+    if (!msgObj?.message?.delivery_annotations) return
+
+    const { span } = ctx.currentStore
+    const name = getResourceNameFromMessage(msgObj)
+    const payloadSize = getAmqpMessageSize(
+      { headers: msgObj.message.delivery_annotations, content: msgObj.message.body }
+    )
+    this.tracer.decodeDataStreamsContext(msgObj.message.delivery_annotations)
+    this.tracer
+      .setCheckpoint(['direction:in', `topic:${name}`, 'type:rabbitmq'], span, payloadSize)
+  }
+
   bindStart (ctx) {
     const { msgObj } = ctx
     const name = getResourceNameFromMessage(msgObj)
     const childOf = extractTextMap(msgObj, this.tracer)
 
-    const span = this.startSpan({
+    this.startSpan({
       childOf,
       resource: name,
       type: 'worker',
@@ -31,18 +46,6 @@ class RheaConsumerPlugin extends ConsumerPlugin {
       },
     }, ctx)
 
-    if (
-      this.config.dsmEnabled &&
-      msgObj?.message?.delivery_annotations
-    ) {
-      const payloadSize = getAmqpMessageSize(
-        { headers: msgObj.message.delivery_annotations, content: msgObj.message.body }
-      )
-      this.tracer.decodeDataStreamsContext(msgObj.message.delivery_annotations)
-      this.tracer
-        .setCheckpoint(['direction:in', `topic:${name}`, 'type:rabbitmq'], span, payloadSize)
-    }
-
     return ctx.currentStore
   }
 }

package/packages/datadog-plugin-rhea/src/producer.js

@@ -37,7 +37,7 @@ class RheaProducerPlugin extends ProducerPlugin {
 
 function addDeliveryAnnotations (msg, tracer, span) {
   if (msg) {
-    msg.delivery_annotations = msg.delivery_annotations || {}
+    msg.delivery_annotations ||= {}
 
     tracer.inject(span, 'text_map', msg.delivery_annotations)
 

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

@@ -7,6 +7,7 @@ const formats = require('../../../ext/formats')
 const HTTP_HEADERS = formats.HTTP_HEADERS
 const log = require('../../dd-trace/src/log')
 const { buildClientHttpUrl } = require('../../dd-trace/src/plugins/util/url')
+const { stripQueryAndFragment } = require('../../dd-trace/src/util')
 const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 
 const {
@@ -62,7 +63,7 @@ class UndiciPlugin extends HttpClientPlugin {
 
     const host = port ? `${hostname}:${port}` : hostname
     const base = `${protocol}//${host}`
-    const pathname = path.split(/[?#]/)[0]
+    const pathname = stripQueryAndFragment(path)
     const uri = `${base}${pathname}`
 
     const allowed = this.config.filter(uri)

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

@@ -5,6 +5,7 @@ const { storage } = require('../../datadog-core')
 
 const {
   TEST_STATUS,
+  TEST_TYPE,
   VITEST_POOL,
   finishAllTraceSpans,
   getTestSuitePath,
@@ -36,6 +37,10 @@ const {
   TEST_HAS_DYNAMIC_NAME,
   TEST_FINAL_STATUS,
   TEST_IS_TEST_FRAMEWORK_WORKER,
+  TEST_BROWSER_DRIVER,
+  TEST_BROWSER_NAME,
+  TEST_IS_RUM_ACTIVE,
+  TEST_PARAMETERS,
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const {
@@ -50,6 +55,28 @@ const { DD_MAJOR } = require('../../../version')
 // This is because there's some loss of resolution.
 const MILLISECONDS_TO_SUBTRACT_FROM_FAILED_TEST_DURATION = 5
 
+function setBrowserTags (tags, browserEnvironment, includeParameters) {
+  if (!browserEnvironment.isBrowserMode) return
+
+  tags[TEST_TYPE] = 'browser'
+  if (browserEnvironment.browserDriver) {
+    tags[TEST_BROWSER_DRIVER] = browserEnvironment.browserDriver
+  }
+  if (browserEnvironment.browserName) {
+    tags[TEST_BROWSER_NAME] = browserEnvironment.browserName
+  }
+  if (includeParameters && (browserEnvironment.browserName || browserEnvironment.browserProjectName)) {
+    const parameters = {}
+    if (browserEnvironment.browserName) {
+      parameters.browser = browserEnvironment.browserName
+    }
+    if (browserEnvironment.browserProjectName) {
+      parameters.project = browserEnvironment.browserProjectName
+    }
+    tags[TEST_PARAMETERS] = JSON.stringify({ arguments: parameters, metadata: {} })
+  }
+}
+
 class VitestPlugin extends CiPlugin {
   static id = 'vitest'
 
@@ -100,6 +127,14 @@ class VitestPlugin extends CiPlugin {
         isModified,
         isTestFrameworkWorker,
         requestErrorTags,
+        isBrowserMode,
+        browserDriver,
+        browserName,
+        browserProjectName,
+        isRumActive,
+        testExecutionId,
+        testStartLine,
+        startTime,
       } = ctx
 
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
@@ -109,6 +144,7 @@ class VitestPlugin extends CiPlugin {
       const extraTags = {
         ...requestErrorTags,
         [TEST_SOURCE_FILE]: testSuite,
+        [TEST_SOURCE_START]: testStartLine || 1,
       }
       if (isRetry) {
         extraTags[TEST_IS_RETRY] = 'true'
@@ -143,12 +179,23 @@ class VitestPlugin extends CiPlugin {
       if (isTestFrameworkWorker) {
         extraTags[TEST_IS_TEST_FRAMEWORK_WORKER] = 'true'
       }
+      if (isRumActive) {
+        extraTags[TEST_IS_RUM_ACTIVE] = 'true'
+      }
+      setBrowserTags(extraTags, {
+        browserDriver,
+        browserName,
+        browserProjectName,
+        isBrowserMode,
+      }, true)
 
       const span = this.startTestSpan(
         testName,
         testSuite,
         testSuiteSpan,
-        extraTags
+        extraTags,
+        testExecutionId,
+        startTime
       )
 
       ctx.parentStore = store
@@ -297,25 +344,41 @@ class VitestPlugin extends CiPlugin {
       testSuiteAbsolutePath,
       isNew,
       isDisabled,
+      isRumActive,
       isTestFrameworkWorker,
       requestErrorTags,
       testSuiteSpan,
+      isBrowserMode,
+      browserDriver,
+      browserName,
+      browserProjectName,
+      testExecutionId,
+      testStartLine,
     }) => {
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
+      const extraTags = {
+        ...requestErrorTags,
+        [TEST_SOURCE_FILE]: testSuite,
+        [TEST_SOURCE_START]: testStartLine || 1,
+        [TEST_STATUS]: 'skip',
+        [TEST_FINAL_STATUS]: 'skip',
+        ...(isDisabled ? { [TEST_MANAGEMENT_IS_DISABLED]: 'true' } : {}),
+        ...(isNew ? { [TEST_IS_NEW]: 'true' } : {}),
+        ...(isRumActive ? { [TEST_IS_RUM_ACTIVE]: 'true' } : {}),
+        ...(isTestFrameworkWorker ? { [TEST_IS_TEST_FRAMEWORK_WORKER]: 'true' } : {}),
+      }
+      setBrowserTags(extraTags, {
+        browserDriver,
+        browserName,
+        browserProjectName,
+        isBrowserMode,
+      }, true)
       const testSpan = this.startTestSpan(
         testName,
         testSuite,
         testSuiteSpan || this.testSuiteSpan,
-        {
-          ...requestErrorTags,
-          [TEST_SOURCE_FILE]: testSuite,
-          [TEST_SOURCE_START]: 1, // we can't get the proper start line in vitest
-          [TEST_STATUS]: 'skip',
-          [TEST_FINAL_STATUS]: 'skip',
-          ...(isDisabled ? { [TEST_MANAGEMENT_IS_DISABLED]: 'true' } : {}),
-          ...(isNew ? { [TEST_IS_NEW]: 'true' } : {}),
-          ...(isTestFrameworkWorker ? { [TEST_IS_TEST_FRAMEWORK_WORKER]: 'true' } : {}),
-        }
+        extraTags,
+        testExecutionId
       )
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', this.getTestTelemetryTags(testSpan))
       testSpan.finish()
@@ -330,6 +393,10 @@ class VitestPlugin extends CiPlugin {
         frameworkVersion,
         isTestFrameworkWorker,
         isVitestNoWorkerInitActive,
+        isBrowserMode,
+        browserDriver,
+        browserName,
+        browserProjectName,
       } = ctx
 
       const testCommand = ctx.testCommand || 'vitest run'
@@ -377,6 +444,12 @@ class VitestPlugin extends CiPlugin {
       if (isTestFrameworkWorker) {
         testSuiteMetadata[TEST_IS_TEST_FRAMEWORK_WORKER] = 'true'
       }
+      setBrowserTags(testSuiteMetadata, {
+        browserDriver,
+        browserName,
+        browserProjectName,
+        isBrowserMode,
+      }, false)
 
       const codeOwners = this.getCodeOwners(testSuiteMetadata)
       if (codeOwners) {

package/packages/datadog-webpack/index.js

@@ -141,7 +141,7 @@ class DatadogWebpackPlugin {
         // (#8980); absent peers stay opaque, so a build that does not opt into the feature does
         // not follow their dependency chain (#8635).
         if (matchesOptionalPeerFile(normalizedResource)) {
-          createData.loaders = createData.loaders || []
+          createData.loaders ||= []
           createData.loaders.push({ loader: require.resolve('./src/optional-peer-loader') })
           log.debug('INLINE: optional-peer loader applied to %s', normalizedResource)
           return
@@ -188,7 +188,7 @@ class DatadogWebpackPlugin {
         const version = packageJson.version
         const pkgPath = request === pkg ? pkg : `${pkg}/${modulePath}`
 
-        createData.loaders = createData.loaders || []
+        createData.loaders ||= []
         createData.loaders.unshift({
           loader: require.resolve('./src/loader'),
           options: { pkg, version, path: pkgPath },

package/packages/dd-trace/src/appsec/downstream_requests.js

@@ -307,7 +307,7 @@ function parseBody (body, contentType) {
       const formBody = Buffer.isBuffer(body) ? body.toString('utf8') : String(body)
       const params = new URLSearchParams(formBody)
       const result = {}
-      for (const [key, value] of params.entries()) {
+      for (const [key, value] of params) {
         if (key in result) {
           const existing = result[key]
           if (Array.isArray(existing)) {

package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-base-analyzer.js

@@ -56,7 +56,7 @@ class HardcodedBaseAnalyzer extends Analyzer {
   }
 
   _getEvidence (value) {
-    return { value: `${value.data}` }
+    return { value: value.data }
   }
 
   _getLocation (value) {

package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-password-analyzer.js

@@ -11,7 +11,7 @@ class HardcodedPasswordAnalyzer extends HardcodedBaseAnalyzer {
   }
 
   _getEvidence (value) {
-    return { value: `${value.ident}` }
+    return { value: value.ident }
   }
 }
 

package/packages/dd-trace/src/appsec/iast/analyzers/sql-injection-analyzer.js

@@ -74,7 +74,7 @@ class SqlInjectionAnalyzer extends StoredInjectionAnalyzer {
   }
 
   analyze (value, store, dialect) {
-    store = store || storage('legacy').getStore()
+    store ||= storage('legacy').getStore()
     if (!(store && store.sqlAnalyzed)) {
       super.analyze(value, store, dialect)
     }

package/packages/dd-trace/src/appsec/iast/taint-tracking/taint-tracking-impl.js

@@ -215,9 +215,7 @@ function getTaintTrackingImpl (telemetryVerbosity, dummy = false) {
   if (dummy) return TaintTrackingNoop
 
   // with Verbosity.DEBUG every invocation of a TaintedUtils method increases the EXECUTED_PROPAGATION metric
-  return isDebugAllowed(telemetryVerbosity)
-    ? createImplWith(getContextDebug)
-    : createImplWith(getContextDefault)
+  return createImplWith(isDebugAllowed(telemetryVerbosity) ? getContextDebug : getContextDefault)
 }
 
 function getTaintTrackingNoop () {

package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/utils.js

@@ -35,7 +35,7 @@ function stringifyWithRanges (obj, objRanges, loadSensitiveRanges = false) {
   let value
   const ranges = []
   const sensitiveRanges = []
-  objRanges = objRanges || {}
+  objRanges ||= {}
 
   if (objRanges || loadSensitiveRanges) {
     const cloneObj = Array.isArray(obj) ? [] : {}

package/packages/dd-trace/src/appsec/iast/vulnerability-reporter.js

@@ -21,7 +21,7 @@ let stackTraceMaxDepth
 let maxStackTraces
 
 function canAddVulnerability (vulnerability) {
-  const hasRequiredFields = vulnerability?.evidence && vulnerability?.type && vulnerability?.location
+  const hasRequiredFields = vulnerability?.evidence && vulnerability.type && vulnerability.location
   if (!hasRequiredFields) return false
 
   const isDuplicated = deduplicationEnabled && isDuplicatedVulnerability(vulnerability)
@@ -64,7 +64,7 @@ function addVulnerability (iastContext, vulnerability, callSiteFrames) {
   }
 
   if (iastContext?.rootSpan) {
-    iastContext[VULNERABILITIES_KEY] = iastContext[VULNERABILITIES_KEY] || []
+    iastContext[VULNERABILITIES_KEY] ||= []
     iastContext[VULNERABILITIES_KEY].push(vulnerability)
   } else {
     sendVulnerabilities([vulnerability], span)

package/packages/dd-trace/src/appsec/sdk/track_event.js

@@ -160,7 +160,7 @@ function flattenFields (fields, depth = 0) {
 
     if (value && typeof value === 'object') {
       const { result: flatValue, truncated: inheritTruncated } = flattenFields(value, depth + 1)
-      truncated = truncated || inheritTruncated
+      truncated ||= inheritTruncated
 
       if (flatValue) {
         for (const flatKey of Object.keys(flatValue)) {

package/packages/dd-trace/src/appsec/waf/waf_manager.js

@@ -39,7 +39,7 @@ class WAFManager {
       const { obfuscatorKeyRegex, obfuscatorValueRegex } = this.config
       return new DDWAF(rules, WAFManager.defaultWafConfigPath, { obfuscatorKeyRegex, obfuscatorValueRegex })
     } catch (err) {
-      this.ddwafVersion = this.ddwafVersion || 'unknown'
+      this.ddwafVersion ||= 'unknown'
       Reporter.reportWafInit(this.ddwafVersion, 'unknown')
 
       log.error('[ASM] AppSec could not load native package. In-app WAF features will not be available.', err)

package/packages/dd-trace/src/ci-visibility/exporters/ci-validation/sink.js

@@ -303,10 +303,11 @@ function writeNewFile (filename, payload) {
  *
  * @param {string} directory directory path
  * @param {string} label directory label
- * @returns {{dev: number, ino: number}} stable directory identity
+ * @returns {{dev: bigint, ino: bigint}} stable directory identity
  */
 function captureDirectory (directory, label) {
-  const stat = fs.lstatSync(directory)
+  // Windows file reference numbers exceed 2^53, where distinct directories round to one number.
+  const stat = fs.lstatSync(directory, { bigint: true })
   if (!stat.isDirectory() || stat.isSymbolicLink()) {
     throw new Error(`Offline Test Optimization validation ${label} must be a regular directory.`)
   }
@@ -317,10 +318,10 @@ function captureDirectory (directory, label) {
  * Creates or validates one child directory without accepting symbolic links.
  *
  * @param {string} parent parent directory path
- * @param {{dev: number, ino: number}} parentIdentity expected parent identity
+ * @param {{dev: bigint, ino: bigint}} parentIdentity expected parent identity
  * @param {string} directory child directory path
  * @param {string} label directory label
- * @returns {{dev: number, ino: number}} stable child identity
+ * @returns {{dev: bigint, ino: bigint}} stable child identity
  */
 function createDirectory (parent, parentIdentity, directory, label) {
   assertDirectoryUnchanged(parent, parentIdentity, 'parent output')
@@ -336,7 +337,7 @@ function createDirectory (parent, parentIdentity, directory, label) {
  * Rejects a directory that changed after sink construction.
  *
  * @param {string} directory directory path
- * @param {{dev: number, ino: number}} identity expected directory identity
+ * @param {{dev: bigint, ino: bigint}} identity expected directory identity
  * @param {string} label directory label
  */
 function assertDirectoryUnchanged (directory, identity, label) {
@@ -351,7 +352,7 @@ function assertDirectoryUnchanged (directory, identity, label) {
  *
  * @param {string} filename partial payload path
  * @param {string} directory expected parent directory
- * @param {{dev: number, ino: number}} identity expected parent identity
+ * @param {{dev: bigint, ino: bigint}} identity expected parent identity
  */
 function removePartialFile (filename, directory, identity) {
   try {

package/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js

@@ -15,11 +15,13 @@ const { uploadCoverageReport: uploadCoverageReportRequest } = require('../reques
 const { uploadTestScreenshot: uploadTestScreenshotRequest } = require('../requests/upload-test-screenshot')
 const { parsers } = require('../../config/parsers')
 const log = require('../../log')
+const { getSegment } = require('../../util')
 const BufferingExporter = require('../../exporters/common/buffering-exporter')
 const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../../plugins/util/tags')
 const { sendGitMetadata: sendGitMetadataRequest } = require('./git/git_metadata')
 
 const hostname = getHostname()
+const EMPTY_SETTINGS = Object.freeze({})
 
 function getTestConfigurationTags (tags) {
   if (!tags) {
@@ -27,8 +29,7 @@ function getTestConfigurationTags (tags) {
   }
   return Object.keys(tags).reduce((acc, key) => {
     if (key.startsWith('test.configuration.')) {
-      const [, configKey] = key.split('test.configuration.')
-      acc[configKey] = tags[key]
+      acc[getSegment(key, 'test.configuration.', 1)] = tags[key]
     }
     return acc
   }, {})
@@ -308,60 +309,58 @@ class CiVisibilityExporter extends BufferingExporter {
   }
 
   // Takes into account potential kill switches
-  filterConfiguration (remoteConfiguration) {
-    if (!remoteConfiguration) {
-      return {}
-    }
+  filterConfiguration (remoteConfiguration = EMPTY_SETTINGS) {
+    const { testOptimization } = this._config
     const {
-      isCodeCoverageEnabled,
-      isSuitesSkippingEnabled,
-      isItrEnabled,
-      requireGit,
-      isEarlyFlakeDetectionEnabled,
+      DD_CIVISIBILITY_EARLY_FLAKE_DETECTION_ENABLED: isEarlyFlakeDetectionAllowed,
+      DD_CIVISIBILITY_FLAKY_RETRY_COUNT: flakyTestRetriesCount = 0,
+      DD_CIVISIBILITY_FLAKY_RETRY_ENABLED: isFlakyTestRetriesAllowed,
+      DD_CIVISIBILITY_IMPACTED_TESTS_DETECTION_ENABLED: isImpactedTestsAllowed,
+      DD_TEST_EARLY_FLAKE_DETECTION_RETRY_COUNT: earlyFlakeDetectionRetryCount,
+      DD_TEST_FAILED_TEST_REPLAY_ENABLED: isFailedTestReplayAllowed,
+      DD_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES: configuredAttemptToFixRetries = 0,
+      DD_TEST_MANAGEMENT_ENABLED: isTestManagementAllowed,
+    } = testOptimization
+    const hasEarlyFlakeDetectionRetryCount = earlyFlakeDetectionRetryCount !== undefined
+    const configuredSlowTestRetries = remoteConfiguration.earlyFlakeDetectionSlowTestRetries ?? EMPTY_SETTINGS
+    const earlyFlakeDetectionSlowTestRetries = hasEarlyFlakeDetectionRetryCount
+      ? Object.freeze({
+        '5s': earlyFlakeDetectionRetryCount,
+        '10s': earlyFlakeDetectionRetryCount,
+        '30s': earlyFlakeDetectionRetryCount,
+        '5m': earlyFlakeDetectionRetryCount,
+      })
+      : Object.isFrozen(configuredSlowTestRetries)
+        ? configuredSlowTestRetries
+        : Object.freeze({ ...configuredSlowTestRetries })
+    const earlyFlakeDetectionNumRetries = hasEarlyFlakeDetectionRetryCount
+      ? earlyFlakeDetectionRetryCount
+      : remoteConfiguration.earlyFlakeDetectionNumRetries ?? 0
+    const testManagementAttemptToFixRetries =
+      remoteConfiguration.testManagementAttemptToFixRetries ?? configuredAttemptToFixRetries
+
+    return Object.freeze({
+      isCodeCoverageEnabled: remoteConfiguration.isCodeCoverageEnabled === true,
+      isSuitesSkippingEnabled: remoteConfiguration.isSuitesSkippingEnabled === true,
+      isItrEnabled: remoteConfiguration.isItrEnabled === true,
+      requireGit: remoteConfiguration.requireGit === true,
+      isEarlyFlakeDetectionEnabled:
+        remoteConfiguration.isEarlyFlakeDetectionEnabled === true && isEarlyFlakeDetectionAllowed === true,
       earlyFlakeDetectionNumRetries,
       earlyFlakeDetectionSlowTestRetries,
-      earlyFlakeDetectionFaultyThreshold,
-      isFlakyTestRetriesEnabled,
-      isDiEnabled,
-      isKnownTestsEnabled,
-      isTestManagementEnabled,
+      earlyFlakeDetectionFaultyThreshold: remoteConfiguration.earlyFlakeDetectionFaultyThreshold ?? 30,
+      isFlakyTestRetriesEnabled:
+        remoteConfiguration.isFlakyTestRetriesEnabled === true && isFlakyTestRetriesAllowed === true,
+      flakyTestRetriesCount,
+      isDiEnabled: remoteConfiguration.isDiEnabled === true && isFailedTestReplayAllowed === true,
+      isKnownTestsEnabled: remoteConfiguration.isKnownTestsEnabled === true,
+      isTestManagementEnabled:
+        remoteConfiguration.isTestManagementEnabled === true && isTestManagementAllowed === true,
       testManagementAttemptToFixRetries,
-      isImpactedTestsEnabled,
-      isCoverageReportUploadEnabled,
-    } = remoteConfiguration
-    const { testOptimization } = this._config
-    const earlyFlakeDetectionRetryCount =
-      testOptimization.DD_TEST_EARLY_FLAKE_DETECTION_RETRY_COUNT
-    const hasEarlyFlakeDetectionRetryCount = earlyFlakeDetectionRetryCount !== undefined
-    return {
-      isCodeCoverageEnabled,
-      isSuitesSkippingEnabled,
-      isItrEnabled,
-      requireGit,
-      isEarlyFlakeDetectionEnabled:
-        isEarlyFlakeDetectionEnabled && testOptimization.DD_CIVISIBILITY_EARLY_FLAKE_DETECTION_ENABLED,
-      earlyFlakeDetectionNumRetries:
-        hasEarlyFlakeDetectionRetryCount ? earlyFlakeDetectionRetryCount : earlyFlakeDetectionNumRetries,
-      earlyFlakeDetectionSlowTestRetries: hasEarlyFlakeDetectionRetryCount
-        ? {
-            '5s': earlyFlakeDetectionRetryCount,
-            '10s': earlyFlakeDetectionRetryCount,
-            '30s': earlyFlakeDetectionRetryCount,
-            '5m': earlyFlakeDetectionRetryCount,
-          }
-        : earlyFlakeDetectionSlowTestRetries,
-      earlyFlakeDetectionFaultyThreshold,
-      isFlakyTestRetriesEnabled: isFlakyTestRetriesEnabled && testOptimization.DD_CIVISIBILITY_FLAKY_RETRY_ENABLED,
-      flakyTestRetriesCount: testOptimization.DD_CIVISIBILITY_FLAKY_RETRY_COUNT,
-      isDiEnabled: isDiEnabled && testOptimization.DD_TEST_FAILED_TEST_REPLAY_ENABLED,
-      isKnownTestsEnabled,
-      isTestManagementEnabled: isTestManagementEnabled && testOptimization.DD_TEST_MANAGEMENT_ENABLED,
-      testManagementAttemptToFixRetries:
-        testManagementAttemptToFixRetries ?? testOptimization.DD_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES,
       isImpactedTestsEnabled:
-        isImpactedTestsEnabled && testOptimization.DD_CIVISIBILITY_IMPACTED_TESTS_DETECTION_ENABLED,
-      isCoverageReportUploadEnabled,
-    }
+        remoteConfiguration.isImpactedTestsEnabled === true && isImpactedTestsAllowed === true,
+      isCoverageReportUploadEnabled: remoteConfiguration.isCoverageReportUploadEnabled === true,
+    })
   }
 
   sendGitMetadata (repositoryUrl) {

package/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js

@@ -8,6 +8,7 @@ const FormData = require('../../../exporters/common/form-data')
 const request = require('../../../exporters/common/request')
 
 const log = require('../../../log')
+const { getSegment } = require('../../../util')
 const {
   getLatestCommits,
   getRepositoryUrl,
@@ -145,7 +146,7 @@ function uploadPackFile ({ url, isEvpProxy, evpProxyPrefix, packFileToUpload, re
   try {
     const packFileContent = fs.readFileSync(packFileToUpload)
     // The original filename includes a random prefix, so we remove it here
-    const [, filename] = path.basename(packFileToUpload).split('-')
+    const filename = getSegment(path.basename(packFileToUpload), '-', 1)
     form.append('packfile', packFileContent, {
       filename,
       contentType: 'application/octet-stream',

package/packages/dd-trace/src/ci-visibility/exporters/test-worker/index.js

@@ -5,6 +5,7 @@ const {
   JEST_WORKER_TRACE_PAYLOAD_CODE,
   JEST_WORKER_TELEMETRY_PAYLOAD_CODE,
   CUCUMBER_WORKER_TRACE_PAYLOAD_CODE,
+  MOCHA_WORKER_LOGS_PAYLOAD_CODE,
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,
   JEST_WORKER_LOGS_PAYLOAD_CODE,
   PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE,
@@ -50,6 +51,9 @@ function getInterprocessLogsCode () {
   if (getEnvironmentVariable('JEST_WORKER_ID')) {
     return JEST_WORKER_LOGS_PAYLOAD_CODE
   }
+  if (getEnvironmentVariable('MOCHA_WORKER_ID') === 'webdriverio') {
+    return MOCHA_WORKER_LOGS_PAYLOAD_CODE
+  }
   if (getEnvironmentVariable('TINYPOOL_WORKER_ID')) {
     return VITEST_WORKER_LOGS_PAYLOAD_CODE
   }

package/packages/dd-trace/src/ci-visibility/exporters/test-worker/webdriverio.js

@@ -0,0 +1,26 @@
+'use strict'
+
+const WEBDRIVERIO_WORKER_ENV = '_DD_TEST_OPTIMIZATION_WEBDRIVERIO_WORKER'
+const WEBDRIVERIO_WORKER_EVENT = 'workerEvent'
+const WEBDRIVERIO_WORKER_ORIGIN = 'datadog'
+
+/**
+ * Wraps an internal worker payload in the event WebdriverIO reserves for worker messages.
+ *
+ * @param {unknown} args
+ * @returns {{args: unknown, name: string, origin: string}}
+ */
+function createWebdriverioWorkerMessage (args) {
+  return {
+    origin: WEBDRIVERIO_WORKER_ORIGIN,
+    name: WEBDRIVERIO_WORKER_EVENT,
+    args,
+  }
+}
+
+module.exports = {
+  createWebdriverioWorkerMessage,
+  WEBDRIVERIO_WORKER_ENV,
+  WEBDRIVERIO_WORKER_EVENT,
+  WEBDRIVERIO_WORKER_ORIGIN,
+}

package/packages/dd-trace/src/ci-visibility/exporters/test-worker/writer.js

@@ -2,6 +2,10 @@
 const { JSONEncoder } = require('../../encode/json-encoder')
 const { getEnvironmentVariable } = require('../../../config/helper')
 const log = require('../../../log')
+const {
+  createWebdriverioWorkerMessage,
+  WEBDRIVERIO_WORKER_ENV,
+} = require('./webdriverio')
 
 function getVitestWorkerPort () {
   const port = globalThis.__vitest_worker__?.ctx?.port
@@ -13,6 +17,7 @@ class Writer {
     this._encoder = new JSONEncoder()
     // Code used to identify the type of payload being sent to the main process
     this._interprocessCode = interprocessCode
+    this._isWebdriverioWorker = !!getEnvironmentVariable(WEBDRIVERIO_WORKER_ENV)
   }
 
   /**
@@ -43,9 +48,12 @@ class Writer {
     // Old because vitest@>=4 uses `DD_VITEST_WORKER` and reports arrays just like other frameworks
     // Before vitest@>=4, we need the `__tinypool_worker_message__` property, or tinypool will crash
     const isVitestWorkerOld = !!getEnvironmentVariable('TINYPOOL_WORKER_ID')
-    const payload = isVitestWorkerOld
+    let payload = isVitestWorkerOld
       ? { __tinypool_worker_message__: true, interprocessCode: this._interprocessCode, data }
       : [this._interprocessCode, data]
+    if (this._isWebdriverioWorker) {
+      payload = createWebdriverioWorkerMessage(payload)
+    }
 
     const vitestWorkerPort = getVitestWorkerPort()
     if (vitestWorkerPort) {