dd-trace 4.0.0 → 5.0.0-pre-ca96946

package/MIGRATING.md

@@ -4,6 +4,45 @@ This guide describes the steps to upgrade dd-trace from a major version to the
 next. If you are having any issues related to migrating, please feel free to
 open an issue or contact our [support](https://www.datadoghq.com/support/) team.
 
+## 3.0 to 4.0
+
+### Node 14 is no longer supported
+
+Node.js 14 has reached EOL in April 2023 and is no longer supported. Generally
+speaking, we highly recommend always keeping Node.js up to date regardless of
+our support policy.
+
+### The `orphanable` option was removed
+
+This option was only useful internally for a single integration that has since
+been removed. It was never useful for manual instrumentation since all that is
+needed to orphan a span on creation is to use
+`tracer.trace('web.request', { childOf: null })`.
+
+### Support for `jest-jasmine2` has been removed
+
+The default test runner for Jest was changed to `jest-circus` around 2 years ago and
+is no longer supported by our Jest integration for CI Visibility. We recommend
+switching to `jest-circus` to anyone still using `jest-jasmine2`.
+
+### Support for older Next.js versions was removed
+
+We now support only Next.js 10.2 and up.
+
+### W3C headers are now prioritized over Datadog headers
+
+As we move towards open standards, we have decided to prioritize W3C Trace
+Context headers over our own vendor-specific headers for context propagation
+across services. For most applications this shouldn't change anything and
+distributed tracing should continue to work seamlessly.
+
+In some rare cases it's possible that some of the services involved in a trace
+are not instrumented by Datadog at all which can cause spans within the trace to
+become disconnected. While the data would still be available in the UI, the
+relationship between spans would no longer be visible. This can be addressed by
+restoring the previous behaviour using
+`DD_TRACE_PROPAGATION_STYLE='datadog,tracecontext'`.
+
 ## 2.0 to 3.0
 
 ### Node 12 is no longer supported

package/README.md

@@ -1,6 +1,7 @@
 # `dd-trace`: Node.js APM Tracer Library
 
-[![npm v3](https://img.shields.io/npm/v/dd-trace/latest?color=blue&label=dd-trace%40v3&logo=npm)](https://www.npmjs.com/package/dd-trace)
+[![npm v4](https://img.shields.io/npm/v/dd-trace/latest?color=blue&label=dd-trace%40v4&logo=npm)](https://www.npmjs.com/package/dd-trace)
+[![npm v3](https://img.shields.io/npm/v/dd-trace/latest-node14?color=blue&label=dd-trace%40v3&logo=npm)](https://www.npmjs.com/package/dd-trace/v/latest-node12)
 [![npm v2](https://img.shields.io/npm/v/dd-trace/latest-node12?color=blue&label=dd-trace%40v2&logo=npm)](https://www.npmjs.com/package/dd-trace/v/latest-node12)
 [![npm dev](https://img.shields.io/npm/v/dd-trace/dev?color=orange&label=dd-trace%40dev&logo=npm)](https://www.npmjs.com/package/dd-trace/v/dev)
 [![codecov](https://codecov.io/gh/DataDog/dd-trace-js/branch/master/graph/badge.svg)](https://codecov.io/gh/DataDog/dd-trace-js)
@@ -28,27 +29,28 @@ Most of the documentation for `dd-trace` is available on these webpages:
 | :---:                                                    | :---:                                                                                                  | :---:    | :---:           | :---:          | :---:       |
 | [`v1`](https://github.com/DataDog/dd-trace-js/tree/v1.x) | ![npm v1](https://img.shields.io/npm/v/dd-trace/legacy-v1?color=white&label=%20&style=flat-square)     | `>= v12` | **End of Life** | 2021-07-13     | 2022-02-25  |
 | [`v2`](https://github.com/DataDog/dd-trace-js/tree/v2.x) | ![npm v2](https://img.shields.io/npm/v/dd-trace/latest-node12?color=white&label=%20&style=flat-square) | `>= v12` | **Maintenance** | 2022-01-28     | 2023-08-15  |
-| [`v3`](https://github.com/DataDog/dd-trace-js/tree/v3.x) | ![npm v3](https://img.shields.io/npm/v/dd-trace/latest?color=white&label=%20&style=flat-square)        | `>= v14` | **Current**     | 2022-08-15     | Unknown     |
+| [`v3`](https://github.com/DataDog/dd-trace-js/tree/v3.x) | ![npm v3](https://img.shields.io/npm/v/dd-trace/latest-node14?color=white&label=%20&style=flat-square) | `>= v14` | **Maintenance** | 2022-08-15     | 2024-05-15  |
+| [`v4`](https://github.com/DataDog/dd-trace-js/tree/v4.x) | ![npm v4](https://img.shields.io/npm/v/dd-trace/latest?color=white&label=%20&style=flat-square)        | `>= v16` | **Current**     | 2023-05-12     | Unknown     |
 
-We currently maintain two release lines, namely `v2` and `v3`.
-Features and bug fixes that are merged are released to the `v3` line and, if appropriate, also the `v2` line.
+We currently maintain three release lines, namely `v2`, `v3` and `v4`.
+Features and bug fixes that are merged are released to the `v4` line and, if appropriate, also the `v2` and `v3` line.
 
-For any new projects it is recommended to use the `v3` release line:
+For any new projects it is recommended to use the `v4` release line:
 
 ```sh
 $ npm install dd-trace
 $ yarn add dd-trace
 ```
 
-However, existing projects that already use the `v2` release line, or projects that need to support Node.js v12, may use the `v2` release line.
+However, existing projects that already use the `v2` or `v3` release lines, or projects that need to support EOL versions of Node.js, may continue to use these release lines.
 This is done by specifying the version when installing the package.
-Note that we also publish to npm using a `latest-node12` tag that can also be used for install:
+Note that we also publish to npm using a `latest-node12` and `latest-node14` tag that can also be used for install:
 
 ```sh
-$ npm install dd-trace@2
-$ yarn add dd-trace@2
-$ npm install dd-trace@latest-node12
-$ yarn add dd-trace@latest-node12
+$ npm install dd-trace@3
+$ yarn add dd-trace@3
+$ npm install dd-trace@latest-node14
+$ yarn add dd-trace@latest-node14
 ```
 
 Any backwards-breaking functionality that is introduced into the library will result in an increase of the major version of the library and therefore a new release line.
@@ -153,6 +155,11 @@ $ yarn lint
 
 ### Experimental ESM Support
 
+> **Warning**
+> 
+> ESM support has been temporarily disabled starting from Node 20 as significant
+> changes are in progress.
+
 ESM support is currently in the experimental stages, while CJS has been supported
 since inception. This means that code loaded using `require()` should work fine
 but code loaded using `import` might not always work.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "4.0.0",
+  "version": "5.0.0-pre-ca96946",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",

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/jest.js

@@ -1,10 +1,8 @@
 '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,
@@ -18,6 +16,7 @@ const {
   getJestTestName,
   getJestSuitesToRun
 } = require('../../datadog-plugin-jest/src/util')
+const { DD_MAJOR } = require('../../../version')
 
 const testSessionStartCh = channel('ci:jest:session:start')
 const testSessionFinishCh = channel('ci:jest:session:finish')
@@ -481,7 +480,7 @@ function jasmineAsyncInstallWraper (jasmineAsyncInstallExport, jestVersion) {
   }
 }
 
-if (semver.lt(ddTraceVersion, '4.0.0')) {
+if (DD_MAJOR < 4) {
   addHook({
     name: 'jest-jasmine2',
     versions: ['>=24.8.0'],

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

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

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

@@ -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
       }
 

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

@@ -17,7 +17,9 @@ const {
   TEST_COMMAND,
   TEST_MODULE,
   TEST_SOURCE_START,
-  finishAllTraceSpans
+  finishAllTraceSpans,
+  getCoveredFilenamesFromCoverage,
+  getTestSuitePath
 } = require('../../dd-trace/src/plugins/util/test')
 
 const TEST_FRAMEWORK_NAME = 'cypress'
@@ -52,6 +54,13 @@ function getCypressVersion (details) {
   return ''
 }
 
+function getRootDir (details) {
+  if (details && details.config) {
+    return details.config.repoRoot || details.config.projectRoot || process.cwd()
+  }
+  return process.cwd()
+}
+
 function getCypressCommand (details) {
   if (!details) {
     return TEST_FRAMEWORK_NAME
@@ -91,10 +100,12 @@ module.exports = (on, config) => {
   let testSuiteSpan = null
   let command = null
   let frameworkVersion
+  let rootDir
 
   on('before:run', (details) => {
     const childOf = getTestParentSpan(tracer)
 
+    rootDir = getRootDir(details)
     command = getCypressCommand(details)
     frameworkVersion = getCypressVersion(details)
 
@@ -132,9 +143,15 @@ module.exports = (on, config) => {
     }
 
     return new Promise(resolve => {
-      tracer._tracer._exporter._writer.flush(() => {
-        resolve(null)
-      })
+      if (tracer._tracer._exporter.flush) {
+        tracer._tracer._exporter.flush(() => {
+          resolve(null)
+        })
+      } else {
+        tracer._tracer._exporter._writer.flush(() => {
+          resolve(null)
+        })
+      }
     })
   })
   on('task', {
@@ -153,9 +170,9 @@ module.exports = (on, config) => {
       })
       return null
     },
-    'dd:testSuiteFinish': (suiteStats) => {
+    'dd:testSuiteFinish': (stats) => {
       if (testSuiteSpan) {
-        const status = getSuiteStatus(suiteStats)
+        const status = getSuiteStatus(stats)
         testSuiteSpan.setTag(TEST_STATUS, status)
         testSuiteSpan.finish()
         testSuiteSpan = null
@@ -204,9 +221,22 @@ module.exports = (on, config) => {
       }
       return activeSpan ? activeSpan.context().toTraceId() : null
     },
-    'dd:afterEach': (test) => {
+    'dd:afterEach': ({ test, coverage }) => {
       const { state, error, isRUMActive, testSourceLine } = test
       if (activeSpan) {
+        if (coverage && tracer._tracer._exporter.exportCoverage) {
+          const coverageFiles = getCoveredFilenamesFromCoverage(coverage)
+          const relativeCoverageFiles = coverageFiles.map(file => getTestSuitePath(file, rootDir))
+          const { _traceId, _spanId } = testSuiteSpan.context()
+          const formattedCoverage = {
+            sessionId: _traceId,
+            suiteId: _spanId,
+            testId: activeSpan.context()._spanId,
+            files: relativeCoverageFiles
+          }
+          tracer._tracer._exporter.exportCoverage(formattedCoverage)
+        }
+
         activeSpan.setTag(TEST_STATUS, CYPRESS_STATUS_TO_TEST_STATUS[state])
         if (error) {
           activeSpan.setTag('error', error)

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

@@ -36,6 +36,6 @@ afterEach(() => {
     if (win.DD_RUM) {
       testInfo.isRUMActive = true
     }
-    cy.task('dd:afterEach', testInfo)
+    cy.task('dd:afterEach', { test: testInfo, coverage: win.__coverage__ })
   })
 })

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

@@ -118,8 +118,8 @@ class JestPlugin extends CiPlugin {
 
     this.addSub('ci:jest:worker-report:coverage', data => {
       const formattedCoverages = JSON.parse(data).map(coverage => ({
-        traceId: id(coverage.traceId),
-        spanId: id(coverage.spanId),
+        sessionId: id(coverage.sessionId),
+        suiteId: id(coverage.suiteId),
         files: coverage.files
       }))
       formattedCoverages.forEach(formattedCoverage => {
@@ -150,9 +150,10 @@ class JestPlugin extends CiPlugin {
      * fetching the ITR config.
      */
     this.addSub('ci:jest:test-suite:code-coverage', (coverageFiles) => {
+      const { _traceId, _spanId } = this.testSuiteSpan.context()
       const formattedCoverage = {
-        traceId: this.testSuiteSpan.context()._traceId,
-        spanId: this.testSuiteSpan.context()._spanId,
+        sessionId: _traceId,
+        suiteId: _spanId,
         files: coverageFiles
       }
       this.tracer._exporter.exportCoverage(formattedCoverage)

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

@@ -8,12 +8,9 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
 
   start ({ topic, partition, message }) {
     const childOf = extract(this.tracer, message.headers)
-
-    this.startSpan('kafka.consume', {
+    this.startSpan({
       childOf,
-      service: this.config.service || `${this.tracer._service}-kafka`,
       resource: topic,
-      kind: 'consumer',
       type: 'worker',
       meta: {
         'component': 'kafkajs',

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

@@ -7,10 +7,8 @@ class KafkajsProducerPlugin extends ProducerPlugin {
   static get operation () { return 'produce' }
 
   start ({ topic, messages }) {
-    const span = this.startSpan('kafka.produce', {
-      service: this.config.service || `${this.tracer._service}-kafka`,
+    const span = this.startSpan({
       resource: topic,
-      kind: 'producer',
       meta: {
         'component': 'kafkajs',
         'kafka.topic': topic

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

@@ -36,9 +36,11 @@ class MochaPlugin extends CiPlugin {
       const relativeCoverageFiles = [...coverageFiles, suiteFile]
         .map(filename => getTestSuitePath(filename, this.sourceRoot))
 
+      const { _traceId, _spanId } = testSuiteSpan.context()
+
       const formattedCoverage = {
-        traceId: testSuiteSpan.context()._traceId,
-        spanId: testSuiteSpan.context()._spanId,
+        sessionId: _traceId,
+        suiteId: _spanId,
         files: relativeCoverageFiles
       }
 

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

@@ -19,12 +19,10 @@ class RheaConsumerPlugin extends ConsumerPlugin {
     const name = getResourceNameFromMessage(msgObj)
     const childOf = extractTextMap(msgObj, this.tracer)
 
-    this.startSpan('amqp.receive', {
+    this.startSpan({
       childOf,
-      service: this.config.service,
       resource: name,
       type: 'worker',
-      kind: 'consumer',
       meta: {
         'component': 'rhea',
         'amqp.link.source.address': name,

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

@@ -9,17 +9,13 @@ class RheaProducerPlugin extends ProducerPlugin {
 
   constructor (...args) {
     super(...args)
-
     this.addTraceSub('encode', this.encode.bind(this))
   }
 
   start ({ targetAddress, host, port }) {
     const name = targetAddress || 'amq.topic'
-
-    this.startSpan('amqp.send', {
-      service: this.config.service || `${this.tracer._service}-amqp-producer`,
+    this.startSpan({
       resource: name,
-      kind: 'producer',
       meta: {
         'component': 'rhea',
         'amqp.link.target.address': name,

package/packages/dd-trace/src/appsec/iast/analyzers/path-traversal-analyzer.js

@@ -6,10 +6,14 @@ const { storage } = require('../../../../../datadog-core')
 const InjectionAnalyzer = require('./injection-analyzer')
 const { PATH_TRAVERSAL } = require('../vulnerabilities')
 
+const ignoredOperations = ['dir.close', 'close']
+
 class PathTraversalAnalyzer extends InjectionAnalyzer {
   constructor () {
     super(PATH_TRAVERSAL)
     this.addSub('apm:fs:operation:start', obj => {
+      if (ignoredOperations.includes(obj.operation)) return
+
       const pathArguments = []
       if (obj.dest) {
         pathArguments.push(obj.dest)

package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-handler.js

@@ -102,7 +102,7 @@ class SensitiveHandler {
             if (entry.start === i) {
               nextSensitive = entry
             } else {
-              sensitive.push(entry)
+              sensitive.unshift(entry)
             }
           }
         }

package/packages/dd-trace/src/ci-visibility/exporters/agentless/coverage-writer.js

@@ -1,16 +1,11 @@
 'use strict'
 const request = require('../../../exporters/common/request')
 const log = require('../../../log')
+const { safeJSONStringify } = require('../../../exporters/common/util')
 
 const { CoverageCIVisibilityEncoder } = require('../../../encode/coverage-ci-visibility')
 const BaseWriter = require('../../../exporters/common/writer')
 
-function safeJSONStringify (value) {
-  return JSON.stringify(value, (key, value) =>
-    key !== 'dd-api-key' ? value : undefined
-  )
-}
-
 class Writer extends BaseWriter {
   constructor ({ url, evpProxyPrefix = '' }) {
     super(...arguments)
@@ -34,7 +29,7 @@ class Writer extends BaseWriter {
     if (this._evpProxyPrefix) {
       options.path = `${this._evpProxyPrefix}/api/v2/citestcov`
       delete options.headers['dd-api-key']
-      options.headers['X-Datadog-EVP-Subdomain'] = 'event-platform-intake'
+      options.headers['X-Datadog-EVP-Subdomain'] = 'citestcov-intake'
     }
 
     log.debug(() => `Request to the intake: ${safeJSONStringify(options)}`)

package/packages/dd-trace/src/ci-visibility/exporters/agentless/index.js

@@ -17,7 +17,7 @@ class AgentlessCiVisibilityExporter extends CiVisibilityExporter {
     this._url = url || new URL(`https://citestcycle-intake.${site}`)
     this._writer = new Writer({ url: this._url, tags })
 
-    this._coverageUrl = url || new URL(`https://event-platform-intake.${site}`)
+    this._coverageUrl = url || new URL(`https://citestcov-intake.${site}`)
     this._coverageWriter = new CoverageWriter({ url: this._coverageUrl })
 
     this._apiUrl = url || new URL(`https://api.${site}`)

package/packages/dd-trace/src/ci-visibility/exporters/agentless/writer.js

@@ -1,16 +1,11 @@
 'use strict'
 const request = require('../../../exporters/common/request')
+const { safeJSONStringify } = require('../../../exporters/common/util')
 const log = require('../../../log')
 
 const { AgentlessCiVisibilityEncoder } = require('../../../encode/agentless-ci-visibility')
 const BaseWriter = require('../../../exporters/common/writer')
 
-function safeJSONStringify (value) {
-  return JSON.stringify(value, (key, value) =>
-    key !== 'dd-api-key' ? value : undefined
-  )
-}
-
 class Writer extends BaseWriter {
   constructor ({ url, tags, evpProxyPrefix = '' }) {
     super(...arguments)

package/packages/dd-trace/src/config.js

@@ -36,6 +36,22 @@ function safeJsonParse (input) {
   }
 }
 
+const namingVersions = ['v0', 'v1']
+const defaultNamingVersion = 'v0'
+
+function validateNamingVersion (versionString) {
+  if (!versionString) {
+    return defaultNamingVersion
+  }
+  if (!namingVersions.includes(versionString)) {
+    log.warn(
+      `Unexpected input for config.spanAttributeSchema, picked default ${defaultNamingVersion}`
+    )
+    return defaultNamingVersion
+  }
+  return versionString
+}
+
 // Shallow clone with property name remapping
 function remapify (input, mappings) {
   if (!input) return
@@ -273,7 +289,9 @@ class Config {
       process.env.DD_TRACE_EXPERIMENTAL_GET_RUM_DATA_ENABLED,
       false
     )
-
+    const DD_TRACE_SPAN_ATTRIBUTE_SCHEMA = validateNamingVersion(
+      process.env.DD_TRACE_SPAN_ATTRIBUTE_SCHEMA
+    )
     const DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH = coalesce(
       process.env.DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH,
       '512'
@@ -489,6 +507,7 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
       sourceMap: !isFalse(DD_PROFILING_SOURCE_MAP),
       exporters: DD_PROFILING_EXPORTERS
     }
+    this.spanAttributeSchema = DD_TRACE_SPAN_ATTRIBUTE_SCHEMA
     this.lookup = options.lookup
     this.startupLogs = isTrue(DD_TRACE_STARTUP_LOGS)
     // Disabled for CI Visibility's agentless

package/packages/dd-trace/src/encode/coverage-ci-visibility.js

@@ -26,11 +26,19 @@ class CoverageCIVisibilityEncoder extends AgentEncoder {
   }
 
   encodeCodeCoverage (bytes, coverage) {
-    this._encodeMapPrefix(bytes, 3)
+    if (coverage.testId) {
+      this._encodeMapPrefix(bytes, 4)
+    } else {
+      this._encodeMapPrefix(bytes, 3)
+    }
     this._encodeString(bytes, 'test_session_id')
-    this._encodeId(bytes, coverage.traceId)
+    this._encodeId(bytes, coverage.sessionId)
     this._encodeString(bytes, 'test_suite_id')
-    this._encodeId(bytes, coverage.spanId)
+    this._encodeId(bytes, coverage.suiteId)
+    if (coverage.testId) {
+      this._encodeString(bytes, 'span_id')
+      this._encodeId(bytes, coverage.testId)
+    }
     this._encodeString(bytes, 'files')
     this._encodeArrayPrefix(bytes, coverage.files)
     for (const filename of coverage.files) {

package/packages/dd-trace/src/exporters/common/util.js

@@ -0,0 +1,9 @@
+function safeJSONStringify (value) {
+  return JSON.stringify(
+    value,
+    (key, value) => key !== 'dd-api-key' ? value : undefined,
+    process.env.DD_TRACE_BEAUTIFUL_LOGS ? 2 : undefined
+  )
+}
+
+module.exports = { safeJSONStringify }

package/packages/dd-trace/src/exporters/common/writer.js

@@ -2,6 +2,7 @@
 
 const request = require('./request')
 const log = require('../../log')
+const { safeJSONStringify } = require('./util')
 
 class Writer {
   constructor ({ url }) {
@@ -25,11 +26,11 @@ class Writer {
 
   append (payload) {
     if (!request.writable) {
-      log.debug(() => `Maximum number of active requests reached. Payload discarded: ${JSON.stringify(payload)}`)
+      log.debug(() => `Maximum number of active requests reached. Payload discarded: ${safeJSONStringify(payload)}`)
       return
     }
 
-    log.debug(() => `Encoding payload: ${JSON.stringify(payload)}`)
+    log.debug(() => `Encoding payload: ${safeJSONStringify(payload)}`)
 
     this._encode(payload)
   }

package/packages/dd-trace/src/plugin_manager.js

@@ -4,6 +4,7 @@ const { channel } = require('../../diagnostics_channel')
 const { isFalse } = require('./util')
 const plugins = require('./plugins')
 const log = require('./log')
+const Nomenclature = require('./service-naming')
 
 const loadChannel = channel('dd-trace:instrumentation:load')
 
@@ -96,6 +97,7 @@ module.exports = class PluginManager {
   // like instrumenter.enable()
   configure (config = {}) {
     this._tracerConfig = config
+    Nomenclature.configure(config)
 
     for (const name in pluginClasses) {
       this.loadPlugin(name)

package/packages/dd-trace/src/plugins/client.js

@@ -1,9 +1,10 @@
 'use strict'
 
-const OutgoingPlugin = require('./outgoing')
+const OutboundPlugin = require('./outbound')
 
-class ClientPlugin extends OutgoingPlugin {
+class ClientPlugin extends OutboundPlugin {
   static get operation () { return 'request' }
+  static get kind () { return 'client' }
 }
 
 module.exports = ClientPlugin

package/packages/dd-trace/src/plugins/consumer.js

@@ -1,9 +1,21 @@
 'use strict'
 
-const IncomingPlugin = require('./incoming')
+const InboundPlugin = require('./inbound')
 
-class ConsumerPlugin extends IncomingPlugin {
+class ConsumerPlugin extends InboundPlugin {
   static get operation () { return 'receive' }
+  static get kind () { return 'consumer' }
+  static get type () { return 'messaging' }
+
+  startSpan (options) {
+    if (!options.service) {
+      options.service = this.config.service || this.serviceName()
+    }
+    if (!options.kind) {
+      options.kind = this.constructor.kind
+    }
+    return super.startSpan(this.operationName(), options)
+  }
 }
 
 module.exports = ConsumerPlugin

package/packages/dd-trace/src/plugins/inbound.js

@@ -0,0 +1,7 @@
+'use strict'
+
+const TracingPlugin = require('./tracing')
+
+class InboundPlugin extends TracingPlugin {}
+
+module.exports = InboundPlugin

package/packages/dd-trace/src/plugins/{outgoing.js → outbound.js}

@@ -4,7 +4,7 @@ const { CLIENT_PORT_KEY } = require('../constants')
 const TracingPlugin = require('./tracing')
 
 // TODO: Exit span on finish when AsyncResource instances are removed.
-class OutgoingPlugin extends TracingPlugin {
+class OutboundPlugin extends TracingPlugin {
   constructor (...args) {
     super(...args)
 
@@ -29,4 +29,4 @@ class OutgoingPlugin extends TracingPlugin {
   }
 }
 
-module.exports = OutgoingPlugin
+module.exports = OutboundPlugin

package/packages/dd-trace/src/plugins/producer.js

@@ -1,9 +1,26 @@
 'use strict'
 
-const OutgoingPlugin = require('./outgoing')
+const OutboundPlugin = require('./outbound')
 
-class ProducerPlugin extends OutgoingPlugin {
+class ProducerPlugin extends OutboundPlugin {
   static get operation () { return 'publish' }
+  static get kind () { return 'producer' }
+  static get type () { return 'messaging' }
+
+  startSpan (options) {
+    const spanDefaults = {
+      kind: this.constructor.kind
+    }
+    if (!options.service) {
+      options.service = this.config.service || this.serviceName()
+    }
+    Object.keys(spanDefaults).forEach(
+      key => {
+        if (!options[key]) options[key] = spanDefaults[key]
+      }
+    )
+    return super.startSpan(this.operationName(), options)
+  }
 }
 
 module.exports = ProducerPlugin

package/packages/dd-trace/src/plugins/server.js

@@ -1,8 +1,8 @@
 'use strict'
 
-const IncomingPlugin = require('./incoming')
+const InboundPlugin = require('./inbound')
 
-class ServerPlugin extends IncomingPlugin {
+class ServerPlugin extends InboundPlugin {
   static get operation () { return 'request' }
 }
 

package/packages/dd-trace/src/plugins/tracing.js

@@ -4,6 +4,7 @@ const Plugin = require('./plugin')
 const { storage } = require('../../../datadog-core')
 const analyticsSampler = require('../analytics_sampler')
 const { COMPONENT } = require('../constants')
+const Nomenclature = require('../service-naming')
 
 class TracingPlugin extends Plugin {
   constructor (...args) {
@@ -31,6 +32,16 @@ class TracingPlugin extends Plugin {
     return store && store.span
   }
 
+  serviceName (serviceArgs) {
+    const { type, id, kind } = this.constructor
+    return Nomenclature.serviceName(type, kind, id, serviceArgs)
+  }
+
+  operationName (opNameArgs) {
+    const { type, id, kind } = this.constructor
+    return Nomenclature.opName(type, kind, id, opNameArgs)
+  }
+
   configure (config) {
     return super.configure({
       ...config,

package/packages/dd-trace/src/profiling/config.js

@@ -91,8 +91,10 @@ class Config {
       Number(DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE), 0)
     const maxHeapExtensionCount = coalesce(options.oomMaxHeapExtensionCount,
       Number(DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT), 0)
-    const exportStrategies = ensureOOMExportStrategies(coalesce(options.oomExportStrategies,
-      DD_PROFILING_EXPERIMENTAL_OOM_EXPORT_STRATEGIES), this)
+    const exportStrategies = oomMonitoringEnabled
+      ? ensureOOMExportStrategies(coalesce(options.oomExportStrategies, DD_PROFILING_EXPERIMENTAL_OOM_EXPORT_STRATEGIES,
+        [oomExportStrategies.PROCESS]), this)
+      : []
     const exportCommand = oomMonitoringEnabled ? buildExportCommand(this) : undefined
     this.oomMonitoring = {
       enabled: oomMonitoringEnabled,

package/packages/dd-trace/src/service-naming/index.js

@@ -0,0 +1,38 @@
+const { schemaDefinitions } = require('./schemas')
+
+const kindMap = {
+  messaging: {
+    client: 'controlPlane',
+    consumer: 'inbound',
+    producer: 'outbound'
+  }
+}
+
+class SchemaManager {
+  constructor () {
+    this.schemas = schemaDefinitions
+    this.config = { spanAttributeSchema: 'v0' }
+  }
+
+  get schema () {
+    return this.schemas[this.version]
+  }
+
+  get version () {
+    return this.config.spanAttributeSchema
+  }
+
+  opName (type, kind, plugin, opNameArgs) {
+    return this.schema.getOpName(type, kindMap[type][kind], plugin, opNameArgs)
+  }
+
+  serviceName (type, kind, plugin, serviceNameArgs) {
+    return this.schema.getServiceName(type, kindMap[type][kind], plugin, this.config.service, serviceNameArgs)
+  }
+
+  configure (config = {}) {
+    this.config = config
+  }
+}
+
+module.exports = new SchemaManager()

package/packages/dd-trace/src/service-naming/schemas/definition.js

@@ -0,0 +1,24 @@
+class SchemaDefinition {
+  constructor (schema) {
+    this.schema = schema
+  }
+
+  getSchemaItem (type, subType, plugin) {
+    const schema = this.schema
+    if (schema && schema[type] && schema[type][subType] && schema[type][subType][plugin]) {
+      return schema[type][subType][plugin]
+    }
+  }
+
+  getOpName (type, subType, plugin, opNameArgs) {
+    const item = this.getSchemaItem(type, subType, plugin)
+    return item.opName(opNameArgs)
+  }
+
+  getServiceName (type, subType, plugin, service, serviceNameArgs) {
+    const item = this.getSchemaItem(type, subType, plugin)
+    return item.serviceName(service, serviceNameArgs)
+  }
+}
+
+module.exports = SchemaDefinition

package/packages/dd-trace/src/service-naming/schemas/index.js

@@ -0,0 +1,6 @@
+const v0 = require('./v0')
+const v1 = require('./v1')
+
+module.exports = {
+  schemaDefinitions: { v0, v1 }
+}

package/packages/dd-trace/src/service-naming/schemas/v0.js

@@ -0,0 +1,66 @@
+const SchemaDefinition = require('./definition')
+
+function amqpServiceName (service) {
+  return `${service}-amqp`
+}
+
+const schema = {
+  messaging: {
+    outbound: {
+      amqplib: {
+        opName: () => 'amqp.command',
+        serviceName: amqpServiceName
+      },
+      amqp10: {
+        opName: () => 'amqp.send',
+        serviceName: amqpServiceName
+      },
+      'google-cloud-pubsub': {
+        opName: () => 'pubsub.request',
+        serviceName: service => `${service}-pubsub`
+      },
+      kafkajs: {
+        opName: () => 'kafka.produce',
+        serviceName: service => `${service}-kafka`
+      },
+      rhea: {
+        opName: () => 'amqp.send',
+        serviceName: service => `${service}-amqp-producer`
+      }
+    },
+    inbound: {
+      amqplib: {
+        opName: () => 'amqp.command',
+        serviceName: amqpServiceName
+      },
+      amqp10: {
+        opName: () => 'amqp.receive',
+        serviceName: amqpServiceName
+      },
+      'google-cloud-pubsub': {
+        opName: () => 'pubsub.receive',
+        serviceName: service => service
+      },
+      kafkajs: {
+        opName: () => 'kafka.consume',
+        serviceName: service => `${service}-kafka`
+      },
+      rhea: {
+        opName: () => 'amqp.receive',
+        serviceName: service => service
+      }
+    },
+    controlPlane: {
+      amqplib: {
+        opName: () => 'amqp.command',
+        serviceName: amqpServiceName
+      },
+      'google-cloud-pubsub': {
+        opName: () => 'pubsub.request',
+        serviceName: service => `${service}-pubsub`
+      }
+    }
+  }
+}
+
+module.exports = new SchemaDefinition(schema)

package/packages/dd-trace/src/service-naming/schemas/v1.js

@@ -0,0 +1,58 @@
+const SchemaDefinition = require('./definition')
+
+function identityService (service) {
+  return service
+}
+
+const amqpInbound = {
+  opName: () => 'amqp.process',
+  serviceName: identityService
+}
+
+const amqpOutbound = {
+  opName: () => 'amqp.send',
+  serviceName: identityService
+}
+
+const schema = {
+  messaging: {
+    outbound: {
+      amqplib: amqpOutbound,
+      amqp10: amqpOutbound,
+      'google-cloud-pubsub': {
+        opName: () => 'gcp.pubsub.send',
+        serviceName: identityService
+      },
+      kafkajs: {
+        opName: () => 'kafka.send',
+        serviceName: identityService
+      },
+      rhea: amqpOutbound
+    },
+    inbound: {
+      amqplib: amqpInbound,
+      amqp10: amqpInbound,
+      'google-cloud-pubsub': {
+        opName: () => 'gcp.pubsub.process',
+        serviceName: identityService
+      },
+      kafkajs: {
+        opName: () => 'kafka.process',
+        serviceName: identityService
+      },
+      rhea: amqpInbound
+    },
+    controlPlane: {
+      amqplib: {
+        opName: () => 'amqp.command',
+        serviceName: identityService
+      },
+      'google-cloud-pubsub': {
+        opName: () => 'gcp.pubsub.request',
+        serviceName: identityService
+      }
+    }
+  }
+}
+
+module.exports = new SchemaDefinition(schema)

package/packages/dd-trace/src/tracer.js

@@ -7,7 +7,7 @@ const { storage } = require('../../datadog-core')
 const { isError } = require('./util')
 const { setStartupLogConfig } = require('./startup-log')
 const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants')
-const { MAJOR } = require('../../../version')
+const { DD_MAJOR } = require('../../../version')
 
 const SPAN_TYPE = tags.SPAN_TYPE
 const RESOURCE_NAME = tags.RESOURCE_NAME
@@ -27,7 +27,7 @@ class DatadogTracer extends Tracer {
       childOf: this.scope().active()
     }, options)
 
-    if (!options.childOf && options.orphanable === false && MAJOR < 4) {
+    if (!options.childOf && options.orphanable === false && DD_MAJOR < 4) {
       return fn(null, () => {})
     }
 
@@ -82,7 +82,7 @@ class DatadogTracer extends Tracer {
         optionsObj = optionsObj.apply(this, arguments)
       }
 
-      if (optionsObj && optionsObj.orphanable === false && !tracer.scope().active() && MAJOR < 4) {
+      if (optionsObj && optionsObj.orphanable === false && !tracer.scope().active() && DD_MAJOR < 4) {
         return fn.apply(this, arguments)
       }
 

package/version.js

@@ -1,9 +1,13 @@
 'use strict'
 
-const matches = require('./package.json').version.match(/^(\d+)\.(\d+)\.(\d+)/)
+const ddMatches = require('./package.json').version.match(/^(\d+)\.(\d+)\.(\d+)/)
+const nodeMatches = process.versions.node.match(/^(\d+)\.(\d+)\.(\d+)/)
 
 module.exports = {
-  MAJOR: parseInt(matches[1]),
-  MINOR: parseInt(matches[2]),
-  PATCH: parseInt(matches[3])
+  DD_MAJOR: parseInt(ddMatches[1]),
+  DD_MINOR: parseInt(ddMatches[2]),
+  DD_PATCH: parseInt(ddMatches[3]),
+  NODE_MAJOR: parseInt(nodeMatches[1]),
+  NODE_MINOR: parseInt(nodeMatches[2]),
+  NODE_PATCH: parseInt(nodeMatches[3])
 }

package/packages/dd-trace/src/plugins/incoming.js

@@ -1,7 +0,0 @@
-'use strict'
-
-const TracingPlugin = require('./tracing')
-
-class IncomingPlugin extends TracingPlugin {}
-
-module.exports = IncomingPlugin