dd-trace 5.61.0 → 5.62.0

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

@@ -4,8 +4,8 @@ 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)

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)

package/packages/datadog-plugin-graphql/src/execute.js

@@ -6,12 +6,14 @@ const { extractErrorIntoSpanEvent } = require('./utils')
 let tools
 
 class GraphQLExecutePlugin extends TracingPlugin {
-  static get id () { return 'graphql' }
-  static get operation () { return 'execute' }
-  static get type () { return 'graphql' }
-  static get kind () { return 'server' }
+  static id = 'graphql'
+  static operation = 'execute'
+  static type = 'graphql'
+  static kind = 'server'
+
+  bindStart (ctx) {
+    const { operation, args, docSource } = ctx
 
-  start ({ operation, args, docSource }) {
     const type = operation && operation.operation
     const name = operation && operation.name && operation.name.value
     const document = args.document
@@ -27,20 +29,25 @@ class GraphQLExecutePlugin extends TracingPlugin {
         'graphql.operation.name': name,
         'graphql.source': source
       }
-    })
+    }, ctx)
 
     addVariableTags(this.config, span, args.variableValues)
+
+    return ctx.currentStore
   }
 
-  finish ({ res, args }) {
-    const span = this.activeSpan
+  finish (ctx) {
+    const { res, args } = ctx
+    const span = ctx?.currentStore?.span || this.activeSpan
     this.config.hooks.execute(span, args, res)
     if (res?.errors) {
       for (const err of res.errors) {
         extractErrorIntoSpanEvent(this._tracerConfig, span, err)
       }
     }
-    super.finish()
+    super.finish(ctx)
+
+    return ctx.parentStore
   }
 }
 

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

