dd-trace 3.3.1 → 3.12.1

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-mongodb-core/src/index.js

@@ -1,54 +1,26 @@
 'use strict'
 
-const Plugin = require('../../dd-trace/src/plugins/plugin')
-const { storage } = require('../../datadog-core')
-const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
-
-class MongodbCorePlugin extends Plugin {
-  static get name () {
-    return 'mongodb-core'
-  }
-
-  constructor (...args) {
-    super(...args)
-
-    this.addSub(`apm:mongodb:query:start`, ({ ns, ops, options, name }) => {
-      const query = getQuery(ops)
-      const resource = truncate(getResource(ns, query, name))
-      const store = storage.getStore()
-      const childOf = store ? store.span : store
-      const span = this.tracer.startSpan('mongodb.query', {
-        childOf,
-        tags: {
-          'service.name': this.config.service || `${this.tracer._service}-mongodb`,
-          'resource.name': resource,
-          'span.type': 'mongodb',
-          'span.kind': 'client',
-          'db.name': ns
-        }
-      })
-
-      if (query) {
-        span.setTag('mongodb.query', query)
-      }
-
-      if (options && options.host && options.port) {
-        span.addTags({
-          'out.host': options.host,
-          'out.port': options.port
-        })
+const DatabasePlugin = require('../../dd-trace/src/plugins/database')
+
+class MongodbCorePlugin extends DatabasePlugin {
+  static get name () { return 'mongodb-core' }
+  static get component () { return 'mongodb' }
+
+  start ({ ns, ops, options = {}, name }) {
+    const query = getQuery(ops)
+    const resource = truncate(getResource(this, ns, query, name))
+
+    this.startSpan('mongodb.query', {
+      service: this.config.service,
+      resource,
+      type: 'mongodb',
+      kind: 'client',
+      meta: {
+        'db.name': ns,
+        'mongodb.query': query,
+        'out.host': options.host,
+        'out.port': options.port
       }
-
-      analyticsSampler.sample(span, this.config.measured)
-      this.enter(span, store)
-    })
-
-    this.addSub(`apm:mongodb:query:error`, err => {
-      storage.getStore().span.setTag('error', err)
-    })
-
-    this.addSub(`apm:mongodb:query:finish`, () => {
-      storage.getStore().span.finish()
     })
   }
 }
@@ -59,10 +31,10 @@ function getQuery (cmd) {
   if (cmd.filter) return JSON.stringify(limitDepth(cmd.filter))
 }
 
-function getResource (ns, query, operationName) {
+function getResource (plugin, ns, query, operationName) {
   const parts = [operationName, ns]
 
-  if (query) {
+  if (plugin.config.queryInResourceName && query) {
     parts.push(query)
   }
 
@@ -107,7 +79,7 @@ function limitDepth (input) {
       let child = input[key]
 
       if (isBSON(child)) {
-        child = child.toJSON()
+        child = typeof child.toJSON === 'function' ? child.toJSON() : '?'
       }
 
       if (depth >= 10 || shouldHide(child)) {

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

@@ -1,65 +1,36 @@
 'use strict'
 
-const Plugin = require('../../dd-trace/src/plugins/plugin')
-const { storage } = require('../../datadog-core')
-const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
-
-class MySQLPlugin extends Plugin {
-  static get name () {
-    return 'mysql'
-  }
-
-  constructor (...args) {
-    super(...args)
-
-    this.addSub(`apm:${this.constructor.name}:query:start`, ({ sql, conf: dbConfig }) => {
-      const service = getServiceName(this.tracer, this.config, dbConfig)
-      const store = storage.getStore()
-      const childOf = store ? store.span : store
-      const span = this.tracer.startSpan('mysql.query', {
-        childOf,
-        tags: {
-          'service.name': service,
-          'span.type': 'sql',
-          'span.kind': 'client',
-          'db.type': 'mysql',
-          'db.user': dbConfig.user,
-          'out.host': dbConfig.host,
-          'out.port': dbConfig.port,
-          'resource.name': sql
-        }
-      })
-
-      if (dbConfig.database) {
-        span.setTag('db.name', dbConfig.database)
-      }
-
-      analyticsSampler.sample(span, this.config.measured)
-      this.enter(span, store)
-    })
-
-    this.addSub(`apm:${this.constructor.name}:query:error`, err => {
-      if (err) {
-        const span = storage.getStore().span
-        span.setTag('error', err)
+const DatabasePlugin = require('../../dd-trace/src/plugins/database')
+
+class MySQLPlugin extends DatabasePlugin {
+  static get name () { return 'mysql' }
+  static get system () { return 'mysql' }
+
+  start ({ sql, conf: dbConfig }) {
+    const service = getServiceName(this.config, dbConfig)
+
+    this.startSpan(`${this.system}.query`, {
+      service,
+      resource: sql,
+      type: 'sql',
+      kind: 'client',
+      meta: {
+        'db.type': this.system,
+        'db.user': dbConfig.user,
+        'db.name': dbConfig.database,
+        'out.host': dbConfig.host,
+        'out.port': dbConfig.port
       }
     })
-
-    this.addSub(`apm:${this.constructor.name}:query:finish`, () => {
-      const span = storage.getStore().span
-      span.finish()
-    })
   }
 }
 
-function getServiceName (tracer, config, dbConfig) {
+function getServiceName (config, dbConfig) {
   if (typeof config.service === 'function') {
     return config.service(dbConfig)
-  } else if (config.service) {
-    return config.service
-  } else {
-    return `${tracer._service}-mysql`
   }
+
+  return config.service
 }
 
 module.exports = MySQLPlugin

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

@@ -3,9 +3,7 @@
 const MySQLPlugin = require('../../datadog-plugin-mysql/src')
 
 class MySQL2Plugin extends MySQLPlugin {
-  static get name () {
-    return 'mysql2'
-  }
+  static get name () { return 'mysql2' }
 }
 
 module.exports = MySQL2Plugin

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

@@ -3,6 +3,7 @@
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 const { storage } = require('../../datadog-core')
 const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
+const { COMPONENT } = require('../../dd-trace/src/constants')
 
 class NetPlugin extends Plugin {
   static get name () {
@@ -19,6 +20,7 @@ class NetPlugin extends Plugin {
       const span = this.tracer.startSpan('ipc.connect', {
         childOf,
         tags: {
+          [COMPONENT]: this.constructor.name,
           'resource.name': options.path,
           'ipc.path': options.path,
           'span.kind': 'client',
@@ -45,6 +47,7 @@ class NetPlugin extends Plugin {
       const span = this.tracer.startSpan('tcp.connect', {
         childOf,
         tags: {
+          [COMPONENT]: this.constructor.name,
           'resource.name': [host, port].filter(val => val).join(':'),
           'tcp.remote.host': host,
           'tcp.remote.port': port,
@@ -67,6 +70,7 @@ class NetPlugin extends Plugin {
     this.addSub(`apm:net:tcp:connection`, ({ socket }) => {
       const span = storage.getStore().span
       span.addTags({
+        [COMPONENT]: this.constructor.name,
         'tcp.local.address': socket.localAddress,
         'tcp.local.port': socket.localPort
       })

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-next/src/index.js

@@ -3,6 +3,7 @@
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 const { storage } = require('../../datadog-core')
 const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
+const { COMPONENT } = require('../../dd-trace/src/constants')
 
 class NextPlugin extends Plugin {
   static get name () {
@@ -20,6 +21,7 @@ class NextPlugin extends Plugin {
       const span = this.tracer.startSpan('next.request', {
         childOf,
         tags: {
+          [COMPONENT]: this.constructor.name,
           'service.name': this.config.service || this.tracer._service,
           'resource.name': req.method,
           'span.type': 'web',
@@ -67,6 +69,7 @@ class NextPlugin extends Plugin {
       const req = this._requests.get(span)
 
       span.addTags({
+        [COMPONENT]: this.constructor.name,
         'resource.name': `${req.method} ${page}`.trim(),
         'next.page': page
       })

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-oracledb/src/index.js

@@ -1,72 +1,46 @@
 'use strict'
 
-const Plugin = require('../../dd-trace/src/plugins/plugin')
-const { storage } = require('../../datadog-core')
-const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
+const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 const log = require('../../dd-trace/src/log')
 
-class OracledbPlugin extends Plugin {
-  static get name () {
-    return 'oracledb'
-  }
+class OracledbPlugin extends DatabasePlugin {
+  static get name () { return 'oracledb' }
+  static get system () { return 'oracle' }
 
-  constructor (...args) {
-    super(...args)
+  start ({ query, connAttrs }) {
+    const service = getServiceName(this.config, connAttrs)
+    const url = getUrl(connAttrs.connectString)
 
-    this.addSub('apm:oracledb:execute:start', ({ query, connAttrs }) => {
-      const service = getServiceName(this.tracer, this.config, connAttrs)
-      let connectStringObj
-      try {
-        connectStringObj = new URL(`http://${connAttrs.connectString}`)
-      } catch (e) {
-        log.error(e)
-      }
-      const tags = {
-        'span.kind': 'client',
-        'span.type': 'sql',
-        'sql.query': query,
+    this.startSpan('oracle.query', {
+      service,
+      resource: query,
+      type: 'sql',
+      kind: 'client',
+      meta: {
         'db.user': this.config.user,
-        'resource.name': query,
-        'service.name': service
-      }
-      if (typeof connectStringObj !== 'undefined') {
-        tags['db.instance'] = connectStringObj.pathname.substring(1)
-        tags['db.hostname'] = connectStringObj.hostname
-        tags['db.port'] = connectStringObj.port
-      }
-      const store = storage.getStore()
-      const childOf = store ? store.span : store
-      const span = this.tracer.startSpan('oracle.query', {
-        childOf,
-        tags
-      })
-      analyticsSampler.sample(span, this.config.measured)
-      this.enter(span, store)
-    })
-
-    this.addSub('apm:oracledb:execute:error', err => {
-      const store = storage.getStore()
-      if (store && store.span) {
-        store.span.setTag('error', err)
-      }
-    })
-
-    this.addSub('apm:oracledb:execute:finish', () => {
-      const store = storage.getStore()
-      if (store && store.span) {
-        store.span.finish()
+        'db.instance': url.pathname && url.pathname.substring(1),
+        'db.hostname': url.hostname,
+        'db.port': url.port
       }
     })
   }
 }
 
-function getServiceName (tracer, config, connAttrs) {
+function getServiceName (config, connAttrs) {
   if (typeof config.service === 'function') {
     return config.service(connAttrs)
-  } else if (config.service) {
-    return config.service
-  } else {
-    return `${tracer._service}-oracle`
+  }
+
+  return config.service
+}
+
+// TODO: Avoid creating an error since it's a heavy operation.
+function getUrl (connectString) {
+  try {
+    return new URL(`http://${connectString}`)
+  } catch (e) {
+    log.error(e)
+    return {}
   }
 }