dd-trace 6.7.0 → 6.8.0

package/packages/dd-trace/src/plugins/ci_plugin.js

@@ -48,12 +48,16 @@ const {
   CI_APP_ORIGIN,
   getTestSessionCommonTags,
   getTestModuleCommonTags,
+  TEST_FRAMEWORK,
+  TEST_FRAMEWORK_ADAPTER,
+  TEST_FRAMEWORK_VERSION,
   TEST_SUITE_ID,
   TEST_MODULE_ID,
   TEST_SESSION_ID,
   TEST_COMMAND,
   TEST_LEVELS_METADATA,
   TEST_MODULE,
+  TEST_TYPE,
   TEST_SESSION_NAME,
   getTestSuiteCommonTags,
   TEST_STATUS,
@@ -62,6 +66,8 @@ const {
   ITR_CORRELATION_ID,
   TEST_SOURCE_FILE,
   TEST_SUITE,
+  TEST_SUITE_EXECUTION_ID,
+  getTestSuiteExecutionKey,
   getFileAndLineNumberFromError,
   DI_ERROR_DEBUG_INFO_CAPTURED,
   DI_DEBUG_ERROR_PREFIX,
@@ -101,6 +107,7 @@ const FRAMEWORK_TO_TRIMMED_COMMAND = {
   cucumber: 'cucumber-js',
   playwright: 'playwright test',
   jest: 'jest',
+  webdriverio: 'wdio',
 }
 
 const WORKER_EXPORTER_TO_TEST_FRAMEWORK = {
@@ -131,7 +138,8 @@ function withTimeout (promise, timeoutMs) {
 }
 
 function setItrSkippingEnabledTagFromLibraryConfig (plugin, frameworkVersion) {
-  const libraryCapabilitiesTags = getDefaultLibraryCapabilitiesTags(plugin.constructor.id, frameworkVersion)
+  const testFramework = plugin.testFramework || plugin.constructor.id
+  const libraryCapabilitiesTags = getDefaultLibraryCapabilitiesTags(testFramework, frameworkVersion)
 
   if (!libraryCapabilitiesTags[DD_CAPABILITIES_TEST_IMPACT_ANALYSIS] ||
     !plugin.libraryConfig ||
@@ -160,6 +168,22 @@ function getTestSuiteLevelVisibilityTags (testSuiteSpan, testFramework) {
   return suiteTags
 }
 
+/**
+ * Keeps non-TIA settings while disabling suite skipping and coverage collection.
+ *
+ * @param {object} libraryConfig
+ * @returns {object}
+ */
+function disableTestImpactAnalysis (libraryConfig) {
+  return Object.freeze({
+    ...libraryConfig,
+    isCodeCoverageEnabled: false,
+    isCoverageReportUploadEnabled: false,
+    isItrEnabled: false,
+    isSuitesSkippingEnabled: false,
+  })
+}
+
 module.exports = class CiPlugin extends Plugin {
   constructor (...args) {
     super(...args)
@@ -170,16 +194,32 @@ module.exports = class CiPlugin extends Plugin {
     this.rootDir = process.cwd() // fallback in case :session:start events are not emitted
     this._testSuiteSpansByTestSuite = new Map()
     this._pendingWorkerTracesByTestSuite = new Map()
+    this._workerTraceExecutionIds = new WeakMap()
     this._pendingRequestErrorTags = []
 
     this.addSub(`ci:${this.constructor.id}:library-configuration`, (ctx) => {
-      const { onDone, frameworkVersion } = ctx
+      const {
+        basicReportingOnly,
+        disableTestImpactAnalysis: shouldDisableTestImpactAnalysis,
+        onDone,
+        frameworkVersion,
+      } = ctx
       ctx.currentStore = legacyStorage.getStore()
 
       if (!this.tracer._exporter || !this.tracer._exporter.getLibraryConfiguration) {
         return onDone({ err: new Error('Test optimization was not initialized correctly') })
       }
       this.tracer._exporter.getLibraryConfiguration(this.testConfiguration, (err, libraryConfig) => {
+        let effectiveLibraryConfig
+        if (!err) {
+          if (basicReportingOnly) {
+            effectiveLibraryConfig = {}
+          } else if (shouldDisableTestImpactAnalysis) {
+            effectiveLibraryConfig = disableTestImpactAnalysis(libraryConfig)
+          } else {
+            effectiveLibraryConfig = libraryConfig
+          }
+        }
         if (err) {
           this.libraryConfig = undefined
           this.itrCorrelationId = undefined
@@ -187,7 +227,7 @@ module.exports = class CiPlugin extends Plugin {
           log.error('Library configuration could not be fetched. %s', err.message)
           this._addRequestErrorTag(DD_CI_LIBRARY_CONFIGURATION_ERROR_SETTINGS, err)
         } else {
-          this.libraryConfig = libraryConfig
+          this.libraryConfig = effectiveLibraryConfig
           setItrSkippingEnabledTagFromLibraryConfig(this, frameworkVersion)
         }
 
@@ -201,7 +241,7 @@ module.exports = class CiPlugin extends Plugin {
         onDone({
           err,
           isTestDynamicInstrumentationEnabled: this.config.isTestDynamicInstrumentationEnabled,
-          libraryConfig,
+          libraryConfig: effectiveLibraryConfig,
           repositoryRoot: this.repositoryRoot,
           requestErrorTags: this._getCurrentRequestErrorTags(),
         })
@@ -234,19 +274,28 @@ module.exports = class CiPlugin extends Plugin {
       )
     })
 
-    this.addSub(`ci:${this.constructor.id}:session:start`, ({ command, frameworkVersion, rootDir }) => {
+    this.addSub(`ci:${this.constructor.id}:session:start`, ({
+      command,
+      frameworkVersion,
+      rootDir,
+      testFramework,
+      testFrameworkAdapter,
+    }) => {
+      const effectiveTestFramework = testFramework || this.constructor.id
       const childOf = getTestParentSpan(this.tracer)
-      const testSessionSpanMetadata = getTestSessionCommonTags(command, frameworkVersion, this.constructor.id)
-      const testModuleSpanMetadata = getTestModuleCommonTags(command, frameworkVersion, this.constructor.id)
+      const testSessionSpanMetadata = getTestSessionCommonTags(command, frameworkVersion, effectiveTestFramework)
+      const testModuleSpanMetadata = getTestModuleCommonTags(command, frameworkVersion, effectiveTestFramework)
 
       this.command = command
       this.frameworkVersion = frameworkVersion
+      this.testFramework = effectiveTestFramework
+      this.testFrameworkAdapter = testFrameworkAdapter
       // only for playwright
       this.rootDir = rootDir
 
       const testSessionName = getTestSessionName(
         this.config,
-        DD_MAJOR < 6 ? this.command : FRAMEWORK_TO_TRIMMED_COMMAND[this.constructor.id],
+        DD_MAJOR < 6 ? this.command : FRAMEWORK_TO_TRIMMED_COMMAND[effectiveTestFramework],
         this.testEnvironmentMetadata
       )
 
@@ -296,7 +345,7 @@ module.exports = class CiPlugin extends Plugin {
       const testCommand = this.command
       for (const testSuite of skippedSuites) {
         const testSuiteMetadata = {
-          ...getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite, this.constructor.id),
+          ...getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite, this.testFramework),
           ...getSessionRequestErrorTags(this.testSessionSpan),
           ...getSessionItrSkippingEnabledTags(this.testSessionSpan),
         }
@@ -392,10 +441,16 @@ module.exports = class CiPlugin extends Plugin {
       return onDone({ err: new Error('No modified tests could have been retrieved') })
     })
 
-    this.addSub(`ci:${this.constructor.id}:worker-report:trace`, traces => {
+    this.addSub(`ci:${this.constructor.id}:worker-report:trace`, payload => {
+      const { traces, [TEST_SUITE_EXECUTION_ID]: testSuiteExecutionId } = typeof payload === 'string'
+        ? { traces: payload }
+        : payload
       const formattedTraces = JSON.parse(traces)
 
       for (const trace of formattedTraces) {
+        if (testSuiteExecutionId) {
+          this._workerTraceExecutionIds.set(trace, testSuiteExecutionId)
+        }
         this._prepareWorkerTrace(trace)
         this._exportWorkerTraceOrBuffer(trace)
       }
@@ -409,7 +464,7 @@ module.exports = class CiPlugin extends Plugin {
   }
 
   get telemetry () {
-    const testFramework = this.constructor.id
+    const testFramework = this.testFramework || this.constructor.id
     const exporter = this.tracer?._exporter
     // TODO: only jest worker supported yet
     const isSupportedWorker = exporter && typeof exporter.exportTelemetry === 'function'
@@ -469,10 +524,19 @@ module.exports = class CiPlugin extends Plugin {
   /**
    * Returns library capability metadata tags for this test framework.
    * @param {string} frameworkVersion - The test framework version.
+   * @param {object} [ctx] - Diagnostic channel context.
+   * @param {boolean} [ctx.basicReportingOnly] - Whether advanced capabilities must be omitted.
+   * @param {string} [ctx.testFramework] - Effective framework when one framework is hosted by another.
    * @returns {Record<string, string|undefined>}
    */
-  getLibraryCapabilitiesTags (frameworkVersion) {
-    return getDefaultLibraryCapabilitiesTags(this.constructor.id, frameworkVersion)
+  getLibraryCapabilitiesTags (frameworkVersion, ctx = {}) {
+    if (ctx.basicReportingOnly) {
+      return {}
+    }
+    return getDefaultLibraryCapabilitiesTags(
+      ctx.testFramework || this.testFramework || this.constructor.id,
+      frameworkVersion
+    )
   }
 
   /**
@@ -592,17 +656,34 @@ module.exports = class CiPlugin extends Plugin {
       // test session, test module and test suite ids. We have to update them in the main process.
       if (span.name !== 'cucumber.test' && span.name !== 'mocha.test') continue
 
+      const testFramework = this.testFramework || this.constructor.id
+      span.meta[TEST_FRAMEWORK] = testFramework
+      span.meta[TEST_MODULE] = testFramework
+      const testType = this.testSessionSpan?.context().getTag(TEST_TYPE)
+      if (testType) {
+        span.meta[TEST_TYPE] = testType
+      }
+      if (this.frameworkVersion) {
+        span.meta[TEST_FRAMEWORK_VERSION] = this.frameworkVersion
+      }
+      if (this.testFrameworkAdapter) {
+        span.meta[TEST_FRAMEWORK_ADAPTER] = this.testFrameworkAdapter
+      }
+
       const testSuite = span.meta[TEST_SUITE]
-      const testSuiteSpan = this._testSuiteSpansByTestSuite.get(testSuite)
-      if (!testSuiteSpan) return testSuite
+      const testSuiteExecutionId = this._workerTraceExecutionIds.get(trace)
+      const testSuiteKey = getTestSuiteExecutionKey(testSuite, testSuiteExecutionId)
+      const testSuiteSpan = this._testSuiteSpansByTestSuite.get(testSuiteKey)
+      if (!testSuiteSpan) return testSuiteKey
 
-      const testSuiteTags = getTestSuiteLevelVisibilityTags(testSuiteSpan, this.constructor.id)
+      const testSuiteTags = getTestSuiteLevelVisibilityTags(testSuiteSpan, testFramework)
       span.meta = {
         ...span.meta,
         ...testSuiteTags,
         ...getSessionRequestErrorTags(this.testSessionSpan),
       }
     }
+    this._workerTraceExecutionIds.delete(trace)
   }
 
   /**
@@ -761,19 +842,22 @@ module.exports = class CiPlugin extends Plugin {
     return codeOwners
   }
 
-  startTestSpan (testName, testSuite, testSuiteSpan, extraTags = {}) {
-    const childOf = getTestParentSpan(this.tracer)
+  startTestSpan (testName, testSuite, testSuiteSpan, extraTags = {}, testExecutionId, startTime) {
+    const childOf = getTestParentSpan(this.tracer, testExecutionId)
 
     let testTags = {
       ...getTestCommonTags(
         testName,
         testSuite,
         this.frameworkVersion,
-        this.constructor.id
+        this.testFramework || this.constructor.id
       ),
       [COMPONENT]: this.constructor.id,
       ...extraTags,
     }
+    if (this.testFrameworkAdapter) {
+      testTags[TEST_FRAMEWORK_ADAPTER] = this.testFrameworkAdapter
+    }
 
     const codeOwners = this.getCodeOwners(testTags)
     if (codeOwners) {
@@ -790,7 +874,7 @@ module.exports = class CiPlugin extends Plugin {
         [TEST_SUITE_ID]: testSuiteSpan.context().toSpanId(),
         [TEST_SESSION_ID]: testSuiteSpan.context().toTraceId(),
         [TEST_COMMAND]: testSuiteSpan.context().getTag(TEST_COMMAND),
-        [TEST_MODULE]: this.constructor.id,
+        [TEST_MODULE]: this.testFramework || this.constructor.id,
         ...getSessionRequestErrorTags(this.testSessionSpan),
       }
       if (testSuiteSpan.context()._parentId) {
@@ -810,6 +894,7 @@ module.exports = class CiPlugin extends Plugin {
     const testSpan = this.tracer
       .startSpan(`${this.constructor.id}.test`, {
         childOf,
+        startTime,
         tags: {
           ...this.testEnvironmentMetadata,
           ...testTags,

package/packages/dd-trace/src/plugins/index.js

@@ -36,6 +36,7 @@ const plugins = {
   get '@smithy/core' () { return require('../../../datadog-plugin-aws-sdk/src') },
   get '@smithy/smithy-client' () { return require('../../../datadog-plugin-aws-sdk/src') },
   get '@vitest/runner' () { return require('../../../datadog-plugin-vitest/src') },
+  get '@wdio/local-runner' () { return require('../../../datadog-plugin-mocha/src') },
   get '@langchain/langgraph' () { return require('../../../datadog-plugin-langgraph/src') },
   get '@openai/agents' () { return require('../../../datadog-plugin-openai-agents/src') },
   get aerospike () { return require('../../../datadog-plugin-aerospike/src') },

package/packages/dd-trace/src/plugins/plugin.js

@@ -103,7 +103,7 @@ module.exports = class Plugin {
    * @returns {void}
    */
   enter (span, store) {
-    store = store || legacyStorage.getStore()
+    store ||= legacyStorage.getStore()
     legacyStorage.enterWith({ ...store, span })
   }
 

package/packages/dd-trace/src/plugins/tracing.js

@@ -265,6 +265,7 @@ class TracingPlugin extends Plugin {
     analyticsSampler.sample(span, config.measured)
 
     // TODO: Remove this after migration to TracingChannel is done.
+    // eslint-disable-next-line unicorn/no-unnecessary-boolean-comparison -- Context objects use the other branch.
     if (enterOrCtx === true) {
       legacyStorage.enterWith({ ...store, span })
     } else if (enterOrCtx) {

package/packages/dd-trace/src/plugins/util/ci.js

@@ -18,6 +18,7 @@ const {
   GIT_REPOSITORY_URL,
   CI_PIPELINE_ID,
   CI_PIPELINE_NAME,
+  CI_PIPELINE_DISPLAY_NAME,
   CI_PIPELINE_NUMBER,
   CI_PIPELINE_URL,
   CI_PROVIDER_NAME,
@@ -75,7 +76,7 @@ function normalizeRef (ref) {
   if (!ref) {
     return ref
   }
-  return ref.replaceAll(/origin\/|refs\/heads\/|tags\//gm, '')
+  return ref.replaceAll(/origin\/|refs\/heads\/|tags\//g, '')
 }
 
 function resolveTilde (filePath) {
@@ -215,7 +216,7 @@ const githubWellKnownDiagnosticDirPatternsUnix = [
 ]
 const githubWellKnownDiagnosticDirPatternsWin = ['C:/actions-runner/*/_diag', 'C:/actions-runner/*/*/_diag']
 
-const githubJobIDRegex = /"job":\s*{[\s\S]*?"v"\s*:\s*(\d+)(?:\.0)?/
+const githubJobIDRegex = /"job":\s*\{[\s\S]*?"v"\s*:\s*(\d+)(?:\.0)?/
 
 function getJobIDFromDiagFile () {
   const runnerTemp = getEnvironmentVariable('RUNNER_TEMP')
@@ -316,10 +317,8 @@ module.exports = {
       }
 
       if (NODE_LABELS) {
-        let nodeLabels
         try {
-          nodeLabels = JSON.stringify(NODE_LABELS.split(' '))
-          tags[CI_NODE_LABELS] = nodeLabels
+          tags[CI_NODE_LABELS] = JSON.stringify(NODE_LABELS.split(' '))
         } catch {
           // ignore errors
         }
@@ -651,7 +650,7 @@ module.exports = {
         [GIT_TAG]: BITBUCKET_TAG,
         [GIT_REPOSITORY_URL]: BITBUCKET_GIT_SSH_ORIGIN || BITBUCKET_GIT_HTTP_ORIGIN,
         [CI_WORKSPACE_PATH]: BITBUCKET_CLONE_DIR,
-        [CI_PIPELINE_ID]: BITBUCKET_PIPELINE_UUID && BITBUCKET_PIPELINE_UUID.replaceAll(/[{}]/gm, ''),
+        [CI_PIPELINE_ID]: BITBUCKET_PIPELINE_UUID && BITBUCKET_PIPELINE_UUID.replaceAll(/[{}]/g, ''),
         [GIT_PULL_REQUEST_BASE_BRANCH]: BITBUCKET_PR_DESTINATION_BRANCH,
         [PR_NUMBER]: BITBUCKET_PR_ID,
       }
@@ -699,6 +698,7 @@ module.exports = {
         BUILDKITE_TAG,
         BUILDKITE_BUILD_ID,
         BUILDKITE_PIPELINE_SLUG,
+        BUILDKITE_PIPELINE_NAME,
         BUILDKITE_BUILD_NUMBER,
         BUILDKITE_BUILD_URL,
         BUILDKITE_JOB_ID,
@@ -722,6 +722,7 @@ module.exports = {
         [CI_PROVIDER_NAME]: 'buildkite',
         [CI_PIPELINE_ID]: BUILDKITE_BUILD_ID,
         [CI_PIPELINE_NAME]: BUILDKITE_PIPELINE_SLUG,
+        [CI_PIPELINE_DISPLAY_NAME]: BUILDKITE_PIPELINE_NAME,
         [CI_PIPELINE_NUMBER]: BUILDKITE_BUILD_NUMBER,
         [CI_PIPELINE_URL]: BUILDKITE_BUILD_URL,
         [CI_JOB_URL]: `${BUILDKITE_BUILD_URL}#${BUILDKITE_JOB_ID}`,

package/packages/dd-trace/src/plugins/util/git.js

@@ -62,7 +62,7 @@ function sanitizedExec (
       let result = cachedExec(cmd, flags, { stdio: 'pipe' }).toString()
 
       if (shouldTrim) {
-        result = result.replaceAll(/(\r\n|\n|\r)/gm, '')
+        result = result.replaceAll(/(\r\n|\n|\r)/g, '')
       }
 
       if (durationMetric) {

package/packages/dd-trace/src/plugins/util/http-otel-semantics.js

@@ -258,7 +258,7 @@ function applyHttpOtelSemantics (formattedSpan) {
   // type): server spans are errors on 5xx only (4xx MUST be left unset per the
   // spec); client spans on any status >= 400.
   if (status !== undefined && newMeta[ERROR_TYPE] === undefined) {
-    const isError = kind === 'server' ? statusCode >= 500 : statusCode >= 400
+    const isError = statusCode >= (kind === 'server' ? 500 : 400)
     if (isError) {
       newMeta[ERROR_TYPE] = status
       formattedSpan.error = 1

package/packages/dd-trace/src/plugins/util/llm.js

@@ -28,7 +28,7 @@ function normalize (text, limit = 128) {
  * Determines whether a prompt completion should be sampled based on the configured sampling rate.
  *
  * @param {Sampler} sampler
- * @param {import('index').Span|import('index').SpanContext} span
+ * @param {import('../../../../..').Span|import('../../../../..').SpanContext} span
  * @returns {boolean} `true` if the prompt completion should be sampled, otherwise `false`.
  */
 function isPromptCompletionSampled (sampler, span) {
@@ -51,7 +51,7 @@ module.exports = function makeUtilities (integrationName, tracerConfig) {
     /**
      * Determines whether a prompt completion should be sampled based on the configured sampling rate.
      *
-     * @param {import('index').Span|import('index').SpanContext} span
+     * @param {import('../../../../..').Span|import('../../../../..').SpanContext} span
      * @returns {boolean} `true` if the prompt completion should be sampled, otherwise `false`.
      */
     isPromptCompletionSampled: (span) => isPromptCompletionSampled(sampler, span),

package/packages/dd-trace/src/plugins/util/tags.js

@@ -26,6 +26,7 @@ const GIT_PULL_REQUEST_BASE_BRANCH = 'git.pull_request.base_branch'
 
 const CI_PIPELINE_ID = 'ci.pipeline.id'
 const CI_PIPELINE_NAME = 'ci.pipeline.name'
+const CI_PIPELINE_DISPLAY_NAME = 'ci.pipeline.display_name'
 const CI_PIPELINE_NUMBER = 'ci.pipeline.number'
 const CI_PIPELINE_URL = 'ci.pipeline.url'
 const CI_PROVIDER_NAME = 'ci.provider.name'
@@ -66,6 +67,7 @@ module.exports = {
   GIT_PULL_REQUEST_BASE_BRANCH,
   CI_PIPELINE_ID,
   CI_PIPELINE_NAME,
+  CI_PIPELINE_DISPLAY_NAME,
   CI_PIPELINE_NUMBER,
   CI_PIPELINE_URL,
   CI_PROVIDER_NAME,

package/packages/dd-trace/src/plugins/util/test.js

@@ -45,6 +45,7 @@ const {
   CI_WORKSPACE_PATH,
   CI_PIPELINE_ID,
   CI_PIPELINE_NAME,
+  CI_PIPELINE_DISPLAY_NAME,
   CI_PIPELINE_NUMBER,
   CI_PIPELINE_URL,
   CI_JOB_NAME,
@@ -89,10 +90,12 @@ const {
 const TEST_SESSION_NAME = 'test_session.name'
 
 const TEST_FRAMEWORK = 'test.framework'
+const TEST_FRAMEWORK_ADAPTER = 'test.framework_adapter'
 const TEST_FRAMEWORK_VERSION = 'test.framework_version'
 const TEST_TYPE = 'test.type'
 const TEST_NAME = 'test.name'
 const TEST_SUITE = 'test.suite'
+const TEST_SUITE_EXECUTION_ID = '_dd.test_suite_execution_id'
 const TEST_STATUS = 'test.status'
 const TEST_FINAL_STATUS = 'test.final_status'
 const TEST_PARAMETERS = 'test.parameters'
@@ -180,6 +183,7 @@ const CUCUMBER_WORKER_TRACE_PAYLOAD_CODE = 70
 
 // mocha worker variables
 const MOCHA_WORKER_TRACE_PAYLOAD_CODE = 80
+const MOCHA_WORKER_LOGS_PAYLOAD_CODE = 81
 
 // playwright worker variables
 const PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE = 90
@@ -207,7 +211,7 @@ const DD_CI_LIBRARY_CONFIGURATION_ERROR_KNOWN_TESTS = '_dd.ci.library_configurat
 const DD_CI_LIBRARY_CONFIGURATION_ERROR_TEST_MANAGEMENT_TESTS =
   '_dd.ci.library_configuration_error.test_management_tests'
 
-const UNSUPPORTED_TIA_FRAMEWORKS = new Set(['playwright', 'vitest'])
+const UNSUPPORTED_TIA_FRAMEWORKS = new Set(['playwright', 'vitest', 'webdriverio'])
 const MINIMUM_FRAMEWORK_VERSION_FOR_EFD = {
   playwright: '>=1.38.0',
 }
@@ -244,6 +248,7 @@ const TEST_LEVELS_METADATA_TAGS = [
   CI_NODE_NAME,
   CI_PIPELINE_ID,
   CI_PIPELINE_NAME,
+  CI_PIPELINE_DISPLAY_NAME,
   CI_PIPELINE_NUMBER,
   CI_PIPELINE_URL,
   CI_PROVIDER_NAME,
@@ -422,10 +427,22 @@ function addTestOptimizationRequest (requestPromises, responseNames, responseNam
   }
 }
 
+/**
+ * Builds the internal key used to correlate a worker test with one suite execution.
+ *
+ * @param {string} testSuite
+ * @param {string|undefined} testSuiteExecutionId
+ * @returns {string}
+ */
+function getTestSuiteExecutionKey (testSuite, testSuiteExecutionId) {
+  return testSuiteExecutionId ? `${testSuite}\0${testSuiteExecutionId}` : testSuite
+}
+
 module.exports = {
   TEST_CODE_OWNERS,
   TEST_SESSION_NAME,
   TEST_FRAMEWORK,
+  TEST_FRAMEWORK_ADAPTER,
   TEST_FRAMEWORK_VERSION,
   JEST_TEST_RUNNER,
   JEST_DISPLAY_NAME,
@@ -435,6 +452,8 @@ module.exports = {
   TEST_TYPE,
   TEST_NAME,
   TEST_SUITE,
+  TEST_SUITE_EXECUTION_ID,
+  getTestSuiteExecutionKey,
   TEST_STATUS,
   TEST_FINAL_STATUS,
   TEST_PARAMETERS,
@@ -454,6 +473,7 @@ module.exports = {
   JEST_WORKER_QUARANTINE_PAYLOAD_CODE,
   CUCUMBER_WORKER_TRACE_PAYLOAD_CODE,
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,
+  MOCHA_WORKER_LOGS_PAYLOAD_CODE,
   PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE,
   VITEST_WORKER_TRACE_PAYLOAD_CODE,
   VITEST_WORKER_LOGS_PAYLOAD_CODE,
@@ -800,7 +820,7 @@ function getTestLevelsMetadataTags (testEnvironmentMetadata) {
 }
 
 function getTestTypeFromFramework (testFramework) {
-  if (testFramework === 'playwright' || testFramework === 'cypress') {
+  if (testFramework === 'playwright' || testFramework === 'cypress' || testFramework === 'webdriverio') {
     return 'browser'
   }
   return 'test'
@@ -860,9 +880,16 @@ function setRumTestCorrelation (context, activeSpan) {
   return testSpan
 }
 
-function getTestParentSpan (tracer) {
+/**
+ * Returns the synthetic parent that makes a test event the root of its trace.
+ *
+ * @param {import('../../tracer')} tracer
+ * @param {string} [testExecutionId]
+ * @returns {import('../../opentracing/span_context')}
+ */
+function getTestParentSpan (tracer, testExecutionId) {
   return tracer.extract('text_map', {
-    'x-datadog-trace-id': id().toString(10),
+    'x-datadog-trace-id': testExecutionId || id().toString(10),
     'x-datadog-parent-id': '0000000000000000',
   })
 }
@@ -871,6 +898,7 @@ function getTestCommonTags (name, suite, version, testFramework) {
   return {
     [SPAN_TYPE]: 'test',
     [TEST_TYPE]: getTestTypeFromFramework(testFramework),
+    [TEST_FRAMEWORK]: testFramework,
     [SAMPLING_RULE_DECISION]: 1,
     [SAMPLING_PRIORITY]: AUTO_KEEP,
     [TEST_NAME]: name,
@@ -941,8 +969,7 @@ function getCodeOwnersFileEntries (rootDir) {
   const lines = codeOwnersContent.split('\n')
 
   for (const line of lines) {
-    const [content] = line.split('#')
-    const trimmed = content.trim()
+    const trimmed = getSegment(line, '#', 0).trim()
     if (trimmed === '') continue
     const [pattern, ...owners] = trimmed.split(/\s+/)
     entries.push(setCodeOwnersPatternRegex({ pattern, owners }))
@@ -988,9 +1015,7 @@ function codeOwnersPatternToRegexSource (pattern) {
 
     if (character === '\\') {
       const escapedCharacter = pattern[i + 1]
-      source += escapedCharacter === undefined
-        ? escapeRegexCharacter(character)
-        : escapeRegexCharacter(escapedCharacter)
+      source += escapeRegexCharacter(escapedCharacter ?? character)
       i++
     } else if (character === '*') {
       if (pattern[i + 1] === '*') {
@@ -1101,6 +1126,7 @@ function getCodeOwnersForFilename (filename, entries) {
 
 function getTestLevelCommonTags (command, testFrameworkVersion, testFramework) {
   return {
+    [TEST_FRAMEWORK]: testFramework,
     [TEST_FRAMEWORK_VERSION]: testFrameworkVersion,
     [LIBRARY_VERSION]: ddTraceVersion,
     [TEST_TYPE]: getTestTypeFromFramework(testFramework),
@@ -1184,7 +1210,7 @@ function getCoveredFilenamesFromCoverage (coverage) {
 }
 
 function getCoverageMap (coverage) {
-  if (coverage?.files && coverage?.fileCoverageFor) {
+  if (coverage?.files && coverage.fileCoverageFor) {
     return coverage
   }
   return istanbul.createCoverageMap(coverage)
@@ -1917,8 +1943,8 @@ function recordAttemptToFixExecution (attemptToFixExecutions, execution) {
   }
 
   result.executions++
-  result.isDisabled = result.isDisabled || !!isDisabled
-  result.isQuarantined = result.isQuarantined || !!isQuarantined
+  result.isDisabled ||= !!isDisabled
+  result.isQuarantined ||= !!isQuarantined
 
   if (status === 'fail') {
     result.failedCount++

package/packages/dd-trace/src/plugins/util/url.js

@@ -8,13 +8,13 @@ const HTTP2_HEADER_AUTHORITY = ':authority'
 const HTTP2_HEADER_SCHEME = ':scheme'
 const HTTP2_HEADER_PATH = ':path'
 
-const PATH_REGEX = /^(?:[a-z]+:\/\/(?:[^?/]+))?(?<path>\/[^?]*)(?:(\?).*)?$/
+const PATH_REGEX = /^(?:[a-z]+:\/\/[^?/]+)?(?<path>\/[^?]*)(?:(\?).*)?$/
 
 const INT_SEGMENT = /^[1-9][0-9]+$/ // Integer of size at least 2 (>=10)
-const INT_ID_SEGMENT = /^(?=.*[0-9].*)[0-9._-]{3,}$/ // Mixed string with digits and delimiters
-const HEX_SEGMENT = /^(?=.*[0-9].*)[A-Fa-f0-9]{6,}$/ // Hexadecimal digits of size at least 6 with at least one decimal digit
-const HEX_ID_SEGMENT = /^(?=.*[0-9].*)[A-Fa-f0-9._-]{6,}$/ // Mixed string with hex digits and delimiters
-const STRING_SEGMENT = /^.{20,}|.*[%&'()*+,:=@].*$/ // Long string or a string containing special characters
+const INT_ID_SEGMENT = /^(?=.*[0-9])[0-9._-]{3,}$/ // Mixed string with digits and delimiters
+const HEX_SEGMENT = /^(?=.*[0-9])[A-Fa-f0-9]{6,}$/ // Hexadecimal digits of size at least 6 with at least one decimal digit
+const HEX_ID_SEGMENT = /^(?=.*[0-9])[A-Fa-f0-9._-]{6,}$/ // Mixed string with hex digits and delimiters
+const STRING_SEGMENT = /^.{20,}|[%&'()*+,:=@]/ // Long string or a string containing special characters
 
 /**
  * Extract full URL from HTTP request

package/packages/dd-trace/src/plugins/util/user-provided-git.js

@@ -36,7 +36,7 @@ function removeEmptyValues (tagsAndValues) {
 // https://github.com/jonschlinkert/is-git-url/blob/396965ffabf2f46656c8af4c47bef1d69f09292e/index.js#L9C15-L9C87
 // The `.git` suffix is optional in this version
 function validateGitRepositoryUrl (repoUrl) {
-  return /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\/?|#[-\w.]+?)$/.test(repoUrl)
+  return /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\/?|#[-\w.]+)$/.test(repoUrl)
 }
 
 function validateGitCommitSha (gitCommitSha) {

package/packages/dd-trace/src/plugins/util/web.js

@@ -376,7 +376,7 @@ function isOriginAllowed (req, headers) {
 }
 
 function splitHeader (str) {
-  return typeof str === 'string' ? str.split(/\s*,\s*/) : []
+  return typeof str === 'string' ? str.split(',').map((header) => header.trim()) : []
 }
 
 function addRequestTags (context, spanType) {

package/packages/dd-trace/src/priority_sampler.js

@@ -140,7 +140,7 @@ class PrioritySampler {
       samplers[key] = new Sampler(rates[key])
     }
 
-    samplers[DEFAULT_KEY] = samplers[DEFAULT_KEY] || defaultSampler
+    samplers[DEFAULT_KEY] ||= defaultSampler
 
     this._samplers = samplers
 
@@ -257,8 +257,11 @@ class PrioritySampler {
     context._trace[SAMPLING_RULE_DECISION] = rule.sampleRate
     context._trace.tags[SAMPLING_KNUTH_RATE] = formatKnuthRate(rule.sampleRate)
     context._sampling.mechanism = SAMPLING_MECHANISM_RULE
-    if (rule.provenance === 'customer') context._sampling.mechanism = SAMPLING_MECHANISM_REMOTE_USER
-    if (rule.provenance === 'dynamic') context._sampling.mechanism = SAMPLING_MECHANISM_REMOTE_DYNAMIC
+    if (rule.provenance === 'customer') {
+      context._sampling.mechanism = SAMPLING_MECHANISM_REMOTE_USER
+    } else if (rule.provenance === 'dynamic') {
+      context._sampling.mechanism = SAMPLING_MECHANISM_REMOTE_DYNAMIC
+    }
 
     return rule.sample(context) && this._isSampledByRateLimit(context)
       ? USER_KEEP

package/packages/dd-trace/src/profiling/profilers/poisson.js

@@ -6,7 +6,7 @@ class PoissonProcessSamplingFilter {
   #samplingInterval
   #resetInterval
   #now
-  #lastNow = Number.NEGATIVE_INFINITY
+  #lastNow = -Infinity
   #samplingInstantCount = 0
 
   constructor ({ samplingInterval, now, resetInterval }) {