dd-trace 5.100.0 → 5.101.0

package/index.d.ts

@@ -3934,6 +3934,13 @@ declare namespace tracer {
        */
       tags?: { [key: string]: any },
 
+      /**
+       * List of tag keys to propagate to LLM Observability cost and token metrics emitted from this span.
+       * Each key must already be present in `tags` from this call or from a previous annotation on the
+       * same span.
+       */
+      costTags?: string[],
+
       /**
        * A Prompt object that represents the prompt used for an LLM call. Only used on `llm` spans.
        */
@@ -3946,6 +3953,13 @@ declare namespace tracer {
        */
       tags?: { [key: string]: any },
 
+      /**
+       * List of tag keys to propagate to LLM Observability cost and token metrics emitted from each span
+       * in the context.
+       * Each key must already be present in `tags` on the span when it starts.
+       */
+      costTags?: string[],
+
       /**
        * Set to override the span name for any spans annotated within the returned context.
        */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.100.0",
+  "version": "5.101.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -18,8 +18,8 @@
     "type:check": "tsc --noEmit -p tsconfig.dev.json",
     "type:doc:build": "cd docs && yarn && yarn build",
     "type:doc:test": "cd docs && yarn && yarn test",
-    "lint": "node scripts/check_licenses.js && node scripts/check-no-coverage-artifacts.js && eslint . --concurrency=auto --max-warnings 0",
-    "lint:fix": "node scripts/check_licenses.js && node scripts/check-no-coverage-artifacts.js && eslint . --concurrency=auto --max-warnings 0 --fix",
+    "lint": "node scripts/check_licenses.js && node scripts/check-no-coverage-artifacts.js && node scripts/check-no-mcr-images.js && eslint . --concurrency=auto --max-warnings 0",
+    "lint:fix": "node scripts/check_licenses.js && node scripts/check-no-coverage-artifacts.js && node scripts/check-no-mcr-images.js && eslint . --concurrency=auto --max-warnings 0 --fix",
     "lint:inspect": "npx @eslint/config-inspector@latest",
     "lint:codeowners": "codeowners-audit",
     "lint:codeowners:ci": "codeowners-audit --glob='**/*.spec.js' --glob='benchmark/sirun/**'",
@@ -166,12 +166,12 @@
     "@datadog/native-appsec": "11.0.1",
     "@datadog/native-iast-taint-tracking": "4.1.0",
     "@datadog/native-metrics": "3.1.1",
-    "@datadog/openfeature-node-server": "^1.1.1",
+    "@datadog/openfeature-node-server": "^1.1.2",
     "@datadog/pprof": "5.14.1",
     "@datadog/wasm-js-rewriter": "5.0.1",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
     "@opentelemetry/api-logs": "<1.0.0",
-    "oxc-parser": "^0.127.0"
+    "oxc-parser": "^0.128.0"
   },
   "devDependencies": {
     "@actions/core": "^3.0.1",

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

@@ -8,11 +8,13 @@ const {
   wrapConfig,
 } = require('./cypress-config')
 
+const MINIMUM_CYPRESS_VERSION = DD_MAJOR >= 6 ? '>=12.0.0' : '>=10.2.0'
+
 // Wrap defineConfig() so configs are instrumented when loaded in Cypress's
 // config child process. This covers both CLI and programmatic usage with CJS configs.
 addHook({
   name: 'cypress',
-  versions: ['>=10.2.0'],
+  versions: [MINIMUM_CYPRESS_VERSION],
 }, (cypress) => {
   if (typeof cypress.defineConfig === 'function') {
     shimmer.wrap(cypress, 'defineConfig', (defineConfig) => function (config) {
@@ -61,7 +63,7 @@ function wrapStartOnModule (mod) {
 for (const file of ['lib/exec/run.js', 'lib/exec/open.js', 'dist/exec/run.js', 'dist/exec/open.js']) {
   addHook({
     name: 'cypress',
-    versions: ['>=10.2.0'],
+    versions: [MINIMUM_CYPRESS_VERSION],
     file,
   }, wrapStartOnModule)
 }
@@ -70,7 +72,7 @@ for (const file of ['lib/exec/run.js', 'lib/exec/open.js', 'dist/exec/run.js', '
 // The chunk exports runModule and openModule, each with a start() method.
 addHook({
   name: 'cypress',
-  versions: ['>=10.2.0'],
+  versions: [MINIMUM_CYPRESS_VERSION],
   filePattern: 'dist/cli.*',
 }, (cliChunk) => {
   if (cliChunk.runModule?.start) {

package/packages/datadog-instrumentations/src/http/client.js

@@ -26,10 +26,27 @@ function hookFn (http) {
   return http
 }
 
+// `inputURL` may be the user's options object (for the `http.request(options)`
+// shape); never write directly into it. The result is later mutated by
+// `normalizeHeaders` and read by `url.format`, so the merged object must be
+// owned by the tracer. `undefined` means "no URL supplied" — Node merges
+// with the options object or its defaults, so build a tracer-owned
+// options-only shape and let tracing proceed. `null`/primitive first args
+// are returned as-is so `normalizeHeaders` throws and the surrounding
+// try/catch in `instrumentRequest` falls through to the native request;
+// spreading a primitive yields `{}`, which would silently turn an invalid
+// `http.request(123)` into a synthesized localhost request.
 function combineOptions (inputURL, inputOptions) {
-  return inputOptions !== null && typeof inputOptions === 'object'
-    ? Object.assign(inputURL || {}, inputOptions)
-    : inputURL
+  if (inputURL === undefined) {
+    return inputOptions !== null && typeof inputOptions === 'object' ? { ...inputOptions } : {}
+  }
+  if (inputURL === null || (typeof inputURL !== 'object' && typeof inputURL !== 'function')) {
+    return inputURL
+  }
+  if (inputOptions !== null && typeof inputOptions === 'object') {
+    return { ...inputURL, ...inputOptions }
+  }
+  return { ...inputURL }
 }
 function normalizeHeaders (options) {
   options.headers ??= {}

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

@@ -4,6 +4,8 @@
 const realSetTimeout = setTimeout
 
 const path = require('path')
+const satisfies = require('../../../vendor/dist/semifies')
+const { DD_MAJOR } = require('../../../version')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
 const {
@@ -126,7 +128,13 @@ const testSuiteJestObjects = new Map()
 
 const BREAKPOINT_HIT_GRACE_PERIOD_MS = 200
 const ATR_RETRY_SUPPRESSION_FLAG = '_ddDisableAtrRetry'
+const MINIMUM_JEST_VERSION = DD_MAJOR >= 6 ? '>=28.0.0' : '>=24.8.0'
+const MINIMUM_JEST_VERSION_BEFORE_30 = DD_MAJOR >= 6 ? '>=28.0.0 <30.0.0' : '>=24.8.0 <30.0.0'
+const MINIMUM_JEST_WORKER_VERSION_BEFORE_30 = DD_MAJOR >= 6 ? '>=28.0.0 <30.0.0' : '>=24.9.0 <30.0.0'
+const MINIMUM_JEST_CONFIG_ASYNC_VERSION = DD_MAJOR >= 6 ? '>=28.0.0' : '>=25.1.0'
+const MINIMUM_JEST_TEST_SCHEDULER_VERSION = DD_MAJOR >= 6 ? '>=28.0.0' : '>=27.0.0'
 const atrSuppressedErrors = new Map()
+let hasWarnedDeprecatedJestVersion = false
 
 // Track quarantined tests whose errors were suppressed, keyed by "suite › testName"
 const quarantinedFailingTests = new Set()
@@ -177,6 +185,20 @@ function formatJestError (errors) {
   return error
 }
 
+function warnDeprecatedJestVersion (frameworkVersion) {
+  if (DD_MAJOR >= 6 || hasWarnedDeprecatedJestVersion || !frameworkVersion ||
+      !satisfies(frameworkVersion, '<28.0.0')) {
+    return
+  }
+
+  hasWarnedDeprecatedJestVersion = true
+  // eslint-disable-next-line no-console
+  console.warn(
+    'dd-trace support for Jest<28.0.0 is deprecated and will be removed in dd-trace v6. ' +
+      'Please upgrade Jest to >=28.0.0.'
+  )
+}
+
 function getTestEnvironmentOptions (config) {
   if (config.projectConfig && config.projectConfig.testEnvironmentOptions) { // newer versions
     return config.projectConfig.testEnvironmentOptions
@@ -1073,12 +1095,12 @@ function applySuiteSkipping (originalTests, rootDir, frameworkVersion) {
 
 addHook({
   name: 'jest-environment-node',
-  versions: ['>=24.8.0'],
+  versions: [MINIMUM_JEST_VERSION],
 }, getTestEnvironment)
 
 addHook({
   name: 'jest-environment-jsdom',
-  versions: ['>=24.8.0'],
+  versions: [MINIMUM_JEST_VERSION],
 }, getTestEnvironment)
 
 addHook({
@@ -1150,6 +1172,8 @@ function searchSourceWrapper (searchSourcePackage, frameworkVersion) {
 
 function getCliWrapper (isNewJestVersion) {
   return function cliWrapper (cli, jestVersion) {
+    warnDeprecatedJestVersion(jestVersion)
+
     if (isNewJestVersion) {
       cli = shimmer.wrap(
         cli,
@@ -1536,7 +1560,7 @@ function coverageReporterWrapper (coverageReporter) {
 addHook({
   name: '@jest/core',
   file: 'build/TestScheduler.js',
-  versions: ['>=27.0.0'],
+  versions: [MINIMUM_JEST_TEST_SCHEDULER_VERSION],
 }, (testSchedulerPackage, frameworkVersion) => {
   const oldCreateTestScheduler = testSchedulerPackage.createTestScheduler
   const newCreateTestScheduler = async function () {
@@ -1552,17 +1576,19 @@ addHook({
   return testSchedulerPackage
 })
 
-addHook({
-  name: '@jest/core',
-  file: 'build/TestScheduler.js',
-  versions: ['>=24.8.0 <27.0.0'],
-}, (testSchedulerPackage, frameworkVersion) => {
-  shimmer.wrap(
-    testSchedulerPackage.default.prototype,
-    'scheduleTests', scheduleTests => getWrappedScheduleTests(scheduleTests, frameworkVersion)
-  )
-  return testSchedulerPackage
-})
+if (DD_MAJOR < 6) {
+  addHook({
+    name: '@jest/core',
+    file: 'build/TestScheduler.js',
+    versions: ['>=24.8.0 <27.0.0'],
+  }, (testSchedulerPackage, frameworkVersion) => {
+    shimmer.wrap(
+      testSchedulerPackage.default.prototype,
+      'scheduleTests', scheduleTests => getWrappedScheduleTests(scheduleTests, frameworkVersion)
+    )
+    return testSchedulerPackage
+  })
+}
 
 addHook({
   name: '@jest/test-sequencer',
@@ -1582,16 +1608,18 @@ addHook({
   return sequencerPackage
 })
 
-addHook({
-  name: '@jest/reporters',
-  file: 'build/coverage_reporter.js',
-  versions: ['>=24.8.0 <26.6.2'],
-}, coverageReporterWrapper)
+if (DD_MAJOR < 6) {
+  addHook({
+    name: '@jest/reporters',
+    file: 'build/coverage_reporter.js',
+    versions: ['>=24.8.0 <26.6.2'],
+  }, coverageReporterWrapper)
+}
 
 addHook({
   name: '@jest/reporters',
   file: 'build/CoverageReporter.js',
-  versions: ['>=26.6.2'],
+  versions: [DD_MAJOR >= 6 ? '>=28.0.0' : '>=26.6.2'],
 }, coverageReporterWrapper)
 
 addHook({
@@ -1604,7 +1632,7 @@ addHook({
 addHook({
   name: '@jest/core',
   file: 'build/cli/index.js',
-  versions: ['>=24.8.0 <30.0.0'],
+  versions: [MINIMUM_JEST_VERSION_BEFORE_30],
 }, getCliWrapper(false))
 
 addHook({
@@ -1691,7 +1719,7 @@ addHook({
 addHook({
   name: 'jest-circus',
   file: 'build/legacy-code-todo-rewrite/jestAdapter.js',
-  versions: ['>=24.8.0'],
+  versions: [MINIMUM_JEST_VERSION],
 }, jestAdapterWrapper)
 
 function configureTestEnvironment (readConfigsResult) {
@@ -1828,7 +1856,7 @@ function wrapCreateScriptTransformer (createScriptTransformer) {
 
 addHook({
   name: '@jest/transform',
-  versions: ['>=24.8.0 <30.0.0'],
+  versions: [MINIMUM_JEST_VERSION_BEFORE_30],
   file: 'build/ScriptTransformer.js',
 }, transformPackage => {
   transformPackage.createScriptTransformer = wrapCreateScriptTransformer(transformPackage.createScriptTransformer)
@@ -1848,20 +1876,22 @@ addHook({
  */
 addHook({
   name: '@jest/core',
-  versions: ['>=24.8.0 <30.0.0'],
+  versions: [MINIMUM_JEST_VERSION_BEFORE_30],
   file: 'build/SearchSource.js',
 }, searchSourceWrapper)
 
 // from 25.1.0 on, readConfigs becomes async
 addHook({
   name: 'jest-config',
-  versions: ['>=25.1.0'],
+  versions: [MINIMUM_JEST_CONFIG_ASYNC_VERSION],
 }, jestConfigAsyncWrapper)
 
-addHook({
-  name: 'jest-config',
-  versions: ['24.8.0 - 24.9.0'],
-}, jestConfigSyncWrapper)
+if (DD_MAJOR < 6) {
+  addHook({
+    name: 'jest-config',
+    versions: ['24.8.0 - 24.9.0'],
+  }, jestConfigSyncWrapper)
+}
 
 const LIBRARIES_BYPASSING_JEST_REQUIRE_ENGINE = new Set([
   'selenium-webdriver',
@@ -1876,7 +1906,7 @@ const LIBRARIES_BYPASSING_JEST_REQUIRE_ENGINE = new Set([
 
 addHook({
   name: 'jest-runtime',
-  versions: ['>=24.8.0'],
+  versions: [MINIMUM_JEST_VERSION],
 }, (runtimePackage) => {
   const Runtime = runtimePackage.default ?? runtimePackage
 
@@ -2077,7 +2107,7 @@ function enqueueWrapper (enqueue) {
 */
 addHook({
   name: 'jest-worker',
-  versions: ['>=24.9.0 <30.0.0'],
+  versions: [MINIMUM_JEST_WORKER_VERSION_BEFORE_30],
   file: 'build/workers/ChildProcessWorker.js',
 }, (childProcessWorker) => {
   const ChildProcessWorker = childProcessWorker.default
@@ -2092,7 +2122,7 @@ addHook({
 
 addHook({
   name: 'jest-worker',
-  versions: ['>=24.9.0 <30.0.0'],
+  versions: [MINIMUM_JEST_WORKER_VERSION_BEFORE_30],
   file: 'build/workers/NodeThreadsWorker.js',
 }, (nodeThreadsWorker) => {
   const ExperimentalWorker = nodeThreadsWorker.default

package/packages/datadog-instrumentations/src/mocha/common.js

@@ -3,8 +3,11 @@
 const { addHook, channel } = require('../helpers/instrument')
 const shimmer = require('../../../datadog-shimmer')
 const { getCallSites } = require('../../../dd-trace/src/plugins/util/stacktrace')
+const { DD_MAJOR } = require('../../../../version')
 const { testToStartLine } = require('./utils')
 
+const MINIMUM_MOCHA_VERSION = DD_MAJOR >= 6 ? '>=8.0.0' : '>=5.2.0'
+
 const parameterizedTestCh = channel('ci:mocha:test:parameterize')
 const patched = new WeakSet()
 
@@ -33,7 +36,7 @@ addHook({
 // support for start line
 addHook({
   name: 'mocha',
-  versions: ['>=5.2.0'],
+  versions: [MINIMUM_MOCHA_VERSION],
   file: 'lib/suite.js',
 }, (Suite) => {
   shimmer.wrap(Suite.prototype, 'addTest', addTest => function (test) {

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

@@ -1,6 +1,8 @@
 'use strict'
 
 const { createCoverageMap } = require('../../../../vendor/dist/istanbul-lib-coverage')
+const satisfies = require('../../../../vendor/dist/semifies')
+const { DD_MAJOR } = require('../../../../version')
 const { addHook, channel } = require('../helpers/instrument')
 const shimmer = require('../../../datadog-shimmer')
 const { isMarkedAsUnskippable } = require('../../../datadog-plugin-jest/src/util')
@@ -41,7 +43,10 @@ const {
 
 require('./common')
 
+const MINIMUM_MOCHA_VERSION = DD_MAJOR >= 6 ? '>=8.0.0' : '>=5.2.0'
+
 const patched = new WeakSet()
+let hasWarnedDeprecatedMochaVersion = false
 
 const unskippableSuites = []
 let suitesToSkip = []
@@ -79,6 +84,20 @@ const itrSkippedSuitesCh = channel('ci:mocha:itr:skipped-suites')
 
 const getCodeCoverageCh = channel('ci:nyc:get-coverage')
 
+function warnDeprecatedMochaVersion (frameworkVersion) {
+  if (DD_MAJOR >= 6 || hasWarnedDeprecatedMochaVersion || !frameworkVersion ||
+      !satisfies(frameworkVersion, '<8.0.0')) {
+    return
+  }
+
+  hasWarnedDeprecatedMochaVersion = true
+  // eslint-disable-next-line no-console
+  console.warn(
+    'dd-trace support for Mocha<8.0.0 is deprecated and will be removed in dd-trace v6. ' +
+      'Please upgrade Mocha to >=8.0.0.'
+  )
+}
+
 // Tests from workers do not come with `isFailed` method
 function isTestFailed (test) {
   if (test.isFailed) {
@@ -345,9 +364,11 @@ function getExecutionConfiguration (runner, isParallel, frameworkVersion, onFini
 // It is called but skipped in parallel mode.
 addHook({
   name: 'mocha',
-  versions: ['>=5.2.0'],
+  versions: [MINIMUM_MOCHA_VERSION],
   file: 'lib/mocha.js',
 }, (Mocha, frameworkVersion) => {
+  warnDeprecatedMochaVersion(frameworkVersion)
+
   shimmer.wrap(Mocha.prototype, 'run', run => function () {
     // Workers do not need to request any data, just run the tests
     if (!testFinishCh.hasSubscribers || getEnvironmentVariable('MOCHA_WORKER_ID') || this.options.parallel) {
@@ -401,7 +422,7 @@ addHook({
 
 addHook({
   name: 'mocha',
-  versions: ['>=5.2.0'],
+  versions: [MINIMUM_MOCHA_VERSION],
   file: 'lib/cli/run-helpers.js',
 }, (run) => {
   // `runMocha` is an async function
@@ -432,7 +453,7 @@ addHook({
 // This hook is used to generate session, module, suite and test events
 addHook({
   name: 'mocha',
-  versions: ['>=5.2.0'],
+  versions: [MINIMUM_MOCHA_VERSION],
   file: 'lib/runner.js',
 }, function (Runner, frameworkVersion) {
   if (patched.has(Runner)) return Runner
@@ -541,7 +562,7 @@ addHook({
 // Used to set the correct async resource to the test.
 addHook({
   name: 'mocha',
-  versions: ['>=5.2.0'],
+  versions: [MINIMUM_MOCHA_VERSION],
   file: 'lib/runnable.js',
 }, (runnablePackage) => runnableWrapper(runnablePackage, config))
 

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

@@ -2,6 +2,7 @@
 
 const { addHook, channel } = require('../helpers/instrument')
 const shimmer = require('../../../datadog-shimmer')
+const { DD_MAJOR } = require('../../../../version')
 
 const {
   runnableWrapper,
@@ -15,6 +16,8 @@ const {
 } = require('./utils')
 require('./common')
 
+const MINIMUM_MOCHA_VERSION = DD_MAJOR >= 6 ? '>=8.0.0' : '>=5.2.0'
+
 const workerFinishCh = channel('ci:mocha:worker:finish')
 
 const config = {}
@@ -64,7 +67,7 @@ addHook({
 // Runner is also hooked in mocha/main.js, but in here we only generate test events.
 addHook({
   name: 'mocha',
-  versions: ['>=5.2.0'],
+  versions: [MINIMUM_MOCHA_VERSION],
   file: 'lib/runner.js',
 }, function (Runner) {
   shimmer.wrap(Runner.prototype, 'runTests', runTests => getRunTestsWrapper(runTests, config))
@@ -99,6 +102,6 @@ addHook({
 // Used to set the correct async resource to the test.
 addHook({
   name: 'mocha',
-  versions: ['>=5.2.0'],
+  versions: [MINIMUM_MOCHA_VERSION],
   file: 'lib/runnable.js',
 }, (runnablePackage) => runnableWrapper(runnablePackage, config))

package/packages/datadog-instrumentations/src/otel-sdk-trace.js

@@ -3,14 +3,10 @@
 const shimmer = require('../../datadog-shimmer')
 const tracer = require('../../dd-trace')
 const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
+const { isFalse, isTrue } = require('../../dd-trace/src/util')
 const { addHook } = require('./helpers/instrument')
 
-const otelSdkEnabled = getValueFromEnvSources('DD_TRACE_OTEL_ENABLED') ||
-getValueFromEnvSources('OTEL_SDK_DISABLED')
-  ? !getValueFromEnvSources('OTEL_SDK_DISABLED')
-  : undefined
-
-if (otelSdkEnabled) {
+if (isOtelSdkEnabled()) {
   addHook({
     name: '@opentelemetry/sdk-trace-node',
     file: 'build/src/NodeTracerProvider.js',
@@ -22,3 +18,12 @@ if (otelSdkEnabled) {
     return mod
   })
 }
+
+function isOtelSdkEnabled () {
+  // Datadog explicit opt-out wins over every OTel signal; check it first.
+  const ddTraceOtelEnabled = getValueFromEnvSources('DD_TRACE_OTEL_ENABLED')
+  if (isFalse(ddTraceOtelEnabled)) return false
+  const otelSdkDisabled = getValueFromEnvSources('OTEL_SDK_DISABLED')
+  if (isTrue(otelSdkDisabled)) return false
+  return isTrue(ddTraceOtelEnabled) || isFalse(otelSdkDisabled)
+}

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

@@ -69,8 +69,8 @@ class BullmqConsumerPlugin extends ConsumerPlugin {
       const ddCarrier = metadata._datadog
       if (!ddCarrier) return
 
-      // Clean up only our _datadog key, preserve other metadata
-      delete metadata._datadog
+      // Avoid `delete`'s hidden-class transition; JSON.stringify also omits undefined values.
+      metadata._datadog = undefined
       job.opts.telemetry.metadata = JSON.stringify(metadata)
 
       return ddCarrier

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

@@ -56,12 +56,14 @@ class BaseBullmqProducerPlugin extends ProducerPlugin {
     throw new Error('injectTraceContext must be implemented by subclass')
   }
 
+  // Returned so setProducerCheckpoint can mutate it without a second parse.
   _injectIntoOpts (span, opts) {
     const carrier = {}
     this.tracer.inject(span, 'text_map', carrier)
     const metadata = parseTelemetryMetadata(opts.telemetry?.metadata)
     metadata._datadog = carrier
     opts.telemetry = { metadata: JSON.stringify(metadata), omitContext: true }
+    return metadata
   }
 
   setProducerCheckpoint (span, ctx) {
@@ -70,7 +72,7 @@ class BaseBullmqProducerPlugin extends ProducerPlugin {
     const dataStreamsContext = this.tracer.setCheckpoint(edgeTags, span, payloadSize)
 
     if (optsTarget && typeof optsTarget === 'object') {
-      const metadata = parseTelemetryMetadata(optsTarget.telemetry?.metadata)
+      const metadata = ctx._ddMetadata ?? parseTelemetryMetadata(optsTarget.telemetry?.metadata)
       DsmPathwayCodec.encode(dataStreamsContext, metadata._datadog || metadata)
       if (!metadata._datadog) metadata._datadog = {}
       optsTarget.telemetry = { metadata: JSON.stringify(metadata), omitContext: true }
@@ -110,7 +112,7 @@ class QueueAddPlugin extends BaseBullmqProducerPlugin {
 
   injectTraceContext (span, ctx) {
     const opts = this.#ensureOpts(ctx)
-    this._injectIntoOpts(span, opts)
+    ctx._ddMetadata = this._injectIntoOpts(span, opts)
   }
 
   getDsmData (ctx) {
@@ -146,36 +148,28 @@ class QueueAddBulkPlugin extends BaseBullmqProducerPlugin {
     const jobs = ctx.arguments?.[0]
     if (!Array.isArray(jobs)) return
 
-    for (const job of jobs) {
+    const cache = []
+    for (let i = 0; i < jobs.length; i++) {
+      const job = jobs[i]
       if (!job) continue
       job.opts = job.opts || {}
-      this._injectIntoOpts(span, job.opts)
-    }
-  }
-
-  getDsmData (ctx) {
-    const jobs = ctx.arguments?.[0] || []
-    const payloadSize = jobs.reduce((total, job) => {
-      return total + (job?.data ? getMessageSize(job.data) : 0)
-    }, 0)
-    return {
-      queueName: ctx.self?.name || 'bullmq',
-      payloadSize,
-      optsTarget: jobs[0]?.opts,
+      cache[i] = this._injectIntoOpts(span, job.opts)
     }
+    ctx._ddMetadata = cache
   }
 
   setProducerCheckpoint (span, ctx) {
     const jobs = ctx.arguments?.[0] || []
     const queueName = ctx.self?.name || 'bullmq'
     const edgeTags = ['direction:out', `topic:${queueName}`, 'type:bullmq']
+    const cache = ctx._ddMetadata
 
-    for (const job of jobs) {
+    for (let i = 0; i < jobs.length; i++) {
+      const job = jobs[i]
       if (!job?.data) continue
       const payloadSize = getMessageSize(job.data)
       const dataStreamsContext = this.tracer.setCheckpoint(edgeTags, span, payloadSize)
-      job.opts = job.opts || {}
-      const metadata = parseTelemetryMetadata(job.opts.telemetry?.metadata)
+      const metadata = cache?.[i] ?? parseTelemetryMetadata(job.opts.telemetry?.metadata)
       DsmPathwayCodec.encode(dataStreamsContext, metadata._datadog || metadata)
       if (!metadata._datadog) metadata._datadog = {}
       job.opts.telemetry = { metadata: JSON.stringify(metadata), omitContext: true }
@@ -201,7 +195,7 @@ class FlowProducerAddPlugin extends BaseBullmqProducerPlugin {
     const flow = ctx.arguments?.[0]
     if (!flow) return
     flow.opts = flow.opts || {}
-    this._injectIntoOpts(span, flow.opts)
+    ctx._ddMetadata = this._injectIntoOpts(span, flow.opts)
   }
 
   getDsmData (ctx) {

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

@@ -4,6 +4,7 @@
 const { performance } = require('perf_hooks')
 const dateNow = Date.now
 
+const satisfies = require('../../../vendor/dist/semifies')
 const {
   TEST_STATUS,
   TEST_IS_RUM_ACTIVE,
@@ -108,6 +109,7 @@ const {
 } = require('./source-map-utils')
 
 const TEST_FRAMEWORK_NAME = 'cypress'
+let hasWarnedDeprecatedCypressVersion = false
 
 const CYPRESS_STATUS_TO_TEST_STATUS = {
   passed: 'pass',
@@ -136,6 +138,20 @@ function getCypressVersion (details) {
   return ''
 }
 
+function warnDeprecatedCypressVersion (version) {
+  if (DD_MAJOR >= 6 || hasWarnedDeprecatedCypressVersion || !version || !satisfies(version, '<12.0.0')) {
+    return
+  }
+
+  hasWarnedDeprecatedCypressVersion = true
+  // console.warn does not seem to work reliably in Cypress, so use console.log instead.
+  // eslint-disable-next-line no-console
+  console.log(
+    'WARNING: dd-trace support for Cypress<12.0.0 is deprecated' +
+    ' and will not be supported in dd-trace v6. Please upgrade Cypress to >=12.0.0.'
+  )
+}
+
 function getRootDir (details) {
   if (details?.config) {
     return details.config.projectRoot || details.config.repoRoot || process.cwd()
@@ -434,6 +450,7 @@ class CypressPlugin {
     this._isInit = true
     this.tracer = tracer
     this.cypressConfig = cypressConfig
+    warnDeprecatedCypressVersion(cypressConfig.version)
 
     this.isTestIsolationEnabled = getIsTestIsolationEnabled(cypressConfig)