dd-trace 2.30.1 → 2.32.0

package/LICENSE-3rdparty.csv

@@ -40,6 +40,7 @@ dev,esbuild,MIT,Copyright (c) 2020 Evan Wallace
 dev,eslint,MIT,Copyright JS Foundation and other contributors https://js.foundation
 dev,eslint-config-standard,MIT,Copyright Feross Aboukhadijeh
 dev,eslint-plugin-import,MIT,Copyright 2015 Ben Mosher
+dev,eslint-plugin-n,MIT,Copyright 2015 Toru Nagashima
 dev,eslint-plugin-node,MIT,Copyright 2015 Toru Nagashima
 dev,eslint-plugin-promise,ISC,jden and other contributors
 dev,eslint-plugin-standard,MIT,Copyright 2015 Jamund Ferguson
@@ -62,6 +63,5 @@ dev,sinon,BSD-3-Clause,Copyright 2010-2017 Christian Johansen
 dev,sinon-chai,WTFPL and BSD-2-Clause,Copyright 2004 Sam Hocevar 2012–2017 Domenic Denicola
 dev,tap,ISC,Copyright 2011-2022 Isaac Z. Schlueter and Contributors
 dev,tape,MIT,Copyright James Halliday
-dev,wait-on,MIT,Copyright 2015 Jeff Barczewski
 file,aws-lambda-nodejs-runtime-interface-client,Apache 2.0,Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 file,profile.proto,Apache license 2.0,Copyright 2016 Google Inc.

package/esbuild.js

@@ -0,0 +1,3 @@
+'use strict'
+
+module.exports = require('./packages/datadog-esbuild/index.js')

package/index.d.ts

@@ -882,7 +882,7 @@ declare namespace plugins {
       /**
        * Hook to execute just before the request span finishes.
        */
-      request?: (span?: opentracing.Span, req?: IncomingMessage, res?: ServerResponse) => any;
+      request?: (span?: Span, req?: IncomingMessage, res?: ServerResponse) => any;
     };
 
     /**
@@ -918,7 +918,7 @@ declare namespace plugins {
       /**
        * Hook to execute just before the request span finishes.
        */
-      request?: (span?: opentracing.Span, req?: ClientRequest, res?: IncomingMessage) => any;
+      request?: (span?: Span, req?: ClientRequest, res?: IncomingMessage) => any;
     };
 
     /**
@@ -1008,7 +1008,7 @@ declare namespace plugins {
       /**
        * Hook to execute just before the aws span finishes.
        */
-      request?: (span?: opentracing.Span, response?: anyObject) => any;
+      request?: (span?: Span, response?: anyObject) => any;
     };
 
     /**
@@ -1077,7 +1077,7 @@ declare namespace plugins {
       /**
        * Hook to execute just before the query span finishes.
        */
-      query?: (span?: opentracing.Span, params?: TransportRequestParams) => any;
+      query?: (span?: Span, params?: TransportRequestParams) => any;
     };
   }
 
