dd-trace 5.61.0 → 5.62.0

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

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

@@ -13,9 +13,9 @@ const LangChainLanguageModelHandler = require('./handlers/language_models')
 const LangChainEmbeddingHandler = require('./handlers/embedding')
 
 class BaseLangChainTracingPlugin extends TracingPlugin {
-  static get id () { return 'langchain' }
-  static get operation () { return 'invoke' }
-  static get system () { return 'langchain' }
+  static id = 'langchain'
+  static operation = 'invoke'
+  static system = 'langchain'
 
   constructor () {
     super(...arguments)
@@ -85,75 +85,57 @@ class BaseLangChainTracingPlugin extends TracingPlugin {
 }
 
 class RunnableSequenceInvokePlugin extends BaseLangChainTracingPlugin {
-  static get id () { return 'langchain_rs_invoke' }
-  static get lcType () { return 'chain' }
-  static get prefix () {
-    return 'tracing:orchestrion:@langchain/core:RunnableSequence_invoke'
-  }
+  static id = 'langchain_rs_invoke'
+  static lcType = 'chain'
+  static prefix = 'tracing:orchestrion:@langchain/core:RunnableSequence_invoke'
 }
 
 class RunnableSequenceBatchPlugin extends BaseLangChainTracingPlugin {
-  static get id () { return 'langchain_rs_batch' }
-  static get lcType () { return 'chain' }
-  static get prefix () {
-    return 'tracing:orchestrion:@langchain/core:RunnableSequence_batch'
-  }
+  static id = 'langchain_rs_batch'
+  static lcType = 'chain'
+  static prefix = 'tracing:orchestrion:@langchain/core:RunnableSequence_batch'
 }
 
 class BaseChatModelGeneratePlugin extends BaseLangChainTracingPlugin {
-  static get id () { return 'langchain_chat_model_generate' }
-  static get lcType () { return 'chat_model' }
-  static get prefix () {
-    return 'tracing:orchestrion:@langchain/core:BaseChatModel_generate'
-  }
+  static id = 'langchain_chat_model_generate'
+  static lcType = 'chat_model'
+  static prefix = 'tracing:orchestrion:@langchain/core:BaseChatModel_generate'
 }
 
 class BaseLLMGeneratePlugin extends BaseLangChainTracingPlugin {
-  static get id () { return 'langchain_llm_generate' }
-  static get lcType () { return 'llm' }
-  static get prefix () {
-    return 'tracing:orchestrion:@langchain/core:BaseLLM_generate'
-  }
+  static id = 'langchain_llm_generate'
+  static lcType = 'llm'
+  static prefix = 'tracing:orchestrion:@langchain/core:BaseLLM_generate'
 }
 
 class EmbeddingsEmbedQueryPlugin extends BaseLangChainTracingPlugin {
-  static get id () { return 'langchain_embeddings_embed_query' }
-  static get lcType () { return 'embedding' }
-  static get prefix () {
-    return 'tracing:apm:@langchain/core:Embeddings_embedQuery'
-  }
+  static id = 'langchain_embeddings_embed_query'
+  static lcType = 'embedding'
+  static prefix = 'tracing:apm:@langchain/core:Embeddings_embedQuery'
 }
 
 class EmbeddingsEmbedDocumentsPlugin extends BaseLangChainTracingPlugin {
-  static get id () { return 'langchain_embeddings_embed_documents' }
-  static get lcType () { return 'embedding' }
-  static get prefix () {
-    return 'tracing:apm:@langchain/core:Embeddings_embedDocuments'
-  }
+  static id = 'langchain_embeddings_embed_documents'
+  static lcType = 'embedding'
+  static prefix = 'tracing:apm:@langchain/core:Embeddings_embedDocuments'
 }
 
 class ToolInvokePlugin extends BaseLangChainTracingPlugin {
-  static get id () { return 'langchain_tool_invoke' }
-  static get lcType () { return 'tool' }
-  static get prefix () {
-    return 'tracing:orchestrion:@langchain/core:Tool_invoke'
-  }
+  static id = 'langchain_tool_invoke'
+  static lcType = 'tool'
+  static prefix = 'tracing:orchestrion:@langchain/core:Tool_invoke'
 }
 
 class VectorStoreSimilaritySearchPlugin extends BaseLangChainTracingPlugin {
-  static get id () { return 'langchain_vectorstore_similarity_search' }
-  static get lcType () { return 'similarity_search' }
-  static get prefix () {
-    return 'tracing:orchestrion:@langchain/core:VectorStore_similaritySearch'
-  }
+  static id = 'langchain_vectorstore_similarity_search'
+  static lcType = 'similarity_search'
+  static prefix = 'tracing:orchestrion:@langchain/core:VectorStore_similaritySearch'
 }
 
 class VectorStoreSimilaritySearchWithScorePlugin extends BaseLangChainTracingPlugin {
-  static get id () { return 'langchain_vectorstore_similarity_search_with_score' }
-  static get lcType () { return 'similarity_search' }
-  static get prefix () {
-    return 'tracing:orchestrion:@langchain/core:VectorStore_similaritySearchWithScore'
-  }
+  static id = 'langchain_vectorstore_similarity_search_with_score'
+  static lcType = 'similarity_search'
+  static prefix = 'tracing:orchestrion:@langchain/core:VectorStore_similaritySearchWithScore'
 }
 
 module.exports = [

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

@@ -4,8 +4,8 @@ const { storage } = require('../../datadog-core')
 const MySQLPlugin = require('../../datadog-plugin-mysql/src')
 
 class MariadbPlugin extends MySQLPlugin {
-  static get id () { return 'mariadb' }
-  static get system () { return 'mariadb' }
+  static id = 'mariadb'
+  static system = 'mariadb'
 
   constructor (...args) {
     super(...args)

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

@@ -4,7 +4,7 @@ const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 const CachePlugin = require('../../dd-trace/src/plugins/cache')
 
 class MemcachedPlugin extends CachePlugin {
-  static get id () { return 'memcached' }
+  static id = 'memcached'
 
   bindStart (ctx) {
     const { client, server, query } = ctx

package/packages/datadog-plugin-microgateway-core/src/index.js

@@ -4,9 +4,7 @@ const RouterPlugin = require('../../datadog-plugin-router/src')
 const web = require('../../dd-trace/src/plugins/util/web')
 
 class MicrogatewayCorePlugin extends RouterPlugin {
-  static get id () {
-    return 'microgateway-core'
-  }
+  static id = 'microgateway-core'
 
   constructor (...args) {
     super(...args)
@@ -19,7 +17,9 @@ class MicrogatewayCorePlugin extends RouterPlugin {
       web.setRoute(req, route)
     })
 
-    this.addSub('apm:microgateway-core:request:error', this.addError)
+    this.addSub('apm:microgateway-core:request:error', ({ error }) => {
+      this.addError(error)
+    })
   }
 }
 

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

@@ -74,9 +74,7 @@ function getTestSuiteLevelVisibilityTags (testSuiteSpan) {
 }
 
 class MochaPlugin extends CiPlugin {
-  static get id () {
-    return 'mocha'
-  }
+  static id = 'mocha'
 
   constructor (...args) {
     super(...args)

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

@@ -4,8 +4,8 @@ const ClientPlugin = require('../../dd-trace/src/plugins/client')
 const { moleculerTags } = require('./util')
 
 class MoleculerClientPlugin extends ClientPlugin {
-  static get id () { return 'moleculer' }
-  static get operation () { return 'call' }
+  static id = 'moleculer'
+  static operation = 'call'
 
   bindStart (ctx) {
     const { actionName, opts } = ctx

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

@@ -7,7 +7,7 @@ const MoleculerClientPlugin = require('./client')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class MoleculerPlugin extends CompositePlugin {
-  static get id () { return 'moleculer' }
+  static id = 'moleculer'
   static get plugins () {
     return {
       server: MoleculerServerPlugin,

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

@@ -4,8 +4,8 @@ const ServerPlugin = require('../../dd-trace/src/plugins/server')
 const { moleculerTags } = require('./util')
 
 class MoleculerServerPlugin extends ServerPlugin {
-  static get id () { return 'moleculer' }
-  static get operation () { return 'action' }
+  static id = 'moleculer'
+  static operation = 'action'
 
   bindStart (ctx) {
     const { action, middlewareCtx, broker } = ctx

package/packages/datadog-plugin-mongodb-core/src/index.js

@@ -6,11 +6,11 @@ const coalesce = require('koalas')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 class MongodbCorePlugin extends DatabasePlugin {
-  static get id () { return 'mongodb-core' }
-  static get component () { return 'mongodb' }
+  static id = 'mongodb-core'
+  static component = 'mongodb'
   // avoid using db.name for peer.service since it includes the collection name
   // should be removed if one day this will be fixed
-  static get peerServicePrecursors () { return [] }
+  static peerServicePrecursors = []
 
   configure (config) {
     super.configure(config)
@@ -24,7 +24,9 @@ class MongodbCorePlugin extends DatabasePlugin {
     )
   }
 
-  start ({ ns, ops, options = {}, name }) {
+  bindStart (ctx) {
+    const { ns, ops, options = {}, name } = ctx
+
     // heartbeat commands can be disabled if this.config.heartbeatEnabled is false
     if (!this.config.heartbeatEnabled && isHeartbeat(ops, this.config)) {
       return
@@ -44,11 +46,13 @@ class MongodbCorePlugin extends DatabasePlugin {
         'out.host': options.host,
         'out.port': options.port
       }
-    })
+    }, ctx)
     const comment = this.injectDbmComment(span, ops.comment, service)
     if (comment) {
       ops.comment = comment
     }
+
+    return ctx.currentStore
   }
 
   getPeerService (tags) {

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

@@ -0,0 +1,20 @@
+'use strict'
+
+const DatabasePlugin = require('../../dd-trace/src/plugins/database')
+const { storage } = require('../../datadog-core')
+
+class MongoosePlugin extends DatabasePlugin {
+  static id = 'mongoose'
+  static operation = 'exec'
+
+  bindStart (ctx) {
+    ctx.parentStore = storage('legacy').getStore()
+    return ctx.parentStore
+  }
+
+  bindFinish (ctx) {
+    return ctx.parentStore
+  }
+}
+
+module.exports = MongoosePlugin

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

@@ -5,8 +5,8 @@ const CLIENT_PORT_KEY = require('../../dd-trace/src/constants')
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 
 class MySQLPlugin extends DatabasePlugin {
-  static get id () { return 'mysql' }
-  static get system () { return 'mysql' }
+  static id = 'mysql'
+  static system = 'mysql'
 
   constructor () {
     super(...arguments)

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

@@ -4,7 +4,7 @@ const { storage } = require('../../datadog-core')
 const MySQLPlugin = require('../../datadog-plugin-mysql/src')
 
 class MySQL2Plugin extends MySQLPlugin {
-  static get id () { return 'mysql2' }
+  static id = 'mysql2'
 
   constructor () {
     super(...arguments)

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

@@ -5,7 +5,7 @@ const NetIPCPlugin = require('./ipc')
 const NetTCPPlugin = require('./tcp')
 
 class NetPlugin extends Plugin {
-  static get id () { return 'net' }
+  static id = 'net'
 
   constructor (...args) {
     super(...args)

package/packages/datadog-plugin-net/src/ipc.js

@@ -3,8 +3,8 @@
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
 
 class NetIPCPlugin extends ClientPlugin {
-  static get id () { return 'net' }
-  static get operation () { return 'ipc' }
+  static id = 'net'
+  static operation = 'ipc'
 
   bindStart (ctx) {
     this.startSpan('ipc.connect', {

package/packages/datadog-plugin-net/src/tcp.js

@@ -4,8 +4,8 @@ const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
 
 class NetTCPPlugin extends ClientPlugin {
-  static get id () { return 'net' }
-  static get operation () { return 'tcp' }
+  static id = 'net'
+  static operation = 'tcp'
 
   constructor (...args) {
     super(...args)

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

@@ -9,9 +9,7 @@ const web = require('../../dd-trace/src/plugins/util/web')
 const errorPages = new Set(['/404', '/500', '/_error', '/_not-found', '/_not-found/page'])
 
 class NextPlugin extends ServerPlugin {
-  static get id () {
-    return 'next'
-  }
+  static id = 'next'
 
   constructor (...args) {
     super(...args)

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

@@ -3,9 +3,7 @@
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 
 class NycPlugin extends CiPlugin {
-  static get id () {
-    return 'nyc'
-  }
+  static id = 'nyc'
 
   constructor (...args) {
     super(...args)

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

@@ -5,7 +5,7 @@ const OpenAiTracingPlugin = require('./tracing')
 const OpenAiLLMObsPlugin = require('../../dd-trace/src/llmobs/plugins/openai')
 
 class OpenAiPlugin extends CompositePlugin {
-  static get id () { return 'openai' }
+  static id = 'openai'
   static get plugins () {
     return {
       llmobs: OpenAiLLMObsPlugin,