dd-trace 2.27.1 → 2.29.0

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

@@ -7,7 +7,7 @@ const { incomingHttpRequestStart, incomingHttpRequestEnd } = require('../../dd-t
 const { COMPONENT } = require('../../dd-trace/src/constants')
 
 class HttpServerPlugin extends Plugin {
-  static get name () {
+  static get id () {
     return 'http'
   }
 
@@ -20,10 +20,10 @@ class HttpServerPlugin extends Plugin {
       const store = storage.getStore()
       const span = web.startSpan(this.tracer, this.config, req, res, 'http.request')
 
-      span.setTag(COMPONENT, this.constructor.name)
+      span.setTag(COMPONENT, this.constructor.id)
 
       this._parentStore = store
-      this.enter(span, { ...store, req })
+      this.enter(span, { ...store, req, res })
 
       const context = web.getContext(req)
 

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

@@ -9,7 +9,7 @@ const tags = require('../../../ext/tags')
 const kinds = require('../../../ext/kinds')
 const formats = require('../../../ext/formats')
 const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
-const { COMPONENT } = require('../../dd-trace/src/constants')
+const { COMPONENT, CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 const urlFilter = require('../../dd-trace/src/plugins/util/urlfilter')
 
 const HTTP_HEADERS = formats.HTTP_HEADERS
@@ -25,7 +25,7 @@ const HTTP2_HEADER_STATUS = ':status'
 const HTTP2_METHOD_GET = 'GET'
 
 class Http2ClientPlugin extends Plugin {
-  static get name () {
+  static get id () {
     return 'http2'
   }
 
@@ -45,7 +45,8 @@ class Http2ClientPlugin extends Plugin {
       const span = this.tracer.startSpan('http.request', {
         childOf,
         tags: {
-          [COMPONENT]: this.constructor.name,
+          [COMPONENT]: this.constructor.id,
+          [CLIENT_PORT_KEY]: parseInt(sessionDetails.port),
           [SPAN_KIND]: CLIENT,
           'service.name': getServiceName(this.tracer, this.config, sessionDetails),
           'resource.name': method,

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 name () { return 'http2' }
+  static get id () { return 'http2' }
   static get plugins () {
     return {
       server: Http2ServerPlugin,

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

@@ -9,7 +9,7 @@ const { incomingHttpRequestStart } = require('../../dd-trace/src/appsec/gateway/
 const { COMPONENT } = require('../../dd-trace/src/constants')
 
 class Http2ServerPlugin extends Plugin {
-  static get name () {
+  static get id () {
     return 'http2'
   }
 
@@ -20,9 +20,9 @@ class Http2ServerPlugin extends Plugin {
       const store = storage.getStore()
       const span = web.startSpan(this.tracer, this.config, req, res, 'web.request')
 
-      span.setTag(COMPONENT, this.constructor.name)
+      span.setTag(COMPONENT, this.constructor.id)
 
-      this.enter(span, { ...store, req })
+      this.enter(span, { ...store, req, res })
 
       const context = web.getContext(req)
 

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

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

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

@@ -5,43 +5,40 @@ const {
   TEST_STATUS,
   JEST_TEST_RUNNER,
   finishAllTraceSpans,
-  getTestEnvironmentMetadata,
   getTestSuiteCommonTags,
   addIntelligentTestRunnerSpanTags,
   TEST_PARAMETERS,
-  getCodeOwnersFileEntries,
   TEST_COMMAND,
   TEST_FRAMEWORK_VERSION
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
+const id = require('../../dd-trace/src/id')
+
+const isJestWorker = !!process.env.JEST_WORKER_ID
 
 // https://github.com/facebook/jest/blob/d6ad15b0f88a05816c2fe034dd6900d28315d570/packages/jest-worker/src/types.ts#L38
 const CHILD_MESSAGE_END = 2
 
 class JestPlugin extends CiPlugin {
-  static get name () {
+  static get id () {
     return 'jest'
   }
 
   constructor (...args) {
     super(...args)
 
-    // Used to handle the end of a jest worker to be able to flush
-    const handler = ([message]) => {
-      if (message === CHILD_MESSAGE_END) {
-        this.tracer._exporter.flush(() => {
-          // eslint-disable-next-line
-          // https://github.com/facebook/jest/blob/24ed3b5ecb419c023ee6fdbc838f07cc028fc007/packages/jest-worker/src/workers/processChild.ts#L118-L133
-          // Only after the flush is done we clean up open handles
-          // so the worker process can hopefully exit gracefully
+    if (isJestWorker) {
+      // Used to handle the end of a jest worker to be able to flush
+      const handler = ([message]) => {
+        if (message === CHILD_MESSAGE_END) {
+          this.testSuiteSpan.finish()
+          finishAllTraceSpans(this.testSuiteSpan)
+          this.tracer._exporter.flush()
           process.removeListener('message', handler)
-        })
+        }
       }
+      process.on('message', handler)
     }
-    process.on('message', handler)
-
-    this.testEnvironmentMetadata = getTestEnvironmentMetadata('jest', this.config)
-    this.codeOwnersEntries = getCodeOwnersFileEntries()
 
     this.addSub('ci:jest:session:finish', ({
       status,
@@ -88,18 +85,44 @@ class JestPlugin extends CiPlugin {
         'x-datadog-parent-id': testModuleId
       })
 
-      const testSuiteMetadata = getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite)
+      const testSuiteMetadata = getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite, 'jest')
 
       this.testSuiteSpan = this.tracer.startSpan('jest.test_suite', {
         childOf: testSessionSpanContext,
         tags: {
-          [COMPONENT]: this.constructor.name,
+          [COMPONENT]: this.constructor.id,
           ...this.testEnvironmentMetadata,
           ...testSuiteMetadata
         }
       })
     })
 
+    this.addSub('ci:jest:worker-report:trace', traces => {
+      const formattedTraces = JSON.parse(traces).map(trace =>
+        trace.map(span => ({
+          ...span,
+          span_id: id(span.span_id),
+          trace_id: id(span.trace_id),
+          parent_id: id(span.parent_id)
+        }))
+      )
+
+      formattedTraces.forEach(trace => {
+        this.tracer._exporter.export(trace)
+      })
+    })
+
+    this.addSub('ci:jest:worker-report:coverage', data => {
+      const formattedCoverages = JSON.parse(data).map(coverage => ({
+        traceId: id(coverage.traceId),
+        spanId: id(coverage.spanId),
+        files: coverage.files
+      }))
+      formattedCoverages.forEach(formattedCoverage => {
+        this.tracer._exporter.exportCoverage(formattedCoverage)
+      })
+    })
+
     this.addSub('ci:jest:test-suite:finish', ({ status, errorMessage }) => {
       this.testSuiteSpan.setTag(TEST_STATUS, status)
       if (errorMessage) {
@@ -109,6 +132,12 @@ class JestPlugin extends CiPlugin {
       // Suites potentially run in a different process than the session,
       // so calling finishAllTraceSpans on the session span is not enough
       finishAllTraceSpans(this.testSuiteSpan)
+      // Flushing within jest workers is cheap, as it's just interprocess communication
+      // We do not want to flush after every suite if jest is running tests serially,
+      // as every flush is an HTTP request.
+      if (isJestWorker) {
+        this.tracer._exporter.flush()
+      }
     })
 
     /**
@@ -117,7 +146,12 @@ class JestPlugin extends CiPlugin {
      * fetching the ITR config.
      */
     this.addSub('ci:jest:test-suite:code-coverage', (coverageFiles) => {
-      this.tracer._exporter.exportCoverage({ span: this.testSuiteSpan, coverageFiles })
+      const formattedCoverage = {
+        traceId: this.testSuiteSpan.context()._traceId,
+        spanId: this.testSuiteSpan.context()._spanId,
+        files: coverageFiles
+      }
+      this.tracer._exporter.exportCoverage(formattedCoverage)
     })
 
     this.addSub('ci:jest:test:start', (test) => {

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

@@ -3,7 +3,7 @@
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
 
 class KafkajsConsumerPlugin extends ConsumerPlugin {
-  static get name () { return 'kafkajs' }
+  static get id () { return 'kafkajs' }
   static get operation () { return 'consume' }
 
   start ({ topic, partition, message }) {

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

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

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

@@ -3,7 +3,7 @@
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 
 class KafkajsProducerPlugin extends ProducerPlugin {
-  static get name () { return 'kafkajs' }
+  static get id () { return 'kafkajs' }
   static get operation () { return 'produce' }
 
   start ({ topic, messages }) {

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

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

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

@@ -1,10 +1,27 @@
 'use strict'
 
+const { storage } = require('../../datadog-core')
 const MySQLPlugin = require('../../datadog-plugin-mysql/src')
 
+let skippedStore
+
 class MariadbPlugin extends MySQLPlugin {
-  static get name () { return 'mariadb' }
+  static get id () { return 'mariadb' }
   static get system () { return 'mariadb' }
+
+  constructor (...args) {
+    super(...args)
+
+    this.addSub(`apm:${this.component}:pool:skip`, () => {
+      skippedStore = storage.getStore()
+      storage.enterWith({ noop: true })
+    })
+
+    this.addSub(`apm:${this.component}:pool:unskip`, () => {
+      storage.enterWith(skippedStore)
+      skippedStore = undefined
+    })
+  }
 }
 
 module.exports = MariadbPlugin

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

@@ -1,9 +1,10 @@
 'use strict'
 
+const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 const CachePlugin = require('../../dd-trace/src/plugins/cache')
 
 class MemcachedPlugin extends CachePlugin {
-  static get name () { return 'memcached' }
+  static get id () { return 'memcached' }
 
   start ({ client, server, query }) {
     const address = getAddress(client, server, query)
@@ -16,7 +17,7 @@ class MemcachedPlugin extends CachePlugin {
       meta: {
         'memcached.command': query.command,
         'out.host': address[0],
-        'out.port': address[1]
+        [CLIENT_PORT_KEY]: address[1]
       }
     })
   }

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

@@ -4,7 +4,7 @@ const RouterPlugin = require('../../datadog-plugin-router/src')
 const web = require('../../dd-trace/src/plugins/util/web')
 
 class MicrogatewayCorePlugin extends RouterPlugin {
-  static get name () {
+  static get id () {
     return 'microgateway-core'
   }
 

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

@@ -15,7 +15,7 @@ const {
 const { COMPONENT } = require('../../dd-trace/src/constants')
 
 class MochaPlugin extends CiPlugin {
-  static get name () {
+  static get id () {
     return 'mocha'
   }
 
@@ -35,10 +35,13 @@ class MochaPlugin extends CiPlugin {
       const relativeCoverageFiles = [...coverageFiles, suiteFile]
         .map(filename => getTestSuitePath(filename, this.sourceRoot))
 
-      this.tracer._exporter.exportCoverage({
-        span: testSuiteSpan,
-        coverageFiles: relativeCoverageFiles
-      })
+      const formattedCoverage = {
+        traceId: testSuiteSpan.context()._traceId,
+        spanId: testSuiteSpan.context()._spanId,
+        files: relativeCoverageFiles
+      }
+
+      this.tracer._exporter.exportCoverage(formattedCoverage)
     })
 
     this.addSub('ci:mocha:test-suite:start', (suite) => {
@@ -46,12 +49,13 @@ class MochaPlugin extends CiPlugin {
       const testSuiteMetadata = getTestSuiteCommonTags(
         this.command,
         this.frameworkVersion,
-        getTestSuitePath(suite.file, this.sourceRoot)
+        getTestSuitePath(suite.file, this.sourceRoot),
+        'mocha'
       )
       const testSuiteSpan = this.tracer.startSpan('mocha.test_suite', {
         childOf: this.testModuleSpan,
         tags: {
-          [COMPONENT]: this.constructor.name,
+          [COMPONENT]: this.constructor.id,
           ...this.testEnvironmentMetadata,
           ...testSuiteMetadata
         }
@@ -128,7 +132,7 @@ class MochaPlugin extends CiPlugin {
       this._testNameToParams[name] = params
     })
 
-    this.addSub('ci:mocha:session:finish', ({ status, isSuitesSkipped }) => {
+    this.addSub('ci:mocha:session:finish', ({ status, isSuitesSkipped, testCodeCoverageLinesTotal }) => {
       if (this.testSessionSpan) {
         const { isSuitesSkippingEnabled, isCodeCoverageEnabled } = this.itrConfig || {}
         this.testSessionSpan.setTag(TEST_STATUS, status)
@@ -137,7 +141,7 @@ class MochaPlugin extends CiPlugin {
         addIntelligentTestRunnerSpanTags(
           this.testSessionSpan,
           this.testModuleSpan,
-          { isSuitesSkipped, isSuitesSkippingEnabled, isCodeCoverageEnabled }
+          { isSuitesSkipped, isSuitesSkippingEnabled, isCodeCoverageEnabled, testCodeCoverageLinesTotal }
         )
 
         this.testModuleSpan.finish()

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

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

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 name () { return 'moleculer' }
+  static get id () { return 'moleculer' }
   static get plugins () {
     return {
       server: MoleculerServerPlugin,

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

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

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

@@ -3,7 +3,7 @@
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 
 class MongodbCorePlugin extends DatabasePlugin {
-  static get name () { return 'mongodb-core' }
+  static get id () { return 'mongodb-core' }
   static get component () { return 'mongodb' }
 
   start ({ ns, ops, options = {}, name }) {

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

@@ -1,9 +1,10 @@
 'use strict'
 
+const CLIENT_PORT_KEY = require('../../dd-trace/src/constants')
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 
 class MySQLPlugin extends DatabasePlugin {
-  static get name () { return 'mysql' }
+  static get id () { return 'mysql' }
   static get system () { return 'mysql' }
 
   start (payload) {
@@ -19,7 +20,7 @@ class MySQLPlugin extends DatabasePlugin {
         'db.user': payload.conf.user,
         'db.name': payload.conf.database,
         'out.host': payload.conf.host,
-        'out.port': payload.conf.port
+        [CLIENT_PORT_KEY]: payload.conf.port
       }
     })
     payload.sql = this.injectDbmQuery(payload.sql, service)

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

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

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

@@ -1,89 +1,23 @@
 'use strict'
 
 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')
+const NetIPCPlugin = require('./ipc')
+const NetTCPPlugin = require('./tcp')
 
 class NetPlugin extends Plugin {
-  static get name () {
-    return 'net'
-  }
+  static get id () { return 'net' }
 
   constructor (...args) {
     super(...args)
 
-    this.addSub(`apm:net:ipc:start`, ({ options }) => {
-      const store = storage.getStore()
-      const childOf = store ? store.span : store
-
-      const span = this.tracer.startSpan('ipc.connect', {
-        childOf,
-        tags: {
-          [COMPONENT]: this.constructor.name,
-          'resource.name': options.path,
-          'ipc.path': options.path,
-          'span.kind': 'client',
-          'service.name': this.config.service || this.tracer._service
-        }
-      })
-
-      analyticsSampler.sample(span, this.config.measured)
-      this.enter(span, store)
-    })
-
-    this.addSub(`apm:net:ipc:error`, errorHandler)
-
-    this.addSub(`apm:net:ipc:finish`, defaultFinish)
-
-    this.addSub(`apm:net:tcp:start`, ({ options }) => {
-      const store = storage.getStore()
-      const childOf = store ? store.span : store
-
-      const host = options.host || 'localhost'
-      const port = options.port || 0
-      const family = options.family || 4
-
-      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,
-          'tcp.family': `IPv${family}`,
-          'out.host': host,
-          'out.port': port,
-          'span.kind': 'client',
-          'service.name': this.config.service || this.tracer._service
-        }
-      })
-
-      analyticsSampler.sample(span, this.config.measured)
-      this.enter(span, store)
-    })
-
-    this.addSub(`apm:net:tcp:error`, errorHandler)
-
-    this.addSub(`apm:net:tcp:finish`, defaultFinish)
-
-    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
-      })
-    })
+    this._ipc = new NetIPCPlugin(...args)
+    this._tcp = new NetTCPPlugin(...args)
   }
-}
-
-function defaultFinish () {
-  storage.getStore().span.finish()
-}
 
-function errorHandler (error) {
-  storage.getStore().span.setTag('error', error)
+  configure (config) {
+    this._ipc.configure(config)
+    this._tcp.configure(config)
+  }
 }
 
 module.exports = NetPlugin

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

@@ -3,7 +3,7 @@
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
 
 class NetIPCPlugin extends ClientPlugin {
-  static get name () { return 'net' }
+  static get id () { return 'net' }
   static get operation () { return 'ipc' }
 
   start ({ options }) {

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

@@ -1,9 +1,10 @@
 'use strict'
 
+const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
 
 class NetTCPPlugin extends ClientPlugin {
-  static get name () { return 'net' }
+  static get id () { return 'net' }
   static get operation () { return 'tcp' }
 
   constructor (...args) {
@@ -37,7 +38,7 @@ class NetTCPPlugin extends ClientPlugin {
       metrics: {
         'tcp.remote.port': port,
         'tcp.local.port': 0,
-        'out.port': port
+        [CLIENT_PORT_KEY]: port
       }
     })
   }

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

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

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

@@ -3,7 +3,7 @@
 const ElasticsearchPlugin = require('../../datadog-plugin-elasticsearch/src')
 
 class OpenSearchPlugin extends ElasticsearchPlugin {
-  static get name () {
+  static get id () {
     return 'opensearch'
   }
 }

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

@@ -1,10 +1,11 @@
 'use strict'
 
+const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 const log = require('../../dd-trace/src/log')
 
 class OracledbPlugin extends DatabasePlugin {
-  static get name () { return 'oracledb' }
+  static get id () { return 'oracledb' }
   static get system () { return 'oracle' }
 
   start ({ query, connAttrs }) {
@@ -20,7 +21,7 @@ class OracledbPlugin extends DatabasePlugin {
         'db.user': this.config.user,
         'db.instance': url.pathname && url.pathname.substring(1),
         'db.hostname': url.hostname,
-        'db.port': url.port
+        [CLIENT_PORT_KEY]: url.port
       }
     })
   }

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

@@ -5,7 +5,7 @@ const PaperplaneLoggerPlugin = require('./logger')
 const PaperplaneServerPlugin = require('./server')
 
 class PaperplanePlugin extends Plugin {
-  static get name () {
+  static get id () {
     return 'paperplane'
   }