dd-trace 5.81.0 → 5.83.0

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

@@ -1,8 +1,8 @@
 'use strict'
 
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
-const AnthropicTracingPlugin = require('./tracing')
 const AnthropicLLMObsPlugin = require('../../dd-trace/src/llmobs/plugins/anthropic')
+const AnthropicTracingPlugin = require('./tracing')
 
 class AnthropicPlugin extends CompositePlugin {
   static id = 'anthropic'

package/packages/datadog-plugin-aws-sdk/src/base.js

@@ -5,7 +5,7 @@ const ClientPlugin = require('../../dd-trace/src/plugins/client')
 const { storage } = require('../../datadog-core')
 const { isTrue } = require('../../dd-trace/src/util')
 const { tagsFromRequest, tagsFromResponse } = require('../../dd-trace/src/payload-tagging')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 
 class BaseAwsSdkPlugin extends ClientPlugin {
   static id = 'aws'
@@ -190,7 +190,7 @@ class BaseAwsSdkPlugin extends ClientPlugin {
 
   isEnabled (request) {
     const serviceId = this.serviceIdentifier.toUpperCase()
-    const envVarValue = getEnvironmentVariable(`DD_TRACE_AWS_SDK_${serviceId}_ENABLED`)
+    const envVarValue = getValueFromEnvSources(`DD_TRACE_AWS_SDK_${serviceId}_ENABLED`)
     return envVarValue ? isTrue(envVarValue) : true
   }
 
@@ -273,9 +273,9 @@ function normalizeConfig (config, serviceIdentifier) {
   const serviceId = serviceIdentifier.toUpperCase()
   const batchPropagationEnabled = isTrue(
     specificConfig.batchPropagationEnabled ??
-    getEnvironmentVariable(`DD_TRACE_AWS_SDK_${serviceId}_BATCH_PROPAGATION_ENABLED`) ??
+    getValueFromEnvSources(`DD_TRACE_AWS_SDK_${serviceId}_BATCH_PROPAGATION_ENABLED`) ??
     config.batchPropagationEnabled ??
-    getEnvironmentVariable('DD_TRACE_AWS_SDK_BATCH_PROPAGATION_ENABLED')
+    getValueFromEnvSources('DD_TRACE_AWS_SDK_BATCH_PROPAGATION_ENABLED')
   )
 
   // Merge the specific config back into the main config

package/packages/datadog-plugin-aws-sdk/src/services/bedrockruntime/index.js

@@ -1,8 +1,8 @@
 'use strict'
 
 const CompositePlugin = require('../../../../dd-trace/src/plugins/composite')
-const BedrockRuntimeTracing = require('./tracing')
 const BedrockRuntimeLLMObsPlugin = require('../../../../dd-trace/src/llmobs/plugins/bedrockruntime')
+const BedrockRuntimeTracing = require('./tracing')
 class BedrockRuntimePlugin extends CompositePlugin {
   static id = 'bedrockruntime'
 

package/packages/datadog-plugin-aws-sdk/src/services/dynamodb.js

@@ -109,7 +109,7 @@ class DynamoDb extends BaseAwsSdkPlugin {
   /**
    * Parses primary key config from the `DD_TRACE_DYNAMODB_TABLE_PRIMARY_KEYS` env var.
    * Only runs when needed, and warns when missing or invalid config.
-   * @returns {Object|undefined} Parsed config from env var or undefined if empty/missing/invalid config.
+   * @returns {object | undefined} Parsed config from env var or undefined if empty/missing/invalid config.
    */
   getPrimaryKeyConfig () {
     if (this.dynamoPrimaryKeyConfig) {
@@ -151,8 +151,8 @@ class DynamoDb extends BaseAwsSdkPlugin {
   /**
    * Calculates a hash for DynamoDB PutItem operations using table's configured primary keys.
    * @param {string} tableName - Name of the DynamoDB table.
-   * @param {Object} item - Complete PutItem item parameter to be put.
-   * @param {Object.<string, Array<string>>} primaryKeyConfig - Mapping of table names to an Array of primary key names
+   * @param {object} item - Complete PutItem item parameter to be put.
+   * @param {Record<string, Array<string>>} primaryKeyConfig - Mapping of table names to an Array of primary key names
    *                                                         loaded from DD_TRACE_DYNAMODB_TABLE_PRIMARY_KEYS.
    * @returns {string|undefined} Hash combining table name and primary key/value pairs, or undefined if unable.
    */
@@ -174,7 +174,7 @@ class DynamoDb extends BaseAwsSdkPlugin {
   /**
    * Calculates a hash for DynamoDB operations that have keys provided (UpdateItem, DeleteItem).
    * @param {string} tableName - Name of the DynamoDB table.
-   * @param {Object} keysObject - Object containing primary key/value attributes in DynamoDB format.
+   * @param {object} keysObject - Object containing primary key/value attributes in DynamoDB format.
    *                       (e.g., { userId: { S: "123" }, sortKey: { N: "456" } })
    * @returns {string|undefined} Hash value combining table name and primary key/value pairs, or undefined if unable.
    *

package/packages/datadog-plugin-aws-sdk/src/services/eventbridge.js

@@ -18,8 +18,8 @@ class EventBridge extends BaseAwsSdkPlugin {
 
   /**
    * requestInject
-   * @param {*} span
-   * @param {*} request
+   * @param {import('../../../..').Span} span
+   * @param {object} request
    *
    * Docs: https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_PutEventsRequestEntry.html
    * We cannot use the traceHeader field as that's reserved for X-Ray.

package/packages/datadog-plugin-aws-sdk/src/util.js

@@ -18,7 +18,7 @@ function generatePointerHash (components) {
 
 /**
  * Encodes a DynamoDB attribute value to Buffer for span pointer hashing.
- * @param {Object} valueObject - DynamoDB value in AWS format ({ S: string } or { N: string } or { B: Buffer })
+ * @param {object} valueObject - DynamoDB value in AWS format ({ S: string } or { N: string } or { B: Buffer })
  * @returns {Buffer|undefined} Encoded value as Buffer, or undefined if invalid input.
  *
  * @example
@@ -55,7 +55,7 @@ function encodeValue (valueObject) {
  * Handles tables with single-key and two-key scenarios.
  *
  * @param {Array<string>} keyNames - Set of primary key names.
- * @param {Object} keyValuePairs - Object containing key/value pairs.
+ * @param {object} keyValuePairs - Object containing key/value pairs.
  * @returns {Array|undefined} [key1Name, key1Value, key2Name, key2Value], or undefined if invalid input.
  *                            key2 entries are empty strings in the single-key case.
  * @example
@@ -90,7 +90,7 @@ const extractPrimaryKeys = (keyNames, keyValuePairs) => {
  * Automatically detects AWS partitions (standard, China, GovCloud) from region.
  *
  * @param {string} queueURL - SQS queue URL in any supported format
- * @returns {Object|null} Object with queueName and arn, or null if URL format is invalid
+ * @returns {object | null} Object with queueName and arn, or null if URL format is invalid
  *
  * @example
  * // Modern AWS SQS URLs

package/packages/datadog-plugin-azure-event-hubs/src/index.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const ProducerPlugin = require('./producer')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+const ProducerPlugin = require('./producer')
 
 class AzureEventHubsPlugin extends CompositePlugin {
   static get id () { return 'azure-event-hubs' }

package/packages/datadog-plugin-azure-event-hubs/src/producer.js

@@ -1,8 +1,10 @@
 'use strict'
 
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 
+const spanContexts = new WeakMap()
+
 class AzureEventHubsProducerPlugin extends ProducerPlugin {
   static get id () { return 'azure-event-hubs' }
   static get operation () { return 'send' }
@@ -36,7 +38,12 @@ class AzureEventHubsProducerPlugin extends ProducerPlugin {
       }
 
       if (batchLinksAreEnabled()) {
-        ctx.batch._spanContexts.push(span.context())
+        const spanContext = spanContexts.get(ctx.batch)
+        if (spanContext) {
+          spanContext.push(span.context())
+        } else {
+          spanContexts.set(ctx.batch, [span.context()])
+        }
         injectTraceContext(this.tracer, span, ctx.eventData)
       }
     }
@@ -53,9 +60,12 @@ class AzureEventHubsProducerPlugin extends ProducerPlugin {
         })
       } else {
         if (batchLinksAreEnabled()) {
-          eventData._spanContexts.forEach(spanContext => {
-            span.addLink(spanContext)
-          })
+          const contexts = spanContexts.get(eventData)
+          if (contexts) {
+            for (const spanContext of contexts) {
+              span.addLink(spanContext)
+            }
+          }
         }
       }
     }
@@ -63,7 +73,11 @@ class AzureEventHubsProducerPlugin extends ProducerPlugin {
   }
 
   asyncEnd (ctx) {
-    super.finish()
+    super.finish(ctx)
+  }
+
+  end (ctx) {
+    super.finish(ctx)
   }
 }
 
@@ -75,7 +89,7 @@ function injectTraceContext (tracer, span, event) {
 }
 
 function batchLinksAreEnabled () {
-  const eh = getEnvironmentVariable('DD_TRACE_AZURE_EVENTHUBS_BATCH_LINKS_ENABLED')
+  const eh = getValueFromEnvSources('DD_TRACE_AZURE_EVENTHUBS_BATCH_LINKS_ENABLED')
   return eh !== 'false'
 }
 

package/packages/datadog-plugin-azure-service-bus/src/index.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const ProducerPlugin = require('./producer')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+const ProducerPlugin = require('./producer')
 
 class AzureServiceBusPlugin extends CompositePlugin {
   static get id () { return 'azure-service-bus' }

package/packages/datadog-plugin-azure-service-bus/src/producer.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 const spanContexts = new WeakMap()
 
@@ -75,6 +75,10 @@ class AzureServiceBusProducerPlugin extends ProducerPlugin {
   asyncEnd (ctx) {
     super.finish(ctx)
   }
+
+  end (ctx) {
+    super.finish(ctx)
+  }
 }
 
 function injectTraceContext (tracer, span, msg) {
@@ -86,7 +90,7 @@ function injectTraceContext (tracer, span, msg) {
 }
 
 function batchLinksAreEnabled () {
-  const sb = getEnvironmentVariable('DD_TRACE_AZURE_SERVICEBUS_BATCH_LINKS_ENABLED')
+  const sb = getValueFromEnvSources('DD_TRACE_AZURE_SERVICEBUS_BATCH_LINKS_ENABLED')
   return sb !== 'false'
 }
 

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

@@ -0,0 +1,60 @@
+'use strict'
+
+const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
+const { getMessageSize } = require('../../dd-trace/src/datastreams')
+
+class BullmqConsumerPlugin extends ConsumerPlugin {
+  static id = 'bullmq'
+  static prefix = 'tracing:orchestrion:bullmq:Worker_callProcessJob'
+
+  asyncEnd (ctx) {
+    ctx.currentStore?.span?.finish()
+  }
+
+  bindStart (ctx) {
+    const job = ctx.arguments?.[0]
+    const queueName = job?.queueName || job?.queue?.name || 'bullmq'
+
+    let childOf
+    const datadogContext = job?.data?._datadog
+    if (datadogContext) {
+      childOf = this.tracer.extract('text_map', datadogContext)
+    }
+
+    const span = this.startSpan({
+      childOf,
+      resource: queueName,
+      meta: {
+        component: 'bullmq',
+        'span.kind': 'consumer',
+        'messaging.system': 'bullmq',
+        'messaging.destination.name': queueName,
+        'messaging.operation': 'process'
+      }
+    }, ctx)
+
+    if (this.config.dsmEnabled) {
+      this.setConsumerCheckpoint(span, ctx)
+    }
+
+    return ctx.currentStore
+  }
+
+  setConsumerCheckpoint (span, ctx) {
+    const job = ctx.arguments?.[0]
+    if (!job) return
+
+    const queueName = job.queueName || job.queue?.name || 'bullmq'
+    const payloadSize = job.data ? getMessageSize(job.data) : 0
+
+    const datadogContext = job.data?._datadog
+    if (datadogContext) {
+      this.tracer.decodeDataStreamsContext(datadogContext)
+    }
+
+    const edgeTags = ['direction:in', `topic:${queueName}`, 'type:bullmq']
+    this.tracer.setCheckpoint(edgeTags, span, payloadSize)
+  }
+}
+
+module.exports = BullmqConsumerPlugin

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

@@ -0,0 +1,18 @@
+'use strict'
+
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+const BullmqProducerPlugins = require('./producer')
+const BullmqConsumerPlugin = require('./consumer')
+
+class BullmqPlugin extends CompositePlugin {
+  static id = 'bullmq'
+
+  static plugins = {
+    queueAdd: BullmqProducerPlugins[0],
+    queueAddBulk: BullmqProducerPlugins[1],
+    flowProducerAdd: BullmqProducerPlugins[2],
+    consumer: BullmqConsumerPlugin
+  }
+}
+
+module.exports = BullmqPlugin

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

@@ -0,0 +1,178 @@
+'use strict'
+
+const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
+const { DsmPathwayCodec, getMessageSize } = require('../../dd-trace/src/datastreams')
+
+class BaseBullmqProducerPlugin extends ProducerPlugin {
+  static id = 'bullmq'
+
+  asyncEnd (ctx) {
+    ctx.currentStore?.span?.finish()
+  }
+
+  bindStart (ctx) {
+    const { resource, meta } = this.getSpanData(ctx)
+    const span = this.startSpan({
+      resource,
+      meta: {
+        component: 'bullmq',
+        'span.kind': 'producer',
+        'messaging.system': 'bullmq',
+        'messaging.operation': 'publish',
+        ...meta
+      }
+    }, ctx)
+
+    this.injectTraceContext(span, ctx)
+
+    if (this.config.dsmEnabled) {
+      this.setProducerCheckpoint(span, ctx)
+    }
+
+    return ctx.currentStore
+  }
+
+  getSpanData (ctx) {
+    throw new Error('getSpanData must be implemented by subclass')
+  }
+
+  injectTraceContext (span, ctx) {
+    throw new Error('injectTraceContext must be implemented by subclass')
+  }
+
+  setProducerCheckpoint (span, ctx) {
+    const { queueName, payloadSize, injectTarget } = this.getDsmData(ctx)
+    const edgeTags = ['direction:out', `topic:${queueName}`, 'type:bullmq']
+    const dataStreamsContext = this.tracer.setCheckpoint(edgeTags, span, payloadSize)
+    if (injectTarget && typeof injectTarget === 'object') {
+      injectTarget._datadog = injectTarget._datadog || {}
+      DsmPathwayCodec.encode(dataStreamsContext, injectTarget._datadog)
+    }
+  }
+
+  getDsmData (ctx) {
+    throw new Error('getDsmData must be implemented by subclass')
+  }
+}
+
+class QueueAddPlugin extends BaseBullmqProducerPlugin {
+  static prefix = 'tracing:orchestrion:bullmq:Queue_add'
+
+  getSpanData (ctx) {
+    const queueName = ctx.self?.name || 'bullmq'
+    return {
+      resource: queueName,
+      meta: {
+        'messaging.destination.name': ctx.self?.name
+      }
+    }
+  }
+
+  injectTraceContext (span, ctx) {
+    const data = ctx.arguments?.[1]
+    if (data?.constructor?.name === 'Object') {
+      data._datadog = data._datadog || {}
+      this.tracer.inject(span, 'text_map', data._datadog)
+    }
+  }
+
+  getDsmData (ctx) {
+    const data = ctx.arguments?.[1]
+    return {
+      queueName: ctx.self?.name || 'bullmq',
+      payloadSize: data ? getMessageSize(data) : 0,
+      injectTarget: data
+    }
+  }
+}
+
+class QueueAddBulkPlugin extends BaseBullmqProducerPlugin {
+  static prefix = 'tracing:orchestrion:bullmq:Queue_addBulk'
+
+  operationName () {
+    return 'bullmq.addBulk'
+  }
+
+  getSpanData (ctx) {
+    const queueName = ctx.self?.name || 'bullmq'
+    const jobs = ctx.arguments?.[0]
+    return {
+      resource: queueName,
+      meta: {
+        'messaging.destination.name': ctx.self?.name,
+        'messaging.batch.message_count': Array.isArray(jobs) ? jobs.length : undefined
+      }
+    }
+  }
+
+  injectTraceContext (span, ctx) {
+    const jobs = ctx.arguments?.[0]
+    if (!Array.isArray(jobs)) return
+    for (const job of jobs) {
+      if (job?.data?.constructor?.name !== 'Object') continue
+      job.data._datadog = job.data._datadog || {}
+      this.tracer.inject(span, 'text_map', job.data._datadog)
+    }
+  }
+
+  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,
+      injectTarget: jobs[0]?.data
+    }
+  }
+
+  setProducerCheckpoint (span, ctx) {
+    const jobs = ctx.arguments?.[0] || []
+    const queueName = ctx.self?.name || 'bullmq'
+    const edgeTags = ['direction:out', `topic:${queueName}`, 'type:bullmq']
+
+    for (const job of jobs) {
+      if (job?.data && job.data !== null && job.data.constructor.name === 'Object') {
+        const payloadSize = getMessageSize(job.data)
+        const dataStreamsContext = this.tracer.setCheckpoint(edgeTags, span, payloadSize)
+        job.data._datadog = job.data._datadog || {}
+        DsmPathwayCodec.encode(dataStreamsContext, job.data._datadog)
+      }
+    }
+  }
+}
+
+class FlowProducerAddPlugin extends BaseBullmqProducerPlugin {
+  static prefix = 'tracing:orchestrion:bullmq:FlowProducer_add'
+
+  getSpanData (ctx) {
+    const flow = ctx.arguments?.[0]
+    const queueName = flow?.queueName || 'bullmq'
+    return {
+      resource: queueName,
+      meta: {
+        'messaging.destination.name': flow?.queueName
+      }
+    }
+  }
+
+  injectTraceContext (span, ctx) {
+    const flow = ctx.arguments?.[0]
+    if (flow?.data?.constructor?.name === 'Object') {
+      flow.data._datadog = flow.data._datadog || {}
+      this.tracer.inject(span, 'text_map', flow.data._datadog)
+    }
+  }
+
+  getDsmData (ctx) {
+    const flow = ctx.arguments?.[0]
+    return {
+      queueName: flow?.queueName || 'bullmq',
+      payloadSize: flow?.data ? getMessageSize(flow.data) : 0,
+      injectTarget: flow?.data
+    }
+  }
+}
+
+module.exports = [QueueAddPlugin, QueueAddBulkPlugin, FlowProducerAddPlugin]

package/packages/datadog-plugin-confluentinc-kafka-javascript/src/index.js

@@ -1,9 +1,9 @@
 'use strict'
 
+const KafkajsPlugin = require('../../datadog-plugin-kafkajs/src/index')
 const ProducerPlugin = require('./producer')
 const ConsumerPlugin = require('./consumer')
 const BatchConsumerPlugin = require('./batch-consumer')
-const KafkajsPlugin = require('../../datadog-plugin-kafkajs/src/index')
 
 class ConfluentKafkaJsPlugin extends KafkajsPlugin {
   /**

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

@@ -2,7 +2,7 @@
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable, getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 
 const {
   TEST_SKIP_REASON,
@@ -112,7 +112,7 @@ class CucumberPlugin extends CiPlugin {
       finishAllTraceSpans(this.testSessionSpan)
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
+        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
 
       this.libraryConfig = null

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

@@ -51,7 +51,7 @@ const {
 } = 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 { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 const { appClosing: appClosingTelemetry } = require('../../dd-trace/src/telemetry')
 const log = require('../../dd-trace/src/log')
 
@@ -644,7 +644,7 @@ class CypressPlugin {
       this.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
       incrementCountMetric(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
+        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
 
       finishAllTraceSpans(this.testSessionSpan)

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

@@ -1,9 +1,9 @@
 'use strict'
 
 const NoopTracer = require('../../dd-trace/src/noop/tracer')
-const cypressPlugin = require('./cypress-plugin')
 const satisfies = require('../../../vendor/dist/semifies')
 const { DD_MAJOR } = require('../../../version')
+const cypressPlugin = require('./cypress-plugin')
 
 const noopTask = {
   'dd:testSuiteStart': () => {

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

@@ -3,13 +3,13 @@
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 const telemetryMetrics = require('../../dd-trace/src/telemetry/metrics')
 const apiMetrics = telemetryMetrics.manager.namespace('tracers')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 
 // api ==> here
 const objectMap = new WeakMap()
 
 const injectionEnabledTag =
-  `injection_enabled:${getEnvironmentVariable('DD_INJECTION_ENABLED') ? 'yes' : 'no'}`
+  `injection_enabled:${getValueFromEnvSources('DD_INJECTION_ENABLED') ? 'yes' : 'no'}`
 
 module.exports = class DdTraceApiPlugin extends Plugin {
   static id = 'dd-trace-api'

package/packages/datadog-plugin-express/src/code_origin.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const dc = require('dc-polyfill')
+
 const { entryTags } = require('../../datadog-code-origin')
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 const web = require('../../dd-trace/src/plugins/util/web')
@@ -12,29 +14,33 @@ class ExpressCodeOriginForSpansPlugin extends Plugin {
 
     const layerTags = new WeakMap()
 
-    this.addSub('apm:express:middleware:enter', ({ req, layer }) => {
+    // Middleware/request handling: apply pre-computed tags to spans
+    const handleMiddlewareEnter = ({ req, layer }) => {
       const tags = layerTags.get(layer)
       if (!tags) return
       web.getContext(req)?.span?.addTags(tags)
-    })
-
-    this.addSub('apm:express:route:added', ({ topOfStackFunc, layer }) => {
-      if (!layer) return
-      if (layerTags.has(layer)) return
-      layerTags.set(layer, entryTags(topOfStackFunc))
-    })
+    }
 
-    this.addSub('apm:router:middleware:enter', ({ req, layer }) => {
-      const tags = layerTags.get(layer)
-      if (!tags) return
-      web.getContext(req)?.span?.addTags(tags)
-    })
+    this.addSub('apm:express:middleware:enter', handleMiddlewareEnter)
+    this.addSub('apm:router:middleware:enter', handleMiddlewareEnter)
 
-    this.addSub('apm:router:route:added', ({ topOfStackFunc, layer }) => {
+    // Route added handling: compute and cache tags
+    const handleRouteAdded = ({ topOfStackFunc, layer }) => {
       if (!layer) return
       if (layerTags.has(layer)) return
       layerTags.set(layer, entryTags(topOfStackFunc))
-    })
+    }
+
+    if (this._tracerConfig.remoteConfig?.enabled) {
+      // When RC is enabled, use manual subscriptions (always pre-compute)
+      // This allows tags to be computed even when CO is disabled, so runtime enabling works
+      dc.channel('apm:express:route:added').subscribe(handleRouteAdded)
+      dc.channel('apm:router:route:added').subscribe(handleRouteAdded)
+    } else {
+      // When RC is disabled, use addSub (only computes when CO is enabled)
+      this.addSub('apm:express:route:added', handleRouteAdded)
+      this.addSub('apm:router:route:added', handleRouteAdded)
+    }
   }
 }
 

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

@@ -1,8 +1,8 @@
 'use strict'
 
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 const ExpressTracingPlugin = require('./tracing')
 const ExpressCodeOriginForSpansPlugin = require('./code_origin')
-const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class ExpressPlugin extends CompositePlugin {
   static id = 'express'