dd-trace 5.61.1 → 5.63.0

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)

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

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

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

@@ -16,8 +16,8 @@ const HTTP_REQUEST_HEADERS = tags.HTTP_REQUEST_HEADERS
 const HTTP_RESPONSE_HEADERS = tags.HTTP_RESPONSE_HEADERS
 
 class HttpClientPlugin extends ClientPlugin {
-  static get id () { return 'http' }
-  static get prefix () { return 'apm:http:client:request' }
+  static id = 'http'
+  static prefix = 'apm:http:client:request'
 
   bindStart (message) {
     const { args, http = {} } = message

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

@@ -5,7 +5,7 @@ const HttpClientPlugin = require('./client')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class HttpPlugin extends CompositePlugin {
-  static get id () { return 'http' }
+  static id = 'http'
   static get plugins () {
     return {
       server: HttpServerPlugin,

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

@@ -7,9 +7,9 @@ const { incomingHttpRequestStart, incomingHttpRequestEnd } = require('../../dd-t
 const { COMPONENT } = require('../../dd-trace/src/constants')
 
 class HttpServerPlugin extends ServerPlugin {
-  static get id () {
-    return 'http'
-  }
+  static id = 'http'
+
+  static prefix = 'apm:http:server:request'
 
   constructor (...args) {
     super(...args)
@@ -17,10 +17,6 @@ class HttpServerPlugin extends ServerPlugin {
     this.addTraceSub('exit', message => this.exit(message))
   }
 
-  addTraceSub (eventName, handler) {
-    this.addSub(`apm:${this.constructor.id}:server:${this.operation}:${eventName}`, handler)
-  }
-
   start ({ req, res, abortController }) {
     const store = storage('legacy').getStore()
     const span = web.startSpan(

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

@@ -24,8 +24,8 @@ const HTTP2_HEADER_STATUS = ':status'
 const HTTP2_METHOD_GET = 'GET'
 
 class Http2ClientPlugin extends ClientPlugin {
-  static get id () { return 'http2' }
-  static get prefix () { return 'apm:http2:client:request' }
+  static id = 'http2'
+  static prefix = 'apm:http2:client:request'
 
   bindStart (message) {
     const { authority, options, headers = {} } = message

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

@@ -5,7 +5,7 @@ const Http2ClientPlugin = require('./client')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class Http2Plugin extends CompositePlugin {
-  static get id () { return 'http2' }
+  static id = 'http2'
   static get plugins () {
     return {
       server: Http2ServerPlugin,

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

@@ -3,21 +3,22 @@
 // Plugin temporarily disabled. See https://github.com/DataDog/dd-trace-js/issues/312
 
 const ServerPlugin = require('../../dd-trace/src/plugins/server')
-const { storage } = require('../../datadog-core')
 const web = require('../../dd-trace/src/plugins/util/web')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 
 class Http2ServerPlugin extends ServerPlugin {
-  static get id () {
-    return 'http2'
+  constructor (tracer, config) {
+    super(tracer, config)
+    this.addBind('apm:http2:server:response:emit', this.bindEmit)
   }
 
-  addTraceSub (eventName, handler) {
-    this.addSub(`apm:${this.constructor.id}:server:${this.operation}:${eventName}`, handler)
-  }
+  static id = 'http2'
+
+  static prefix = 'apm:http2:server:request'
+
+  bindStart (ctx) {
+    const { req, res } = ctx
 
-  start ({ req, res }) {
-    const store = storage('legacy').getStore()
     const span = web.startSpan(
       this.tracer,
       {
@@ -26,13 +27,15 @@ class Http2ServerPlugin extends ServerPlugin {
       },
       req,
       res,
-      this.operationName()
+      this.operationName(),
+      ctx
     )
 
     span.setTag(COMPONENT, this.constructor.id)
     span._integrationName = this.constructor.id
 
-    this.enter(span, { ...store, req, res })
+    ctx.currentStore.req = req
+    ctx.currentStore.res = res
 
     const context = web.getContext(req)
 
@@ -40,14 +43,22 @@ class Http2ServerPlugin extends ServerPlugin {
       context.res.writeHead = web.wrapWriteHead(context)
       context.instrumented = true
     }
+
+    return ctx.currentStore
   }
 
-  finish ({ req }) {
+  bindEmit (ctx) {
+    if (ctx.eventName !== 'close') return ctx.currentStore
+
+    const { req } = ctx
+
     const context = web.getContext(req)
 
     if (!context || !context.res) return // Not created by a http.Server instance.
 
     web.finishAll(context)
+
+    return ctx.currentStore
   }
 
   error (error) {

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

@@ -3,9 +3,7 @@
 const RedisPlugin = require('../../datadog-plugin-redis/src')
 
 class IORedisPlugin extends RedisPlugin {
-  static get id () {
-    return 'ioredis'
-  }
+  static id = 'ioredis'
 }
 
 module.exports = IORedisPlugin

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

@@ -3,11 +3,9 @@
 const RedisPlugin = require('../../datadog-plugin-redis/src')
 
 class IOValkeyPlugin extends RedisPlugin {
-  static get id () {
-    return 'iovalkey'
-  }
+  static id = 'iovalkey'
 
-  static get system () { return 'valkey' }
+  static system = 'valkey'
 
   constructor (...args) {
     super(...args)

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

@@ -67,9 +67,7 @@ function withTimeout (promise, timeoutMs) {
 }
 
 class JestPlugin extends CiPlugin {
-  static get id () {
-    return 'jest'
-  }
+  static id = 'jest'
 
   // The lists are the same for every test suite, so we can cache them
   getUnskippableSuites (unskippableSuitesList) {

package/packages/datadog-plugin-kafkajs/src/batch-consumer.js

@@ -5,8 +5,8 @@ const { getMessageSize } = require('../../dd-trace/src/datastreams')
 const { convertToTextMap } = require('./utils')
 
 class KafkajsBatchConsumerPlugin extends ConsumerPlugin {
-  static get id () { return 'kafkajs' }
-  static get operation () { return 'consume-batch' }
+  static id = 'kafkajs'
+  static operation = 'consume-batch'
 
   start (ctx) {
     const { topic, messages, groupId, clusterId } = ctx.extractedArgs || ctx

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

@@ -10,8 +10,8 @@ const beforeFinishCh = dc.channel('dd-trace:kafkajs:consumer:beforeFinish')
 const MESSAGING_DESTINATION_KEY = 'messaging.destination.name'
 
 class KafkajsConsumerPlugin extends ConsumerPlugin {
-  static get id () { return 'kafkajs' }
-  static get operation () { return 'consume' }
+  static id = 'kafkajs'
+  static operation = 'consume'
 
   constructor () {
     super(...arguments)

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

@@ -6,7 +6,7 @@ const BatchConsumerPlugin = require('./batch-consumer')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class KafkajsPlugin extends CompositePlugin {
-  static get id () { return 'kafkajs' }
+  static id = 'kafkajs'
   static get plugins () {
     return {
       producer: ProducerPlugin,

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

@@ -7,9 +7,9 @@ const BOOTSTRAP_SERVERS_KEY = 'messaging.kafka.bootstrap.servers'
 const MESSAGING_DESTINATION_KEY = 'messaging.destination.name'
 
 class KafkajsProducerPlugin extends ProducerPlugin {
-  static get id () { return 'kafkajs' }
-  static get operation () { return 'produce' }
-  static get peerServicePrecursors () { return [BOOTSTRAP_SERVERS_KEY] }
+  static id = 'kafkajs'
+  static operation = 'produce'
+  static peerServicePrecursors = [BOOTSTRAP_SERVERS_KEY]
 
   constructor () {
     super(...arguments)

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

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

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

@@ -19,8 +19,8 @@ for (const Plugin of langChainTracingPlugins) {
 }
 
 class LangChainPlugin extends CompositePlugin {
-  static get id () { return 'langchain' }
-  static get plugins () { return plugins }
+  static id = 'langchain'
+  static plugins = plugins
 }
 
 module.exports = LangChainPlugin