dd-trace 5.53.0 → 5.54.0

package/packages/dd-trace/src/opentelemetry/span_processor.js

@@ -5,8 +5,8 @@ class NoopSpanProcessor {
     return Promise.resolve()
   }
 
-  onStart (span, context) { }
-  onEnd (span) { }
+  onStart (span, context) {}
+  onEnd (span) {}
 
   shutdown () {
     return Promise.resolve()

package/packages/dd-trace/src/opentelemetry/tracer.js

@@ -71,7 +71,11 @@ class Tracer {
 
         // Update meta and samplingPriority based on extracted values
         Object.assign(meta, otherPropagatedTags)
-        samplingPriority = TextMapPropagator._getSamplingPriority(traceFlag, parseInt(samplingPriorityTs, 10), origin)
+        samplingPriority = TextMapPropagator._getSamplingPriority(
+          traceFlag,
+          Number.parseInt(samplingPriorityTs, 10),
+          origin
+        )
       } else {
         log.debug(`no dd list member in tracestate from incoming request: ${ts}`)
       }
@@ -144,10 +148,7 @@ class Tracer {
 
       // Set initial span attributes. The attributes object may have been mutated
       // by the sampler, so we sanitize the merged attributes before setting them.
-      sanitizeAttributes(
-        // Object.assign(attributes, samplingResult.attributes)
-        attributes
-      )
+      sanitizeAttributes(attributes)
     )
   }
 

package/packages/dd-trace/src/opentracing/propagation/log.js

