dd-trace 2.21.0 → 2.22.0

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

@@ -1,24 +1,18 @@
 'use strict'
 
-const Plugin = require('../../dd-trace/src/plugins/plugin')
+const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
 
 const {
-  CI_APP_ORIGIN,
   TEST_SKIP_REASON,
-  ERROR_MESSAGE,
   TEST_STATUS,
-  TEST_CODE_OWNERS,
   finishAllTraceSpans,
-  getTestEnvironmentMetadata,
-  getTestSuitePath,
-  getCodeOwnersFileEntries,
-  getCodeOwnersForFilename,
-  getTestCommonTags
+  getTestSuitePath
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
+const { COMPONENT, ERROR_MESSAGE } = require('../../dd-trace/src/constants')
 
-class CucumberPlugin extends Plugin {
+class CucumberPlugin extends CiPlugin {
   static get name () {
     return 'cucumber'
   }
@@ -26,36 +20,18 @@ class CucumberPlugin extends Plugin {
   constructor (...args) {
     super(...args)
 
-    const testEnvironmentMetadata = getTestEnvironmentMetadata('cucumber', this.config)
-    const sourceRoot = process.cwd()
-    const codeOwnersEntries = getCodeOwnersFileEntries(sourceRoot)
-
     this.addSub('ci:cucumber:session:finish', () => {
       this.tracer._exporter._writer.flush()
     })
 
-    this.addSub('ci:cucumber:run:start', ({ pickleName, pickleUri }) => {
+    this.addSub('ci:cucumber:run:start', ({ testName, fullTestSuite }) => {
       const store = storage.getStore()
       const childOf = store ? store.span : store
-      const testSuite = getTestSuitePath(pickleUri, sourceRoot)
-
-      const commonTags = getTestCommonTags(pickleName, testSuite, this.tracer._version)
+      const testSuite = getTestSuitePath(fullTestSuite, process.cwd())
 
-      const codeOwners = getCodeOwnersForFilename(testSuite, codeOwnersEntries)
-      if (codeOwners) {
-        commonTags[TEST_CODE_OWNERS] = codeOwners
-      }
+      const testSpan = this.startTestSpan(testName, testSuite, childOf)
 
-      const span = this.tracer.startSpan('cucumber.test', {
-        childOf,
-        tags: {
-          ...commonTags,
-          ...testEnvironmentMetadata
-        }
-      })
-
-      span.context()._trace.origin = CI_APP_ORIGIN
-      this.enter(span, store)
+      this.enter(testSpan, store)
     })
 
     this.addSub('ci:cucumber:run-step:start', ({ resource }) => {
@@ -64,6 +40,7 @@ class CucumberPlugin extends Plugin {
       const span = this.tracer.startSpan('cucumber.step', {
         childOf,
         tags: {
+          [COMPONENT]: this.constructor.name,
           'cucumber.step': resource,
           [RESOURCE_NAME]: resource
         }
@@ -98,6 +75,10 @@ class CucumberPlugin extends Plugin {
       }
     })
   }
+
+  startTestSpan (testName, testSuite, childOf) {
+    return super.startTestSpan(testName, testSuite, {}, childOf)
+  }
 }
 
 module.exports = CucumberPlugin

package/packages/datadog-plugin-cypress/src/plugin.js

@@ -10,7 +10,7 @@ const {
   getTestCommonTags
 } = require('../../dd-trace/src/plugins/util/test')
 
-const { ORIGIN_KEY } = require('../../dd-trace/src/constants')
+const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
 
 const CYPRESS_STATUS_TO_TEST_STATUS = {
   passed: 'pass',
@@ -62,6 +62,7 @@ module.exports = (on, config) => {
         activeSpan = tracer.startSpan('cypress.test', {
           childOf,
           tags: {
+            [COMPONENT]: 'cypress',
             [ORIGIN_KEY]: CI_APP_ORIGIN,
             ...testSpanMetadata,
             ...testEnvironmentMetadata

package/packages/datadog-plugin-google-cloud-pubsub/src/client.js

@@ -14,7 +14,6 @@ class GoogleCloudPubsubClientPlugin extends ClientPlugin {
       resource: [cfg.method, cfg.reqOpts.name].filter(x => x).join(' '),
       kind: 'client',
       meta: {
-        'component': '@google-cloud/pubsub',
         'pubsub.method': cfg.method,
         'gcloud.project_id': projectId
       }

package/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js

@@ -18,7 +18,6 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
       kind: 'consumer',
       type: 'worker',
       meta: {
-        'component': '@google-cloud/pubsub',
         'gcloud.project_id': subscription.pubsub.projectId,
         'pubsub.topic': topic
       },

package/packages/datadog-plugin-google-cloud-pubsub/src/producer.js

@@ -15,7 +15,6 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
       resource: `${cfg.method} ${topic}`,
       kind: 'producer',
       meta: {
-        'component': '@google-cloud/pubsub',
         'gcloud.project_id': projectId,
         'pubsub.method': cfg.method, // TODO: remove
         'pubsub.topic': topic

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

@@ -9,6 +9,7 @@ const HTTP_HEADERS = formats.HTTP_HEADERS
 const urlFilter = require('../../dd-trace/src/plugins/util/urlfilter')
 const log = require('../../dd-trace/src/log')
 const url = require('url')
+const { COMPONENT, ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants')
 
 const HTTP_STATUS_CODE = tags.HTTP_STATUS_CODE
 const HTTP_REQUEST_HEADERS = tags.HTTP_REQUEST_HEADERS
@@ -38,6 +39,7 @@ class HttpClientPlugin extends Plugin {
       const span = this.tracer.startSpan('http.request', {
         childOf,
         tags: {
+          [COMPONENT]: this.constructor.name,
           'span.kind': 'client',
           'service.name': getServiceName(this.tracer, this.config, options),
           'resource.name': method,
@@ -91,9 +93,9 @@ function errorHandler (err) {
 
   if (err) {
     span.addTags({
-      'error.type': err.name,
-      'error.msg': err.message,
-      'error.stack': err.stack
+      [ERROR_TYPE]: err.name,
+      [ERROR_MESSAGE]: err.message,
+      [ERROR_STACK]: err.stack
     })
   } else {
     span.setTag('error', 1)

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

@@ -4,6 +4,7 @@ const Plugin = require('../../dd-trace/src/plugins/plugin')
 const { storage } = require('../../datadog-core')
 const web = require('../../dd-trace/src/plugins/util/web')
 const { incomingHttpRequestStart } = require('../../dd-trace/src/appsec/gateway/channels')
+const { COMPONENT } = require('../../dd-trace/src/constants')
 
 class HttpServerPlugin extends Plugin {
   static get name () {
@@ -17,6 +18,8 @@ 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)
+
       this.enter(span, { ...store, req })
 
       const context = web.getContext(req)

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

@@ -9,6 +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 urlFilter = require('../../dd-trace/src/plugins/util/urlfilter')
 
 const HTTP_HEADERS = formats.HTTP_HEADERS
@@ -44,6 +45,7 @@ class Http2ClientPlugin extends Plugin {
       const span = this.tracer.startSpan('http.request', {
         childOf,
         tags: {
+          [COMPONENT]: this.constructor.name,
           [SPAN_KIND]: CLIENT,
           'service.name': getServiceName(this.tracer, this.config, sessionDetails),
           'resource.name': method,

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

@@ -6,6 +6,7 @@ const Plugin = require('../../dd-trace/src/plugins/plugin')
 const { storage } = require('../../datadog-core')
 const web = require('../../dd-trace/src/plugins/util/web')
 const { incomingHttpRequestStart } = require('../../dd-trace/src/appsec/gateway/channels')
+const { COMPONENT } = require('../../dd-trace/src/constants')
 
 class Http2ServerPlugin extends Plugin {
   static get name () {
@@ -19,6 +20,8 @@ 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)
+
       this.enter(span, { ...store, req })
 
       const context = web.getContext(req)

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

@@ -1,53 +1,28 @@
-const { channel } = require('diagnostics_channel')
-
-const Plugin = require('../../dd-trace/src/plugins/plugin')
+const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
 
 const {
-  CI_APP_ORIGIN,
   TEST_STATUS,
   JEST_TEST_RUNNER,
   finishAllTraceSpans,
   getTestEnvironmentMetadata,
   getTestParentSpan,
-  getTestCommonTags,
   getTestSessionCommonTags,
   getTestSuiteCommonTags,
   TEST_PARAMETERS,
   getCodeOwnersFileEntries,
-  getCodeOwnersForFilename,
-  TEST_CODE_OWNERS,
   TEST_SESSION_ID,
   TEST_SUITE_ID,
   TEST_COMMAND,
   TEST_ITR_TESTS_SKIPPED,
   TEST_CODE_COVERAGE_LINES_TOTAL
 } = require('../../dd-trace/src/plugins/util/test')
-
-const { getSkippableSuites } = require('../../dd-trace/src/ci-visibility/intelligent-test-runner/get-skippable-suites')
-const {
-  getItrConfiguration
-} = require('../../dd-trace/src/ci-visibility/intelligent-test-runner/get-itr-configuration')
+const { COMPONENT } = require('../../dd-trace/src/constants')
 
 // https://github.com/facebook/jest/blob/d6ad15b0f88a05816c2fe034dd6900d28315d570/packages/jest-worker/src/types.ts#L38
 const CHILD_MESSAGE_END = 2
 
-function getTestSpanMetadata (tracer, test) {
-  const childOf = getTestParentSpan(tracer)
-
-  const { suite, name, runner, testParameters } = test
-
-  const commonTags = getTestCommonTags(name, suite, tracer._version)
-
-  return {
-    childOf,
-    ...commonTags,
-    [JEST_TEST_RUNNER]: runner,
-    [TEST_PARAMETERS]: testParameters
-  }
-}
-
-class JestPlugin extends Plugin {
+class JestPlugin extends CiPlugin {
   static get name () {
     return 'jest'
   }
@@ -55,16 +30,6 @@ class JestPlugin extends Plugin {
   constructor (...args) {
     super(...args)
 
-    const gitMetadataUploadFinishCh = channel('ci:git-metadata-upload:finish')
-    // `gitMetadataPromise` is used to wait until git metadata is uploaded to
-    // proceed with calculating the suites to skip
-    // TODO: add timeout after which the promise is resolved
-    const gitMetadataPromise = new Promise(resolve => {
-      gitMetadataUploadFinishCh.subscribe(err => {
-        resolve(err)
-      })
-    })
-
     // Used to handle the end of a jest worker to be able to flush
     const handler = ([message]) => {
       if (message === CHILD_MESSAGE_END) {
@@ -82,78 +47,6 @@ class JestPlugin extends Plugin {
     this.testEnvironmentMetadata = getTestEnvironmentMetadata('jest', this.config)
     this.codeOwnersEntries = getCodeOwnersFileEntries()
 
-    const {
-      'git.repository_url': repositoryUrl,
-      'git.commit.sha': sha,
-      'os.version': osVersion,
-      'os.platform': osPlatform,
-      'os.architecture': osArchitecture,
-      'runtime.name': runtimeName,
-      'runtime.version': runtimeVersion,
-      'git.branch': gitBranch
-    } = this.testEnvironmentMetadata
-
-    this.addSub('ci:jest:configuration', ({ onResponse, onError }) => {
-      if (!this.config.isAgentlessEnabled || !this.config.isIntelligentTestRunnerEnabled) {
-        onResponse({})
-        return
-      }
-      const testConfiguration = {
-        url: this.config.url,
-        site: this.config.site,
-        env: this.tracer._env,
-        service: this.config.service || this.tracer._service,
-        repositoryUrl,
-        sha,
-        osVersion,
-        osPlatform,
-        osArchitecture,
-        runtimeName,
-        runtimeVersion,
-        branch: gitBranch
-      }
-      getItrConfiguration(testConfiguration, (err, config) => {
-        if (err) {
-          onError(err)
-        } else {
-          onResponse(config)
-        }
-      })
-    })
-
-    this.addSub('ci:jest:test-suite:skippable', ({ onResponse, onError }) => {
-      if (!this.config.isAgentlessEnabled || !this.config.isIntelligentTestRunnerEnabled) {
-        return onResponse([])
-      }
-      // we only request after git upload has happened, if it didn't fail
-      gitMetadataPromise.then((gitUploadError) => {
-        if (gitUploadError) {
-          return onError(gitUploadError)
-        }
-        const testConfiguration = {
-          url: this.config.url,
-          site: this.config.site,
-          env: this.tracer._env,
-          service: this.config.service || this.tracer._service,
-          repositoryUrl,
-          sha,
-          osVersion,
-          osPlatform,
-          osArchitecture,
-          runtimeName,
-          runtimeVersion,
-          branch: gitBranch
-        }
-        getSkippableSuites(testConfiguration, (err, skippableTests) => {
-          if (err) {
-            onError(err)
-          } else {
-            onResponse(skippableTests)
-          }
-        })
-      })
-    })
-
     this.addSub('ci:jest:session:start', (command) => {
       if (!this.config.isAgentlessEnabled) {
         return
@@ -165,6 +58,7 @@ class JestPlugin extends Plugin {
       const testSessionSpan = this.tracer.startSpan('jest.test_session', {
         childOf,
         tags: {
+          [COMPONENT]: this.constructor.name,
           ...this.testEnvironmentMetadata,
           ...testSessionSpanMetadata
         }
@@ -222,6 +116,7 @@ class JestPlugin extends Plugin {
       const testSuiteSpan = this.tracer.startSpan('jest.test_suite', {
         childOf: testSessionSpanContext,
         tags: {
+          [COMPONENT]: this.constructor.name,
           ...this.testEnvironmentMetadata,
           ...testSuiteMetadata
         }
@@ -292,30 +187,15 @@ class JestPlugin extends Plugin {
       suiteTags[TEST_COMMAND] = testSuiteSpan.context()._tags[TEST_COMMAND]
     }
 
-    const {
-      childOf,
-      ...testSpanMetadata
-    } = getTestSpanMetadata(this.tracer, test)
-
-    const codeOwners = getCodeOwnersForFilename(test.suite, this.codeOwnersEntries)
+    const { suite, name, runner, testParameters } = test
 
-    if (codeOwners) {
-      testSpanMetadata[TEST_CODE_OWNERS] = codeOwners
+    const extraTags = {
+      [JEST_TEST_RUNNER]: runner,
+      [TEST_PARAMETERS]: testParameters,
+      ...suiteTags
     }
 
-    const testSpan = this.tracer
-      .startSpan('jest.test', {
-        childOf,
-        tags: {
-          ...this.testEnvironmentMetadata,
-          ...testSpanMetadata,
-          ...suiteTags
-        }
-      })
-
-    testSpan.context()._trace.origin = CI_APP_ORIGIN
-
-    return testSpan
+    return super.startTestSpan(name, suite, extraTags)
   }
 }
 

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

@@ -1,45 +1,24 @@
 'use strict'
 
-const Plugin = require('../../dd-trace/src/plugins/plugin')
+const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
 
 const {
-  CI_APP_ORIGIN,
-  TEST_CODE_OWNERS,
-  TEST_SUITE,
   TEST_STATUS,
   TEST_PARAMETERS,
   finishAllTraceSpans,
-  getTestEnvironmentMetadata,
   getTestSuitePath,
   getTestParentSpan,
   getTestParametersString,
-  getCodeOwnersFileEntries,
-  getCodeOwnersForFilename,
-  getTestCommonTags,
   getTestSessionCommonTags,
   getTestSuiteCommonTags,
   TEST_SUITE_ID,
   TEST_SESSION_ID,
   TEST_COMMAND
 } = require('../../dd-trace/src/plugins/util/test')
+const { COMPONENT } = require('../../dd-trace/src/constants')
 
-function getTestSpanMetadata (tracer, test, sourceRoot) {
-  const childOf = getTestParentSpan(tracer)
-
-  const { file: testSuiteAbsolutePath } = test
-  const fullTestName = test.fullTitle()
-  const testSuite = getTestSuitePath(testSuiteAbsolutePath, sourceRoot)
-
-  const commonTags = getTestCommonTags(fullTestName, testSuite, tracer._version)
-
-  return {
-    childOf,
-    ...commonTags
-  }
-}
-
-class MochaPlugin extends Plugin {
+class MochaPlugin extends CiPlugin {
   static get name () {
     return 'mocha'
   }
@@ -49,9 +28,25 @@ class MochaPlugin extends Plugin {
 
     this._testSuites = new Map()
     this._testNameToParams = {}
-    this.testEnvironmentMetadata = getTestEnvironmentMetadata('mocha', this.config)
     this.sourceRoot = process.cwd()
-    this.codeOwnersEntries = getCodeOwnersFileEntries(this.sourceRoot)
+
+    this.addSub('ci:mocha:test-suite:code-coverage', ({ coverageFiles, suiteFile }) => {
+      if (!this.config.isAgentlessEnabled || !this.config.isIntelligentTestRunnerEnabled) {
+        return
+      }
+      if (!this.itrConfig || !this.itrConfig.isCodeCoverageEnabled) {
+        return
+      }
+      const testSuiteSpan = this._testSuites.get(suiteFile)
+
+      const relativeCoverageFiles = [...coverageFiles, suiteFile]
+        .map(filename => getTestSuitePath(filename, this.sourceRoot))
+
+      this.tracer._exporter.exportCoverage({
+        span: testSuiteSpan,
+        coverageFiles: relativeCoverageFiles
+      })
+    })
 
     this.addSub('ci:mocha:session:start', (command) => {
       if (!this.config.isAgentlessEnabled) {
@@ -64,6 +59,7 @@ class MochaPlugin extends Plugin {
       this.testSessionSpan = this.tracer.startSpan('mocha.test_session', {
         childOf,
         tags: {
+          [COMPONENT]: this.constructor.name,
           ...this.testEnvironmentMetadata,
           ...testSessionSpanMetadata
         }
@@ -83,6 +79,7 @@ class MochaPlugin extends Plugin {
       const testSuiteSpan = this.tracer.startSpan('mocha.test_suite', {
         childOf: this.testSessionSpan,
         tags: {
+          [COMPONENT]: this.constructor.name,
           ...this.testEnvironmentMetadata,
           ...testSuiteMetadata
         }
@@ -161,13 +158,13 @@ class MochaPlugin extends Plugin {
         finishAllTraceSpans(this.testSessionSpan)
       }
       this.tracer._exporter._writer.flush()
+      this.itrConfig = null
     })
   }
 
   startTestSpan (test) {
     const testSuiteTags = {}
     const testSuiteSpan = this._testSuites.get(test.parent.file)
-
     if (testSuiteSpan) {
       const testSuiteId = testSuiteSpan.context()._spanId.toString(10)
       testSuiteTags[TEST_SUITE_ID] = testSuiteId
@@ -179,30 +176,20 @@ class MochaPlugin extends Plugin {
       testSuiteTags[TEST_COMMAND] = this.command
     }
 
-    const { childOf, ...testSpanMetadata } = getTestSpanMetadata(this.tracer, test, this.sourceRoot)
+    const { file: testSuiteAbsolutePath } = test
+    const fullTestName = test.fullTitle()
+    const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.sourceRoot)
 
-    const testParametersString = getTestParametersString(this._testNameToParams, test.title)
-    if (testParametersString) {
-      testSpanMetadata[TEST_PARAMETERS] = testParametersString
+    const extraTags = {
+      ...testSuiteTags
     }
-    const codeOwners = getCodeOwnersForFilename(testSpanMetadata[TEST_SUITE], this.codeOwnersEntries)
 
-    if (codeOwners) {
-      testSpanMetadata[TEST_CODE_OWNERS] = codeOwners
+    const testParametersString = getTestParametersString(this._testNameToParams, test.title)
+    if (testParametersString) {
+      extraTags[TEST_PARAMETERS] = testParametersString
     }
 
-    const testSpan = this.tracer
-      .startSpan('mocha.test', {
-        childOf,
-        tags: {
-          ...this.testEnvironmentMetadata,
-          ...testSpanMetadata,
-          ...testSuiteTags
-        }
-      })
-    testSpan.context()._trace.origin = CI_APP_ORIGIN
-
-    return testSpan
+    return super.startTestSpan(fullTestName, testSuite, extraTags)
   }
 }
 

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

@@ -7,12 +7,13 @@ class PGPlugin extends DatabasePlugin {
   static get operation () { return 'query' }
   static get system () { return 'postgres' }
 
-  start ({ params = {}, statement, processId }) {
+  start ({ params = {}, query, processId }) {
     const service = getServiceName(this.config, params)
+    const originalStatement = query.text
 
     this.startSpan('pg.query', {
       service,
-      resource: statement,
+      resource: originalStatement,
       type: 'sql',
       kind: 'client',
       meta: {
@@ -24,6 +25,8 @@ class PGPlugin extends DatabasePlugin {
         'out.port': params.port
       }
     })
+
+    query.text = this.injectDbmQuery(query.text)
   }
 }
 

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

@@ -4,6 +4,7 @@ const web = require('../../dd-trace/src/plugins/util/web')
 const WebPlugin = require('../../datadog-plugin-web/src')
 const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
 const { storage } = require('../../datadog-core')
+const { COMPONENT } = require('../../dd-trace/src/constants')
 
 class RouterPlugin extends WebPlugin {
   static get name () {
@@ -97,6 +98,7 @@ class RouterPlugin extends WebPlugin {
     const span = this.tracer.startSpan(`${this.constructor.name}.middleware`, {
       childOf,
       tags: {
+        [COMPONENT]: this.constructor.name,
         'resource.name': name || '<anonymous>'
       }
     })