dd-trace 5.61.0 → 5.62.0

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

@@ -9,8 +9,8 @@ const { tagsFromRequest, tagsFromResponse } = require('../../dd-trace/src/payloa
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 class BaseAwsSdkPlugin extends ClientPlugin {
-  static get id () { return 'aws' }
-  static get isPayloadReporter () { return false }
+  static id = 'aws'
+  static isPayloadReporter = false
 
   get serviceIdentifier () {
     const id = this.constructor.id.toLowerCase()
@@ -34,17 +34,26 @@ class BaseAwsSdkPlugin extends ClientPlugin {
   constructor (...args) {
     super(...args)
 
-    this.addSub(`apm:aws:request:start:${this.serviceIdentifier}`, ({
-      request,
-      operation,
-      awsRegion,
-      awsService
-    }) => {
+    this._parentMap = new WeakMap()
+
+    this.addBind(`apm:aws:request:start:${this.serviceIdentifier}`, (ctx) => {
+      const {
+        request,
+        operation,
+        awsRegion,
+        awsService
+      } = ctx
+
+      const parentStore = ctx.parentStore = storage('legacy').getStore()
+      const childOf = parentStore?.span
+
+      this._parentMap.set(request, parentStore)
+
       if (!this.isEnabled(request)) {
-        return
+        return parentStore
       }
-      const childOf = this.tracer.scope().active()
-      const tags = {
+
+      const meta = {
         'span.kind': 'client',
         'service.name': this.serviceName(),
         'aws.operation': operation,
@@ -54,18 +63,19 @@ class BaseAwsSdkPlugin extends ClientPlugin {
         'aws.service': awsService,
         component: 'aws-sdk'
       }
-      if (this.requestTags) this.requestTags.set(request, tags)
+      if (this.requestTags) this.requestTags.set(request, meta)
 
-      const span = this.tracer.startSpan(this.operationFromRequest(request),
-        {
-          childOf,
-          tags,
-          integrationName: 'aws-sdk'
-        })
+      const span = this.startSpan(this.operationFromRequest(request), {
+        childOf,
+        meta,
+        integrationName: 'aws-sdk'
+      }, ctx)
 
       analyticsSampler.sample(span, this.config.measured)
 
-      this.requestInject(span, request)
+      storage('legacy').run(ctx.currentStore, () => {
+        this.requestInject(span, request)
+      })
 
       if (this.constructor.isPayloadReporter && this.cloudTaggingConfig.requestsEnabled) {
         const maxDepth = this.cloudTaggingConfig.maxDepth
@@ -73,12 +83,15 @@ class BaseAwsSdkPlugin extends ClientPlugin {
         span.addTags(requestTags)
       }
 
-      this.enter(span)
-      const store = storage('legacy').getStore()
+      return ctx.currentStore
+    })
 
-      const peerServerlessStorage = storage('peerServerless')
+    this.addSub(`apm:aws:request:start:${this.serviceIdentifier}`, (ctx) => {
       if (!this._tracerConfig?._isInServerlessEnvironment()) return
 
+      const { awsRegion, awsService, currentStore, request } = ctx
+      const peerServerlessStorage = storage('peerServerless')
+
       // Try to resolve the hostname immediately; if not possible, keep enough
       // information so the region callback can resolve it later.
       const hostname = getHostname({ awsParams: request.params, awsService }, awsRegion)
@@ -86,15 +99,15 @@ class BaseAwsSdkPlugin extends ClientPlugin {
       peerServerlessStorage.enterWith(peerServerlessStore)
 
       if (hostname) {
-        span.setTag('peer.service', hostname)
+        currentStore.span.setTag('peer.service', hostname)
         peerServerlessStore.peerHostname = hostname
       } else {
-        store.awsParams = request.params
-        store.awsService = awsService
+        currentStore.awsParams = request.params
+        currentStore.awsService = awsService
       }
     })
 
-    this.addSub(`apm:aws:request:region:${this.serviceIdentifier}`, region => {
+    this.addSub(`apm:aws:request:region:${this.serviceIdentifier}`, ({ region }) => {
       const store = storage('legacy').getStore()
       if (!store) return
       const { span } = store
@@ -114,24 +127,31 @@ class BaseAwsSdkPlugin extends ClientPlugin {
       }
     })
 
-    this.addSub(`apm:aws:request:complete:${this.serviceIdentifier}`, ({ response, cbExists = false }) => {
-      const store = storage('legacy').getStore()
-      if (!store) return
-      const { span } = store
+    this.addSub(`apm:aws:request:complete:${this.serviceIdentifier}`, ctx => {
+      const { response, cbExists = false, currentStore } = ctx
+      if (!currentStore) return
+      const { span } = currentStore
       if (!span) return
-      // try to extract DSM context from response if no callback exists as extraction normally happens in CB
-      if (!cbExists && this.serviceIdentifier === 'sqs') {
-        const params = response.request.params
-        const operation = response.request.operation
-        this.responseExtractDSMContext(operation, params, response.data ?? response, span)
-      }
-      this.addResponseTags(span, response)
 
-      if (this._tracerConfig?.trace?.aws?.addSpanPointers) {
-        this.addSpanPointers(span, response)
-      }
+      storage('legacy').run(currentStore, () => {
+        // try to extract DSM context from response if no callback exists as extraction normally happens in CB
+        if (!cbExists && this.serviceIdentifier === 'sqs') {
+          const params = response.request.params
+          const operation = response.request.operation
+          this.responseExtractDSMContext(operation, params, response.data ?? response, span)
+        }
+        this.addResponseTags(span, response)
+
+        if (this._tracerConfig?.trace?.aws?.addSpanPointers) {
+          this.addSpanPointers(span, response)
+        }
+      })
 
-      this.finish(span, response, response.error)
+      this.finish(ctx)
+    })
+
+    this.addBind(`apm:aws:response:start:${this.serviceIdentifier}`, ctx => {
+      return this._parentMap.get(ctx.request)
     })
   }
 
@@ -205,11 +225,15 @@ class BaseAwsSdkPlugin extends ClientPlugin {
     // implemented by subclasses, or not
   }
 
-  finish (span, response, err) {
-    if (err) {
-      span.setTag('error', err)
+  finish (ctx) {
+    const { currentStore, response } = ctx
+    const { span } = currentStore
+    const error = response?.error || ctx.error
+
+    if (error) {
+      span.setTag('error', error)
 
-      const requestId = err.RequestId || err.requestId
+      const requestId = error.RequestId || error.requestId
       if (requestId) {
         span.addTags({ 'aws.response.request_id': requestId })
       }
@@ -219,7 +243,7 @@ class BaseAwsSdkPlugin extends ClientPlugin {
       this.config.hooks.request(span, response)
     }
 
-    super.finish()
+    super.finish(ctx)
   }
 
   configure (config) {

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

@@ -5,9 +5,7 @@ const Plugin = require('../../dd-trace/src/plugins/plugin')
 const services = require('./services')
 
 class AwsSdkPlugin extends Plugin {
-  static get id () {
-    return 'aws-sdk'
-  }
+  static id = 'aws-sdk'
 
   constructor (...args) {
     super(...args)

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

@@ -4,9 +4,7 @@ const CompositePlugin = require('../../../../dd-trace/src/plugins/composite')
 const BedrockRuntimeTracing = require('./tracing')
 const BedrockRuntimeLLMObsPlugin = require('../../../../dd-trace/src/llmobs/plugins/bedrockruntime')
 class BedrockRuntimePlugin extends CompositePlugin {
-  static get id () {
-    return 'bedrockruntime'
-  }
+  static id = 'bedrockruntime'
 
   static get plugins () {
     return {

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

@@ -6,7 +6,7 @@ const { parseModelId } = require('./utils')
 const enabledOperations = new Set(['invokeModel'])
 
 class BedrockRuntime extends BaseAwsSdkPlugin {
-  static get id () { return 'bedrockruntime' }
+  static id = 'bedrockruntime'
 
   isEnabled (request) {
     const operation = request.operation

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

@@ -3,7 +3,7 @@
 const BaseAwsSdkPlugin = require('../base')
 
 class CloudwatchLogs extends BaseAwsSdkPlugin {
-  static get id () { return 'cloudwatchlogs' }
+  static id = 'cloudwatchlogs'
 
   generateTags (params, operation) {
     if (!params?.logGroupName) return {}

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

@@ -6,9 +6,9 @@ const { DYNAMODB_PTR_KIND, SPAN_POINTER_DIRECTION } = require('../../../dd-trace
 const { extractPrimaryKeys, generatePointerHash } = require('../util')
 
 class DynamoDb extends BaseAwsSdkPlugin {
-  static get id () { return 'dynamodb' }
-  static get peerServicePrecursors () { return ['tablename'] }
-  static get isPayloadReporter () { return true }
+  static id = 'dynamodb'
+  static peerServicePrecursors = ['tablename']
+  static isPayloadReporter = true
 
   generateTags (params, operation, response) {
     const tags = {}

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

@@ -3,8 +3,8 @@ const log = require('../../../dd-trace/src/log')
 const BaseAwsSdkPlugin = require('../base')
 
 class EventBridge extends BaseAwsSdkPlugin {
-  static get id () { return 'eventbridge' }
-  static get isPayloadReporter () { return true }
+  static id = 'eventbridge'
+  static isPayloadReporter = true
 
   generateTags (params, operation, response) {
     if (!params?.source) return {}

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

@@ -2,12 +2,11 @@
 const { DsmPathwayCodec, getSizeOrZero } = require('../../../dd-trace/src/datastreams')
 const log = require('../../../dd-trace/src/log')
 const BaseAwsSdkPlugin = require('../base')
-const { storage } = require('../../../datadog-core')
 
 class Kinesis extends BaseAwsSdkPlugin {
-  static get id () { return 'kinesis' }
-  static get peerServicePrecursors () { return ['streamname'] }
-  static get isPayloadReporter () { return true }
+  static id = 'kinesis'
+  static peerServicePrecursors = ['streamname']
+  static isPayloadReporter = true
 
   constructor (...args) {
     super(...args)
@@ -16,48 +15,50 @@ class Kinesis extends BaseAwsSdkPlugin {
     // in the base class
     this.requestTags = new WeakMap()
 
-    this.addSub('apm:aws:response:start:kinesis', obj => {
-      const { request, response } = obj
-      const store = storage('legacy').getStore()
+    this.addBind('apm:aws:response:start:kinesis', ctx => {
+      const { request, response } = ctx
       const plugin = this
 
+      let store = this._parentMap.get(request)
+
       // if we have either of these operations, we want to store the streamName param
       // since it is not typically available during get/put records requests
       if (request.operation === 'getShardIterator' || request.operation === 'listShards') {
-        this.storeStreamName(request.params, request.operation, store)
-        return
+        return this.storeStreamName(request.params, request.operation, store)
       }
 
       if (request.operation === 'getRecords') {
         let span
         const responseExtraction = this.responseExtract(request.params, request.operation, response)
         if (responseExtraction && responseExtraction.maybeChildOf) {
-          obj.needsFinish = true
+          ctx.needsFinish = true
           const options = {
             childOf: responseExtraction.maybeChildOf,
-            tags: {
+            meta: {
               ...this.requestTags.get(request),
               'span.kind': 'server'
             },
             integrationName: 'aws-sdk'
           }
-          span = plugin.tracer.startSpan('aws.response', options)
-          this.enter(span, store)
+          span = plugin.startSpan('aws.response', options, ctx)
+          store = ctx.currentStore
         }
 
         // get the stream name that should have been stored previously
-        const { streamName } = storage('legacy').getStore()
+        const { streamName } = store
 
         // extract DSM context after as we might not have a parent-child but may have a DSM context
         this.responseExtractDSMContext(
           request.operation, request.params, response, span || null, { streamName }
         )
       }
+
+      return store
     })
 
-    this.addSub('apm:aws:response:finish:kinesis', err => {
-      const { span } = storage('legacy').getStore()
-      this.finish(span, null, err)
+    this.addSub('apm:aws:response:finish:kinesis', ctx => {
+      if (!ctx.needsFinish) return
+      this.finish(ctx)
     })
   }
 
@@ -72,11 +73,12 @@ class Kinesis extends BaseAwsSdkPlugin {
   }
 
   storeStreamName (params, operation, store) {
-    if (!operation || (operation !== 'getShardIterator' && operation !== 'listShards')) return
-    if (!params || !params.StreamName) return
+    if (!operation) return store
+    if (operation !== 'getShardIterator' && operation !== 'listShards') return store
+    if (!params || !params.StreamName) return store
 
     const streamName = params.StreamName
-    storage('legacy').enterWith({ ...store, streamName })
+    return { ...store, streamName }
   }
 
   responseExtract (params, operation, response) {

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

@@ -4,7 +4,7 @@ const log = require('../../../dd-trace/src/log')
 const BaseAwsSdkPlugin = require('../base')
 
 class Lambda extends BaseAwsSdkPlugin {
-  static get id () { return 'lambda' }
+  static id = 'lambda'
 
   generateTags (params, operation, response) {
     if (!params?.FunctionName) return {}

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

@@ -3,7 +3,7 @@
 const BaseAwsSdkPlugin = require('../base')
 
 class Redshift extends BaseAwsSdkPlugin {
-  static get id () { return 'redshift' }
+  static id = 'redshift'
 
   generateTags (params, operation, response) {
     if (!params?.ClusterIdentifier) return {}

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

@@ -6,9 +6,9 @@ const { generatePointerHash } = require('../util')
 const { S3_PTR_KIND, SPAN_POINTER_DIRECTION } = require('../../../dd-trace/src/constants')
 
 class S3 extends BaseAwsSdkPlugin {
-  static get id () { return 's3' }
-  static get peerServicePrecursors () { return ['bucketname'] }
-  static get isPayloadReporter () { return true }
+  static id = 's3'
+  static peerServicePrecursors = ['bucketname']
+  static isPayloadReporter = true
 
   generateTags (params, operation, response) {
     if (!params?.Bucket) return {}

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

@@ -1,7 +1,7 @@
 'use strict'
 const Stepfunctions = require('./stepfunctions')
 class Sfn extends Stepfunctions {
-  static get id () { return 'sfn' }
+  static id = 'sfn'
 }
 
 module.exports = Sfn

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

@@ -4,9 +4,9 @@ const log = require('../../../dd-trace/src/log')
 const BaseAwsSdkPlugin = require('../base')
 
 class Sns extends BaseAwsSdkPlugin {
-  static get id () { return 'sns' }
-  static get peerServicePrecursors () { return ['topicname'] }
-  static get isPayloadReporter () { return true }
+  static id = 'sns'
+  static peerServicePrecursors = ['topicname']
+  static isPayloadReporter = true
 
   generateTags (params, operation, response) {
     if (!params) return {}

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

@@ -2,13 +2,12 @@
 
 const log = require('../../../dd-trace/src/log')
 const BaseAwsSdkPlugin = require('../base')
-const { storage } = require('../../../datadog-core')
 const { DsmPathwayCodec, getHeadersSize } = require('../../../dd-trace/src/datastreams')
 
 class Sqs extends BaseAwsSdkPlugin {
-  static get id () { return 'sqs' }
-  static get peerServicePrecursors () { return ['queuename'] }
-  static get isPayloadReporter () { return true }
+  static id = 'sqs'
+  static peerServicePrecursors = ['queuename']
+  static isPayloadReporter = true
 
   constructor (...args) {
     super(...args)
@@ -17,36 +16,39 @@ class Sqs extends BaseAwsSdkPlugin {
     // in the base class
     this.requestTags = new WeakMap()
 
-    this.addSub('apm:aws:response:start:sqs', obj => {
-      const { request, response } = obj
-      const store = storage('legacy').getStore()
+    this.addBind('apm:aws:response:start:sqs', ctx => {
+      const { request, response } = ctx
       const contextExtraction = this.responseExtract(request.params, request.operation, response)
+
+      let store = this._parentMap.get(request)
       let span
       let parsedMessageAttributes = null
       if (contextExtraction && contextExtraction.datadogContext) {
-        obj.needsFinish = true
+        ctx.needsFinish = true
         const options = {
           childOf: contextExtraction.datadogContext,
-          tags: {
+          meta: {
             ...this.requestTags.get(request),
             'span.kind': 'server'
           },
           integrationName: 'aws-sdk'
         }
         parsedMessageAttributes = contextExtraction.parsedAttributes
-        span = this.tracer.startSpan('aws.response', options)
-        this.enter(span, store)
+        span = this.startSpan('aws.response', options, ctx)
+        store = ctx.currentStore
       }
-      // extract DSM context after as we might not have a parent-child but may have a DSM context
 
+      // extract DSM context after as we might not have a parent-child but may have a DSM context
       this.responseExtractDSMContext(
         request.operation, request.params, response, span || null, { parsedAttributes: parsedMessageAttributes }
       )
+
+      return store
     })
 
-    this.addSub('apm:aws:response:finish:sqs', err => {
-      const { span } = storage('legacy').getStore()
-      this.finish(span, null, err)
+    this.addSub('apm:aws:response:finish:sqs', ctx => {
+      if (!ctx.needsFinish) return
+      this.finish(ctx)
     })
   }
 

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

@@ -1,7 +1,7 @@
 'use strict'
 const Stepfunctions = require('./stepfunctions')
 class States extends Stepfunctions {
-  static get id () { return 'states' }
+  static id = 'states'
 }
 
 module.exports = States

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

@@ -3,7 +3,7 @@ const log = require('../../../dd-trace/src/log')
 const BaseAwsSdkPlugin = require('../base')
 
 class Stepfunctions extends BaseAwsSdkPlugin {
-  static get id () { return 'stepfunctions' }
+  static id = 'stepfunctions'
 
   // This is the shape of StartExecutionInput, as defined in
   // https://github.com/aws/aws-sdk-js/blob/master/apis/states-2016-11-23.normal.json

package/packages/datadog-plugin-azure-functions/src/index.js

@@ -16,11 +16,11 @@ const triggerMap = {
 }
 
 class AzureFunctionsPlugin extends TracingPlugin {
-  static get id () { return 'azure-functions' }
-  static get operation () { return 'invoke' }
-  static get kind () { return 'server' }
-  static get type () { return 'serverless' }
-  static get prefix () { return 'tracing:datadog:azure:functions:invoke' }
+  static id = 'azure-functions'
+  static operation = 'invoke'
+  static kind = 'server'
+  static type = 'serverless'
+  static prefix = 'tracing:datadog:azure:functions:invoke'
 
   bindStart (ctx) {
     const childOf = extractTraceContext(this._tracer, ctx)

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

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

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

@@ -3,8 +3,8 @@
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 
 class AzureServiceBusProducerPlugin extends ProducerPlugin {
-  static get id () { return 'azure-service-bus' }
-  static get operation () { return 'send' }
+  static id = 'azure-service-bus'
+  static operation = 'send'
 
   bindStart (ctx) {
     const { sender, msg } = ctx

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

@@ -1,10 +1,8 @@
 'use strict'
 
-const StructuredLogPlugin = require('../../dd-trace/src/plugins/structured_log_plugin')
+const LogPlugin = require('../../dd-trace/src/plugins/log_plugin')
 
-class BunyanPlugin extends StructuredLogPlugin {
-  static get id () {
-    return 'bunyan'
-  }
+class BunyanPlugin extends LogPlugin {
+  static id = 'bunyan'
 }
 module.exports = BunyanPlugin

package/packages/datadog-plugin-cassandra-driver/src/index.js

@@ -4,9 +4,9 @@ const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 const CASSANDRA_CONTACT_POINTS_KEY = 'db.cassandra.contact.points'
 
 class CassandraDriverPlugin extends DatabasePlugin {
-  static get id () { return 'cassandra-driver' }
-  static get system () { return 'cassandra' }
-  static get peerServicePrecursors () { return [CASSANDRA_CONTACT_POINTS_KEY] }
+  static id = 'cassandra-driver'
+  static system = 'cassandra'
+  static peerServicePrecursors = [CASSANDRA_CONTACT_POINTS_KEY]
 
   bindStart (ctx) {
     let { keyspace, query, contactPoints = {} } = ctx

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

@@ -28,8 +28,8 @@ function truncateCommand (cmdFields) {
 }
 
 class ChildProcessPlugin extends TracingPlugin {
-  static get id () { return 'child_process' }
-  static get prefix () { return 'tracing:datadog:child_process:execution' }
+  static id = 'child_process'
+  static prefix = 'tracing:datadog:child_process:execution'
 
   get tracer () {
     return this._tracer

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

@@ -3,9 +3,7 @@
 const KafkajsBatchConsumerPlugin = require('../../datadog-plugin-kafkajs/src/batch-consumer')
 
 class ConfluentKafkaJsBatchConsumerPlugin extends KafkajsBatchConsumerPlugin {
-  static get id () {
-    return 'confluentinc-kafka-javascript'
-  }
+  static id = 'confluentinc-kafka-javascript'
 }
 
 module.exports = ConfluentKafkaJsBatchConsumerPlugin

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

@@ -3,9 +3,7 @@
 const KafkajsConsumerPlugin = require('../../datadog-plugin-kafkajs/src/consumer')
 
 class ConfluentKafkaJsConsumerPlugin extends KafkajsConsumerPlugin {
-  static get id () {
-    return 'confluentinc-kafka-javascript'
-  }
+  static id = 'confluentinc-kafka-javascript'
 }
 
 module.exports = ConfluentKafkaJsConsumerPlugin

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

@@ -6,7 +6,7 @@ const BatchConsumerPlugin = require('./batch-consumer')
 const KafkajsPlugin = require('../../datadog-plugin-kafkajs/src/index')
 
 class ConfluentKafkaJsPlugin extends KafkajsPlugin {
-  static get id () { return 'confluentinc-kafka-javascript' }
+  static id = 'confluentinc-kafka-javascript'
   static get plugins () {
     return {
       producer: ProducerPlugin,

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

@@ -3,9 +3,7 @@
 const KafkajsProducerPlugin = require('../../datadog-plugin-kafkajs/src/producer')
 
 class ConfluentKafkaJsProducerPlugin extends KafkajsProducerPlugin {
-  static get id () {
-    return 'confluentinc-kafka-javascript'
-  }
+  static id = 'confluentinc-kafka-javascript'
 }
 
 module.exports = ConfluentKafkaJsProducerPlugin

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

@@ -3,9 +3,7 @@
 const RouterPlugin = require('../../datadog-plugin-router/src')
 
 class ConnectPlugin extends RouterPlugin {
-  static get id () {
-    return 'connect'
-  }
+  static id = 'connect'
 
   constructor (...args) {
     super(...args)