dd-trace 3.20.0 → 3.22.0

package/index.d.ts

@@ -79,7 +79,8 @@ export declare interface Tracer extends opentracing.Tracer {
    * which case the span will finish at the end of the function execution.
    *
    * If the `orphanable` option is set to false, the function will not be traced
-   * unless there is already an active span or `childOf` option.
+   * unless there is already an active span or `childOf` option. Note that this
+   * option is deprecated and has been removed in version 4.0.
    */
   trace<T> (name: string, fn: (span?: Span, fn?: (error?: Error) => any) => T): T;
   trace<T> (name: string, options: TraceOptions & SpanOptions, fn: (span?: Span, done?: (error?: Error) => string) => T): T;
@@ -443,6 +444,11 @@ export declare interface TracerOptions {
        * Whether to enable vulnerability deduplication
        */
       deduplicationEnabled?: boolean
+      /**
+       * Whether to enable vulnerability redaction
+       * @default true
+       */
+      redactionEnabled?: boolean
     }
   };
 
@@ -491,6 +497,7 @@ export declare interface TracerOptions {
   /**
    * If false, require a parent in order to trace.
    * @default true
+   * @deprecated since version 4.0
    */
   orphanable?: boolean
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "3.20.0",
+  "version": "3.22.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -36,6 +36,7 @@
     "test:integration:cucumber": "mocha --colors --timeout 30000 \"integration-tests/cucumber/*.spec.js\"",
     "test:integration:cypress": "mocha --colors --timeout 30000 \"integration-tests/cypress/*.spec.js\"",
     "test:integration:playwright": "mocha --colors --timeout 30000 \"integration-tests/playwright/*.spec.js\"",
+    "test:integration:serverless": "mocha --colors --timeout 30000 \"integration-tests/serverless/*.spec.js\"",
     "test:shimmer": "mocha --colors 'packages/datadog-shimmer/test/**/*.spec.js'",
     "test:shimmer:ci": "nyc --no-clean --include 'packages/datadog-shimmer/src/**/*.js' -- npm run test:shimmer",
     "leak:core": "node ./scripts/install_plugin_modules && (cd packages/memwatch && yarn) && NODE_PATH=./packages/memwatch/node_modules node --no-warnings ./node_modules/.bin/tape 'packages/dd-trace/test/leak/**/*.js'",
@@ -65,11 +66,11 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@datadog/native-appsec": "^3.1.0",
+    "@datadog/native-appsec": "^3.2.0",
     "@datadog/native-iast-rewriter": "2.0.1",
-    "@datadog/native-iast-taint-tracking": "^1.4.0",
-    "@datadog/native-metrics": "^1.6.0",
-    "@datadog/pprof": "^2.2.0",
+    "@datadog/native-iast-taint-tracking": "^1.4.1",
+    "@datadog/native-metrics": "^2.0.0",
+    "@datadog/pprof": "^2.2.1",
     "@datadog/sketches-js": "^2.1.0",
     "crypto-randomuuid": "^1.0.0",
     "diagnostics_channel": "^1.1.0",

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

@@ -3,6 +3,7 @@ const { createCoverageMap } = require('istanbul-lib-coverage')
 
 const { addHook, channel, AsyncResource } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const log = require('../../dd-trace/src/log')
 
 const testStartCh = channel('ci:cucumber:test:start')
 const testFinishCh = channel('ci:cucumber:test:finish') // used for test steps too
@@ -175,6 +176,12 @@ function wrapRun (pl, isLatestVersion) {
 }
 
 function pickleHook (PickleRunner) {
+  if (process.env.CUCUMBER_WORKER_ID) {
+    // Parallel mode is not supported
+    log.warn('Unable to initialize CI Visibility because Cucumber is running in parallel mode.')
+    return PickleRunner
+  }
+
   const pl = PickleRunner.default
 
   wrapRun(pl, false)
@@ -183,6 +190,12 @@ function pickleHook (PickleRunner) {
 }
 
 function testCaseHook (TestCaseRunner) {
+  if (process.env.CUCUMBER_WORKER_ID) {
+    // Parallel mode is not supported
+    log.warn('Unable to initialize CI Visibility because Cucumber is running in parallel mode.')
+    return TestCaseRunner
+  }
+
   const pl = TestCaseRunner.default
 
   wrapRun(pl, true)

package/packages/datadog-instrumentations/src/grpc/client.js

@@ -4,6 +4,8 @@ const types = require('./types')
 const { addHook, channel, AsyncResource } = require('../helpers/instrument')
 const shimmer = require('../../../datadog-shimmer')
 
+const nodeMajor = parseInt(process.versions.node.split('.')[0])
+
 const patched = new WeakSet()
 const instances = new WeakMap()
 
@@ -232,13 +234,15 @@ function patch (grpc) {
   return grpc
 }
 
-addHook({ name: 'grpc', versions: ['>=1.24.3'] }, patch)
+if (nodeMajor <= 14) {
+  addHook({ name: 'grpc', versions: ['>=1.24.3'] }, patch)
 
-addHook({ name: 'grpc', versions: ['>=1.24.3'], file: 'src/client.js' }, client => {
-  shimmer.wrap(client, 'makeClientConstructor', createWrapMakeClientConstructor())
+  addHook({ name: 'grpc', versions: ['>=1.24.3'], file: 'src/client.js' }, client => {
+    shimmer.wrap(client, 'makeClientConstructor', createWrapMakeClientConstructor())
 
-  return client
-})
+    return client
+  })
+}
 
 addHook({ name: '@grpc/grpc-js', versions: ['>=1.0.3'] }, patch)
 

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

@@ -4,6 +4,8 @@ const types = require('./types')
 const { channel, addHook, AsyncResource } = require('../helpers/instrument')
 const shimmer = require('../../../datadog-shimmer')
 
+const nodeMajor = parseInt(process.versions.node.split('.')[0])
+
 const startChannel = channel('apm:grpc:server:request:start')
 const errorChannel = channel('apm:grpc:server:request:error')
 const updateChannel = channel('apm:grpc:server:request:update')
@@ -139,11 +141,13 @@ function isEmitter (obj) {
   return typeof obj.emit === 'function' && typeof obj.once === 'function'
 }
 
-addHook({ name: 'grpc', versions: ['>=1.24.3'], file: 'src/server.js' }, server => {
-  shimmer.wrap(server.Server.prototype, 'register', wrapRegister)
+if (nodeMajor <= 14) {
+  addHook({ name: 'grpc', versions: ['>=1.24.3'], file: 'src/server.js' }, server => {
+    shimmer.wrap(server.Server.prototype, 'register', wrapRegister)
 
-  return server
-})
+    return server
+  })
+}
 
 addHook({ name: '@grpc/grpc-js', versions: ['>=1.0.3'], file: 'build/src/server.js' }, server => {
   shimmer.wrap(server.Server.prototype, 'register', wrapRegister)

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

@@ -80,6 +80,7 @@ module.exports = {
   'rhea': () => require('../rhea'),
   'router': () => require('../router'),
   'sharedb': () => require('../sharedb'),
+  'sequelize': () => require('../sequelize'),
   'tedious': () => require('../tedious'),
   'when': () => require('../when'),
   'winston': () => require('../winston')

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

@@ -22,6 +22,10 @@ for (const packageName of names) {
 
     hooks[packageName]()
 
+    if (!instrumentations[packageName]) {
+      return moduleExports
+    }
+
     for (const { name, file, versions, hook } of instrumentations[packageName]) {
       const fullFilename = filename(name, file)
 

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

@@ -101,6 +101,7 @@ function patch (http, methodName) {
   }
 
   function normalizeArgs (inputURL, inputOptions, cb) {
+    const originalUrl = inputURL
     inputURL = normalizeOptions(inputURL)
 
     const [callback, inputOptionsNormalized] = normalizeCallback(inputOptions, cb, inputURL)
@@ -108,7 +109,7 @@ function patch (http, methodName) {
     normalizeHeaders(options)
     const uri = url.format(options)
 
-    return { uri, options, callback }
+    return { uri, options, callback, originalUrl }
   }
 
   function combineOptions (inputURL, inputOptions) {

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

@@ -11,6 +11,7 @@ const startServerCh = channel('apm:http:server:request:start')
 const exitServerCh = channel('apm:http:server:request:exit')
 const errorServerCh = channel('apm:http:server:request:error')
 const finishServerCh = channel('apm:http:server:request:finish')
+const finishSetHeaderCh = channel('datadog:http:server:response:set-header:finish')
 
 const requestFinishedSet = new WeakSet()
 
@@ -58,6 +59,9 @@ function wrapEmit (emit) {
           // TODO: should this always return true ?
           return this.listenerCount(eventName) > 0
         }
+        if (finishSetHeaderCh.hasSubscribers) {
+          wrapSetHeader(res)
+        }
         return emit.apply(this, arguments)
       } catch (err) {
         errorServerCh.publish(err)
@@ -70,3 +74,13 @@ function wrapEmit (emit) {
     return emit.apply(this, arguments)
   }
 }
+
+function wrapSetHeader (res) {
+  shimmer.wrap(res, 'setHeader', setHeader => {
+    return function (name, value) {
+      const setHeaderResult = setHeader.apply(this, arguments)
+      finishSetHeaderCh.publish({ name, value, res })
+      return setHeaderResult
+    }
+  })
+}

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

@@ -3,6 +3,7 @@
 const shimmer = require('../../../datadog-shimmer')
 const { addHook, channel, AsyncResource } = require('../helpers/instrument')
 
+const connectChannel = channel('apm:http2:client:connect:start')
 const startChannel = channel('apm:http2:client:request:start')
 const finishChannel = channel('apm:http2:client:request:finish')
 const errorChannel = channel('apm:http2:client:request:error')
@@ -52,6 +53,9 @@ function createWrapRequest (authority, options) {
 
 function wrapConnect (connect) {
   return function (authority, options) {
+    if (connectChannel.hasSubscribers) {
+      connectChannel.publish({ authority })
+    }
     const session = connect.apply(this, arguments)
 
     shimmer.wrap(session, 'request', createWrapRequest(authority, options))

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

@@ -1,13 +1,23 @@
 'use strict'
+const semver = require('semver')
+
 const { addHook, channel, AsyncResource } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
+const { version: ddTraceVersion } = require('../../../package.json')
 const {
   getCoveredFilenamesFromCoverage,
   JEST_WORKER_TRACE_PAYLOAD_CODE,
   JEST_WORKER_COVERAGE_PAYLOAD_CODE,
-  getTestLineStart
+  getTestLineStart,
+  getTestSuitePath,
+  getTestParametersString
 } = require('../../dd-trace/src/plugins/util/test')
+const {
+  getFormattedJestTestParameters,
+  getJestTestName,
+  getJestSuitesToRun
+} = require('../../datadog-plugin-jest/src/util')
 
 const testSessionStartCh = channel('ci:jest:session:start')
 const testSessionFinishCh = channel('ci:jest:session:finish')
@@ -34,13 +44,6 @@ let skippableSuites = []
 let isCodeCoverageEnabled = false
 let isSuitesSkippingEnabled = false
 
-const {
-  getTestSuitePath,
-  getTestParametersString
-} = require('../../dd-trace/src/plugins/util/test')
-
-const { getFormattedJestTestParameters, getJestTestName } = require('../../datadog-plugin-jest/src/util')
-
 const sessionAsyncResource = new AsyncResource('bound-anonymous-fn')
 
 const specStatusToTestStatus = {
@@ -426,10 +429,7 @@ addHook({
     const testPaths = await getTestPaths.apply(this, arguments)
     const { tests } = testPaths
 
-    const filteredTests = tests.filter(({ path: testPath }) => {
-      const relativePath = testPath.replace(`${rootDir}/`, '')
-      return !skippableSuites.includes(relativePath)
-    })
+    const filteredTests = getJestSuitesToRun(skippableSuites, tests, rootDir)
 
     skippableSuites = []
 
@@ -451,6 +451,7 @@ addHook({
 }, jestConfigSyncWrapper)
 
 function jasmineAsyncInstallWraper (jasmineAsyncInstallExport, jestVersion) {
+  log.warn('jest-jasmine2 support is removed from dd-trace@v4. Consider changing to jest-circus as `testRunner`.')
   return function (globalConfig, globalInput) {
     globalInput._ddtrace = global._ddtrace
     shimmer.wrap(globalInput.jasmine.Spec.prototype, 'execute', execute => function (onComplete) {
@@ -480,11 +481,13 @@ function jasmineAsyncInstallWraper (jasmineAsyncInstallExport, jestVersion) {
   }
 }
 
-addHook({
-  name: 'jest-jasmine2',
-  versions: ['>=24.8.0'],
-  file: 'build/jasmineAsyncInstall.js'
-}, jasmineAsyncInstallWraper)
+if (semver.lt(ddTraceVersion, '4.0.0')) {
+  addHook({
+    name: 'jest-jasmine2',
+    versions: ['>=24.8.0'],
+    file: 'build/jasmineAsyncInstall.js'
+  }, jasmineAsyncInstallWraper)
+}
 
 addHook({
   name: 'jest-worker',

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

@@ -4,6 +4,7 @@
 
 const { channel, addHook, AsyncResource } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { MAJOR } = require('../../../version')
 
 const startChannel = channel('apm:next:request:start')
 const finishChannel = channel('apm:next:request:finish')
@@ -168,7 +169,11 @@ addHook({ name: 'next', versions: ['>=11.1 <13.2'], file: 'dist/server/next-serv
   return nextServer
 })
 
-addHook({ name: 'next', versions: ['>=9.5 <11.1'], file: 'dist/next-server/server/next-server.js' }, nextServer => {
+addHook({
+  name: 'next',
+  versions: MAJOR >= 4 ? ['>=10.2 <11.1'] : ['>=9.5 <11.1'],
+  file: 'dist/next-server/server/next-server.js'
+}, nextServer => {
   const Server = nextServer.default
 
   shimmer.wrap(Server.prototype, 'handleRequest', wrapHandleRequest)

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

@@ -248,7 +248,7 @@ function runnerHook (runnerExport, playwrightVersion) {
 addHook({
   name: '@playwright/test',
   file: 'lib/runner.js',
-  versions: ['>=1.18.0 <1.30.0']
+  versions: ['>=1.18.0 <=1.30.0']
 }, runnerHook)
 
 addHook({

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

@@ -0,0 +1,51 @@
+'use strict'
+
+const {
+  channel,
+  addHook,
+  AsyncResource
+} = require('./helpers/instrument')
+
+const shimmer = require('../../datadog-shimmer')
+
+addHook({ name: 'sequelize', versions: ['>=4'] }, Sequelize => {
+  const startCh = channel('datadog:sequelize:query:start')
+  const finishCh = channel('datadog:sequelize:query:finish')
+
+  shimmer.wrap(Sequelize.prototype, 'query', query => {
+    return function (sql) {
+      if (!startCh.hasSubscribers) {
+        return query.apply(this, arguments)
+      }
+
+      const asyncResource = new AsyncResource('bound-anonymous-fn')
+
+      let dialect
+      if (this.options && this.options.dialect) {
+        dialect = this.options.dialect
+      } else if (this.dialect && this.dialect.name) {
+        dialect = this.dialect.name
+      }
+
+      function onFinish () {
+        asyncResource.bind(function () {
+          finishCh.publish()
+        }, this).apply(this)
+      }
+
+      return asyncResource.bind(function () {
+        startCh.publish({
+          sql,
+          dialect
+        })
+
+        const promise = query.apply(this, arguments)
+        promise.then(onFinish, onFinish)
+
+        return promise
+      }, this).apply(this, arguments)
+    }
+  })
+
+  return Sequelize
+})

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-aws-sdk/src/base.js

@@ -38,6 +38,8 @@ class BaseAwsSdkPlugin extends Plugin {
         'service.name': serviceName,
         'aws.operation': operation,
         'aws.region': awsRegion,
+        'region': awsRegion,
+        'aws_service': awsService,
         'aws.service': awsService,
         'component': 'aws-sdk'
       }
@@ -60,6 +62,7 @@ class BaseAwsSdkPlugin extends Plugin {
       const { span } = store
       if (!span) return
       span.setTag('aws.region', region)
+      span.setTag('region', region)
     })
 
     this.addSub(`apm:aws:request:complete:${this.serviceIdentifier}`, ({ response }) => {

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

@@ -12,7 +12,8 @@ class CloudwatchLogs extends BaseAwsSdkPlugin {
 
     return Object.assign(tags, {
       'resource.name': `${operation} ${params.logGroupName}`,
-      'aws.cloudwatch.logs.log_group_name': params.logGroupName
+      'aws.cloudwatch.logs.log_group_name': params.logGroupName,
+      'loggroupname': params.logGroupName
     })
   }
 }

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

@@ -12,7 +12,8 @@ class DynamoDb extends BaseAwsSdkPlugin {
       if (params.TableName) {
         Object.assign(tags, {
           'resource.name': `${operation} ${params.TableName}`,
-          'aws.dynamodb.table_name': params.TableName
+          'aws.dynamodb.table_name': params.TableName,
+          'tablename': params.TableName
         })
       }
 
@@ -27,7 +28,8 @@ class DynamoDb extends BaseAwsSdkPlugin {
             // also add span type to match serverless convention
             Object.assign(tags, {
               'resource.name': `${operation} ${tableName}`,
-              'aws.dynamodb.table_name': tableName
+              'aws.dynamodb.table_name': tableName,
+              'tablename': tableName
             })
           }
         }

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

@@ -7,10 +7,11 @@ class EventBridge extends BaseAwsSdkPlugin {
 
   generateTags (params, operation, response) {
     if (!params || !params.source) return {}
-
+    const rulename = params.Name ? params.Name : ''
     return {
-      'resource.name': `${operation} ${params.source}`,
-      'aws.eventbridge.source': params.source
+      'resource.name': operation ? `${operation} ${params.source}` : params.source,
+      'aws.eventbridge.source': `${params.source}`,
+      'rulename': `${rulename}`
     }
   }
 

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

@@ -9,7 +9,8 @@ class Kinesis extends BaseAwsSdkPlugin {
 
     return {
       'resource.name': `${operation} ${params.StreamName}`,
-      'aws.kinesis.stream_name': params.StreamName
+      'aws.kinesis.stream_name': params.StreamName,
+      'streamname': params.StreamName
     }
   }
 

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

@@ -13,6 +13,7 @@ class Lambda extends BaseAwsSdkPlugin {
 
     return Object.assign(tags, {
       'resource.name': `${operation} ${params.FunctionName}`,
+      'functionname': params.FunctionName,
       'aws.lambda': params.FunctionName
     })
   }

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

@@ -12,7 +12,8 @@ class Redshift extends BaseAwsSdkPlugin {
 
     return Object.assign(tags, {
       'resource.name': `${operation} ${params.ClusterIdentifier}`,
-      'aws.redshift.cluster_identifier': params.ClusterIdentifier
+      'aws.redshift.cluster_identifier': params.ClusterIdentifier,
+      'clusteridentifier': params.ClusterIdentifier
     })
   }
 }

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

@@ -12,7 +12,8 @@ class S3 extends BaseAwsSdkPlugin {
 
     return Object.assign(tags, {
       'resource.name': `${operation} ${params.Bucket}`,
-      'aws.s3.bucket_name': params.Bucket
+      'aws.s3.bucket_name': params.Bucket,
+      'bucketname': params.Bucket
     })
   }
 }

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

@@ -9,10 +9,17 @@ class Sns extends BaseAwsSdkPlugin {
     if (!params) return {}
 
     if (!params.TopicArn && !(response.data && response.data.TopicArn)) return {}
+    const TopicArn = params.TopicArn || response.data.TopicArn
+    // Split the ARN into its parts
+    // ex.'arn:aws:sns:us-east-1:123456789012:my-topic'
+    const arnParts = TopicArn.split(':')
 
+    // Get the topic name from the last part of the ARN
+    const topicName = arnParts[arnParts.length - 1]
     return {
       'resource.name': `${operation} ${params.TopicArn || response.data.TopicArn}`,
-      'aws.sns.topic_arn': params.TopicArn || response.data.TopicArn
+      'aws.sns.topic_arn': TopicArn,
+      'topicname': topicName
     }
 
     // TODO: should arn be sanitized or quantized in some way here,

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

@@ -59,10 +59,16 @@ class Sqs extends BaseAwsSdkPlugin {
     const tags = {}
 
     if (!params || (!params.QueueName && !params.QueueUrl)) return tags
+    // 'https://sqs.us-east-1.amazonaws.com/123456789012/my-queue';
+    let queueName = params.QueueName
+    if (params.QueueUrl) {
+      queueName = params.QueueUrl.split('/')[params.QueueUrl.split('/').length - 1]
+    }
 
     Object.assign(tags, {
       'resource.name': `${operation} ${params.QueueName || params.QueueUrl}`,
-      'aws.sqs.queue_name': params.QueueName || params.QueueUrl
+      'aws.sqs.queue_name': params.QueueName || params.QueueUrl,
+      'queuename': queueName
     })
 
     switch (operation) {

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

@@ -73,8 +73,8 @@ class CucumberPlugin extends CiPlugin {
         .map(filename => getTestSuitePath(filename, this.sourceRoot))
 
       const formattedCoverage = {
-        traceId: this.testSuiteSpan.context()._traceId,
-        spanId: this.testSuiteSpan.context()._spanId,
+        sessionId: this.testSuiteSpan.context()._traceId,
+        suiteId: this.testSuiteSpan.context()._spanId,
         files: relativeCoverageFiles
       }