dd-trace 4.0.0-pre-5d09d34 → 4.0.0-pre-2e8aecc

package/index.d.ts

@@ -221,6 +221,21 @@ export declare interface SpanSamplingRule {
   name?: string
 }
 
+/**
+ * Selection and priority order of context propagation injection and extraction mechanisms.
+ */
+export declare interface PropagationStyle {
+  /**
+   * Selection of context propagation injection mechanisms.
+   */
+  inject: string[],
+
+  /**
+   * Selection and priority order of context propagation extraction mechanisms.
+   */
+  extract: string[]
+}
+
 /**
  * List of options available to the tracer.
  */
@@ -550,6 +565,11 @@ export declare interface TracerOptions {
    * Custom header name to source the http.client_ip tag from.
    */
   clientIpHeader?: string,
+
+  /**
+   * The selection and priority order of context propagation injection and extraction mechanisms.
+   */
+  propagationStyle?: string[] | PropagationStyle
 }
 
 /**

package/package.json

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

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

@@ -3,15 +3,35 @@
 const { addHook, channel, AsyncResource } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 
-const runStartCh = channel('ci:cucumber:run:start')
-const runFinishCh = channel('ci:cucumber:run:finish')
-const runStepStartCh = channel('ci:cucumber:run-step:start')
+const testStartCh = channel('ci:cucumber:test:start')
+const testFinishCh = channel('ci:cucumber:test:finish') // used for test steps too
+
+const testStepStartCh = channel('ci:cucumber:test-step:start')
+
 const errorCh = channel('ci:cucumber:error')
+
+const testSuiteStartCh = channel('ci:cucumber:test-suite:start')
+const testSuiteFinishCh = channel('ci:cucumber:test-suite:finish')
+
+const sessionStartCh = channel('ci:cucumber:session:start')
 const sessionFinishCh = channel('ci:cucumber:session:finish')
 
 // TODO: remove in a later major version
 const patched = new WeakSet()
 
+let pickleByFile = {}
+const pickleResultByFile = {}
+
+function getSuiteStatusFromTestStatuses (testStatuses) {
+  if (testStatuses.some(status => status === 'fail')) {
+    return 'fail'
+  }
+  if (testStatuses.every(status => status === 'skip')) {
+    return 'skip'
+  }
+  return 'pass'
+}
+
 function getStatusFromResult (result) {
   if (result.status === 1) {
     return { status: 'pass' }
@@ -44,13 +64,18 @@ function wrapRun (pl, isLatestVersion) {
   patched.add(pl)
 
   shimmer.wrap(pl.prototype, 'run', run => function () {
-    if (!runStartCh.hasSubscribers) {
+    if (!testStartCh.hasSubscribers) {
       return run.apply(this, arguments)
     }
 
     const asyncResource = new AsyncResource('bound-anonymous-fn')
     return asyncResource.runInAsyncScope(() => {
-      runStartCh.publish({ testName: this.pickle.name, fullTestSuite: this.pickle.uri })
+      const testSuiteFullPath = this.pickle.uri
+
+      if (!pickleResultByFile[testSuiteFullPath]) { // first test in suite
+        testSuiteStartCh.publish(testSuiteFullPath)
+      }
+      testStartCh.publish({ testName: this.pickle.name, fullTestSuite: testSuiteFullPath })
       try {
         const promise = run.apply(this, arguments)
         promise.finally(() => {
@@ -58,7 +83,17 @@ function wrapRun (pl, isLatestVersion) {
           const { status, skipReason, errorMessage } = isLatestVersion
             ? getStatusFromResultLatest(result) : getStatusFromResult(result)
 
-          runFinishCh.publish({ status, skipReason, errorMessage })
+          if (!pickleResultByFile[testSuiteFullPath]) {
+            pickleResultByFile[testSuiteFullPath] = [status]
+          } else {
+            pickleResultByFile[testSuiteFullPath].push(status)
+          }
+          // last test in suite
+          if (pickleResultByFile[testSuiteFullPath].length === pickleByFile[testSuiteFullPath].length) {
+            const testSuiteStatus = getSuiteStatusFromTestStatuses(pickleResultByFile[testSuiteFullPath])
+            testSuiteFinishCh.publish(testSuiteStatus)
+          }
+          testFinishCh.publish({ status, skipReason, errorMessage })
         })
         return promise
       } catch (err) {
@@ -68,7 +103,7 @@ function wrapRun (pl, isLatestVersion) {
     })
   })
   shimmer.wrap(pl.prototype, 'runStep', runStep => function () {
-    if (!runStepStartCh.hasSubscribers) {
+    if (!testStepStartCh.hasSubscribers) {
       return runStep.apply(this, arguments)
     }
     const testStep = arguments[0]
@@ -82,7 +117,7 @@ function wrapRun (pl, isLatestVersion) {
 
     const asyncResource = new AsyncResource('bound-anonymous-fn')
     return asyncResource.runInAsyncScope(() => {
-      runStepStartCh.publish({ resource })
+      testStepStartCh.publish({ resource })
       try {
         const promise = runStep.apply(this, arguments)
 
@@ -90,7 +125,7 @@ function wrapRun (pl, isLatestVersion) {
           const { status, skipReason, errorMessage } = isLatestVersion
             ? getStatusFromResultLatest(result) : getStatusFromResult(result)
 
-          runFinishCh.publish({ isStep: true, status, skipReason, errorMessage })
+          testFinishCh.publish({ isStep: true, status, skipReason, errorMessage })
         })
         return promise
       } catch (err) {
@@ -129,16 +164,40 @@ addHook({
   file: 'lib/runtime/test_case_runner.js'
 }, testCaseHook)
 
+function getPickleByFile (runtime) {
+  return runtime.pickleIds.reduce((acc, pickleId) => {
+    const test = runtime.eventDataCollector.getPickle(pickleId)
+    if (acc[test.uri]) {
+      acc[test.uri].push(test)
+    } else {
+      acc[test.uri] = [test]
+    }
+    return acc
+  }, {})
+}
+
 addHook({
   name: '@cucumber/cucumber',
   versions: ['>=7.0.0'],
   file: 'lib/runtime/index.js'
-}, (Runtime) => {
-  shimmer.wrap(Runtime.default.prototype, 'start', start => async function () {
-    const result = await start.apply(this, arguments)
-    sessionFinishCh.publish(undefined)
-    return result
+}, (runtimePackage, cucumberVersion) => {
+  shimmer.wrap(runtimePackage.default.prototype, 'start', start => async function () {
+    pickleByFile = getPickleByFile(this)
+
+    const processArgv = process.argv.slice(2).join(' ')
+    const command = process.env.npm_lifecycle_script || `cucumber-js ${processArgv}`
+
+    const asyncResource = new AsyncResource('bound-anonymous-fn')
+    asyncResource.runInAsyncScope(() => {
+      sessionStartCh.publish({ command, frameworkVersion: cucumberVersion })
+    })
+    const success = await start.apply(this, arguments)
+
+    asyncResource.runInAsyncScope(() => {
+      sessionFinishCh.publish(success ? 'pass' : 'fail')
+    })
+    return success
   })
 
-  return Runtime
+  return runtimePackage
 })

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

@@ -32,7 +32,7 @@ for (const packageName of names) {
           try {
             loadChannel.publish({ name, version, file })
 
-            moduleExports = hook(moduleExports)
+            moduleExports = hook(moduleExports, version)
           } catch (e) {
             log.error(e)
           }

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

@@ -72,7 +72,7 @@ function getTestEnvironmentOptions (config) {
   return {}
 }
 
-function getWrappedEnvironment (BaseEnvironment) {
+function getWrappedEnvironment (BaseEnvironment, jestVersion) {
   return class DatadogEnvironment extends BaseEnvironment {
     constructor (config, context) {
       super(config, context)
@@ -116,7 +116,8 @@ function getWrappedEnvironment (BaseEnvironment) {
             name: getJestTestName(event.test),
             suite: this.testSuite,
             runner: 'jest-circus',
-            testParameters
+            testParameters,
+            frameworkVersion: jestVersion
           })
           originalTestFns.set(event.test, event.test.fn)
           event.test.fn = asyncResource.bind(event.test.fn)
@@ -142,7 +143,8 @@ function getWrappedEnvironment (BaseEnvironment) {
           testSkippedCh.publish({
             name: getJestTestName(event.test),
             suite: this.testSuite,
-            runner: 'jest-circus'
+            runner: 'jest-circus',
+            frameworkVersion: jestVersion
           })
         })
       }
@@ -150,14 +152,14 @@ function getWrappedEnvironment (BaseEnvironment) {
   }
 }
 
-function getTestEnvironment (pkg) {
+function getTestEnvironment (pkg, jestVersion) {
   if (pkg.default) {
-    const wrappedTestEnvironment = getWrappedEnvironment(pkg.default)
+    const wrappedTestEnvironment = getWrappedEnvironment(pkg.default, jestVersion)
     pkg.default = wrappedTestEnvironment
     pkg.TestEnvironment = wrappedTestEnvironment
     return pkg
   }
-  return getWrappedEnvironment(pkg)
+  return getWrappedEnvironment(pkg, jestVersion)
 }
 
 addHook({
@@ -170,7 +172,7 @@ addHook({
   versions: ['>=24.8.0']
 }, getTestEnvironment)
 
-function cliWrapper (cli) {
+function cliWrapper (cli, jestVersion) {
   const wrapped = shimmer.wrap(cli, 'runCLI', runCLI => async function () {
     let onDone
     const configurationPromise = new Promise((resolve) => {
@@ -215,19 +217,9 @@ function cliWrapper (cli) {
 
     const isSuitesSkipped = !!skippableSuites.length
 
-    let testFrameworkVersion
-    try {
-      testFrameworkVersion = this.getVersion()
-    } catch (e) {
-      try {
-        testFrameworkVersion = this.default.getVersion()
-      } catch (e) {
-        // ignore errors
-      }
-    }
     const processArgv = process.argv.slice(2).join(' ')
     sessionAsyncResource.runInAsyncScope(() => {
-      testSessionStartCh.publish({ command: `jest ${processArgv}`, testFrameworkVersion })
+      testSessionStartCh.publish({ command: `jest ${processArgv}`, frameworkVersion: jestVersion })
     })
 
     const result = await runCLI.apply(this, arguments)
@@ -295,7 +287,7 @@ addHook({
   versions: ['>=24.8.0']
 }, cliWrapper)
 
-function jestAdapterWrapper (jestAdapter) {
+function jestAdapterWrapper (jestAdapter, jestVersion) {
   const adapter = jestAdapter.default ? jestAdapter.default : jestAdapter
   const newAdapter = shimmer.wrap(adapter, function () {
     const environment = arguments[2]
@@ -306,7 +298,8 @@ function jestAdapterWrapper (jestAdapter) {
     return asyncResource.runInAsyncScope(() => {
       testSuiteStartCh.publish({
         testSuite: environment.testSuite,
-        testEnvironmentOptions: environment.testEnvironmentOptions
+        testEnvironmentOptions: environment.testEnvironmentOptions,
+        frameworkVersion: jestVersion
       })
       return adapter.apply(this, arguments).then(suiteResults => {
         const { numFailingTests, skipped, failureMessage: errorMessage } = suiteResults
@@ -447,7 +440,7 @@ addHook({
   versions: ['24.8.0 - 24.9.0']
 }, jestConfigSyncWrapper)
 
-function jasmineAsyncInstallWraper (jasmineAsyncInstallExport) {
+function jasmineAsyncInstallWraper (jasmineAsyncInstallExport, jestVersion) {
   return function (globalConfig, globalInput) {
     globalInput._ddtrace = global._ddtrace
     shimmer.wrap(globalInput.jasmine.Spec.prototype, 'execute', execute => function (onComplete) {
@@ -457,7 +450,8 @@ function jasmineAsyncInstallWraper (jasmineAsyncInstallExport) {
         testStartCh.publish({
           name: this.getFullName(),
           suite: testSuite,
-          runner: 'jest-jasmine2'
+          runner: 'jest-jasmine2',
+          frameworkVersion: jestVersion
         })
         const spec = this
         const callback = asyncResource.bind(function () {

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

@@ -38,7 +38,7 @@ const testFileToSuiteAr = new Map()
 const originalCoverageMap = createCoverageMap()
 
 let suitesToSkip = []
-let mochaVersion
+let frameworkVersion
 
 function getSuitesByTestFile (root) {
   const suitesByTestFile = {}
@@ -128,7 +128,7 @@ function mochaHook (Runner) {
     this.once('start', testRunAsyncResource.bind(function () {
       const processArgv = process.argv.slice(2).join(' ')
       const command = `mocha ${processArgv}`
-      testSessionStartCh.publish({ command, frameworkVersion: mochaVersion })
+      testSessionStartCh.publish({ command, frameworkVersion })
     }))
 
     this.on('suite', function (suite) {
@@ -313,14 +313,14 @@ addHook({
   name: 'mocha',
   versions: ['>=5.2.0'],
   file: 'lib/mocha.js'
-}, (Mocha) => {
+}, (Mocha, mochaVersion) => {
+  frameworkVersion = mochaVersion
   const mochaRunAsyncResource = new AsyncResource('bound-anonymous-fn')
   /**
    * Get ITR configuration and skippable suites
    * If ITR is disabled, `onDone` is called immediately on the subscriber
    */
   shimmer.wrap(Mocha.prototype, 'run', run => function () {
-    mochaVersion = this.version
     if (!itrConfigurationCh.hasSubscribers) {
       return run.apply(this, arguments)
     }

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

@@ -181,17 +181,15 @@ function dispatcherHookNew (dispatcherExport) {
   return dispatcherExport
 }
 
-function runnerHook (runnerExport) {
+function runnerHook (runnerExport, playwrightVersion) {
   shimmer.wrap(runnerExport.Runner.prototype, 'runAllTests', runAllTests => async function () {
     const testSessionAsyncResource = new AsyncResource('bound-anonymous-fn')
-    const { version: frameworkVersion } = getPlaywrightConfig(this)
-
     const rootDir = getRootDir(this)
 
     const processArgv = process.argv.slice(2).join(' ')
     const command = `playwright ${processArgv}`
     testSessionAsyncResource.runInAsyncScope(() => {
-      testSessionStartCh.publish({ command, frameworkVersion, rootDir })
+      testSessionStartCh.publish({ command, frameworkVersion: playwrightVersion, rootDir })
     })
 
     const res = await runAllTests.apply(this, arguments)

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

@@ -7,7 +7,16 @@ const {
   TEST_SKIP_REASON,
   TEST_STATUS,
   finishAllTraceSpans,
-  getTestSuitePath
+  getTestSuitePath,
+  getTestParentSpan,
+  getTestSessionCommonTags,
+  getTestModuleCommonTags,
+  getTestSuiteCommonTags,
+  TEST_SUITE_ID,
+  TEST_MODULE_ID,
+  TEST_SESSION_ID,
+  TEST_COMMAND,
+  TEST_BUNDLE
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT, ERROR_MESSAGE } = require('../../dd-trace/src/constants')
@@ -20,21 +29,73 @@ class CucumberPlugin extends CiPlugin {
   constructor (...args) {
     super(...args)
 
-    this.addSub('ci:cucumber:session:finish', () => {
+    this.sourceRoot = process.cwd()
+
+    this.addSub('ci:cucumber:session:start', ({ command, frameworkVersion }) => {
+      const childOf = getTestParentSpan(this.tracer)
+      const testSessionSpanMetadata = getTestSessionCommonTags(command, frameworkVersion)
+
+      this.command = command
+      this.frameworkVersion = frameworkVersion
+      this.testSessionSpan = this.tracer.startSpan('cucumber.test_session', {
+        childOf,
+        tags: {
+          [COMPONENT]: this.constructor.name,
+          ...this.testEnvironmentMetadata,
+          ...testSessionSpanMetadata
+        }
+      })
+
+      const testModuleSpanMetadata = getTestModuleCommonTags(command, frameworkVersion)
+      this.testModuleSpan = this.tracer.startSpan('cucumber.test_module', {
+        childOf: this.testSessionSpan,
+        tags: {
+          [COMPONENT]: this.constructor.name,
+          ...this.testEnvironmentMetadata,
+          ...testModuleSpanMetadata
+        }
+      })
+    })
+
+    this.addSub('ci:cucumber:session:finish', (status) => {
+      this.testSessionSpan.setTag(TEST_STATUS, status)
+      this.testModuleSpan.setTag(TEST_STATUS, status)
+      this.testModuleSpan.finish()
+      this.testSessionSpan.finish()
+      finishAllTraceSpans(this.testSessionSpan)
       this.tracer._exporter.flush()
     })
 
-    this.addSub('ci:cucumber:run:start', ({ testName, fullTestSuite }) => {
-      const store = storage.getStore()
-      const childOf = store ? store.span : store
-      const testSuite = getTestSuitePath(fullTestSuite, process.cwd())
+    this.addSub('ci:cucumber:test-suite:start', (testSuiteFullPath) => {
+      const testSuiteMetadata = getTestSuiteCommonTags(
+        this.command,
+        this.frameworkVersion,
+        getTestSuitePath(testSuiteFullPath, this.sourceRoot)
+      )
+      this.testSuiteSpan = this.tracer.startSpan('cucumber.test_suite', {
+        childOf: this.testModuleSpan,
+        tags: {
+          [COMPONENT]: this.constructor.name,
+          ...this.testEnvironmentMetadata,
+          ...testSuiteMetadata
+        }
+      })
+    })
 
-      const testSpan = this.startTestSpan(testName, testSuite, childOf)
+    this.addSub('ci:cucumber:test-suite:finish', status => {
+      this.testSuiteSpan.setTag(TEST_STATUS, status)
+      this.testSuiteSpan.finish()
+    })
+
+    this.addSub('ci:cucumber:test:start', ({ testName, fullTestSuite }) => {
+      const store = storage.getStore()
+      const testSuite = getTestSuitePath(fullTestSuite, this.sourceRoot)
+      const testSpan = this.startTestSpan(testName, testSuite)
 
       this.enter(testSpan, store)
     })
 
-    this.addSub('ci:cucumber:run-step:start', ({ resource }) => {
+    this.addSub('ci:cucumber:test-step:start', ({ resource }) => {
       const store = storage.getStore()
       const childOf = store ? store.span : store
       const span = this.tracer.startSpan('cucumber.step', {
@@ -48,7 +109,7 @@ class CucumberPlugin extends CiPlugin {
       this.enter(span, store)
     })
 
-    this.addSub('ci:cucumber:run:finish', ({ isStep, status, skipReason, errorMessage }) => {
+    this.addSub('ci:cucumber:test:finish', ({ isStep, status, skipReason, errorMessage }) => {
       const span = storage.getStore().span
       const statusTag = isStep ? 'step.status' : TEST_STATUS
 
@@ -76,8 +137,34 @@ class CucumberPlugin extends CiPlugin {
     })
   }
 
-  startTestSpan (testName, testSuite, childOf) {
-    return super.startTestSpan(testName, testSuite, {}, childOf)
+  startTestSpan (testName, testSuite) {
+    const childOf = getTestParentSpan(this.tracer)
+    // TODO: move this logic to CiPlugin once every framework supports test suite level visibility
+    // This is a hack to get good time resolution on test events, while keeping
+    // the test event as the root span of its trace.
+    childOf._trace.startTime = this.testSessionSpan.context()._trace.startTime
+    childOf._trace.ticks = this.testSessionSpan.context()._trace.ticks
+
+    const testSuiteTags = {}
+    const testSuiteId = this.testSuiteSpan.context().toSpanId()
+    testSuiteTags[TEST_SUITE_ID] = testSuiteId
+
+    const testSessionId = this.testSessionSpan.context().toTraceId()
+    testSuiteTags[TEST_SESSION_ID] = testSessionId
+    testSuiteTags[TEST_COMMAND] = this.command
+
+    const testModuleId = this.testModuleSpan.context().toSpanId()
+    testSuiteTags[TEST_MODULE_ID] = testModuleId
+    testSuiteTags[TEST_COMMAND] = this.command
+    testSuiteTags[TEST_BUNDLE] = this.command
+
+    return super.startTestSpan(
+      testName,
+      testSuite,
+      childOf,
+      this.frameworkVersion,
+      testSuiteTags
+    )
   }
 }
 

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

@@ -7,7 +7,15 @@ const {
   getTestParentSpan,
   getCodeOwnersFileEntries,
   getCodeOwnersForFilename,
-  getTestCommonTags
+  getTestCommonTags,
+  getTestSessionCommonTags,
+  getTestModuleCommonTags,
+  getTestSuiteCommonTags,
+  TEST_SUITE_ID,
+  TEST_MODULE_ID,
+  TEST_SESSION_ID,
+  TEST_COMMAND,
+  TEST_BUNDLE
 } = require('../../dd-trace/src/plugins/util/test')
 
 const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
@@ -30,6 +38,43 @@ function getTestSpanMetadata (tracer, testName, testSuite, cypressConfig) {
   }
 }
 
+function getCypressVersion (details) {
+  if (details && details.cypressVersion) {
+    return details.cypressVersion
+  }
+  if (details && details.config && details.config.version) {
+    return details.config.version
+  }
+  return ''
+}
+
+function getCypressCommand (details) {
+  if (!details) {
+    return 'cypress'
+  }
+  return `cypress ${details.specPattern || ''}`
+}
+
+function getSessionStatus (summary) {
+  if (summary.totalFailed !== undefined && summary.totalFailed > 0) {
+    return 'fail'
+  }
+  if (summary.totalSkipped !== undefined && summary.totalSkipped === summary.totalTests) {
+    return 'skip'
+  }
+  return 'pass'
+}
+
+function getSuiteStatus (suiteStats) {
+  if (suiteStats.failures !== undefined && suiteStats.failures > 0) {
+    return 'fail'
+  }
+  if (suiteStats.tests !== undefined && suiteStats.tests === suiteStats.pending) {
+    return 'skip'
+  }
+  return 'pass'
+}
+
 module.exports = (on, config) => {
   const tracer = require('../../dd-trace')
   const testEnvironmentMetadata = getTestEnvironmentMetadata('cypress')
@@ -37,14 +82,84 @@ module.exports = (on, config) => {
   const codeOwnersEntries = getCodeOwnersFileEntries()
 
   let activeSpan = null
-  on('after:run', () => {
+  let testSessionSpan = null
+  let testModuleSpan = null
+  let testSuiteSpan = null
+  let command = null
+  let frameworkVersion
+
+  on('before:run', (details) => {
+    const childOf = getTestParentSpan(tracer)
+
+    command = getCypressCommand(details)
+    frameworkVersion = getCypressVersion(details)
+
+    const testSessionSpanMetadata = getTestSessionCommonTags(command, frameworkVersion)
+    const testModuleSpanMetadata = getTestModuleCommonTags(command, frameworkVersion)
+
+    testSessionSpan = tracer.startSpan('cypress.test_session', {
+      childOf,
+      tags: {
+        [COMPONENT]: 'cypress',
+        ...testEnvironmentMetadata,
+        ...testSessionSpanMetadata
+      }
+    })
+    testModuleSpan = tracer.startSpan('cypress.test_module', {
+      childOf: testSessionSpan,
+      tags: {
+        [COMPONENT]: 'cypress',
+        ...testEnvironmentMetadata,
+        ...testModuleSpanMetadata
+      }
+    })
+  })
+
+  on('after:run', (suiteStats) => {
+    const testStatus = getSessionStatus(suiteStats)
+    testModuleSpan.setTag(TEST_STATUS, testStatus)
+    testSessionSpan.setTag(TEST_STATUS, testStatus)
+
+    testModuleSpan.finish()
+    testSessionSpan.finish()
+
     return new Promise(resolve => {
       tracer._tracer._exporter._writer.flush(() => resolve(null))
     })
   })
   on('task', {
+    'dd:testSuiteStart': (suite) => {
+      const testSuiteSpanMetadata = getTestSuiteCommonTags(command, frameworkVersion, suite)
+      testSuiteSpan = tracer.startSpan('cypress.test_suite', {
+        childOf: testModuleSpan,
+        tags: {
+          [COMPONENT]: 'cypress',
+          ...testEnvironmentMetadata,
+          ...testSuiteSpanMetadata
+        }
+      })
+      return null
+    },
+    'dd:testSuiteFinish': (suiteStats) => {
+      const status = getSuiteStatus(suiteStats)
+      testSuiteSpan.setTag(TEST_STATUS, status)
+      testSuiteSpan.finish()
+      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
+      }
 
       const {
         childOf,
@@ -65,7 +180,8 @@ module.exports = (on, config) => {
             [COMPONENT]: 'cypress',
             [ORIGIN_KEY]: CI_APP_ORIGIN,
             ...testSpanMetadata,
-            ...testEnvironmentMetadata
+            ...testEnvironmentMetadata,
+            ...testSuiteTags
           }
         })
       }

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

@@ -8,7 +8,12 @@ beforeEach(() => {
   })
 })
 
+before(() => {
+  cy.task('dd:testSuiteStart', Cypress.mocha.getRootSuite().file)
+})
+
 after(() => {
+  cy.task('dd:testSuiteFinish', Cypress.mocha.getRunner().stats)
   cy.window().then(win => {
     win.dispatchEvent(new Event('beforeunload'))
   })