@@ -9,7 +9,7 @@ const GraphQLValidatePlugin = require('./validate')
 const GraphQLResolvePlugin = require('./resolve')
 
 class GraphQLPlugin extends CompositePlugin {
-  static get id () { return 'graphql' }
+  static id = 'graphql'
   static get plugins () {
     return {
       execute: GraphQLExecutePlugin,

package/packages/datadog-plugin-graphql/src/parse.js

@@ -3,19 +3,22 @@
 const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
 
 class GraphQLParsePlugin extends TracingPlugin {
-  static get id () { return 'graphql' }
-  static get operation () { return 'parser' }
+  static id = 'graphql'
+  static operation = 'parser'
 
-  start () {
+  bindStart (ctx) {
     this.startSpan('graphql.parse', {
       service: this.config.service,
       type: 'graphql',
       meta: {}
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 
-  finish ({ source, document, docSource }) {
-    const span = this.activeSpan
+  finish (ctx) {
+    const { source, document, docSource } = ctx
+    const span = ctx?.currentStore?.span || this.activeSpan
 
     if (this.config.source && document) {
       span.setTag('graphql.source', docSource)
@@ -23,7 +26,9 @@ class GraphQLParsePlugin extends TracingPlugin {
 
     this.config.hooks.parse(span, source, document)
 
-    super.finish()
+    super.finish(ctx)
+
+    return ctx.parentStore
   }
 }
 

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

@@ -6,28 +6,37 @@ const dc = require('dc-polyfill')
 const collapsedPathSym = Symbol('collapsedPaths')
 
 class GraphQLResolvePlugin extends TracingPlugin {
-  static get id () { return 'graphql' }
-  static get operation () { return 'resolve' }
+  static id = 'graphql'
+  static operation = 'resolve'
+
+  start (fieldCtx) {
+    const { info, rootCtx, args } = fieldCtx
 
-  start ({ info, context, args }) {
     const path = getPath(info, this.config)
 
+    // we need to get the parent span to the field if it exists for correct span parenting
+    // of nested fields
+    const parentField = getParentField(rootCtx, pathToArray(info && info.path))
+    const childOf = parentField?.ctx?.currentStore?.span
+
+    fieldCtx.parent = parentField
+
     if (!shouldInstrument(this.config, path)) return
     const computedPathString = path.join('.')
 
     if (this.config.collapse) {
-      if (context.fields[computedPathString]) return
+      if (rootCtx.fields[computedPathString]) return
 
-      if (!context[collapsedPathSym]) {
-        context[collapsedPathSym] = {}
-      } else if (context[collapsedPathSym][computedPathString]) {
+      if (!rootCtx[collapsedPathSym]) {
+        rootCtx[collapsedPathSym] = {}
+      } else if (rootCtx[collapsedPathSym][computedPathString]) {
         return
       }
 
-      context[collapsedPathSym][computedPathString] = true
+      rootCtx[collapsedPathSym][computedPathString] = true
     }
 
-    const document = context.source
+    const document = rootCtx.source
     const fieldNode = info.fieldNodes.find(fieldNode => fieldNode.kind === 'Field')
     const loc = this.config.source && document && fieldNode && fieldNode.loc
     const source = loc && document.slice(loc.start, loc.end)
@@ -35,6 +44,7 @@ class GraphQLResolvePlugin extends TracingPlugin {
     const span = this.startSpan('graphql.resolve', {
       service: this.config.service,
       resource: `${info.fieldName}:${info.returnType}`,
+      childOf,
       type: 'graphql',
       meta: {
         'graphql.field.name': info.fieldName,
@@ -42,7 +52,7 @@ class GraphQLResolvePlugin extends TracingPlugin {
         'graphql.field.type': info.returnType.name,
         'graphql.source': source
       }
-    })
+    }, fieldCtx)
 
     if (fieldNode && this.config.variables && fieldNode.arguments) {
       const variables = this.config.variables(info.variableValues)
@@ -56,21 +66,25 @@ class GraphQLResolvePlugin extends TracingPlugin {
     }
 
     if (this.resolverStartCh.hasSubscribers) {
-      this.resolverStartCh.publish({ context, resolverInfo: getResolverInfo(info, args) })
+      this.resolverStartCh.publish({ ctx: rootCtx, resolverInfo: getResolverInfo(info, args) })
     }
+
+    return fieldCtx.currentStore
   }
 
   constructor (...args) {
     super(...args)
 
-    this.addTraceSub('updateField', ({ field, info, err }) => {
+    this.addTraceSub('updateField', (ctx) => {
+      const { field, info, error } = ctx
+
       const path = getPath(info, this.config)
 
       if (!shouldInstrument(this.config, path)) return
 
-      const span = this.activeSpan
+      const span = ctx?.currentStore?.span || this.activeSpan
       field.finishTime = span._getTime ? span._getTime() : 0
-      field.error = field.error || err
+      field.error = field.error || error
     })
 
     this.resolverStartCh = dc.channel('datadog:graphql:resolver:start')
@@ -81,8 +95,13 @@ class GraphQLResolvePlugin extends TracingPlugin {
     super.configure(config.depth === 0 ? false : config)
   }
 
-  finish (finishTime) {
-    this.activeSpan.finish(finishTime)
+  finish (ctx) {
+    const { finishTime } = ctx
+
+    const span = ctx?.currentStore?.span || this.activeSpan
+    span.finish(finishTime)
+
+    return ctx.parentStore
   }
 }
 
@@ -154,4 +173,19 @@ function getResolverInfo (info, args) {
   return resolverInfo
 }
 
+function getParentField (parentCtx, path) {
+  for (let i = path.length - 1; i > 0; i--) {
+    const field = getField(parentCtx, path.slice(0, i))
+    if (field) {
+      return field
+    }
+  }
+
+  return null
+}
+
+function getField (parentCtx, path) {
+  return parentCtx.fields[path.join('.')]
+}
+
 module.exports = GraphQLResolvePlugin

package/packages/datadog-plugin-graphql/src/validate.js

@@ -4,10 +4,11 @@ const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
 const { extractErrorIntoSpanEvent } = require('./utils')
 
 class GraphQLValidatePlugin extends TracingPlugin {
-  static get id () { return 'graphql' }
-  static get operation () { return 'validate' }
+  static id = 'graphql'
+  static operation = 'validate'
 
-  start ({ docSource, document }) {
+  bindStart (ctx) {
+    const { docSource, document } = ctx
     const source = this.config.source && document && docSource
 
     this.startSpan('graphql.validate', {
@@ -16,18 +17,23 @@ class GraphQLValidatePlugin extends TracingPlugin {
       meta: {
         'graphql.source': source
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 
-  finish ({ document, errors }) {
-    const span = this.activeSpan
+  finish (ctx) {
+    const { document, errors } = ctx
+    const span = ctx?.currentStore?.span || this.activeSpan
     this.config.hooks.validate(span, document, errors)
     if (errors) {
       for (const err of errors) {
         extractErrorIntoSpanEvent(this._tracerConfig, span, err)
       }
     }
-    super.finish()
+    super.finish(ctx)
+
+    return ctx.parentStore
   }
 }
 

package/packages/datadog-plugin-grpc/src/client.js

@@ -6,10 +6,10 @@ const { TEXT_MAP } = require('../../../ext/formats')
 const { addMetadataTags, getFilter, getMethodMetadata } = require('./util')
 
 class GrpcClientPlugin extends ClientPlugin {
-  static get id () { return 'grpc' }
-  static get operation () { return 'client:request' }
-  static get prefix () { return 'apm:grpc:client:request' }
-  static get peerServicePrecursors () { return ['rpc.service'] }
+  static id = 'grpc'
+  static operation = 'client:request'
+  static prefix = 'apm:grpc:client:request'
+  static peerServicePrecursors = ['rpc.service']
 
   constructor (...args) {
     super(...args)

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

@@ -5,7 +5,7 @@ const GrpcClientPlugin = require('./client')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class GrpcPlugin extends CompositePlugin {
-  static get id () { return 'grpc' }
+  static id = 'grpc'
   static get plugins () {
     return {
       server: GrpcServerPlugin,

package/packages/datadog-plugin-grpc/src/server.js

@@ -6,9 +6,9 @@ const { TEXT_MAP } = require('../../../ext/formats')
 const { addMetadataTags, getFilter, getMethodMetadata } = require('./util')
 
 class GrpcServerPlugin extends ServerPlugin {
-  static get id () { return 'grpc' }
-  static get operation () { return 'server:request' }
-  static get prefix () { return 'apm:grpc:server:request' }
+  static id = 'grpc'
+  static operation = 'server:request'
+  static prefix = 'apm:grpc:server:request'
 
   constructor (...args) {
     super(...args)

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

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