dd-trace 3.15.0 → 3.17.0

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

@@ -1,11 +1,12 @@
 'use strict'
 
 const { TEXT_MAP } = require('../../../ext/formats')
+const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 const { getResourceName } = require('./util')
 
 class AmqplibProducerPlugin extends ProducerPlugin {
-  static get name () { return 'amqplib' }
+  static get id () { return 'amqplib' }
   static get operation () { return 'command' }
 
   start ({ channel = {}, method, fields }) {
@@ -18,7 +19,7 @@ class AmqplibProducerPlugin extends ProducerPlugin {
       kind: 'producer',
       meta: {
         'out.host': stream._host,
-        'out.port': stream.remotePort,
+        [CLIENT_PORT_KEY]: stream.remotePort,
         'amqp.queue': fields.queue,
         'amqp.exchange': fields.exchange,
         'amqp.routingKey': fields.routingKey,

package/packages/datadog-plugin-aws-sdk/src/base.js

@@ -3,10 +3,13 @@
 const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 const { storage } = require('../../datadog-core')
+const { isTrue } = require('../../dd-trace/src/util')
 
 class BaseAwsSdkPlugin extends Plugin {
+  static get id () { return 'aws' }
+
   get serviceIdentifier () {
-    const id = this.constructor.name.toLowerCase()
+    const id = this.constructor.id.toLowerCase()
     Object.defineProperty(this, 'serviceIdentifier', {
       configurable: true,
       writable: true,
@@ -74,7 +77,9 @@ class BaseAwsSdkPlugin extends Plugin {
   }
 
   isEnabled (request) {
-    return true
+    const serviceId = this.serviceIdentifier.toUpperCase()
+    const envVarValue = process.env[`DD_TRACE_AWS_SDK_${serviceId}_ENABLED`]
+    return envVarValue ? isTrue(envVarValue) : true
   }
 
   addResponseTags (span, response) {

package/packages/datadog-plugin-aws-sdk/src/index.js

@@ -5,7 +5,7 @@ const Plugin = require('../../dd-trace/src/plugins/plugin')
 const services = require('./services')
 
 class AwsSdkPlugin extends Plugin {
-  static get name () {
+  static get id () {
     return 'aws-sdk'
   }
 

package/packages/datadog-plugin-aws-sdk/src/services/cloudwatchlogs.js

@@ -3,6 +3,8 @@
 const BaseAwsSdkPlugin = require('../base')
 
 class CloudwatchLogs extends BaseAwsSdkPlugin {
+  static get id () { return 'cloudwatchlogs' }
+
   generateTags (params, operation) {
     const tags = {}
 

package/packages/datadog-plugin-aws-sdk/src/services/dynamodb.js

@@ -3,6 +3,8 @@
 const BaseAwsSdkPlugin = require('../base')
 
 class DynamoDb extends BaseAwsSdkPlugin {
+  static get id () { return 'dynamodb' }
+
   generateTags (params, operation, response) {
     const tags = {}
 

package/packages/datadog-plugin-aws-sdk/src/services/eventbridge.js

@@ -3,6 +3,8 @@ const log = require('../../../dd-trace/src/log')
 const BaseAwsSdkPlugin = require('../base')
 
 class EventBridge extends BaseAwsSdkPlugin {
+  static get id () { return 'eventbridge' }
+
   generateTags (params, operation, response) {
     if (!params || !params.source) return {}
 

package/packages/datadog-plugin-aws-sdk/src/services/kinesis.js

@@ -2,6 +2,8 @@
 const log = require('../../../dd-trace/src/log')
 const BaseAwsSdkPlugin = require('../base')
 class Kinesis extends BaseAwsSdkPlugin {
+  static get id () { return 'kinesis' }
+
   generateTags (params, operation, response) {
     if (!params || !params.StreamName) return {}
 

package/packages/datadog-plugin-aws-sdk/src/services/lambda.js

@@ -4,6 +4,8 @@ const log = require('../../../dd-trace/src/log')
 const BaseAwsSdkPlugin = require('../base')
 
 class Lambda extends BaseAwsSdkPlugin {
+  static get id () { return 'lambda' }
+
   generateTags (params, operation, response) {
     const tags = {}
 

package/packages/datadog-plugin-aws-sdk/src/services/redshift.js

@@ -3,6 +3,8 @@
 const BaseAwsSdkPlugin = require('../base')
 
 class Redshift extends BaseAwsSdkPlugin {
+  static get id () { return 'redshift' }
+
   generateTags (params, operation, response) {
     const tags = {}
 

package/packages/datadog-plugin-aws-sdk/src/services/s3.js

@@ -3,6 +3,8 @@
 const BaseAwsSdkPlugin = require('../base')
 
 class S3 extends BaseAwsSdkPlugin {
+  static get id () { return 's3' }
+
   generateTags (params, operation, response) {
     const tags = {}
 

package/packages/datadog-plugin-aws-sdk/src/services/sns.js

@@ -3,6 +3,8 @@ const log = require('../../../dd-trace/src/log')
 const BaseAwsSdkPlugin = require('../base')
 
 class Sns extends BaseAwsSdkPlugin {
+  static get id () { return 'sns' }
+
   generateTags (params, operation, response) {
     if (!params) return {}
 

package/packages/datadog-plugin-aws-sdk/src/services/sqs.js

@@ -5,6 +5,8 @@ const BaseAwsSdkPlugin = require('../base')
 const { storage } = require('../../../datadog-core')
 
 class Sqs extends BaseAwsSdkPlugin {
+  static get id () { return 'sqs' }
+
   constructor (...args) {
     super(...args)
     //

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

@@ -3,7 +3,7 @@
 const LogPlugin = require('../../dd-trace/src/plugins/log_plugin')
 
 class BunyanPlugin extends LogPlugin {
-  static get name () {
+  static get id () {
     return 'bunyan'
   }
 }

package/packages/datadog-plugin-cassandra-driver/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 CassandraDriverPlugin extends DatabasePlugin {
-  static get name () { return 'cassandra-driver' }
+  static get id () { return 'cassandra-driver' }
   static get system () { return 'cassandra' }
 
   start ({ keyspace, query, connectionOptions = {} }) {
@@ -21,7 +22,7 @@ class CassandraDriverPlugin extends DatabasePlugin {
         'cassandra.query': query,
         'cassandra.keyspace': keyspace,
         'out.host': connectionOptions.host,
-        'out.port': connectionOptions.port
+        [CLIENT_PORT_KEY]: connectionOptions.port
       }
     })
   }

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

@@ -3,7 +3,7 @@
 const RouterPlugin = require('../../datadog-plugin-router/src')
 
 class ConnectPlugin extends RouterPlugin {
-  static get name () {
+  static get id () {
     return 'connect'
   }
 

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

@@ -5,7 +5,7 @@ const { storage } = require('../../datadog-core')
 const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
 
 class CouchBasePlugin extends Plugin {
-  static get name () {
+  static get id () {
     return 'couchbase'
   }
 

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

@@ -8,13 +8,14 @@ const {
   TEST_STATUS,
   finishAllTraceSpans,
   getTestSuitePath,
-  getTestSuiteCommonTags
+  getTestSuiteCommonTags,
+  addIntelligentTestRunnerSpanTags
 } = 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 CiPlugin {
-  static get name () {
+  static get id () {
     return 'cucumber'
   }
 
@@ -23,12 +24,21 @@ class CucumberPlugin extends CiPlugin {
 
     this.sourceRoot = process.cwd()
 
-    this.addSub('ci:cucumber:session:finish', (status) => {
+    this.addSub('ci:cucumber:session:finish', ({ status, isSuitesSkipped, testCodeCoverageLinesTotal }) => {
+      const { isSuitesSkippingEnabled, isCodeCoverageEnabled } = this.itrConfig || {}
+      addIntelligentTestRunnerSpanTags(
+        this.testSessionSpan,
+        this.testModuleSpan,
+        { isSuitesSkipped, isSuitesSkippingEnabled, isCodeCoverageEnabled, testCodeCoverageLinesTotal }
+      )
+
       this.testSessionSpan.setTag(TEST_STATUS, status)
       this.testModuleSpan.setTag(TEST_STATUS, status)
       this.testModuleSpan.finish()
       this.testSessionSpan.finish()
       finishAllTraceSpans(this.testSessionSpan)
+
+      this.itrConfig = null
       this.tracer._exporter.flush()
     })
 
@@ -36,12 +46,13 @@ class CucumberPlugin extends CiPlugin {
       const testSuiteMetadata = getTestSuiteCommonTags(
         this.command,
         this.frameworkVersion,
-        getTestSuitePath(testSuiteFullPath, this.sourceRoot)
+        getTestSuitePath(testSuiteFullPath, this.sourceRoot),
+        'cucumber'
       )
       this.testSuiteSpan = this.tracer.startSpan('cucumber.test_suite', {
         childOf: this.testModuleSpan,
         tags: {
-          [COMPONENT]: this.constructor.name,
+          [COMPONENT]: this.constructor.id,
           ...this.testEnvironmentMetadata,
           ...testSuiteMetadata
         }
@@ -53,6 +64,22 @@ class CucumberPlugin extends CiPlugin {
       this.testSuiteSpan.finish()
     })
 
+    this.addSub('ci:cucumber:test-suite:code-coverage', ({ coverageFiles, suiteFile }) => {
+      if (!this.itrConfig || !this.itrConfig.isCodeCoverageEnabled) {
+        return
+      }
+      const relativeCoverageFiles = [...coverageFiles, suiteFile]
+        .map(filename => getTestSuitePath(filename, this.sourceRoot))
+
+      const formattedCoverage = {
+        traceId: this.testSuiteSpan.context()._traceId,
+        spanId: this.testSuiteSpan.context()._spanId,
+        files: relativeCoverageFiles
+      }
+
+      this.tracer._exporter.exportCoverage(formattedCoverage)
+    })
+
     this.addSub('ci:cucumber:test:start', ({ testName, fullTestSuite }) => {
       const store = storage.getStore()
       const testSuite = getTestSuitePath(fullTestSuite, this.sourceRoot)
@@ -67,7 +94,7 @@ class CucumberPlugin extends CiPlugin {
       const span = this.tracer.startSpan('cucumber.step', {
         childOf,
         tags: {
-          [COMPONENT]: this.constructor.name,
+          [COMPONENT]: this.constructor.id,
           'cucumber.step': resource,
           [RESOURCE_NAME]: resource
         }

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

@@ -3,7 +3,7 @@ const Plugin = require('../../dd-trace/src/plugins/plugin')
 // Cypress plugin does not patch any library. This is just a placeholder to
 // follow the structure of the plugins
 class CypressPlugin extends Plugin {
-  static get name () {
+  static get id () {
     return 'cypress'
   }
 }

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

@@ -15,10 +15,12 @@ const {
   TEST_MODULE_ID,
   TEST_SESSION_ID,
   TEST_COMMAND,
-  TEST_BUNDLE,
+  TEST_MODULE,
   finishAllTraceSpans
 } = require('../../dd-trace/src/plugins/util/test')
 
+const TEST_FRAMEWORK_NAME = 'cypress'
+
 const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
 
 const CYPRESS_STATUS_TO_TEST_STATUS = {
@@ -51,9 +53,9 @@ function getCypressVersion (details) {
 
 function getCypressCommand (details) {
   if (!details) {
-    return 'cypress'
+    return TEST_FRAMEWORK_NAME
   }
-  return `cypress ${details.specPattern || ''}`
+  return `${TEST_FRAMEWORK_NAME} ${details.specPattern || ''}`
 }
 
 function getSessionStatus (summary) {
@@ -78,7 +80,7 @@ function getSuiteStatus (suiteStats) {
 
 module.exports = (on, config) => {
   const tracer = require('../../dd-trace')
-  const testEnvironmentMetadata = getTestEnvironmentMetadata('cypress')
+  const testEnvironmentMetadata = getTestEnvironmentMetadata(TEST_FRAMEWORK_NAME)
 
   const codeOwnersEntries = getCodeOwnersFileEntries()
 
@@ -95,21 +97,21 @@ module.exports = (on, config) => {
     command = getCypressCommand(details)
     frameworkVersion = getCypressVersion(details)
 
-    const testSessionSpanMetadata = getTestSessionCommonTags(command, frameworkVersion)
-    const testModuleSpanMetadata = getTestModuleCommonTags(command, frameworkVersion)
+    const testSessionSpanMetadata = getTestSessionCommonTags(command, frameworkVersion, TEST_FRAMEWORK_NAME)
+    const testModuleSpanMetadata = getTestModuleCommonTags(command, frameworkVersion, TEST_FRAMEWORK_NAME)
 
-    testSessionSpan = tracer.startSpan('cypress.test_session', {
+    testSessionSpan = tracer.startSpan(`${TEST_FRAMEWORK_NAME}.test_session`, {
       childOf,
       tags: {
-        [COMPONENT]: 'cypress',
+        [COMPONENT]: TEST_FRAMEWORK_NAME,
         ...testEnvironmentMetadata,
         ...testSessionSpanMetadata
       }
     })
-    testModuleSpan = tracer.startSpan('cypress.test_module', {
+    testModuleSpan = tracer.startSpan(`${TEST_FRAMEWORK_NAME}.test_module`, {
       childOf: testSessionSpan,
       tags: {
-        [COMPONENT]: 'cypress',
+        [COMPONENT]: TEST_FRAMEWORK_NAME,
         ...testEnvironmentMetadata,
         ...testModuleSpanMetadata
       }
@@ -117,14 +119,16 @@ module.exports = (on, config) => {
   })
 
   on('after:run', (suiteStats) => {
-    const testStatus = getSessionStatus(suiteStats)
-    testModuleSpan.setTag(TEST_STATUS, testStatus)
-    testSessionSpan.setTag(TEST_STATUS, testStatus)
+    if (testSessionSpan && testModuleSpan) {
+      const testStatus = getSessionStatus(suiteStats)
+      testModuleSpan.setTag(TEST_STATUS, testStatus)
+      testSessionSpan.setTag(TEST_STATUS, testStatus)
 
-    testModuleSpan.finish()
-    testSessionSpan.finish()
+      testModuleSpan.finish()
+      testSessionSpan.finish()
 
-    finishAllTraceSpans(testSessionSpan)
+      finishAllTraceSpans(testSessionSpan)
+    }
 
     return new Promise(resolve => {
       tracer._tracer._exporter._writer.flush(() => {
@@ -137,11 +141,11 @@ module.exports = (on, config) => {
       if (testSuiteSpan) {
         return null
       }
-      const testSuiteSpanMetadata = getTestSuiteCommonTags(command, frameworkVersion, suite)
-      testSuiteSpan = tracer.startSpan('cypress.test_suite', {
+      const testSuiteSpanMetadata = getTestSuiteCommonTags(command, frameworkVersion, suite, TEST_FRAMEWORK_NAME)
+      testSuiteSpan = tracer.startSpan(`${TEST_FRAMEWORK_NAME}.test_suite`, {
         childOf: testModuleSpan,
         tags: {
-          [COMPONENT]: 'cypress',
+          [COMPONENT]: TEST_FRAMEWORK_NAME,
           ...testEnvironmentMetadata,
           ...testSuiteSpanMetadata
         }
@@ -149,25 +153,28 @@ module.exports = (on, config) => {
       return null
     },
     'dd:testSuiteFinish': (suiteStats) => {
-      const status = getSuiteStatus(suiteStats)
-      testSuiteSpan.setTag(TEST_STATUS, status)
-      testSuiteSpan.finish()
-      testSuiteSpan = null
+      if (testSuiteSpan) {
+        const status = getSuiteStatus(suiteStats)
+        testSuiteSpan.setTag(TEST_STATUS, status)
+        testSuiteSpan.finish()
+        testSuiteSpan = null
+      }
       return null
     },
     'dd:beforeEach': (test) => {
       const { testName, testSuite } = test
-      const testSuiteId = testSuiteSpan.context().toSpanId()
-      const testSessionId = testSessionSpan.context().toTraceId()
-      const testModuleId = testModuleSpan.context().toSpanId()
 
       const testSuiteTags = {
-        [TEST_SUITE_ID]: testSuiteId,
-        [TEST_SESSION_ID]: testSessionId,
         [TEST_COMMAND]: command,
-        [TEST_MODULE_ID]: testModuleId,
         [TEST_COMMAND]: command,
-        [TEST_BUNDLE]: command
+        [TEST_MODULE]: TEST_FRAMEWORK_NAME
+      }
+      if (testSuiteSpan) {
+        testSuiteTags[TEST_SUITE_ID] = testSuiteSpan.context().toSpanId()
+      }
+      if (testSessionSpan && testModuleSpan) {
+        testSuiteTags[TEST_SESSION_ID] = testSessionSpan.context().toTraceId()
+        testSuiteTags[TEST_MODULE_ID] = testModuleSpan.context().toSpanId()
       }
 
       const {
@@ -183,10 +190,10 @@ module.exports = (on, config) => {
       }
 
       if (!activeSpan) {
-        activeSpan = tracer.startSpan('cypress.test', {
+        activeSpan = tracer.startSpan(`${TEST_FRAMEWORK_NAME}.test`, {
           childOf,
           tags: {
-            [COMPONENT]: 'cypress',
+            [COMPONENT]: TEST_FRAMEWORK_NAME,
             [ORIGIN_KEY]: CI_APP_ORIGIN,
             ...testSpanMetadata,
             ...testEnvironmentMetadata,
@@ -194,7 +201,7 @@ module.exports = (on, config) => {
           }
         })
       }
-      return activeSpan ? activeSpan._spanContext._traceId.toString(10) : null
+      return activeSpan ? activeSpan.context().toTraceId() : null
     },
     'dd:afterEach': (test) => {
       const { state, error, isRUMActive } = test

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

@@ -9,7 +9,7 @@ const DNSReversePlugin = require('./reverse')
 // TODO: Are DNS spans really client spans?
 
 class DNSPlugin extends CompositePlugin {
-  static get name () { return 'dns' }
+  static get id () { return 'dns' }
   static get plugins () {
     return {
       lookup: DNSLookupPlugin,

package/packages/datadog-plugin-dns/src/lookup.js

@@ -3,7 +3,7 @@
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
 
 class DNSLookupPlugin extends ClientPlugin {
-  static get name () { return 'dns' }
+  static get id () { return 'dns' }
   static get operation () { return 'lookup' }
 
   start ([hostname]) {

package/packages/datadog-plugin-dns/src/lookup_service.js

@@ -3,7 +3,7 @@
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
 
 class DNSLookupServicePlugin extends ClientPlugin {
-  static get name () { return 'dns' }
+  static get id () { return 'dns' }
   static get operation () { return 'lookup_service' }
 
   start ([address, port]) {

package/packages/datadog-plugin-dns/src/resolve.js

@@ -3,7 +3,7 @@
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
 
 class DNSResolvePlugin extends ClientPlugin {
-  static get name () { return 'dns' }
+  static get id () { return 'dns' }
   static get operation () { return 'resolve' }
 
   start ([hostname, maybeType]) {

package/packages/datadog-plugin-dns/src/reverse.js

@@ -3,7 +3,7 @@
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
 
 class DNSReversePlugin extends ClientPlugin {
-  static get name () { return 'dns' }
+  static get id () { return 'dns' }
   static get operation () { return 'reverse' }
 
   start ([ip]) {

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

@@ -3,7 +3,7 @@
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 
 class ElasticsearchPlugin extends DatabasePlugin {
-  static get name () { return 'elasticsearch' }
+  static get id () { return 'elasticsearch' }
 
   start ({ params }) {
     const body = getBody(params.body || params.bulkBody)

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

@@ -3,7 +3,7 @@
 const RouterPlugin = require('../../datadog-plugin-router/src')
 
 class ExpressPlugin extends RouterPlugin {
-  static get name () {
+  static get id () {
     return 'express'
   }
 

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

@@ -3,7 +3,7 @@
 const RouterPlugin = require('../../datadog-plugin-router/src')
 
 class FastifyPlugin extends RouterPlugin {
-  static get name () {
+  static get id () {
     return 'fastify'
   }
 

package/packages/datadog-plugin-find-my-way/src/index.js

@@ -4,7 +4,7 @@ const Plugin = require('../../dd-trace/src/plugins/plugin')
 const web = require('../../dd-trace/src/plugins/util/web')
 
 class FindMyWayPlugin extends Plugin {
-  static get name () {
+  static get id () {
     return 'find-my-way'
   }
 

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

@@ -3,7 +3,7 @@
 const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
 
 class FsPlugin extends TracingPlugin {
-  static get name () { return 'fs' }
+  static get id () { return 'fs' }
   static get operation () { return 'operation' }
 
   configure (...args) {

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

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

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

@@ -3,7 +3,7 @@
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
 
 class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
-  static get name () { return 'google-cloud-pubsub' }
+  static get id () { return 'google-cloud-pubsub' }
   static get operation () { return 'receive' }
 
   start ({ message }) {

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

@@ -7,7 +7,7 @@ const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 // TODO: Consider splitting channels for publish/receive in the instrumentation.
 class GoogleCloudPubsubPlugin extends CompositePlugin {
-  static get name () { return 'google-cloud-pubsub' }
+  static get id () { return 'google-cloud-pubsub' }
   static get plugins () {
     return {
       producer: ProducerPlugin,

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

@@ -3,20 +3,21 @@
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 
 class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
-  static get name () { return 'google-cloud-pubsub' }
+  static get id () { return 'google-cloud-pubsub' }
   static get operation () { return 'request' }
 
-  start ({ cfg, projectId, messages }) {
-    if (cfg.method !== 'publish') return
+  start ({ request, api, projectId }) {
+    if (api !== 'publish') return
 
-    const topic = cfg.reqOpts.topic
+    const messages = request.messages || []
+    const topic = request.topic
     const span = this.startSpan('pubsub.request', { // TODO: rename
       service: this.config.service || `${this.tracer._service}-pubsub`,
-      resource: `${cfg.method} ${topic}`,
+      resource: `${api} ${topic}`,
       kind: 'producer',
       meta: {
         'gcloud.project_id': projectId,
-        'pubsub.method': cfg.method, // TODO: remove
+        'pubsub.method': api, // TODO: remove
         'pubsub.topic': topic
       }
     })

package/packages/datadog-plugin-graphql/src/execute.js

@@ -5,7 +5,7 @@ const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
 let tools
 
 class GraphQLExecutePlugin extends TracingPlugin {
-  static get name () { return 'graphql' }
+  static get id () { return 'graphql' }
   static get operation () { return 'execute' }
 
   start ({ operation, args, docSource }) {