dd-trace 6.9.0 → 6.11.0

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

@@ -78,6 +78,7 @@ const {
   TEST_HAS_DYNAMIC_NAME,
   getIsFaultyEarlyFlakeDetection,
   DYNAMIC_NAME_RE,
+  isMarkedAsUnskippable,
   recordAttemptToFixExecution,
   recordTestManagementExecution,
   logAttemptToFixTestExecution,
@@ -86,7 +87,6 @@ const {
   TEST_FINAL_STATUS,
   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')
@@ -477,7 +477,7 @@ class CypressPlugin {
   testsToSkip = []
   skippedTests = []
   skippedTestIds = new Set()
-  skippableTestsCoverage = {}
+  skippableTestsCoverage
   testSessionCoverageMap = createCoverageMap()
   hasForcedToRunSuites = false
   hasUnskippableSuites = false
@@ -492,6 +492,7 @@ class CypressPlugin {
   loggedAttemptToFixTests = new Set()
   uploadedScreenshotPaths = new Set()
   screenshotUploadPromisesByTraceId = new Map()
+  screenshotUploadAbortControllers = new Set()
   afterScreenshotHandler = undefined
   lastFinishedTest = null
   pendingScreenshotUploads = []
@@ -565,7 +566,7 @@ class CypressPlugin {
     this.testsToSkip = []
     this.skippedTests = []
     this.skippedTestIds = new Set()
-    this.skippableTestsCoverage = {}
+    this.skippableTestsCoverage = undefined
     this.testSessionCoverageMap = createCoverageMap()
     this.hasForcedToRunSuites = false
     this.hasUnskippableSuites = false
@@ -581,10 +582,12 @@ class CypressPlugin {
     this.loggedAttemptToFixTests = new Set()
     this.uploadedScreenshotPaths = new Set()
     this.screenshotUploadPromisesByTraceId = new Map()
+    this.screenshotUploadAbortControllers = new Set()
     this.lastFinishedTest = null
     this.pendingScreenshotUploads = []
     this.activeTestSpan = null
     this.testSuiteSpan = null
+    this.finishedTestSuiteSpans = []
     this.testModuleSpan = null
     this.testSessionSpan = null
     this.command = undefined
@@ -643,6 +646,19 @@ class CypressPlugin {
     return Promise.all(uploadPromises).then(getScreenshotUploadResult)
   }
 
+  /**
+   * Cancels screenshot work that must not outlive an errored after:spec finalization boundary.
+   *
+   * @param {Error} error - Error that triggered finalization
+   * @returns {void}
+   */
+  abortPendingScreenshotUploads (error) {
+    for (const controller of this.screenshotUploadAbortControllers) controller.abort(error)
+    this.screenshotUploadAbortControllers.clear()
+    this.screenshotUploadPromisesByTraceId.clear()
+    this.pendingScreenshotUploads = []
+  }
+
   /**
    * Returns the current time in the same coordinate system used by span
    * start/finish. Captured at session span creation so it shares the same
@@ -663,17 +679,6 @@ class CypressPlugin {
     return this.repositoryRoot || this.rootDir || process.cwd()
   }
 
-  /**
-   * Returns whether the backend supplied skipped-test coverage data.
-   *
-   * @returns {boolean}
-   */
-  hasSkippableTestsCoverage () {
-    return !!(this.skippableTestsCoverage &&
-      typeof this.skippableTestsCoverage === 'object' &&
-      Object.keys(this.skippableTestsCoverage).length > 0)
-  }
-
   /**
    * Returns whether skipped test coverage should be backfilled into the session coverage map.
    *
@@ -683,7 +688,7 @@ class CypressPlugin {
     return this.isItrEnabled &&
       this.isCoverageReportUploadEnabled &&
       this.isTestsSkipped &&
-      this.hasSkippableTestsCoverage()
+      this.skippableTestsCoverage !== undefined
   }
 
   /**
@@ -800,6 +805,17 @@ class CypressPlugin {
   // Depending on the received configuration, the Cypress configuration can be modified:
   // for example, to enable retries for failed tests.
   init (tracer, cypressConfig) {
+    if (this.cypressConfig === cypressConfig && this.hasOriginalCypressRetries) {
+      cypressConfig.retries = this.originalCypressRetries !== null &&
+        typeof this.originalCypressRetries === 'object'
+        ? { ...this.originalCypressRetries }
+        : this.originalCypressRetries
+    } else {
+      this.originalCypressRetries = cypressConfig.retries !== null && typeof cypressConfig.retries === 'object'
+        ? { ...cypressConfig.retries }
+        : cypressConfig.retries
+      this.hasOriginalCypressRetries = true
+    }
     this.resetRunState()
     this._isInit = true
     this.tracer = tracer
@@ -1063,9 +1079,13 @@ class CypressPlugin {
   }
 
   async beforeRun (details) {
-    // We need to make sure that the plugin is initialized before running the tests
-    // This is for the case where the user has not returned the promise from the init function
-    await this.libraryConfigurationPromise
+    if (this._isInit) {
+      // The user may not have returned the promise from the init function.
+      await this.libraryConfigurationPromise
+    } else {
+      // Cypress open reuses the same plugin process for every interactive run.
+      await this.init(this.tracer, this.cypressConfig)
+    }
 
     this.command = getCypressCommand(details)
     this.frameworkVersion = getCypressVersion(details)
@@ -1131,7 +1151,7 @@ class CypressPlugin {
       } else {
         const { skippableTests, correlationId, skippableTestsCoverage } = skippableTestsResponse
         this.testsToSkip = skippableTests || []
-        this.skippableTestsCoverage = skippableTestsCoverage || {}
+        this.skippableTestsCoverage = skippableTestsCoverage
         this.itrCorrelationId = correlationId
         incrementCountMetric(TELEMETRY_ITR_SKIPPED, { testLevel: 'test' }, this.testsToSkip.length)
       }
@@ -1252,18 +1272,29 @@ class CypressPlugin {
     return details
   }
 
-  afterRun (suiteStats) {
+  afterRun (suiteStats, error, shouldFailFinishedSuites = true) {
     if (!this._isInit) {
       log.warn('Attemping to call afterRun without initializating the plugin first')
       return
     }
     if (this.testSessionSpan && this.testModuleSpan) {
-      const testStatus = getSessionStatus(suiteStats)
+      const testStatus = error ? 'fail' : getSessionStatus(suiteStats)
       const hasBackfilledCoverage = this.applySkippedCoverageToTestSessionCoverage()
       const testCodeCoverageLinesTotal = this.getTestCodeCoverageLinesTotal(hasBackfilledCoverage)
 
       this.testModuleSpan.setTag(TEST_STATUS, testStatus)
       this.testSessionSpan.setTag(TEST_STATUS, testStatus)
+      for (const span of this.finishedTestSuiteSpans) {
+        if (error && shouldFailFinishedSuites) {
+          span.setTag(TEST_STATUS, 'fail')
+          span.setTag('error', error)
+        }
+      }
+      this.finishedTestSuiteSpans = []
+      if (error) {
+        this.testModuleSpan.setTag('error', error)
+        this.testSessionSpan.setTag('error', error)
+      }
 
       addIntelligentTestRunnerSpanTags(
         this.testSessionSpan,
@@ -1301,6 +1332,7 @@ class CypressPlugin {
       })
 
       finishAllTraceSpans(this.testSessionSpan)
+      this.tracer._tracer._exporter?.exportDeferredTestSuiteSpans?.()
     }
 
     return new Promise(resolve => {
@@ -1358,7 +1390,7 @@ class CypressPlugin {
     }
   }
 
-  afterSpec (spec, results) {
+  afterSpec (spec, results, error) {
     const { tests, stats, screenshots } = results || {}
     const cypressTests = tests || []
     const specScreenshots = screenshots || []
@@ -1572,13 +1604,16 @@ class CypressPlugin {
         const screenshotUploadResultPromise = failedTestTraceId
           ? this.getScreenshotUploadResultPromise(failedTestTraceId)
           : undefined
-        if (screenshotUploadResultPromise) {
+        if (screenshotUploadResultPromise && !error) {
           testSpanFinishPromises.push(screenshotUploadResultPromise.then((uploadResult) => {
             setScreenshotUploadTags(finishedTest.testSpan, uploadResult)
             this.screenshotUploadPromisesByTraceId.delete(failedTestTraceId)
             finishedTest.testSpan.finish(finishedTest.finishTime)
           }))
         } else {
+          if (screenshotUploadResultPromise) {
+            this.screenshotUploadPromisesByTraceId.delete(failedTestTraceId)
+          }
           finishedTest.testSpan.finish(finishedTest.finishTime)
         }
       }
@@ -1586,13 +1621,18 @@ class CypressPlugin {
 
     const finishSuite = () => {
       if (this.testSuiteSpan) {
-        const status = getSuiteStatus(stats)
+        const status = error ? 'fail' : getSuiteStatus(stats)
         this.testSuiteSpan.setTag(TEST_STATUS, status)
 
-        if (latestError) {
-          this.testSuiteSpan.setTag('error', latestError)
+        if (error || latestError) {
+          this.testSuiteSpan.setTag('error', error || latestError)
         }
+        const canRunAfterRun = this.cypressConfig.isTextTerminal ||
+          this.cypressConfig.experimentalInteractiveRunEvents
+        const exporter = this.tracer._tracer._exporter
+        if (canRunAfterRun && exporter?.deferTestSuiteSpan) exporter.deferTestSuiteSpan(this.testSuiteSpan)
         this.testSuiteSpan.finish()
+        if (canRunAfterRun) this.finishedTestSuiteSpans.push(this.testSuiteSpan)
         this.testSuiteSpan = null
         this.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'suite')
       }
@@ -1608,16 +1648,23 @@ class CypressPlugin {
 
     finishSuite()
 
+    if (error) {
+      this.abortPendingScreenshotUploads(error)
+      return this.afterRun(undefined, error, false)
+    }
+
     const screenshotUploadsPromise = waitForScreenshotUploads()
+    let afterSpecPromise = screenshotUploadsPromise
     if (testSpanFinishPromises.length > 0) {
       const testSpansPromise = Promise.all(testSpanFinishPromises).then(() => null)
       if (screenshotUploadsPromise) {
-        return Promise.all([testSpansPromise, screenshotUploadsPromise]).then(() => null)
+        afterSpecPromise = Promise.all([testSpansPromise, screenshotUploadsPromise]).then(() => null)
+      } else {
+        afterSpecPromise = testSpansPromise
       }
-      return testSpansPromise
     }
 
-    return screenshotUploadsPromise
+    return afterSpecPromise
   }
 
   /**
@@ -1637,6 +1684,7 @@ class CypressPlugin {
     }
 
     const uploadPromises = []
+    const abortController = new AbortController()
 
     for (const screenshot of screenshots) {
       const filePath = getScreenshotFilePath(screenshot)
@@ -1655,6 +1703,7 @@ class CypressPlugin {
           traceId,
           idempotencyKey,
           capturedAtMs,
+          signal: abortController.signal,
         }, (err) => {
           resolve(err ? SCREENSHOT_UPLOAD_RESULT_ERROR : SCREENSHOT_UPLOAD_RESULT_UPLOADED)
         })
@@ -1662,7 +1711,10 @@ class CypressPlugin {
     }
 
     if (uploadPromises.length > 0) {
-      const uploadPromise = Promise.all(uploadPromises).then(getScreenshotUploadResult)
+      this.screenshotUploadAbortControllers.add(abortController)
+      const uploadPromise = Promise.all(uploadPromises).then(getScreenshotUploadResult).finally(() => {
+        this.screenshotUploadAbortControllers.delete(abortController)
+      })
       this.addScreenshotUploadPromise(traceId, uploadPromise)
       return uploadPromise
     }

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

@@ -0,0 +1,76 @@
+'use strict'
+
+const { AsyncLocalStorage } = require('node:async_hooks')
+
+const log = require('../../dd-trace/src/log')
+
+const DD_CYPRESS_USER_HANDLER_CONTEXT = Symbol.for('dd-trace.cypress.user-handler.context')
+const userHandlerContext = globalThis[DD_CYPRESS_USER_HANDLER_CONTEXT] ||= new AsyncLocalStorage()
+const manualPluginOwner = {}
+
+/**
+ * Runs a Cypress user handler while allowing wrapped legacy Datadog helpers to
+ * defer to the managed finalizer.
+ *
+ * @param {() => unknown} handler user handler invocation
+ * @returns {unknown} handler result
+ */
+function runUserHandler (handler) {
+  return userHandlerContext.run(true, handler)
+}
+
+/**
+ * @returns {boolean} whether a managed finalizer owns the current lifecycle event
+ */
+function shouldDeferLegacyFinalization () {
+  return userHandlerContext.getStore() === true
+}
+
+/**
+ * Converts a Cypress rejection reason into error metadata without changing the
+ * value rethrown to Cypress.
+ *
+ * @param {unknown} reason rejection reason
+ * @returns {Error} error used for Test Optimization finalization
+ */
+function normalizeUserHandlerError (reason) {
+  if (reason instanceof Error) return reason
+  if (reason == null) return new Error('Cypress user handler rejected without an error')
+
+  try {
+    return new Error(String(reason))
+  } catch {
+    return new Error('Cypress user handler failed')
+  }
+}
+
+/**
+ * Runs the Datadog finalizer after user handlers while preserving the user
+ * error as the framework-visible failure.
+ *
+ * @param {Promise<void>} userHandlers collected user-handler chain
+ * @param {(userError?: unknown) => unknown} finalizer Datadog finalizer
+ * @returns {Promise<unknown>} finalizer result
+ */
+function finalizeAfterUserHandlers (userHandlers, finalizer) {
+  return userHandlers.then(
+    () => finalizer(),
+    userError => Promise.resolve().then(() => {
+      return finalizer(normalizeUserHandlerError(userError))
+    }).then(
+      () => { throw userError },
+      finalizerError => {
+        log.error('Datadog Cypress finalizer failed after a user handler error', finalizerError)
+        throw userError
+      }
+    )
+  )
+}
+
+module.exports = {
+  finalizeAfterUserHandlers,
+  manualPluginOwner,
+  normalizeUserHandlerError,
+  runUserHandler,
+  shouldDeferLegacyFinalization,
+}

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

@@ -2,6 +2,7 @@
 
 const NoopTracer = require('../../dd-trace/src/noop/tracer')
 const Plugin = require('../../dd-trace/src/plugins/plugin')
+const { finalizeAfterUserHandlers, runUserHandler } = require('./finalization')
 
 /**
  * Cypress plugin handles setup-node-events from the instrumentation layer
@@ -30,11 +31,12 @@ class CypressPlugin extends Plugin {
       const registerAfterRunWithCleanup = (afterRunHandler) => {
         on('after:run', (results) => {
           const chain = userAfterRunHandlers.reduce(
-            (p, h) => p.then(() => h(results)),
+            (p, h) => p.then(() => runUserHandler(() => h(results))),
             Promise.resolve()
           )
           if (afterRunHandler) {
-            return chain.then(() => afterRunHandler(results)).finally(cleanupWrapper)
+            return finalizeAfterUserHandlers(chain, userError => afterRunHandler(results, userError))
+              .finally(cleanupWrapper)
           }
           return chain.finally(cleanupWrapper)
         })
@@ -82,7 +84,7 @@ class CypressPlugin extends Plugin {
         // (the chained registration replaces the one plugin.js set, so it must include it).
         if (userAfterSpecHandlers.length > 0) {
           on('after:spec', (spec, results) => userAfterSpecHandlers.reduce(
-            (chain, handler) => chain.then(() => handler(spec, results)),
+            (chain, handler) => chain.then(() => runUserHandler(() => handler(spec, results))),
             Promise.resolve()
           ))
         }
@@ -97,13 +99,17 @@ class CypressPlugin extends Plugin {
 
       on('after:spec', (spec, results) => {
         const chain = userAfterSpecHandlers.reduce(
-          (p, h) => p.then(() => h(spec, results)),
+          (p, h) => p.then(() => runUserHandler(() => h(spec, results))),
           Promise.resolve()
         )
-        return chain.then(() => cypressPlugin.afterSpec(spec, results))
+        return finalizeAfterUserHandlers(chain, userError => cypressPlugin.afterSpec(spec, results, userError))
+          .catch((error) => {
+            cleanupWrapper()
+            throw error
+          })
       })
 
-      registerAfterRunWithCleanup((results) => cypressPlugin.afterRun(results))
+      registerAfterRunWithCleanup((results, userError) => cypressPlugin.afterRun(results, userError))
 
       on('task', cypressPlugin.getTasks())
 

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

@@ -4,6 +4,12 @@ const NoopTracer = require('../../dd-trace/src/noop/tracer')
 const satisfies = require('../../../vendor/dist/semifies')
 const { DD_MAJOR } = require('../../../version')
 const cypressPlugin = require('./cypress-plugin')
+const { manualPluginOwner } = require('./finalization')
+
+const DD_CYPRESS_AFTER_SPEC_HANDLER = Symbol.for('dd-trace.cypress.after-spec.handler')
+const DD_CYPRESS_AFTER_RUN_HANDLER = Symbol.for('dd-trace.cypress.after-run.handler')
+const DD_CYPRESS_TASK_HANDLER = Symbol.for('dd-trace.cypress.task.handler')
+const DD_CYPRESS_NOOP_TASK_HANDLER = Symbol.for('dd-trace.cypress.noop-task.handler')
 
 const noopTask = {
   'dd:testSuiteStart': () => {
@@ -18,6 +24,7 @@ const noopTask = {
   'dd:addTags': () => {
     return null
   },
+  [DD_CYPRESS_NOOP_TASK_HANDLER]: true,
 }
 
 module.exports = function CypressPlugin (on, config) {
@@ -41,9 +48,15 @@ module.exports = function CypressPlugin (on, config) {
 
   on('before:run', cypressPlugin.beforeRun.bind(cypressPlugin))
   on('after:screenshot', cypressPlugin.getAfterScreenshotHandler())
-  on('after:spec', cypressPlugin.afterSpec.bind(cypressPlugin))
-  on('after:run', cypressPlugin.afterRun.bind(cypressPlugin))
-  on('task', cypressPlugin.getTasks())
+  const afterSpecHandler = cypressPlugin.afterSpec.bind(cypressPlugin)
+  afterSpecHandler[DD_CYPRESS_AFTER_SPEC_HANDLER] = true
+  on('after:spec', afterSpecHandler)
+  const afterRunHandler = cypressPlugin.afterRun.bind(cypressPlugin)
+  afterRunHandler[DD_CYPRESS_AFTER_RUN_HANDLER] = true
+  on('after:run', afterRunHandler)
+  const taskHandler = cypressPlugin.getTasks()
+  taskHandler[DD_CYPRESS_TASK_HANDLER] = manualPluginOwner
+  on('task', taskHandler)
 
   return cypressPlugin.init(tracer, config)
 }

package/packages/datadog-plugin-dd-trace-api/src/index.js

@@ -78,6 +78,10 @@ module.exports = class DdTraceApiPlugin extends Plugin {
     }
 
     // handleEvent('configure')
+    // No handoff for `openfeature` yet: an application that calls into the tracer
+    // exclusively through the `dd-trace-api` shim (instead of `require('dd-trace')`) cannot
+    // reach `tracer.openfeature` through that shim. This does not affect SSI itself --
+    // auto-injection and vendored-provider resolution work regardless of this gap.
     handleEvent('startSpan')
     handleEvent('wrap')
     handleEvent('trace')

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

@@ -1,11 +1,13 @@
 'use strict'
 
+const { DD_MAJOR } = require('../../../version')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 const ElectronIpcPlugin = require('./ipc')
 const ElectronNetPlugin = require('./net')
 
 class ElectronPlugin extends CompositePlugin {
   static id = 'electron'
+  static optIn = DD_MAJOR >= 7
   static get plugins () {
     return {
       net: ElectronNetPlugin,

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

@@ -5,7 +5,7 @@ const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
 class FsPlugin extends TracingPlugin {
   static id = 'fs'
   static operation = 'operation'
-  static experimental = true
+  static optIn = true
 
   bindStart (ctx) {
     if (!this.activeSpan) return { noop: true }

package/packages/datadog-plugin-google-cloud-pubsub/src/producer.js

@@ -1,8 +1,17 @@
 'use strict'
 
-const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
+const {
+  readDatadogParentId,
+  readDatadogSamplingPriority,
+  readDatadogTraceId,
+  readTraceparent,
+  writeDatadogParentId,
+  writeDatadogSamplingPriority,
+  writeDatadogTraceId,
+} = require('../../dd-trace/src/carrier')
 const { DsmPathwayCodec, getHeadersSize } = require('../../dd-trace/src/datastreams')
 const id = require('../../dd-trace/src/id')
+const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 
 class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
   static id = 'google-cloud-pubsub'
@@ -21,7 +30,7 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
 
   handleMessagePublish ({ attributes, pubsub, topicName }) {
     // Skip if message already has trace context from upstream
-    if (attributes['x-datadog-trace-id'] || attributes.traceparent) return
+    if (readDatadogTraceId(attributes) || readTraceparent(attributes)) return
 
     const activeSpan = this.tracer.scope().active()
     if (!activeSpan) return
@@ -62,7 +71,7 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
     const messages = request.messages || []
     const topic = request.topic
     const messageCount = messages.length
-    const hasTraceContext = messages[0]?.attributes?.['x-datadog-trace-id']
+    const hasTraceContext = messages[0]?.attributes && readDatadogTraceId(messages[0].attributes)
 
     /**
      * Batch Publishing Strategy:
@@ -82,12 +91,14 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
     }
 
     const firstAttrs = messages[0]?.attributes
-    const parentData = firstAttrs?.['x-datadog-trace-id'] && firstAttrs['x-datadog-parent-id']
+    const traceId = firstAttrs && readDatadogTraceId(firstAttrs)
+    const spanId = firstAttrs && readDatadogParentId(firstAttrs)
+    const parentData = traceId && spanId
       ? {
-          traceId: firstAttrs['x-datadog-trace-id'],
-          spanId: firstAttrs['x-datadog-parent-id'],
+          traceId,
+          spanId,
           traceIdUpper: firstAttrs['_dd.p.tid'],
-          samplingPriority: firstAttrs['x-datadog-sampling-priority'],
+          samplingPriority: readDatadogSamplingPriority(firstAttrs),
         }
       : null
 
@@ -174,33 +185,36 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
   }
 
   #extractSpanLink (attrs) {
-    if (!attrs?.['x-datadog-trace-id'] || !attrs['x-datadog-parent-id']) return null
+    if (!attrs) return null
+    const traceId = readDatadogTraceId(attrs)
+    const spanId = readDatadogParentId(attrs)
+    if (!traceId || !spanId) return null
 
     // Convert to hex strings
-    const lowerHex = id(attrs['x-datadog-trace-id']).toString(16)
-    const spanIdHex = id(attrs['x-datadog-parent-id']).toString(16)
+    const lowerHex = id(traceId).toString(16)
+    const spanIdHex = id(spanId).toString(16)
 
     // Build full 128-bit trace ID
     const traceIdHex = attrs['_dd.p.tid']
       ? attrs['_dd.p.tid'] + lowerHex
       : lowerHex.padStart(32, '0')
 
+    const samplingPriority = readDatadogSamplingPriority(attrs)
     return {
       traceId: traceIdHex,
       spanId: spanIdHex,
-      samplingPriority: attrs['x-datadog-sampling-priority']
-        ? Number.parseInt(attrs['x-datadog-sampling-priority'], 10)
+      samplingPriority: samplingPriority
+        ? Number.parseInt(samplingPriority, 10)
         : undefined,
     }
   }
 
   #extractParentContext (data) {
-    const carrier = {
-      'x-datadog-trace-id': data.traceId,
-      'x-datadog-parent-id': data.spanId,
-    }
+    const carrier = /** @type {Record<string, unknown>} */ ({})
+    writeDatadogTraceId(carrier, data.traceId)
+    writeDatadogParentId(carrier, data.spanId)
     if (data.traceIdUpper) carrier['_dd.p.tid'] = data.traceIdUpper
-    if (data.samplingPriority) carrier['x-datadog-sampling-priority'] = String(data.samplingPriority)
+    if (data.samplingPriority) writeDatadogSamplingPriority(carrier, String(data.samplingPriority))
 
     return this.tracer.extract('text_map', carrier)
   }

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

@@ -5,6 +5,7 @@ const realSetTimeout = setTimeout
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
+const { writeDatadogParentId, writeDatadogTraceId } = require('../../dd-trace/src/carrier')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const { appClosing: appClosingTelemetry } = require('../../dd-trace/src/telemetry')
 
@@ -112,6 +113,7 @@ class JestPlugin extends CiPlugin {
       hasUnskippableSuites,
       hasForcedToRunSuites,
       error,
+      isTestSessionFinalizationError,
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
@@ -122,6 +124,9 @@ class JestPlugin extends CiPlugin {
         this.testModuleSpan.setTag(TEST_STATUS, status)
 
         if (error) {
+          if (isTestSessionFinalizationError) {
+            this.tracer._exporter.setDeferredTestSuiteError?.(error)
+          }
           this.testSessionSpan.setTag('error', error)
           this.testModuleSpan.setTag('error', error)
         }
@@ -158,6 +163,7 @@ class JestPlugin extends CiPlugin {
           this.testSessionSpan.setTag(TEST_MANAGEMENT_ENABLED, 'true')
         }
 
+        this.tracer._exporter.exportDeferredTestSuiteSpans?.()
         this.testModuleSpan.finish()
         this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'module')
         this.testSessionSpan.finish()
@@ -230,10 +236,10 @@ class JestPlugin extends CiPlugin {
         _ddItrSkippingEnabledTags: itrSkippingEnabledTags,
       } = testEnvironmentOptions
 
-      const testSessionSpanContext = this.tracer.extract('text_map', {
-        'x-datadog-trace-id': testSessionId,
-        'x-datadog-parent-id': testModuleId,
-      })
+      const carrier = /** @type {Record<string, unknown>} */ ({})
+      writeDatadogTraceId(carrier, testSessionId)
+      writeDatadogParentId(carrier, testModuleId)
+      const testSessionSpanContext = this.tracer.extract('text_map', carrier)
 
       const testSuiteMetadata = {
         ...getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite, 'jest'),
@@ -328,6 +334,7 @@ class JestPlugin extends CiPlugin {
       this.pendingTestSuiteFinishes.add(pendingFinish)
 
       const finish = () => {
+        this.tracer._exporter.deferTestSuiteSpan?.(testSuiteSpan)
         testSuiteSpan.finish()
         this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'suite')
         // Suites potentially run in a different process than the session,

package/packages/datadog-plugin-kafkajs/src/batch-consumer.js

@@ -1,8 +1,7 @@
 'use strict'
 
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
-const { getMessageSize } = require('../../dd-trace/src/datastreams')
-const { convertToTextMap } = require('./utils')
+const { convertToTextMap, getKafkaMessageSize } = require('./utils')
 
 class KafkajsBatchConsumerPlugin extends ConsumerPlugin {
   static id = 'kafkajs'
@@ -39,7 +38,7 @@ class KafkajsBatchConsumerPlugin extends ConsumerPlugin {
       }
 
       if (!this.config.dsmEnabled) continue
-      const payloadSize = getMessageSize(message)
+      const payloadSize = getKafkaMessageSize(message)
       this.tracer.decodeDataStreamsContext(headers)
       const edgeTags = ['direction:in', `group:${groupId}`, `topic:${topic}`, 'type:kafka']
       if (clusterId) {