@@ -1183,7 +1183,8 @@ declare namespace plugins {
 
     /**
      * Whether to enable signature calculation for the resource name. This can
-     * be disabled if your GraphQL operations always have a name.
+     * be disabled if your GraphQL operations always have a name. Note that when
+     * disabled all queries will need to be named for this to work properly.
      *
      * @default true
      */
@@ -1252,7 +1253,7 @@ declare namespace plugins {
        * Hook to execute just before the request span finishes.
        */
       request?: (
-        span?: opentracing.Span,
+        span?: Span,
         req?: IncomingMessage | ClientRequest,
         res?: ServerResponse | IncomingMessage
       ) => any;
@@ -1445,7 +1446,7 @@ declare namespace plugins {
       /**
        * Hook to execute just before the request span finishes.
        */
-      request?: (span?: opentracing.Span, req?: IncomingMessage, res?: ServerResponse) => any;
+      request?: (span?: Span, req?: IncomingMessage, res?: ServerResponse) => any;
     };
   }
 
@@ -1564,12 +1565,12 @@ declare namespace plugins {
       /**
        * Hook to execute just when the span is created.
        */
-      receive?: (span?: opentracing.Span, request?: any) => any;
+      receive?: (span?: Span, request?: any) => any;
 
       /**
        * Hook to execute just when the span is finished.
        */
-      reply?: (span?: opentracing.Span, request?: any, response?: any) => any;
+      reply?: (span?: Span, request?: any, response?: any) => any;
     };
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "2.30.1",
+  "version": "2.32.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -15,10 +15,10 @@
     "lint": "node scripts/check_licenses.js && eslint . && yarn audit --groups dependencies",
     "services": "node ./scripts/install_plugin_modules && node packages/dd-trace/test/setup/services",
     "test": "SERVICES=* yarn services && mocha --colors --exit --expose-gc 'packages/dd-trace/test/setup/node.js' 'packages/*/test/**/*.spec.js'",
-    "test:appsec": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" --exclude \"packages/dd-trace/test/appsec/iast/**/*.plugin.spec.js\" \"packages/dd-trace/test/appsec/**/*.spec.js\"",
-    "test:appsec:ci": "nyc --no-clean --include \"packages/dd-trace/src/appsec/**/*.js\" --exclude \"packages/dd-trace/test/appsec/iast/**/*.plugin.spec.js\" -- npm run test:appsec",
-    "test:appsec:plugins": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/appsec/iast/**/*.@($(echo $PLUGINS)).plugin.spec.js\"",
-    "test:appsec:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/test/appsec/iast/**/*.@($(echo $PLUGINS)).plugin.spec.js\" -- npm run test:appsec:plugins",
+    "test:appsec": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" --exclude \"packages/dd-trace/test/appsec/**/*.plugin.spec.js\" \"packages/dd-trace/test/appsec/**/*.spec.js\"",
+    "test:appsec:ci": "nyc --no-clean --include \"packages/dd-trace/src/appsec/**/*.js\" --exclude \"packages/dd-trace/test/appsec/**/*.plugin.spec.js\" -- npm run test:appsec",
+    "test:appsec:plugins": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/appsec/**/*.@($(echo $PLUGINS)).plugin.spec.js\"",
+    "test:appsec:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/test/appsec/**/*.@($(echo $PLUGINS)).plugin.spec.js\" -- npm run test:appsec:plugins",
     "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,encode,exporters,opentracing,plugins,telemetry}/**/*.spec.js\"",
     "test:trace:core:ci": "npm run test:trace:core -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/**/*.js\"",
     "test:instrumentations": "mocha --colors -r 'packages/dd-trace/test/setup/mocha.js' 'packages/datadog-instrumentations/test/**/*.spec.js'",
@@ -65,17 +65,17 @@
     "node": ">=12"
   },
   "dependencies": {
-    "@datadog/native-appsec": "2.0.0",
+    "@datadog/native-appsec": "^3.1.0",
     "@datadog/native-iast-rewriter": "2.0.1",
-    "@datadog/native-iast-taint-tracking": "1.3.1",
-    "@datadog/native-metrics": "^1.5.0",
-    "@datadog/pprof": "^2.1.0",
+    "@datadog/native-iast-taint-tracking": "^1.4.0",
+    "@datadog/native-metrics": "^1.6.0",
+    "@datadog/pprof": "^2.2.0",
     "@datadog/sketches-js": "^2.1.0",
     "@types/node": "<18.13",
     "crypto-randomuuid": "^1.0.0",
     "diagnostics_channel": "^1.1.0",
     "ignore": "^5.2.0",
-    "import-in-the-middle": "^1.3.4",
+    "import-in-the-middle": "^1.3.5",
     "ipaddr.js": "^2.0.1",
     "istanbul-lib-coverage": "3.2.0",
     "koalas": "^1.0.2",
@@ -108,6 +108,7 @@
     "eslint": "^8.23.0",
     "eslint-config-standard": "^11.0.0-beta.0",
     "eslint-plugin-import": "^2.8.0",
+    "eslint-plugin-n": "^15.7.0",
     "eslint-plugin-node": "^5.2.1",
     "eslint-plugin-promise": "^3.6.0",
     "eslint-plugin-standard": "^3.0.1",
@@ -129,7 +130,6 @@
     "sinon": "^11.1.2",
     "sinon-chai": "^3.7.0",
     "tap": "^16.3.4",
-    "tape": "^4.9.1",
-    "wait-on": "^5.0.0"
+    "tape": "^4.9.1"
   }
 }

package/packages/datadog-core/src/storage/async_resource.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { createHook, executionAsyncResource } = require('async_hooks')
-const { channel } = require('diagnostics_channel')
+const { channel } = require('../../../diagnostics_channel')
 
 const beforeCh = channel('dd-trace:storage:before')
 const afterCh = channel('dd-trace:storage:after')

package/packages/datadog-esbuild/index.js

@@ -93,11 +93,18 @@ module.exports.setup = function (build) {
   })
 }
 
