dd-trace 3.4.0 → 3.6.0

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

@@ -1,93 +1,17 @@
 'use strict'
 
-const Plugin = require('../../dd-trace/src/plugins/plugin')
-const { storage } = require('../../datadog-core')
-const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
-
-class KafkajsPlugin extends Plugin {
-  static get name () {
-    return 'kafkajs'
-  }
-
-  constructor (...args) {
-    super(...args)
-
-    this.addSub(`apm:kafkajs:produce:start`, ({ topic, messages }) => {
-      const store = storage.getStore()
-      const childOf = store ? store.span : store
-      const span = this.tracer.startSpan('kafka.produce', {
-        childOf,
-        tags: {
-          'service.name': this.config.service || `${this.tracer._service}-kafka`,
-          'span.kind': 'producer',
-          'component': 'kafkajs'
-        }
-      })
-
-      analyticsSampler.sample(span, this.config.measured)
-      this.enter(span, store)
-
-      span.addTags({
-        'resource.name': topic,
-        'kafka.topic': topic,
-        'kafka.batch_size': messages.length
-      })
-      for (const message of messages) {
-        if (typeof message === 'object') {
-          this.tracer.inject(span, 'text_map', message.headers)
-        }
-      }
-    })
-
-    this.addSub(`apm:kafkajs:consume:start`, ({ topic, partition, message }) => {
-      const store = storage.getStore()
-      const childOf = extract(this.tracer, message.headers)
-      const span = this.tracer.startSpan('kafka.consume', {
-        childOf,
-        tags: {
-          'service.name': this.config.service || `${this.tracer._service}-kafka`,
-          'span.kind': 'consumer',
-          'span.type': 'worker',
-          'component': 'kafkajs',
-          'resource.name': topic,
-          'kafka.topic': topic,
-          'kafka.partition': partition,
-          'kafka.message.offset': message.offset
-        }
-      })
-
-      analyticsSampler.sample(span, this.config.measured, true)
-      this.enter(span, store)
-    })
-
-    this.addSub(`apm:kafkajs:consume:error`, errorHandler)
-
-    this.addSub(`apm:kafkajs:consume:finish`, finishHandler)
-
-    this.addSub(`apm:kafkajs:produce:error`, errorHandler)
-
-    this.addSub(`apm:kafkajs:produce:finish`, finishHandler)
+const ProducerPlugin = require('./producer')
+const ConsumerPlugin = require('./consumer')
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+
+class KafkajsPlugin extends CompositePlugin {
+  static get name () { return 'kafkajs' }
+  static get plugins () {
+    return {
+      producer: ProducerPlugin,
+      consumer: ConsumerPlugin
+    }
   }
 }
 
-function finishHandler () {
-  storage.getStore().span.finish()
-}
-
-function errorHandler (error) {
-  storage.getStore().span.setTag('error', error)
-}
-
-function extract (tracer, bufferMap) {
-  if (!bufferMap) return null
-
-  const textMap = {}
-
-  for (const key of Object.keys(bufferMap)) {
-    textMap[key] = bufferMap[key].toString()
-  }
-
-  return tracer.extract('text_map', textMap)
-}
-
 module.exports = KafkajsPlugin

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

@@ -0,0 +1,31 @@
+'use strict'
+
+const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
+
+class KafkajsProducerPlugin extends ProducerPlugin {
+  static get name () { return 'kafkajs' }
+  static get operation () { return 'produce' }
+
+  start ({ topic, messages }) {
+    const span = this.startSpan('kafka.produce', {
+      service: this.config.service || `${this.tracer._service}-kafka`,
+      resource: topic,
+      kind: 'producer',
+      meta: {
+        'component': 'kafkajs',
+        'kafka.topic': topic
+      },
+      metrics: {
+        'kafka.batch_size': messages.length
+      }
+    })
+
+    for (const message of messages) {
+      if (typeof message === 'object') {
+        this.tracer.inject(span, 'text_map', message.headers)
+      }
+    }
+  }
+}
+
+module.exports = KafkajsProducerPlugin

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

@@ -53,7 +53,7 @@ class MochaPlugin extends Plugin {
     this.sourceRoot = process.cwd()
     this.codeOwnersEntries = getCodeOwnersFileEntries(this.sourceRoot)
 
-    this.addSub('ci:mocha:run:start', (command) => {
+    this.addSub('ci:mocha:session:start', (command) => {
       if (!this.config.isAgentlessEnabled) {
         return
       }
@@ -154,7 +154,7 @@ class MochaPlugin extends Plugin {
       this._testNameToParams[name] = params
     })
 
-    this.addSub('ci:mocha:run:finish', (status) => {
+    this.addSub('ci:mocha:session:finish', (status) => {
       if (this.testSessionSpan) {
         this.testSessionSpan.setTag(TEST_STATUS, status)
         this.testSessionSpan.finish()

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

@@ -1,49 +1,35 @@
 'use strict'
 
-const { storage } = require('../../datadog-core')
-const Plugin = require('../../dd-trace/src/plugins/plugin')
+const ClientPlugin = require('../../dd-trace/src/plugins/client')
 const { moleculerTags } = require('./util')
 
-class MoleculerClientPlugin extends Plugin {
-  constructor (...args) {
-    super(...args)
-
-    this.addSub('apm:moleculer:call:start', ({ actionName, params, opts }) => {
-      const store = storage.getStore()
-      const childOf = store && store.span
-      const span = this.tracer.startSpan('moleculer.call', {
-        childOf,
-        tags: {
-          'service.name': this.config.service || this.tracer._service,
-          'span.kind': 'client',
-          'resource.name': actionName
-        }
-      })
-
-      this.tracer.inject(span, 'text_map', opts.meta)
-
-      this.enter(span, store)
+class MoleculerClientPlugin extends ClientPlugin {
+  static get name () { return 'moleculer' }
+  static get operation () { return 'call' }
+
+  start ({ actionName, opts }) {
+    const span = this.startSpan('moleculer.call', {
+      service: this.config.service,
+      resource: actionName,
+      kind: 'client'
     })
 
-    this.addSub('apm:moleculer:call:finish', ({ broker, ctx }) => {
-      const store = storage.getStore()
-      const span = store.span
+    this.tracer.inject(span, 'text_map', opts.meta)
+  }
+
+  finish ({ broker, ctx }) {
+    const span = this.activeSpan
 
-      if (ctx) {
-        const endpoint = ctx.endpoint || {}
-        const node = endpoint.node || {}
+    if (ctx) {
+      const endpoint = ctx.endpoint || {}
+      const node = endpoint.node || {}
 
-        span.addTags({
-          'out.host': node.hostname,
-          'out.port': node.port,
-          ...moleculerTags(broker, ctx, this.config)
-        })
-      }
+      this.addHost(node.hostname, node.port)
 
-      span.finish()
-    })
+      span.addTags(moleculerTags(broker, ctx, this.config))
+    }
 
-    this.addSub('apm:moleculer:call:error', this.addError)
+    span.finish()
   }
 }
 

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

@@ -2,35 +2,17 @@
 
 // TODO: support https://moleculer.services/docs/0.13/actions.html#Streaming
 
-const Plugin = require('../../dd-trace/src/plugins/plugin')
 const MoleculerServerPlugin = require('./server')
 const MoleculerClientPlugin = require('./client')
-
-class MoleculerPlugin extends Plugin {
-  static get name () {
-    return 'moleculer'
-  }
-
-  constructor (...args) {
-    super(...args)
-
-    this.server = new MoleculerServerPlugin(...args)
-    this.client = new MoleculerClientPlugin(...args)
-  }
-
-  configure (config) {
-    const clientConfig = config.client === false ? false : {
-      ...config,
-      ...config.client
-    }
-
-    const serverConfig = config.server === false ? false : {
-      ...config,
-      ...config.server
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+
+class MoleculerPlugin extends CompositePlugin {
+  static get name () { return 'moleculer' }
+  static get plugins () {
+    return {
+      server: MoleculerServerPlugin,
+      client: MoleculerClientPlugin
     }
-
-    this.server.configure(serverConfig)
-    this.client.configure(clientConfig)
   }
 }
 

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

@@ -1,38 +1,26 @@
 'use strict'
 
-const { storage } = require('../../datadog-core')
-const Plugin = require('../../dd-trace/src/plugins/plugin')
+const ServerPlugin = require('../../dd-trace/src/plugins/server')
 const { moleculerTags } = require('./util')
 
-class MoleculerServerPlugin extends Plugin {
-  constructor (...args) {
-    super(...args)
-
-    this.addSub('apm:moleculer:action:start', ({ action, ctx, broker }) => {
-      const store = storage.getStore()
-      const followsFrom = this.tracer.extract('text_map', ctx.meta)
-      const span = this.tracer.startSpan('moleculer.action', {
-        childOf: followsFrom || (store && store.span),
-        tags: {
-          'service.name': this.config.service || this.tracer._service,
-          'span.type': 'web',
-          'span.kind': 'server',
-          'resource.name': action.name,
-          ...moleculerTags(broker, ctx, this.config)
-        }
-      })
-
-      this.enter(span, store)
-    })
-
-    this.addSub('apm:moleculer:action:finish', () => {
-      const store = storage.getStore()
-      const span = store.span
-
-      span.finish()
+class MoleculerServerPlugin extends ServerPlugin {
+  static get name () { return 'moleculer' }
+  static get operation () { return 'action' }
+
+  start ({ action, ctx, broker }) {
+    const followsFrom = this.tracer.extract('text_map', ctx.meta)
+
+    this.startSpan('moleculer.action', {
+      childOf: followsFrom || this.activeSpan,
+      service: this.config.service,
+      resource: action.name,
+      kind: 'server',
+      type: 'web',
+      meta: {
+        'resource.name': action.name,
+        ...moleculerTags(broker, ctx, this.config)
+      }
     })
-
-    this.addSub('apm:moleculer:action:error', this.addError)
   }
 }
 

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

@@ -0,0 +1,21 @@
+'use strict'
+
+const ClientPlugin = require('../../dd-trace/src/plugins/client')
+
+class NetIPCPlugin extends ClientPlugin {
+  static get name () { return 'net' }
+  static get operation () { return 'ipc' }
+
+  start ({ options }) {
+    this.startSpan('ipc.connect', {
+      service: this.config.service,
+      resource: options.path,
+      kind: 'client',
+      meta: {
+        'ipc.path': options.path
+      }
+    })
+  }
+}
+
+module.exports = NetIPCPlugin

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

@@ -0,0 +1,46 @@
+'use strict'
+
+const ClientPlugin = require('../../dd-trace/src/plugins/client')
+
+class NetTCPPlugin extends ClientPlugin {
+  static get name () { return 'net' }
+  static get operation () { return 'tcp' }
+
+  constructor (...args) {
+    super(...args)
+
+    this.addTraceSub('connection', ({ socket }) => {
+      const span = this.activeSpan
+
+      span.addTags({
+        'tcp.local.address': socket.localAddress,
+        'tcp.local.port': socket.localPort
+      })
+    })
+  }
+
+  start ({ options }) {
+    const host = options.host || 'localhost'
+    const port = options.port || 0
+    const family = options.family || 4
+
+    this.startSpan('tcp.connect', {
+      service: this.config.service,
+      resource: [host, port].filter(val => val).join(':'),
+      kind: 'client',
+      meta: {
+        'tcp.remote.host': host,
+        'tcp.family': `IPv${family}`,
+        'tcp.local.address': '',
+        'out.host': host
+      },
+      metrics: {
+        'tcp.remote.port': port,
+        'tcp.local.port': 0,
+        'out.port': port
+      }
+    })
+  }
+}
+
+module.exports = NetTCPPlugin

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

@@ -0,0 +1,11 @@
+'use strict'
+
+const ElasticsearchPlugin = require('../../datadog-plugin-elasticsearch/src')
+
+class OpenSearchPlugin extends ElasticsearchPlugin {
+  static get name () {
+    return 'opensearch'
+  }
+}
+
+module.exports = OpenSearchPlugin

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

@@ -7,7 +7,7 @@ class PGPlugin extends DatabasePlugin {
   static get operation () { return 'query' }
   static get system () { return 'postgres' }
 
-  start ({ params = {}, statement }) {
+  start ({ params = {}, statement, processId }) {
     const service = getServiceName(this.config, params)
 
     this.startSpan('pg.query', {
@@ -17,6 +17,7 @@ class PGPlugin extends DatabasePlugin {
       kind: 'client',
       meta: {
         'db.type': 'postgres',
+        'db.pid': processId,
         'db.name': params.database,
         'db.user': params.user,
         'out.host': params.host,

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

@@ -0,0 +1,55 @@
+'use strict'
+
+const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
+const { storage } = require('../../datadog-core')
+
+class RheaConsumerPlugin extends ConsumerPlugin {
+  static get name () { return 'rhea' }
+
+  constructor (...args) {
+    super(...args)
+
+    this.addTraceSub('dispatch', ({ state }) => {
+      const span = storage.getStore().span
+      span.setTag('amqp.delivery.state', state)
+    })
+  }
+
+  start ({ msgObj }) {
+    const name = getResourceNameFromMessage(msgObj)
+    const childOf = extractTextMap(msgObj, this.tracer)
+
+    this.startSpan('amqp.receive', {
+      childOf,
+      service: this.config.service,
+      resource: name,
+      type: 'worker',
+      kind: 'consumer',
+      meta: {
+        'component': 'rhea',
+        'amqp.link.source.address': name,
+        'amqp.link.role': 'receiver'
+      }
+    })
+  }
+}
+
+function getResourceNameFromMessage (msgObj) {
+  let resourceName = 'amq.topic'
+  let options = {}
+  if (msgObj.receiver && msgObj.receiver.options) {
+    options = msgObj.receiver.options
+  }
+  if (options.source && options.source.address) {
+    resourceName = options.source.address
+  }
+  return resourceName
+}
+
+function extractTextMap (msgObj, tracer) {
+  if (msgObj.message) {
+    return tracer.extract('text_map', msgObj.message.delivery_annotations)
+  }
+}
+
+module.exports = RheaConsumerPlugin

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

@@ -1,104 +1,16 @@
 'use strict'
 
-const Plugin = require('../../dd-trace/src/plugins/plugin')
-const { storage } = require('../../datadog-core')
-const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
-
-class RheaPlugin extends Plugin {
-  static get name () {
-    return 'rhea'
-  }
-
-  constructor (...args) {
-    super(...args)
-
-    this.addSub(`apm:rhea:send:start`, ({ targetAddress, host, port, msg }) => {
-      const store = storage.getStore()
-      const childOf = store ? store.span : store
-      const name = targetAddress || 'amq.topic'
-      const span = this.tracer.startSpan('amqp.send', {
-        childOf,
-        tags: {
-          'component': 'rhea',
-          'resource.name': name,
-          'service.name': this.config.service || `${this.tracer._service}-amqp-producer`,
-          'span.kind': 'producer',
-          'amqp.link.target.address': name,
-          'amqp.link.role': 'sender',
-          'out.host': host,
-          'out.port': port
-        }
-      })
-      analyticsSampler.sample(span, this.config.measured)
-
-      this.enter(span, store)
-    })
-
-    this.addSub('apm:rhea:encode', msg => {
-      addDeliveryAnnotations(msg, this.tracer, this.tracer.scope().active())
-    })
-
-    this.addSub(`apm:rhea:receive:start`, ({ msgObj, connection }) => {
-      const name = getResourceNameFromMessage(msgObj)
-
-      const store = storage.getStore()
-      const childOf = extractTextMap(msgObj, this.tracer)
-      const span = this.tracer.startSpan('amqp.receive', {
-        childOf,
-        tags: {
-          'span.type': 'worker',
-          'component': 'rhea',
-          'resource.name': name,
-          'service.name': this.config.service || this.tracer._service,
-          'span.kind': 'consumer',
-          'amqp.link.source.address': name,
-          'amqp.link.role': 'receiver'
-        }
-      })
-      analyticsSampler.sample(span, this.config.measured, true)
-
-      this.enter(span, store)
-    })
-
-    this.addSub(`apm:rhea:error`, error => {
-      storage.getStore().span.setTag('error', error)
-    })
-
-    this.addSub(`apm:rhea:finish`, () => {
-      const span = storage.getStore().span
-      span.finish()
-    })
-
-    this.addSub(`apm:rhea:dispatch`, ({ state }) => {
-      const span = storage.getStore().span
-      span.setTag('amqp.delivery.state', state)
-    })
-  }
-}
-
-function getResourceNameFromMessage (msgObj) {
-  let resourceName = 'amq.topic'
-  let options = {}
-  if (msgObj.receiver && msgObj.receiver.options) {
-    options = msgObj.receiver.options
-  }
-  if (options.source && options.source.address) {
-    resourceName = options.source.address
-  }
-  return resourceName
-}
-
-function extractTextMap (msgObj, tracer) {
-  if (msgObj.message) {
-    return tracer.extract('text_map', msgObj.message.delivery_annotations)
-  }
-}
-
-function addDeliveryAnnotations (msg, tracer, span) {
-  if (msg) {
-    msg.delivery_annotations = msg.delivery_annotations || {}
-
-    tracer.inject(span, 'text_map', msg.delivery_annotations)
+const ProducerPlugin = require('./producer')
+const ConsumerPlugin = require('./consumer')
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+
+class RheaPlugin extends CompositePlugin {
+  static get name () { return 'rhea' }
+  static get plugins () {
+    return {
+      producer: ProducerPlugin,
+      consumer: ConsumerPlugin
+    }
   }
 }
 

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

@@ -0,0 +1,45 @@
+'use strict'
+
+const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
+
+class RheaProducerPlugin extends ProducerPlugin {
+  static get name () { return 'rhea' }
+  static get operation () { return 'send' }
+
+  constructor (...args) {
+    super(...args)
+
+    this.addTraceSub('encode', this.encode.bind(this))
+  }
+
+  start ({ targetAddress, host, port }) {
+    const name = targetAddress || 'amq.topic'
+
+    this.startSpan('amqp.send', {
+      service: this.config.service || `${this.tracer._service}-amqp-producer`,
+      resource: name,
+      kind: 'producer',
+      meta: {
+        'component': 'rhea',
+        'amqp.link.target.address': name,
+        'amqp.link.role': 'sender',
+        'out.host': host,
+        'out.port': port
+      }
+    })
+  }
+
+  encode (msg) {
+    addDeliveryAnnotations(msg, this.tracer, this.activeSpan)
+  }
+}
+
+function addDeliveryAnnotations (msg, tracer, span) {
+  if (msg) {
+    msg.delivery_annotations = msg.delivery_annotations || {}
+
+    tracer.inject(span, 'text_map', msg.delivery_annotations)
+  }
+}
+
+module.exports = RheaProducerPlugin