dd-trace 5.61.1 → 5.63.0

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)

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

@@ -4,16 +4,18 @@ const StoragePlugin = require('../../dd-trace/src/plugins/storage')
 const { storage } = require('../../datadog-core')
 
 class CouchBasePlugin extends StoragePlugin {
-  static get id () { return 'couchbase' }
-  static get peerServicePrecursors () { return ['db.couchbase.seed.nodes'] }
+  static id = 'couchbase'
+  static peerServicePrecursors = ['db.couchbase.seed.nodes']
 
-  addSubs (func, start) {
-    this.addSub(`apm:couchbase:${func}:start`, start)
-    this.addSub(`apm:couchbase:${func}:error`, error => this.addError(error))
-    this.addSub(`apm:couchbase:${func}:finish`, message => this.finish(message))
+  addBinds (func, start) {
+    this.addBind(`apm:couchbase:${func}:start`, start)
+    this.addSub(`apm:couchbase:${func}:error`, ({ error }) => this.addError(error))
+    this.addSub(`apm:couchbase:${func}:finish`, ctx => this.finish(ctx))
+    this.addBind(`apm:couchbase:${func}:callback:start`, callbackStart)
+    this.addBind(`apm:couchbase:${func}:callback:finish`, callbackFinish)
   }
 
-  startSpan (operation, customTags, store, { bucket, collection, seedNodes }) {
+  startSpan (operation, customTags, { bucket, collection, seedNodes }, ctx) {
     const tags = {
       'db.type': 'couchbase',
       component: 'couchbase',
@@ -34,26 +36,34 @@ class CouchBasePlugin extends StoragePlugin {
       {
         service: this.serviceName({ pluginConfig: this.config }),
         meta: tags
-      }
+      },
+      ctx
     )
   }
 
   constructor (...args) {
     super(...args)
 
-    this.addSubs('query', ({ resource, bucket, seedNodes }) => {
-      const store = storage('legacy').getStore()
-      const span = this.startSpan(
-        'query', {
+    this.addBinds('query', (ctx) => {
+      const { resource, bucket, seedNodes } = ctx
+
+      this.startSpan(
+        'query',
+        {
           'span.type': 'sql',
           'resource.name': resource,
           'span.kind': this.constructor.kind
         },
-        store,
-        { bucket, seedNodes }
+        { bucket, seedNodes },
+        ctx
       )
-      this.enter(span, store)
+
+      return ctx.currentStore
     })
+    this.addBind('apm:couchbase:bucket:maybeInvoke:callback:start', callbackStart)
+    this.addBind('apm:couchbase:bucket:maybeInvoke:callback:finish', callbackFinish)
+    this.addBind('apm:couchbase:cluster:maybeInvoke:callback:start', callbackStart)
+    this.addBind('apm:couchbase:cluster:maybeInvoke:callback:finish', callbackFinish)
 
     this._addCommandSubs('upsert')
     this._addCommandSubs('insert')
@@ -63,12 +73,22 @@ class CouchBasePlugin extends StoragePlugin {
   }
 
   _addCommandSubs (name) {
-    this.addSubs(name, ({ bucket, collection, seedNodes }) => {
-      const store = storage('legacy').getStore()
-      const span = this.startSpan(name, {}, store, { bucket, collection, seedNodes })
-      this.enter(span, store)
+    this.addBinds(name, (ctx) => {
+      const { bucket, collection, seedNodes } = ctx
+
+      this.startSpan(name, {}, { bucket, collection, seedNodes }, ctx)
+      return ctx.currentStore
     })
   }
 }
 
+function callbackStart (ctx) {
+  ctx.parentStore = storage('legacy').getStore()
+  return ctx.parentStore
+}
+
+function callbackFinish (ctx) {
+  return ctx.parentStore
+}
+
 module.exports = CouchBasePlugin

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

@@ -75,9 +75,7 @@ function getTestSuiteTags (testSuiteSpan) {
 }
 
 class CucumberPlugin extends CiPlugin {
-  static get id () {
-    return 'cucumber'
-  }
+  static id = 'cucumber'
 
   constructor (...args) {
     super(...args)

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

@@ -5,9 +5,7 @@ const Plugin = require('../../dd-trace/src/plugins/plugin')
 // Cypress plugin does not patch any library. This is just a placeholder to
 // follow the structure of the plugins
 class CypressPlugin extends Plugin {
-  static get id () {
-    return 'cypress'
-  }
+  static id = 'cypress'
 }
 
 module.exports = CypressPlugin

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

@@ -12,9 +12,7 @@ const injectionEnabledTag =
   `injection_enabled:${getEnvironmentVariable('DD_INJECTION_ENABLED') ? 'yes' : 'no'}`
 
 module.exports = class DdTraceApiPlugin extends Plugin {
-  static get id () {
-    return 'dd-trace-api'
-  }
+  static id = 'dd-trace-api'
 
   constructor (...args) {
     super(...args)

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

@@ -9,7 +9,7 @@ const DNSReversePlugin = require('./reverse')
 // TODO: Are DNS spans really client spans?
 
 class DNSPlugin extends CompositePlugin {
-  static get id () { return 'dns' }
+  static id = 'dns'
   static get plugins () {
     return {
       lookup: DNSLookupPlugin,

package/packages/datadog-plugin-dns/src/lookup.js

@@ -3,8 +3,8 @@
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
 
 class DNSLookupPlugin extends ClientPlugin {
-  static get id () { return 'dns' }
-  static get operation () { return 'lookup' }
+  static id = 'dns'
+  static operation = 'lookup'
 
   bindStart (ctx) {
     const [hostname] = ctx.args

package/packages/datadog-plugin-dns/src/lookup_service.js

@@ -3,8 +3,8 @@
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
 
 class DNSLookupServicePlugin extends ClientPlugin {
-  static get id () { return 'dns' }
-  static get operation () { return 'lookup_service' }
+  static id = 'dns'
+  static operation = 'lookup_service'
 
   bindStart (ctx) {
     const [address, port] = ctx.args

package/packages/datadog-plugin-dns/src/resolve.js

@@ -3,8 +3,8 @@
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
 
 class DNSResolvePlugin extends ClientPlugin {
-  static get id () { return 'dns' }
-  static get operation () { return 'resolve' }
+  static id = 'dns'
+  static operation = 'resolve'
 
   bindStart (ctx) {
     const [hostname, maybeType] = ctx.args

package/packages/datadog-plugin-dns/src/reverse.js

@@ -3,8 +3,8 @@
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
 
 class DNSReversePlugin extends ClientPlugin {
-  static get id () { return 'dns' }
-  static get operation () { return 'reverse' }
+  static id = 'dns'
+  static operation = 'reverse'
 
   bindStart (ctx) {
     const [ip] = ctx.args

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

@@ -3,7 +3,7 @@
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 
 class ElasticsearchPlugin extends DatabasePlugin {
-  static get id () { return 'elasticsearch' }
+  static id = 'elasticsearch'
 
   bindStart (ctx) {
     const { params } = ctx

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

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

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

@@ -5,7 +5,7 @@ const ExpressCodeOriginForSpansPlugin = require('./code_origin')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class ExpressPlugin extends CompositePlugin {
-  static get id () { return 'express' }
+  static id = 'express'
   static get plugins () {
     return {
       tracing: ExpressTracingPlugin,

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

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

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

@@ -7,9 +7,7 @@ const web = require('../../dd-trace/src/plugins/util/web')
 const kCodeOriginForSpansTagsSym = Symbol('datadog.codeOriginForSpansTags')
 
 class FastifyCodeOriginForSpansPlugin extends Plugin {
-  static get id () {
-    return 'fastify'
-  }
+  static id = 'fastify'
 
   constructor (...args) {
     super(...args)

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

@@ -5,7 +5,7 @@ const FastifyCodeOriginForSpansPlugin = require('./code_origin')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class FastifyPlugin extends CompositePlugin {
-  static get id () { return 'fastify' }
+  static id = 'fastify'
   static get plugins () {
     return {
       tracing: FastifyTracingPlugin,

package/packages/datadog-plugin-fastify/src/tracing.js

@@ -1,11 +1,10 @@
 'use strict'
 
 const RouterPlugin = require('../../datadog-plugin-router/src')
+const { storage } = require('../../datadog-core')
 
 class FastifyTracingPlugin extends RouterPlugin {
-  static get id () {
-    return 'fastify'
-  }
+  static id = 'fastify'
 
   constructor (...args) {
     super(...args)
@@ -13,7 +12,23 @@ class FastifyTracingPlugin extends RouterPlugin {
     this.addSub('apm:fastify:request:handle', ({ req }) => {
       this.setFramework(req, 'fastify', this.config)
     })
+
+    this.addBind('datadog:fastify:pre-parsing:start', getParentStore)
+    this.addBind('datadog:fastify:pre-validation:start', getParentStore)
+
+    this.addSub('datadog:fastify:pre-parsing:finish', (ctx) => {
+      return ctx.parentStore
+    })
+    this.addSub('datadog:fastify:pre-validation:finish', (ctx) => {
+      return ctx.parentStore
+    })
+    this.addSub('datadog:fastify:callback:execute', getParentStore)
   }
 }
 
+function getParentStore (ctx) {
+  ctx.parentStore = ctx.parentStore ?? storage('legacy').getStore()
+  return ctx.parentStore
+}
+
 module.exports = FastifyTracingPlugin

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

@@ -3,8 +3,8 @@
 const HttpClientPlugin = require('../../datadog-plugin-http/src/client')
 
 class FetchPlugin extends HttpClientPlugin {
-  static get id () { return 'fetch' }
-  static get prefix () { return 'tracing:apm:fetch:request' }
+  static id = 'fetch'
+  static prefix = 'tracing:apm:fetch:request'
 
   bindStart (ctx) {
     const req = ctx.req

package/packages/datadog-plugin-find-my-way/src/index.js

@@ -4,9 +4,7 @@ const Plugin = require('../../dd-trace/src/plugins/plugin')
 const web = require('../../dd-trace/src/plugins/util/web')
 
 class FindMyWayPlugin extends Plugin {
-  static get id () {
-    return 'find-my-way'
-  }
+  static id = 'find-my-way'
 
   constructor (...args) {
     super(...args)

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

@@ -3,8 +3,8 @@
 const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
 
 class FsPlugin extends TracingPlugin {
-  static get id () { return 'fs' }
-  static get operation () { return 'operation' }
+  static id = 'fs'
+  static operation = 'operation'
 
   configure (...args) {
     return super.configure(...args)

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

@@ -3,9 +3,9 @@
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
 
 class GoogleCloudPubsubClientPlugin extends ClientPlugin {
-  static get id () { return 'google-cloud-pubsub' }
-  static get type () { return 'messaging' }
-  static get operation () { return 'request' }
+  static id = 'google-cloud-pubsub'
+  static type = 'messaging'
+  static operation = 'request'
 
   start (ctx) {
     const { request, api, projectId } = ctx

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

@@ -4,8 +4,8 @@ const { getMessageSize } = require('../../dd-trace/src/datastreams')
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
 
 class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
-  static get id () { return 'google-cloud-pubsub' }
-  static get operation () { return 'receive' }
+  static id = 'google-cloud-pubsub'
+  static operation = 'receive'
 
   bindStart (ctx) {
     const { message } = ctx

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

@@ -7,7 +7,7 @@ const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 // TODO: Consider splitting channels for publish/receive in the instrumentation.
 class GoogleCloudPubsubPlugin extends CompositePlugin {
-  static get id () { return 'google-cloud-pubsub' }
+  static id = 'google-cloud-pubsub'
   static get plugins () {
     return {
       producer: ProducerPlugin,

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

@@ -4,8 +4,8 @@ const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 const { DsmPathwayCodec, getHeadersSize } = require('../../dd-trace/src/datastreams')
 
 class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
-  static get id () { return 'google-cloud-pubsub' }
-  static get operation () { return 'request' }
+  static id = 'google-cloud-pubsub'
+  static operation = 'request'
 
   bindStart (ctx) {
     const { request, api, projectId } = ctx

package/packages/datadog-plugin-google-cloud-vertexai/src/index.js

@@ -5,7 +5,7 @@ const GoogleVertexAITracingPlugin = require('./tracing')
 const VertexAILLMObsPlugin = require('../../dd-trace/src/llmobs/plugins/vertexai')
 
 class GoogleCloudVertexAIPlugin extends CompositePlugin {
-  static get id () { return 'google-cloud-vertexai' }
+  static id = 'google-cloud-vertexai'
   static get plugins () {
     return {
       llmobs: VertexAILLMObsPlugin,

package/packages/datadog-plugin-google-cloud-vertexai/src/tracing.js

@@ -10,10 +10,8 @@ const {
 } = require('./utils')
 
 class GoogleCloudVertexAITracingPlugin extends TracingPlugin {
-  static get id () { return 'google-cloud-vertexai' }
-  static get prefix () {
-    return 'tracing:apm:vertexai:request'
-  }
+  static id = 'google-cloud-vertexai'
+  static prefix = 'tracing:apm:vertexai:request'
 
   constructor () {
     super(...arguments)