+// Currently esbuild support requires Node.js >=v16.17 or >=v18.7
+// Better yet it would support Node >=v14.17 or >=v16
+// Of course, the most ideal would be to support all versions of Node that dd-trace supports.
+// Version constraints based on Node's diagnostics_channel support
 function warnIfUnsupported () {
   const [major, minor] = process.versions.node.split('.').map(Number)
-  if (major < 14 || (major === 14 && minor < 17)) {
+  if (
+    major < 16 ||
+    (major === 16 && minor < 17) ||
+    (major === 18 && minor < 7)) {
     console.error('WARNING: Esbuild support isn\'t available for older versions of Node.js.')
-    console.error(`Expected: Node.js >= v14.17. Actual: Node.js = ${process.version}.`)
+    console.error(`Expected: Node.js >=v16.17 or >=v18.7. Actual: Node.js = ${process.version}.`)
     console.error('This application may build properly with this version of Node.js, but unless a')
     console.error('more recent version is used at runtime, third party packages won\'t be instrumented.')
   }

package/packages/datadog-instrumentations/src/body-parser.js

@@ -1,14 +1,21 @@
 'use strict'
 
-const { channel, addHook, AsyncResource } = require('./helpers/instrument')
+const { AbortController } = require('node-abort-controller') // AbortController is not available in node <15
+const shimmer = require('../../datadog-shimmer')
+const { channel, addHook } = require('./helpers/instrument')
 
 const bodyParserReadCh = channel('datadog:body-parser:read:finish')
 
-function publishRequestBodyAndNext (request, next) {
+function publishRequestBodyAndNext (req, res, next) {
   return function () {
-    if (bodyParserReadCh.hasSubscribers && request) {
-      bodyParserReadCh.publish({ request })
+    if (bodyParserReadCh.hasSubscribers && req) {
+      const abortController = new AbortController()
+
+      bodyParserReadCh.publish({ req, res, abortController })
+
+      if (abortController.signal.aborted) return
     }
+
     next.apply(this, arguments)
   }
 }
@@ -16,11 +23,10 @@ function publishRequestBodyAndNext (request, next) {
 addHook({
   name: 'body-parser',
   file: 'lib/read.js',
-  versions: ['>=1']
+  versions: ['>=1.4.0']
 }, read => {
-  return function (req, res, next) {
-    const nextResource = new AsyncResource('bound-anonymous-fn')
-    arguments[2] = nextResource.bind(publishRequestBodyAndNext(req, next))
+  return shimmer.wrap(read, function (req, res, next) {
+    arguments[2] = publishRequestBodyAndNext(req, res, next)
     read.apply(this, arguments)
-  }
+  })
 })

package/packages/datadog-instrumentations/src/cucumber.js

@@ -90,7 +90,17 @@ function wrapRun (pl, isLatestVersion) {
       if (!pickleResultByFile[testSuiteFullPath]) { // first test in suite
         testSuiteStartCh.publish(testSuiteFullPath)
       }
-      testStartCh.publish({ testName: this.pickle.name, fullTestSuite: testSuiteFullPath })
+
+      const testSourceLine = this.gherkinDocument &&
+        this.gherkinDocument.feature &&
+        this.gherkinDocument.feature.location &&
+        this.gherkinDocument.feature.location.line
+
+      testStartCh.publish({
+        testName: this.pickle.name,
+        fullTestSuite: testSuiteFullPath,
+        testSourceLine
+      })
       try {
         const promise = run.apply(this, arguments)
         promise.finally(() => {

package/packages/datadog-instrumentations/src/express.js

@@ -3,6 +3,7 @@
 const { createWrapRouterMethod } = require('./router')
 const shimmer = require('../../datadog-shimmer')
 const { addHook, channel } = require('./helpers/instrument')
+const { AbortController } = require('node-abort-controller')
 
 const handleChannel = channel('apm:express:request:handle')
 
@@ -25,3 +26,34 @@ addHook({ name: 'express', versions: ['>=4'] }, express => {
 
   return express
 })
+
+const queryParserReadCh = channel('datadog:query:read:finish')
+
+function publishQueryParsedAndNext (req, res, next) {
+  return function () {
+    if (queryParserReadCh.hasSubscribers && req) {
+      const abortController = new AbortController()
+
+      queryParserReadCh.publish({ req, res, abortController })
+
+      if (abortController.signal.aborted) return
+    }
+
+    next.apply(this, arguments)
+  }
+}
+
+addHook({
+  name: 'express',
+  versions: ['>=4'],
+  file: 'lib/middleware/query.js'
+}, query => {
+  return shimmer.wrap(query, function () {
+    const queryMiddleware = query.apply(this, arguments)
+
+    return shimmer.wrap(queryMiddleware, function (req, res, next) {
+      arguments[2] = publishQueryParsedAndNext(req, res, next)
+      return queryMiddleware.apply(this, arguments)
+    })
+  })
+})

package/packages/datadog-instrumentations/src/helpers/instrument.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const dc = require('diagnostics_channel')
+const dc = require('../../../diagnostics_channel')
 const semver = require('semver')
 const instrumentations = require('./instrumentations')
 const { AsyncResource } = require('async_hooks')

package/packages/datadog-instrumentations/src/helpers/register.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { channel } = require('diagnostics_channel')
+const { channel } = require('../../../diagnostics_channel')
 const path = require('path')
 const semver = require('semver')
 const Hook = require('./hook')

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

@@ -55,7 +55,8 @@ function wrapEmit (emit) {
 
       try {
         if (abortController.signal.aborted) {
-          return res.end()
+          // TODO: should this always return true ?
+          return this.listenerCount(eventName) > 0
         }
         return emit.apply(this, arguments)
       } catch (err) {

package/packages/datadog-instrumentations/src/jest.js

@@ -5,7 +5,8 @@ const log = require('../../dd-trace/src/log')
 const {
   getCoveredFilenamesFromCoverage,
   JEST_WORKER_TRACE_PAYLOAD_CODE,
-  JEST_WORKER_COVERAGE_PAYLOAD_CODE
+  JEST_WORKER_COVERAGE_PAYLOAD_CODE,
+  getTestLineStart
 } = require('../../dd-trace/src/plugins/util/test')
 
 const testSessionStartCh = channel('ci:jest:session:start')
@@ -125,7 +126,8 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             suite: this.testSuite,
             runner: 'jest-circus',
             testParameters,
-            frameworkVersion: jestVersion
+            frameworkVersion: jestVersion,
+            testStartLine: getTestLineStart(event.test.asyncError, this.testSuite)
           })
           originalTestFns.set(event.test, event.test.fn)
           event.test.fn = asyncResource.bind(event.test.fn)
@@ -152,7 +154,8 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             name: getJestTestName(event.test),
             suite: this.testSuite,
             runner: 'jest-circus',
-            frameworkVersion: jestVersion
+            frameworkVersion: jestVersion,
+            testStartLine: getTestLineStart(event.test.asyncError, this.testSuite)
           })
         })
       }

package/packages/datadog-instrumentations/src/mocha.js

@@ -9,7 +9,8 @@ const {
   resetCoverage,
   mergeCoverage,
   getTestSuitePath,
-  fromCoverageMapToCoverage
+  fromCoverageMapToCoverage,
+  getTestLineStart
 } = require('../../dd-trace/src/plugins/util/test')
 
 const testStartCh = channel('ci:mocha:test:start')
@@ -35,6 +36,7 @@ const patched = new WeakSet()
 const testToAr = new WeakMap()
 const originalFns = new WeakMap()
 const testFileToSuiteAr = new Map()
+const testToStartLine = new WeakMap()
 
 // `isWorker` is true if it's a Mocha worker
 let isWorker = false
@@ -207,10 +209,11 @@ function mochaHook (Runner) {
       if (isRetry(test)) {
         return
       }
+      const testStartLine = testToStartLine.get(test)
       const asyncResource = new AsyncResource('bound-anonymous-fn')
       testToAr.set(test.fn, asyncResource)
       asyncResource.runInAsyncScope(() => {
-        testStartCh.publish(test)
+        testStartCh.publish({ test, testStartLine })
       })
     })
 
@@ -384,6 +387,20 @@ addHook({
   return Mocha
 })
 
+addHook({
+  name: 'mocha',
+  versions: ['>=5.2.0'],
+  file: 'lib/suite.js'
+}, (Suite) => {
+  shimmer.wrap(Suite.prototype, 'addTest', addTest => function (test) {
+    // In here, the test definition is in the stack, so we search for it.
+    const startLine = getTestLineStart(new Error(), test.file)
+    testToStartLine.set(test, startLine)
+    return addTest.apply(this, arguments)
+  })
+  return Suite
+})
+
 addHook({
   name: 'mocha',
   versions: ['>=5.2.0'],

package/packages/datadog-instrumentations/src/playwright.js

@@ -72,11 +72,14 @@ function getRootDir (playwrightRunner) {
   if (playwrightRunner._configDir) {
     return playwrightRunner._configDir
   }
+  if (playwrightRunner._config && playwrightRunner._config.config) {
+    return playwrightRunner._config.config.rootDir
+  }
   return process.cwd()
 }
 
 function testBeginHandler (test) {
-  const { _requireFile: testSuiteAbsolutePath, title: testName, _type } = test
+  const { _requireFile: testSuiteAbsolutePath, title: testName, _type, location: { line: testSourceLine } } = test
 
   if (_type === 'beforeAll' || _type === 'afterAll') {
     return
@@ -96,7 +99,7 @@ function testBeginHandler (test) {
   const testAsyncResource = new AsyncResource('bound-anonymous-fn')
   testToAr.set(test, testAsyncResource)
   testAsyncResource.runInAsyncScope(() => {
-    testStartCh.publish({ testName, testSuiteAbsolutePath })
+    testStartCh.publish({ testName, testSuiteAbsolutePath, testSourceLine })
   })
 }
 

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

@@ -11,11 +11,9 @@ class Amqp10ConsumerPlugin extends ConsumerPlugin {
     const source = getShortName(link)
     const address = getAddress(link)
 
-    this.startSpan('amqp.receive', {
-      service: this.config.service || `${this.tracer._service}-amqp`,
+    this.startSpan({
       resource: ['receive', source].filter(v => v).join(' '),
       type: 'worker',
-      kind: 'consumer',
       meta: {
         'amqp.link.source.address': source,
         'amqp.link.role': 'receiver',

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

@@ -13,10 +13,8 @@ class Amqp10ProducerPlugin extends ProducerPlugin {
     const address = getAddress(link)
     const target = getShortName(link)
 
-    this.startSpan('amqp.send', {
-      service: this.config.service || `${this.tracer._service}-amqp`,
+    this.startSpan({
       resource: ['send', target].filter(v => v).join(' '),
-      kind: 'producer',
       meta: {
         'amqp.link.target.address': target,
         'amqp.link.role': 'sender',

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

@@ -7,6 +7,7 @@ const { getResourceName } = require('./util')
 
 class AmqplibClientPlugin extends ClientPlugin {
   static get id () { return 'amqplib' }
+  static get type () { return 'messaging' }
   static get operation () { return 'command' }
 
   start ({ channel = {}, method, fields }) {
@@ -14,10 +15,10 @@ class AmqplibClientPlugin extends ClientPlugin {
     if (method === 'basic.publish') return
 
     const stream = (channel.connection && channel.connection.stream) || {}
-    const span = this.startSpan('amqp.command', {
-      service: this.config.service || `${this.tracer._service}-amqp`,
+    const span = this.startSpan(this.operationName(), {
+      service: this.config.service || this.serviceName(),
       resource: getResourceName(method, fields),
-      kind: 'client',
+      kind: this.constructor.kind,
       meta: {
         'out.host': stream._host,
         [CLIENT_PORT_KEY]: stream.remotePort,

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

@@ -13,11 +13,9 @@ class AmqplibConsumerPlugin extends ConsumerPlugin {
 
     const childOf = extract(this.tracer, message)
 
-    this.startSpan('amqp.command', {
+    this.startSpan({
       childOf,
-      service: this.config.service || `${this.tracer._service}-amqp`,
       resource: getResourceName(method, fields),
-      kind: 'consumer',
       type: 'worker',
       meta: {
         'amqp.queue': fields.queue,

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

@@ -13,10 +13,8 @@ class AmqplibProducerPlugin extends ProducerPlugin {
     if (method !== 'basic.publish') return
 
     const stream = (channel.connection && channel.connection.stream) || {}
-    const span = this.startSpan('amqp.command', {
-      service: this.config.service || `${this.tracer._service}-amqp`,
+    const span = this.startSpan({
       resource: getResourceName(method, fields),
-      kind: 'producer',
       meta: {
         'out.host': stream._host,
         [CLIENT_PORT_KEY]: stream.remotePort,

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

@@ -6,6 +6,7 @@ const { storage } = require('../../datadog-core')
 const {
   TEST_SKIP_REASON,
   TEST_STATUS,
+  TEST_SOURCE_START,
   finishAllTraceSpans,
   getTestSuitePath,
   getTestSuiteCommonTags,
@@ -80,10 +81,10 @@ class CucumberPlugin extends CiPlugin {
       this.tracer._exporter.exportCoverage(formattedCoverage)
     })
 
-    this.addSub('ci:cucumber:test:start', ({ testName, fullTestSuite }) => {
+    this.addSub('ci:cucumber:test:start', ({ testName, fullTestSuite, testSourceLine }) => {
       const store = storage.getStore()
       const testSuite = getTestSuitePath(fullTestSuite, this.sourceRoot)
-      const testSpan = this.startTestSpan(testName, testSuite)
+      const testSpan = this.startTestSpan(testName, testSuite, testSourceLine)
 
       this.enter(testSpan, store)
     })
@@ -130,11 +131,12 @@ class CucumberPlugin extends CiPlugin {
     })
   }
 
-  startTestSpan (testName, testSuite) {
+  startTestSpan (testName, testSuite, testSourceLine) {
     return super.startTestSpan(
       testName,
       testSuite,
-      this.testSuiteSpan
+      this.testSuiteSpan,
+      { [TEST_SOURCE_START]: testSourceLine }
     )
   }
 }

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

@@ -16,6 +16,7 @@ const {
   TEST_SESSION_ID,
   TEST_COMMAND,
   TEST_MODULE,
+  TEST_SOURCE_START,
   finishAllTraceSpans
 } = require('../../dd-trace/src/plugins/util/test')
 
@@ -204,7 +205,7 @@ module.exports = (on, config) => {
       return activeSpan ? activeSpan.context().toTraceId() : null
     },
     'dd:afterEach': (test) => {
-      const { state, error, isRUMActive } = test
+      const { state, error, isRUMActive, testSourceLine } = test
       if (activeSpan) {
         activeSpan.setTag(TEST_STATUS, CYPRESS_STATUS_TO_TEST_STATUS[state])
         if (error) {
@@ -213,6 +214,9 @@ module.exports = (on, config) => {
         if (isRUMActive) {
           activeSpan.setTag(TEST_IS_RUM_ACTIVE, 'true')
         }
+        if (testSourceLine) {
+          activeSpan.setTag(TEST_SOURCE_START, testSourceLine)
+        }
         activeSpan.finish()
       }
       activeSpan = null

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

@@ -29,6 +29,10 @@ afterEach(() => {
       state: currentTest.state,
       error: currentTest.err,
     }
+    try {
+      testInfo.testSourceLine = Cypress.mocha.getRunner().currentRunnable.invocationDetails.line
+    } catch (e) {}
+
     if (win.DD_RUM) {
       testInfo.isRUMActive = true
     }

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

@@ -4,15 +4,16 @@ const ClientPlugin = require('../../dd-trace/src/plugins/client')
 
 class GoogleCloudPubsubClientPlugin extends ClientPlugin {
   static get id () { return 'google-cloud-pubsub' }
+  static get type () { return 'messaging' }
   static get operation () { return 'request' }
 
   start ({ request, api, projectId }) {
     if (api === 'publish') return
 
-    this.startSpan('pubsub.request', {
-      service: this.config.service || `${this.tracer._service}-pubsub`,
+    this.startSpan(this.operationName(), {
+      service: this.config.service || this.serviceName(),
       resource: [api, request.name].filter(x => x).join(' '),
-      kind: 'client',
+      kind: this.constructor.kind,
       meta: {
         'pubsub.method': api,
         'gcloud.project_id': projectId

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

@@ -11,11 +11,9 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
     const topic = subscription.metadata && subscription.metadata.topic
     const childOf = this.tracer.extract('text_map', message.attributes) || null
 
-    this.startSpan('pubsub.receive', {
+    this.startSpan({
       childOf,
-      service: this.config.service,
       resource: topic,
-      kind: 'consumer',
       type: 'worker',
       meta: {
         'gcloud.project_id': subscription.pubsub.projectId,

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

@@ -11,10 +11,8 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
 
     const messages = request.messages || []
     const topic = request.topic
-    const span = this.startSpan('pubsub.request', { // TODO: rename
-      service: this.config.service || `${this.tracer._service}-pubsub`,
+    const span = this.startSpan({ // TODO: rename
       resource: `${api} ${topic}`,
-      kind: 'producer',
       meta: {
         'gcloud.project_id': projectId,
         'pubsub.method': api, // TODO: remove

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

@@ -94,7 +94,7 @@ function errorHandler (err) {
   if (err) {
     span.addTags({
       [ERROR_TYPE]: err.name,
-      [ERROR_MESSAGE]: err.message,
+      [ERROR_MESSAGE]: err.message || err.code,
       [ERROR_STACK]: err.stack
     })
   } else {