@@ -14,12 +14,10 @@ class LogPropagator {
     carrier.dd = {}
 
     if (spanContext) {
-      if (this._config.traceId128BitGenerationEnabled &&
-        this._config.traceId128BitLoggingEnabled && spanContext._trace.tags['_dd.p.tid']) {
-        carrier.dd.trace_id = spanContext.toTraceId(true)
-      } else {
-        carrier.dd.trace_id = spanContext.toTraceId()
-      }
+      carrier.dd.trace_id = this._config.traceId128BitGenerationEnabled &&
+        this._config.traceId128BitLoggingEnabled && spanContext._trace.tags['_dd.p.tid']
+        ? spanContext.toTraceId(true)
+        : spanContext.toTraceId()
 
       carrier.dd.span_id = spanContext.toSpanId()
     }
@@ -35,8 +33,8 @@ class LogPropagator {
     }
 
     if (carrier.dd.trace_id.length === 32) {
-      const hi = carrier.dd.trace_id.substring(0, 16)
-      const lo = carrier.dd.trace_id.substring(16, 32)
+      const hi = carrier.dd.trace_id.slice(0, 16)
+      const lo = carrier.dd.trace_id.slice(16, 32)
       const spanContext = new DatadogSpanContext({
         traceId: id(lo, 16),
         spanId: id(carrier.dd.span_id, 10)

package/packages/dd-trace/src/opentracing/propagation/text_map.js

@@ -31,21 +31,21 @@ const b3HeaderKey = 'b3'
 const sqsdHeaderHey = 'x-aws-sqsd-attr-_datadog'
 const b3HeaderExpr = /^(([0-9a-f]{16}){1,2}-[0-9a-f]{16}(-[01d](-[0-9a-f]{16})?)?|[01d])$/i
 const baggageExpr = new RegExp(`^${baggagePrefix}(.+)$`)
-const tagKeyExpr = /^_dd\.p\.[\x21-\x2b\x2d-\x7e]+$/ // ASCII minus spaces and commas
-const tagValueExpr = /^[\x20-\x2b\x2d-\x7e]*$/ // ASCII minus commas
+const tagKeyExpr = /^_dd\.p\.[\x21-\x2B\x2D-\x7E]+$/ // ASCII minus spaces and commas
+const tagValueExpr = /^[\x20-\x2B\x2D-\x7E]*$/ // ASCII minus commas
 const traceparentExpr = /^([a-f0-9]{2})-([a-f0-9]{32})-([a-f0-9]{16})-([a-f0-9]{2})(-.*)?$/i
 const traceparentKey = 'traceparent'
 const tracestateKey = 'tracestate'
 const ddKeys = [traceKey, spanKey, samplingKey, originKey]
 const b3Keys = [b3TraceKey, b3SpanKey, b3ParentKey, b3SampledKey, b3FlagsKey, b3HeaderKey]
 const w3cKeys = [traceparentKey, tracestateKey]
-const logKeys = ddKeys.concat(b3Keys, w3cKeys)
+const logKeys = [...ddKeys, ...b3Keys, ...w3cKeys]
 // Origin value in tracestate replaces '~', ',' and ';' with '_"
-const tracestateOriginFilter = /[^\x20-\x2b\x2d-\x3a\x3c-\x7d]/g
+const tracestateOriginFilter = /[^\x20-\x2B\x2D-\x3A\x3C-\x7D]/g
 // Tag keys in tracestate replace ' ', ',' and '=' with '_'
-const tracestateTagKeyFilter = /[^\x21-\x2b\x2d-\x3c\x3e-\x7e]/g
+const tracestateTagKeyFilter = /[^\x21-\x2B\x2D-\x3C\x3E-\x7E]/g
 // Tag values in tracestate replace ',', '~' and ';' with '_'
-const tracestateTagValueFilter = /[^\x20-\x2b\x2d-\x3a\x3c-\x7d]/g
+const tracestateTagValueFilter = /[^\x20-\x2B\x2D-\x3A\x3C-\x7D]/g
 const invalidSegment = /^0+$/
 const zeroTraceId = '0000000000000000'
 const hex16 = /^[0-9A-Fa-f]{16}$/
@@ -146,7 +146,7 @@ class TextMapPropagator {
         baggage += item
       }
 
-      baggage = baggage.slice(0, baggage.length - 1)
+      baggage = baggage.slice(0, -1)
       if (baggage) carrier.baggage = baggage
     }
   }
@@ -240,7 +240,7 @@ class TextMapPropagator {
       if (typeof origin === 'string') {
         const originValue = origin
           .replace(tracestateOriginFilter, '_')
-          .replace(/[\x3d]/g, '~')
+          .replace(/[\x3D]/g, '~')
 
         state.set('o', originValue)
       }
@@ -254,7 +254,7 @@ class TextMapPropagator {
         const tagValue = tags[key]
           .toString()
           .replace(tracestateTagValueFilter, '_')
-          .replace(/[\x3d]/g, '~')
+          .replace(/[\x3D]/g, '~')
 
         state.set(tagKey, tagValue)
       }
@@ -316,12 +316,10 @@ class TextMapPropagator {
           extractedContext = this._extractB3SingleContext(carrier)
           break
         case 'b3':
-          if (this._config.tracePropagationStyle.otelPropagators) {
+          extractedContext = this._config.tracePropagationStyle.otelPropagators
             // TODO: should match "b3 single header" in next major
-            extractedContext = this._extractB3SingleContext(carrier)
-          } else {
-            extractedContext = this._extractB3MultiContext(carrier)
-          }
+            ? this._extractB3SingleContext(carrier)
+            : this._extractB3MultiContext(carrier)
           break
         case 'b3multi':
           extractedContext = this._extractB3MultiContext(carrier)
@@ -442,7 +440,7 @@ class TextMapPropagator {
     let parsed
     try {
       parsed = JSON.parse(headerValue)
-    } catch (e) {
+    } catch {
       return null
     }
     return this._extractDatadogContext(parsed)
@@ -471,7 +469,7 @@ class TextMapPropagator {
         traceId: id(traceId, 16),
         spanId: id(spanId, 16),
         isRemote: true,
-        sampling: { priority: parseInt(flags, 10) & 1 ? 1 : 0 },
+        sampling: { priority: Number.parseInt(flags, 10) & 1 ? 1 : 0 },
         traceparent,
         tracestate
       })
@@ -486,7 +484,7 @@ class TextMapPropagator {
               break
             }
             case 's': {
-              const priority = parseInt(value, 10)
+              const priority = Number.parseInt(value, 10)
               if (!Number.isInteger(priority)) continue
               if (
                 (spanContext._sampling.priority === 1 && priority > 0) ||
@@ -500,7 +498,7 @@ class TextMapPropagator {
               spanContext._trace.origin = value
               break
             case 't.dm': {
-              const mechanism = Math.abs(parseInt(value, 10))
+              const mechanism = Math.abs(Number.parseInt(value, 10))
               if (Number.isInteger(mechanism)) {
                 spanContext._sampling.mechanism = mechanism
                 spanContext._trace.tags['_dd.p.dm'] = `-${mechanism}`
@@ -510,7 +508,7 @@ class TextMapPropagator {
             default: {
               if (!key.startsWith('t.')) continue
               const subKey = key.slice(2) // e.g. t.tid -> tid
-              const transformedValue = value.replace(/[\x7e]/gm, '=')
+              const transformedValue = value.replace(/[\x7E]/gm, '=')
 
               // If subkey is tid  then do nothing because trace header tid should always be preserved
               if (subKey === 'tid') {
@@ -590,7 +588,7 @@ class TextMapPropagator {
       }
 
       if (parts[2]) {
-        b3[b3SampledKey] = parts[2] !== '0' ? '1' : '0'
+        b3[b3SampledKey] = parts[2] === '0' ? '0' : '1'
 
         if (parts[2] === 'd') {
           b3[b3FlagsKey] = '1'
@@ -633,6 +631,9 @@ class TextMapPropagator {
     if (!carrier || !carrier.baggage) return
     if (!spanContext) removeAllBaggageItems()
     const baggages = carrier.baggage.split(',')
+    const keysToSpanTag = this._config.baggageTagKeys === '*'
+      ? undefined
+      : new Set(this._config.baggageTagKeys.split(','))
     for (const keyValue of baggages) {
       if (!keyValue.includes('=')) {
         if (spanContext) spanContext._baggageItems = {}
@@ -647,8 +648,11 @@ class TextMapPropagator {
       }
       // the current code assumes precedence of ot-baggage- (legacy opentracing baggage) over baggage
       if (spanContext) {
-        if (key in spanContext._baggageItems) return
+        if (Object.hasOwn(spanContext._baggageItems, key)) continue
         spanContext._baggageItems[key] = value
+        if (this._config.baggageTagKeys === '*' || keysToSpanTag.has(key)) {
+          spanContext._trace.tags['baggage.' + key] = value
+        }
       } else {
         setBaggageItem(key, value)
       }
@@ -656,7 +660,7 @@ class TextMapPropagator {
   }
 
   _extractSamplingPriority (carrier, spanContext) {
-    const priority = parseInt(carrier[samplingKey], 10)
+    const priority = Number.parseInt(carrier[samplingKey], 10)
 
     if (Number.isInteger(priority)) {
       spanContext._sampling.priority = priority
@@ -703,7 +707,7 @@ class TextMapPropagator {
 
     if (buffer.length !== 16) return
 
-    const tid = traceId.substring(0, 16)
+    const tid = traceId.slice(0, 16)
 
     if (tid === zeroTraceId) return
 

package/packages/dd-trace/src/opentracing/propagation/tracestate.js

@@ -17,10 +17,14 @@ function fromString (Type, regex, value) {
 }
 
 function toString (map, pairSeparator, fieldSeparator) {
-  return Array.from(map.entries())
-    .reverse()
-    .map((pair) => pair.join(pairSeparator))
-    .join(fieldSeparator)
+  let result = ''
+  for (const [key, value] of map) {
+    if (result) {
+      result = `${fieldSeparator}${result}`
+    }
+    result = `${key}${pairSeparator}${value}${result}`
+  }
+  return result
 }
 
 class TraceStateData extends Map {

package/packages/dd-trace/src/opentracing/span.js

@@ -4,7 +4,6 @@
 const { performance } = require('perf_hooks')
 const now = performance.now.bind(performance)
 const dateNow = Date.now
-const satisfies = require('semifies')
 const SpanContext = require('./span_context')
 const id = require('../id')
 const tagger = require('../tagger')
@@ -26,7 +25,7 @@ const unfinishedRegistry = createRegistry('unfinished')
 const finishedRegistry = createRegistry('finished')
 
 const OTEL_ENABLED = !!process.env.DD_TRACE_OTEL_ENABLED
-const ALLOWED = ['string', 'number', 'boolean']
+const ALLOWED = new Set(['string', 'number', 'boolean'])
 
 const integrationCounters = {
   spans_created: {},
@@ -129,7 +128,7 @@ class DatadogSpan {
     const spanContext = this.context()
     const resourceName = spanContext._tags['resource.name'] || ''
     const resource = resourceName.length > 100
-      ? `${resourceName.substring(0, 97)}...`
+      ? `${resourceName.slice(0, 97)}...`
       : resourceName
     const json = JSON.stringify({
       traceId: spanContext._traceId,
@@ -198,7 +197,7 @@ class DatadogSpan {
 
   addLink (context, attributes) {
     this._links.push({
-      context: context._ddContext ? context._ddContext : context,
+      context: context._ddContext ?? context,
       attributes: this._sanitizeAttributes(attributes)
     })
   }
@@ -235,10 +234,8 @@ class DatadogSpan {
       return
     }
 
-    if (DD_TRACE_EXPERIMENTAL_STATE_TRACKING === 'true') {
-      if (!this._spanContext._tags['service.name']) {
-        log.error('Finishing invalid span: %s', this)
-      }
+    if (DD_TRACE_EXPERIMENTAL_STATE_TRACKING === 'true' && !this._spanContext._tags['service.name']) {
+      log.error('Finishing invalid span: %s', this)
     }
 
     getIntegrationCounter('spans_finished', this._integrationName).inc()
@@ -256,7 +253,7 @@ class DatadogSpan {
       finishedRegistry.register(this, this._name)
     }
 
-    finishTime = parseFloat(finishTime) || this._getTime()
+    finishTime = Number.parseFloat(finishTime) || this._getTime()
 
     this._duration = finishTime - this._startTime
     this._spanContext._trace.finished.push(this)
@@ -275,7 +272,7 @@ class DatadogSpan {
         }
       } else {
         const maybeScalar = maybeArray
-        if (ALLOWED.includes(typeof maybeScalar)) {
+        if (ALLOWED.has(typeof maybeScalar)) {
           // Wrap the value as a string if it's not already a string
           sanitizedAttributes[key] = typeof maybeScalar === 'string' ? maybeScalar : String(maybeScalar)
         } else {
@@ -299,14 +296,14 @@ class DatadogSpan {
       if (Array.isArray(value)) {
         const newArray = []
         for (const subkey in value) {
-          if (ALLOWED.includes(typeof value[subkey])) {
+          if (ALLOWED.has(typeof value[subkey])) {
             newArray.push(value[subkey])
           } else {
             log.warn('Dropping span event attribute. It is not of an allowed type')
           }
         }
         sanitizedAttributes[key] = newArray
-      } else if (ALLOWED.includes(typeof value)) {
+      } else if (ALLOWED.has(typeof value)) {
         sanitizedAttributes[key] = value
       } else {
         log.warn('Dropping span event attribute. It is not of an allowed type')
@@ -388,8 +385,6 @@ class DatadogSpan {
 }
 
 function createRegistry (type) {
-  if (!satisfies(process.version, '>=14.6')) return
-
   return new global.FinalizationRegistry(name => {
     runtimeMetrics.decrement(`runtime.node.spans.${type}`)
     runtimeMetrics.decrement(`runtime.node.spans.${type}.by.name`, [`span_name:${name}`])

package/packages/dd-trace/src/opentracing/tracer.js

@@ -107,6 +107,12 @@ class DatadogTracer {
   }
 }
 
+/**
+ * Get the span context from a span or a span context.
+ *
+ * @param {Span|SpanContext} spanContext
+ * @returns {SpanContext}
+ */
 function getContext (spanContext) {
   if (spanContext instanceof Span) {
     spanContext = spanContext.context()
@@ -122,17 +128,14 @@ function getContext (spanContext) {
 function getParent (references = []) {
   let parent = null
 
-  for (let i = 0; i < references.length; i++) {
-    const ref = references[i]
+  for (const ref of references) {
     const type = ref.type()
 
     if (type === REFERENCE_CHILD_OF) {
       parent = ref.referencedContext()
       break
-    } else if (type === REFERENCE_FOLLOWS_FROM) {
-      if (!parent) {
-        parent = ref.referencedContext()
-      }
+    } else if (type === REFERENCE_FOLLOWS_FROM && !parent) {
+      parent = ref.referencedContext()
     }
   }
 

package/packages/dd-trace/src/payload-tagging/index.js

@@ -22,7 +22,7 @@ function maybeJSONParseValue (value) {
 
   try {
     return JSON.parse(value)
-  } catch (e) {
+  } catch {
     return value
   }
 }

package/packages/dd-trace/src/payload-tagging/tagging.js

@@ -1,13 +1,13 @@
 const { PAYLOAD_TAGGING_MAX_TAGS } = require('../constants')
 
-const redactedKeys = [
+const redactedKeys = new Set([
   'authorization', 'x-authorization', 'password', 'token'
-]
+])
 const truncated = 'truncated'
 const redacted = 'redacted'
 
 function escapeKey (key) {
-  return key.replaceAll('.', '\\.')
+  return key.replaceAll('.', String.raw`\.`)
 }
 
 /**
@@ -56,18 +56,18 @@ function tagsFromObject (object, opts) {
 
     if (['number', 'boolean'].includes(typeof object) || Buffer.isBuffer(object)) {
       tagCount += 1
-      result[prefix] = object.toString().substring(0, 5000)
+      result[prefix] = object.toString().slice(0, 5000)
       return
     }
 
     if (typeof object === 'string') {
       tagCount += 1
-      result[prefix] = object.substring(0, 5000)
+      result[prefix] = object.slice(0, 5000)
     }
 
     if (typeof object === 'object') {
       for (const [key, value] of Object.entries(object)) {
-        if (redactedKeys.includes(key.toLowerCase())) {
+        if (redactedKeys.has(key.toLowerCase())) {
           tagCount += 1
           result[`${prefix}.${escapeKey(key)}`] = redacted
         } else {

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

@@ -22,7 +22,7 @@ function findPkg () {
 
   try {
     return JSON.parse(fs.readFileSync(filePath, 'utf8'))
-  } catch (e) {
+  } catch {
     return {}
   }
 }

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

@@ -28,7 +28,10 @@ const {
   DI_DEBUG_ERROR_SNAPSHOT_ID_SUFFIX,
   DI_DEBUG_ERROR_FILE_SUFFIX,
   DI_DEBUG_ERROR_LINE_SUFFIX,
-  getLibraryCapabilitiesTags
+  getLibraryCapabilitiesTags,
+  getPullRequestDiff,
+  getModifiedTestsFromDiff,
+  getPullRequestBaseBranch
 } = require('./util/test')
 const Plugin = require('./plugin')
 const { COMPONENT } = require('../constants')
@@ -45,10 +48,23 @@ const {
   GIT_COMMIT_SHA,
   GIT_BRANCH,
   CI_WORKSPACE_PATH,
-  GIT_COMMIT_MESSAGE
+  GIT_COMMIT_MESSAGE,
+  GIT_TAG,
+  GIT_PULL_REQUEST_BASE_BRANCH_SHA,
+  GIT_COMMIT_HEAD_SHA,
+  GIT_PULL_REQUEST_BASE_BRANCH
 } = require('./util/tags')
 const { OS_VERSION, OS_PLATFORM, OS_ARCHITECTURE, RUNTIME_NAME, RUNTIME_VERSION } = require('./util/env')
 const getDiClient = require('../ci-visibility/dynamic-instrumentation')
+const { DD_MAJOR } = require('../../../../version')
+
+const FRAMEWORK_TO_TRIMMED_COMMAND = {
+  vitest: 'vitest run',
+  mocha: 'mocha',
+  cucumber: 'cucumber-js',
+  playwright: 'playwright test',
+  jest: 'jest'
+}
 
 module.exports = class CiPlugin extends Plugin {
   constructor (...args) {
@@ -103,7 +119,11 @@ module.exports = class CiPlugin extends Plugin {
       // only for playwright
       this.rootDir = rootDir
 
-      const testSessionName = getTestSessionName(this.config, this.command, this.testEnvironmentMetadata)
+      const testSessionName = getTestSessionName(
+        this.config,
+        DD_MAJOR < 6 ? this.command : FRAMEWORK_TO_TRIMMED_COMMAND[this.constructor.id],
+        this.testEnvironmentMetadata
+      )
 
       const metadataTags = {}
       for (const testLevel of TEST_LEVEL_EVENT_TYPES) {
@@ -194,6 +214,27 @@ module.exports = class CiPlugin extends Plugin {
         onDone({ err, testManagementTests })
       })
     })
+
+    this.addSub(`ci:${this.constructor.id}:modified-tests`, ({ onDone }) => {
+      const {
+        [GIT_PULL_REQUEST_BASE_BRANCH]: pullRequestBaseBranch,
+        [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: pullRequestBaseBranchSha,
+        [GIT_COMMIT_HEAD_SHA]: commitHeadSha
+      } = this.testEnvironmentMetadata
+
+      const baseBranchSha = pullRequestBaseBranchSha || getPullRequestBaseBranch(pullRequestBaseBranch)
+
+      if (baseBranchSha) {
+        const diff = getPullRequestDiff(baseBranchSha, commitHeadSha)
+        const modifiedTests = getModifiedTestsFromDiff(diff)
+        if (modifiedTests) {
+          return onDone({ err: null, modifiedTests })
+        }
+      }
+
+      // TODO: Add telemetry for this type of error
+      return onDone({ err: new Error('No modified tests could have been retrieved') })
+    })
   }
 
   get telemetry () {
@@ -240,7 +281,10 @@ module.exports = class CiPlugin extends Plugin {
       [GIT_BRANCH]: branch,
       [CI_PROVIDER_NAME]: ciProviderName,
       [CI_WORKSPACE_PATH]: repositoryRoot,
-      [GIT_COMMIT_MESSAGE]: commitMessage
+      [GIT_COMMIT_MESSAGE]: commitMessage,
+      [GIT_TAG]: tag,
+      [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: pullRequestBaseSha,
+      [GIT_COMMIT_HEAD_SHA]: commitHeadSha
     } = this.testEnvironmentMetadata
 
     this.repositoryRoot = repositoryRoot || process.cwd()
@@ -259,7 +303,10 @@ module.exports = class CiPlugin extends Plugin {
       runtimeVersion,
       branch,
       testLevel: 'suite',
-      commitMessage
+      commitMessage,
+      tag,
+      pullRequestBaseSha,
+      commitHeadSha
     }
   }
 
@@ -372,11 +419,12 @@ module.exports = class CiPlugin extends Plugin {
       return Promise.resolve()
     }
     log.debug('Removing all Dynamic Instrumentation probes')
-    return Promise.all(Array.from(this.fileLineToProbeId.keys())
-      .map((fileLine) => {
-        const [file, line] = fileLine.split(':')
-        return this.removeDiProbe({ file, line })
-      }))
+    const promises = []
+    for (const fileLine of this.fileLineToProbeId.keys()) {
+      const [file, line] = fileLine.split(':')
+      promises.push(this.removeDiProbe({ file, line }))
+    }
+    return Promise.all(promises)
   }
 
   removeDiProbe ({ file, line }) {
@@ -387,6 +435,10 @@ module.exports = class CiPlugin extends Plugin {
   }
 
   addDiProbe (err) {
+    if (!err?.stack) {
+      log.warn('Can not add breakpoint if the test error does not have a stack')
+      return
+    }
     const [file, line, stackIndex] = getFileAndLineNumberFromError(err, this.repositoryRoot)
 
     if (!file || !Number.isInteger(line)) {

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

@@ -7,14 +7,14 @@ class ConsumerPlugin extends InboundPlugin {
   static get kind () { return 'consumer' }
   static get type () { return 'messaging' }
 
-  startSpan (options) {
+  startSpan (options, enterOrCtx) {
     if (!options.service) {
       options.service = this.config.service || this.serviceName()
     }
     if (!options.kind) {
       options.kind = this.constructor.kind
     }
-    return super.startSpan(this.operationName(), options)
+    return super.startSpan(this.operationName(), options, enterOrCtx)
   }
 }
 

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

@@ -2,6 +2,10 @@
 
 const TracingPlugin = require('./tracing')
 
-class InboundPlugin extends TracingPlugin {}
+class InboundPlugin extends TracingPlugin {
+  bindFinish (ctx) {
+    return ctx.parentStore
+  }
+}
 
 module.exports = InboundPlugin

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

@@ -84,7 +84,6 @@ module.exports = {
   get nyc () { return require('../../../datadog-plugin-nyc/src') },
   get oracledb () { return require('../../../datadog-plugin-oracledb/src') },
   get openai () { return require('../../../datadog-plugin-openai/src') },
-  get paperplane () { return require('../../../datadog-plugin-paperplane/src') },
   get pg () { return require('../../../datadog-plugin-pg/src') },
   get pino () { return require('../../../datadog-plugin-pino/src') },
   get 'pino-pretty' () { return require('../../../datadog-plugin-pino/src') },

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

@@ -26,6 +26,10 @@ class OutboundPlugin extends TracingPlugin {
     })
   }
 
+  bindFinish (ctx) {
+    return ctx.parentStore
+  }
+
   startSpan (...args) {
     const span = super.startSpan(...args)
     if (
@@ -67,7 +71,6 @@ class OutboundPlugin extends TracingPlugin {
         }
       }
     }
-    return undefined
   }
 
   getPeerServiceRemap (peerData) {
@@ -87,10 +90,6 @@ class OutboundPlugin extends TracingPlugin {
     return peerData
   }
 
-  bindFinish (ctx) {
-    return ctx.parentStore
-  }
-
   finish (ctx) {
     const span = ctx?.currentStore?.span || this.activeSpan
     this.tagPeerService(span)

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

@@ -34,7 +34,7 @@ class StoreBinding {
     this._transform = data => {
       const store = storage('legacy').getStore()
 
-      return !store || !store.noop
+      return !store || !store.noop || data?.currentStore
         ? transform(data)
         : store
     }

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

@@ -7,7 +7,7 @@ class ProducerPlugin extends OutboundPlugin {
   static get kind () { return 'producer' }
   static get type () { return 'messaging' }
 
-  startSpan (options) {
+  startSpan (options, enterOrCtx) {
     const spanDefaults = {
       kind: this.constructor.kind
     }
@@ -19,7 +19,7 @@ class ProducerPlugin extends OutboundPlugin {
         if (!options[key]) options[key] = spanDefaults[key]
       }
     )
-    return super.startSpan(this.operationName(), options)
+    return super.startSpan(this.operationName(), options, enterOrCtx)
   }
 }
 

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

@@ -11,12 +11,12 @@ class StoragePlugin extends ClientPlugin {
     this.system = this.constructor.system || this.component
   }
 
-  startSpan (name, options) {
+  startSpan (name, options, ctx) {
     if (!options.service && this.system) {
       options.service = `${this.tracer._service}-${this.system}`
     }
 
-    return super.startSpan(name, options)
+    return super.startSpan(name, options, ctx)
   }
 }