dd-trace 5.4.0 → 5.6.0

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

@@ -15,7 +15,10 @@ const {
   TEST_ITR_FORCED_RUN,
   TEST_CODE_OWNERS,
   ITR_CORRELATION_ID,
-  TEST_SOURCE_FILE
+  TEST_SOURCE_FILE,
+  TEST_EARLY_FLAKE_IS_ENABLED,
+  TEST_IS_NEW,
+  TEST_EARLY_FLAKE_IS_RETRY
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT, ERROR_MESSAGE } = require('../../dd-trace/src/constants')
@@ -46,7 +49,8 @@ class CucumberPlugin extends CiPlugin {
       numSkippedSuites,
       testCodeCoverageLinesTotal,
       hasUnskippableSuites,
-      hasForcedToRunSuites
+      hasForcedToRunSuites,
+      isEarlyFlakeDetectionEnabled
     }) => {
       const { isSuitesSkippingEnabled, isCodeCoverageEnabled } = this.libraryConfig || {}
       addIntelligentTestRunnerSpanTags(
@@ -63,6 +67,9 @@ class CucumberPlugin extends CiPlugin {
           hasForcedToRunSuites
         }
       )
+      if (isEarlyFlakeDetectionEnabled) {
+        this.testSessionSpan.setTag(TEST_EARLY_FLAKE_IS_ENABLED, 'true')
+      }
 
       this.testSessionSpan.setTag(TEST_STATUS, status)
       this.testModuleSpan.setTag(TEST_STATUS, status)
@@ -141,7 +148,12 @@ class CucumberPlugin extends CiPlugin {
       const store = storage.getStore()
       const testSuite = getTestSuitePath(testFileAbsolutePath, this.sourceRoot)
       const testSourceFile = getTestSuitePath(testFileAbsolutePath, this.repositoryRoot)
-      const testSpan = this.startTestSpan(testName, testSuite, testSourceFile, testSourceLine)
+
+      const extraTags = {
+        [TEST_SOURCE_START]: testSourceLine,
+        [TEST_SOURCE_FILE]: testSourceFile
+      }
+      const testSpan = this.startTestSpan(testName, testSuite, extraTags)
 
       this.enter(testSpan, store)
     })
@@ -160,12 +172,19 @@ class CucumberPlugin extends CiPlugin {
       this.enter(span, store)
     })
 
-    this.addSub('ci:cucumber:test:finish', ({ isStep, status, skipReason, errorMessage }) => {
+    this.addSub('ci:cucumber:test:finish', ({ isStep, status, skipReason, errorMessage, isNew, isEfdRetry }) => {
       const span = storage.getStore().span
       const statusTag = isStep ? 'step.status' : TEST_STATUS
 
       span.setTag(statusTag, status)
 
+      if (isNew) {
+        span.setTag(TEST_IS_NEW, 'true')
+        if (isEfdRetry) {
+          span.setTag(TEST_EARLY_FLAKE_IS_RETRY, 'true')
+        }
+      }
+
       if (skipReason) {
         span.setTag(TEST_SKIP_REASON, skipReason)
       }
@@ -193,15 +212,12 @@ class CucumberPlugin extends CiPlugin {
     })
   }
 
-  startTestSpan (testName, testSuite, testSourceFile, testSourceLine) {
+  startTestSpan (testName, testSuite, extraTags) {
     return super.startTestSpan(
       testName,
       testSuite,
       this.testSuiteSpan,
-      {
-        [TEST_SOURCE_START]: testSourceLine,
-        [TEST_SOURCE_FILE]: testSourceFile
-      }
+      extraTags
     )
   }
 }

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

@@ -0,0 +1,3 @@
+const cypressPlugin = require('./cypress-plugin')
+
+module.exports = cypressPlugin.afterRun.bind(cypressPlugin)

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

@@ -0,0 +1,3 @@
+const cypressPlugin = require('./cypress-plugin')
+
+module.exports = cypressPlugin.afterSpec.bind(cypressPlugin)