dd-trace 5.84.0 → 5.85.0

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

@@ -19,8 +19,8 @@ class BaseBullmqProducerPlugin extends ProducerPlugin {
         'span.kind': 'producer',
         'messaging.system': 'bullmq',
         'messaging.operation': 'publish',
-        ...meta
-      }
+        ...meta,
+      },
     }, ctx)
 
     this.injectTraceContext(span, ctx)
@@ -63,8 +63,8 @@ class QueueAddPlugin extends BaseBullmqProducerPlugin {
     return {
       resource: queueName,
       meta: {
-        'messaging.destination.name': ctx.self?.name
-      }
+        'messaging.destination.name': ctx.self?.name,
+      },
     }
   }
 
@@ -81,7 +81,7 @@ class QueueAddPlugin extends BaseBullmqProducerPlugin {
     return {
       queueName: ctx.self?.name || 'bullmq',
       payloadSize: data ? getMessageSize(data) : 0,
-      injectTarget: data
+      injectTarget: data,
     }
   }
 }
@@ -100,8 +100,8 @@ class QueueAddBulkPlugin extends BaseBullmqProducerPlugin {
       resource: queueName,
       meta: {
         'messaging.destination.name': ctx.self?.name,
-        'messaging.batch.message_count': Array.isArray(jobs) ? jobs.length : undefined
-      }
+        'messaging.batch.message_count': Array.isArray(jobs) ? jobs.length : undefined,
+      },
     }
   }
 
@@ -123,7 +123,7 @@ class QueueAddBulkPlugin extends BaseBullmqProducerPlugin {
     return {
       queueName: ctx.self?.name || 'bullmq',
       payloadSize,
-      injectTarget: jobs[0]?.data
+      injectTarget: jobs[0]?.data,
     }
   }
 
@@ -152,8 +152,8 @@ class FlowProducerAddPlugin extends BaseBullmqProducerPlugin {
     return {
       resource: queueName,
       meta: {
-        'messaging.destination.name': flow?.queueName
-      }
+        'messaging.destination.name': flow?.queueName,
+      },
     }
   }
 
@@ -170,7 +170,7 @@ class FlowProducerAddPlugin extends BaseBullmqProducerPlugin {
     return {
       queueName: flow?.queueName || 'bullmq',
       payloadSize: flow?.data ? getMessageSize(flow.data) : 0,
-      injectTarget: flow?.data
+      injectTarget: flow?.data,
     }
   }
 }

package/packages/datadog-plugin-cassandra-driver/src/index.js

@@ -24,8 +24,8 @@ class CassandraDriverPlugin extends DatabasePlugin {
         'db.type': 'cassandra',
         'cassandra.query': query,
         'cassandra.keyspace': keyspace,
-        [CASSANDRA_CONTACT_POINTS_KEY]: contactPoints.join(',') || null
-      }
+        [CASSANDRA_CONTACT_POINTS_KEY]: contactPoints.join(',') || null,
+      },
     }, ctx)
 
     return ctx.currentStore

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

@@ -48,7 +48,7 @@ class ChildProcessPlugin extends TracingPlugin {
 
     const meta = {
       component: 'subprocess',
-      [property]: (shell === true) ? cmdFields.join(' ') : JSON.stringify(cmdFields)
+      [property]: (shell === true) ? cmdFields.join(' ') : JSON.stringify(cmdFields),
     }
 
     if (truncated) {
@@ -59,7 +59,7 @@ class ChildProcessPlugin extends TracingPlugin {
       service: this.config.service || this._tracerConfig.service,
       resource: (shell === true) ? 'sh' : cmdFields[0],
       type: 'system',
-      meta
+      meta,
     }, ctx)
 
     return ctx.currentStore

package/packages/datadog-plugin-child_process/src/scrub-cmd-params.js

@@ -33,7 +33,7 @@ function getTokensByExpression (expressionTokens) {
   let wipExpressionTokens = []
   let isNewExpression = true
 
-  expressionTokens.forEach(token => {
+  for (const token of expressionTokens) {
     if (isNewExpression) {
       expressionListTokens.push(wipExpressionTokens)
       isNewExpression = false
@@ -45,7 +45,7 @@ function getTokensByExpression (expressionTokens) {
       wipExpressionTokens = []
       isNewExpression = true
     }
-  })
+  }
   return expressionListTokens
 }
 
@@ -56,14 +56,14 @@ function scrubChildProcessCmd (expression) {
   const expressionListTokens = getTokensByExpression(expressionTokens)
 
   const result = []
-  expressionListTokens.forEach((expressionTokens) => {
+  for (const expressionTokens of expressionListTokens) {
     let foundBinary = false
     for (let index = 0; index < expressionTokens.length; index++) {
       const token = expressionTokens[index]
 
       if (token === null) {
         continue
-      } else if (typeof token === 'object') { // eslint-disable-line eslint-rules/eslint-safe-typeof-object
+      } else if (typeof token === 'object') {
         if (token.pattern) {
           result.push(token.pattern)
         } else if (token.op) {
@@ -119,7 +119,7 @@ function scrubChildProcessCmd (expression) {
         }
       }
     }
-  })
+  }
 
   return result
 }

package/packages/datadog-plugin-confluentinc-kafka-javascript/src/index.js

@@ -17,7 +17,7 @@ class ConfluentKafkaJsPlugin extends KafkajsPlugin {
     return {
       producer: ProducerPlugin,
       consumer: ConsumerPlugin,
-      batchConsumer: BatchConsumerPlugin
+      batchConsumer: BatchConsumerPlugin,
     }
   }
 }

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

@@ -21,7 +21,7 @@ class CouchBasePlugin extends StoragePlugin {
       component: 'couchbase',
       'resource.name': `couchbase.${operation}`,
       'span.kind': this.constructor.kind,
-      'db.couchbase.seed.nodes': seedNodes
+      'db.couchbase.seed.nodes': seedNodes,
     }
 
     if (bucket) tags['couchbase.bucket.name'] = bucket.name
@@ -35,7 +35,7 @@ class CouchBasePlugin extends StoragePlugin {
       this.operationName({ operation }),
       {
         service: this.serviceName({ pluginConfig: this.config }),
-        meta: tags
+        meta: tags,
       },
       ctx
     )
@@ -52,7 +52,7 @@ class CouchBasePlugin extends StoragePlugin {
         {
           'span.type': 'sql',
           'resource.name': resource,
-          'span.kind': this.constructor.kind
+          'span.kind': this.constructor.kind,
         },
         { bucket, seedNodes },
         ctx

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

@@ -47,7 +47,7 @@ const {
   TELEMETRY_EVENT_FINISHED,
   TELEMETRY_ITR_FORCED_TO_RUN,
   TELEMETRY_ITR_UNSKIPPABLE,
-  TELEMETRY_TEST_SESSION
+  TELEMETRY_TEST_SESSION,
 } = require('../../dd-trace/src/ci-visibility/telemetry')
 
 const BREAKPOINT_HIT_GRACE_PERIOD_MS = 200
@@ -73,7 +73,7 @@ class CucumberPlugin extends CiPlugin {
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
-      isParallel
+      isParallel,
     }) => {
       const { isSuitesSkippingEnabled, isCodeCoverageEnabled } = this.libraryConfig || {}
       addIntelligentTestRunnerSpanTags(
@@ -87,7 +87,7 @@ class CucumberPlugin extends CiPlugin {
           skippingCount: numSkippedSuites,
           skippingType: 'suite',
           hasUnskippableSuites,
-          hasForcedToRunSuites
+          hasForcedToRunSuites,
         }
       )
       if (isEarlyFlakeDetectionEnabled) {
@@ -112,7 +112,7 @@ class CucumberPlugin extends CiPlugin {
       finishAllTraceSpans(this.testSessionSpan)
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
+        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER'),
       })
 
       this.libraryConfig = null
@@ -123,7 +123,7 @@ class CucumberPlugin extends CiPlugin {
       testFileAbsolutePath,
       isUnskippable,
       isForcedToRun,
-      itrCorrelationId
+      itrCorrelationId,
     }) => {
       const testSuitePath = getTestSuitePath(testFileAbsolutePath, process.cwd())
       const testSourceFile = getTestSuitePath(testFileAbsolutePath, this.repositoryRoot)
@@ -160,9 +160,9 @@ class CucumberPlugin extends CiPlugin {
         tags: {
           [COMPONENT]: this.constructor.id,
           ...this.testEnvironmentMetadata,
-          ...testSuiteMetadata
+          ...testSuiteMetadata,
         },
-        integrationName: this.constructor.id
+        integrationName: this.constructor.id,
       })
       this._testSuiteSpansByTestSuite.set(testSuitePath, testSuiteSpan)
 
@@ -196,7 +196,7 @@ class CucumberPlugin extends CiPlugin {
       const formattedCoverage = {
         sessionId: testSuiteSpan.context()._traceId,
         suiteId: testSuiteSpan.context()._spanId,
-        files: relativeCoverageFiles
+        files: relativeCoverageFiles,
       }
 
       this.tracer._exporter.exportCoverage(formattedCoverage)
@@ -211,7 +211,7 @@ class CucumberPlugin extends CiPlugin {
 
       const extraTags = {
         [TEST_SOURCE_START]: testSourceLine,
-        [TEST_SOURCE_FILE]: testSourceFile
+        [TEST_SOURCE_FILE]: testSourceFile,
       }
       if (isParallel) {
         extraTags[CUCUMBER_IS_PARALLEL] = 'true'
@@ -272,9 +272,9 @@ class CucumberPlugin extends CiPlugin {
         tags: {
           [COMPONENT]: this.constructor.id,
           'cucumber.step': resource,
-          [RESOURCE_NAME]: resource
+          [RESOURCE_NAME]: resource,
         },
-        integrationName: this.constructor.id
+        integrationName: this.constructor.id,
       })
       ctx.parentStore = store
       ctx.currentStore = { ...store, span }
@@ -299,7 +299,7 @@ class CucumberPlugin extends CiPlugin {
       hasFailedAttemptToFix,
       isDisabled,
       isQuarantined,
-      isModified
+      isModified,
     }) => {
       const statusTag = isStep ? 'step.status' : TEST_STATUS
 
@@ -367,7 +367,7 @@ class CucumberPlugin extends CiPlugin {
         hasCodeOwners: !!spanTags[TEST_CODE_OWNERS],
         isNew,
         isRum: spanTags[TEST_IS_RUM_ACTIVE] === 'true',
-        browserDriver: spanTags[TEST_BROWSER_DRIVER]
+        browserDriver: spanTags[TEST_BROWSER_DRIVER],
       }
       span.finish()
       if (!isStep) {
@@ -412,7 +412,7 @@ class CucumberPlugin extends CiPlugin {
       modifiedFiles,
       stepIds,
       stepDefinitions,
-      setIsModified
+      setIsModified,
     }) => {
       const testScenarioPath = getTestSuitePath(testFileAbsolutePath, this.repositoryRoot || process.cwd())
       for (const scenario of scenarios) {

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

@@ -47,7 +47,7 @@ const {
   getPullRequestDiff,
   getModifiedFilesFromDiff,
   TEST_IS_MODIFIED,
-  getPullRequestBaseBranch
+  getPullRequestBaseBranch,
 } = require('../../dd-trace/src/plugins/util/test')
 const { isMarkedAsUnskippable } = require('../../datadog-plugin-jest/src/util')
 const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
@@ -65,7 +65,7 @@ const {
   incrementCountMetric,
   distributionMetric,
   TELEMETRY_ITR_SKIPPED,
-  TELEMETRY_TEST_SESSION
+  TELEMETRY_TEST_SESSION,
 } = require('../../dd-trace/src/ci-visibility/telemetry')
 
 const {
@@ -79,14 +79,14 @@ const {
   GIT_PULL_REQUEST_BASE_BRANCH_SHA,
   GIT_COMMIT_HEAD_SHA,
   GIT_PULL_REQUEST_BASE_BRANCH,
-  GIT_COMMIT_HEAD_MESSAGE
+  GIT_COMMIT_HEAD_MESSAGE,
 } = require('../../dd-trace/src/plugins/util/tags')
 const {
   OS_VERSION,
   OS_PLATFORM,
   OS_ARCHITECTURE,
   RUNTIME_NAME,
-  RUNTIME_VERSION
+  RUNTIME_VERSION,
 } = require('../../dd-trace/src/plugins/util/env')
 const { DD_MAJOR } = require('../../../version')
 
@@ -96,7 +96,7 @@ const CYPRESS_STATUS_TO_TEST_STATUS = {
   passed: 'pass',
   failed: 'fail',
   pending: 'skip',
-  skipped: 'skip'
+  skipped: 'skip',
 }
 
 function getSessionStatus (summary) {
@@ -162,7 +162,7 @@ function getSkippableTests (tracer, testConfiguration) {
       resolve({
         err,
         skippableTests,
-        correlationId
+        correlationId,
       })
     })
   })
@@ -176,7 +176,7 @@ function getKnownTests (tracer, testConfiguration) {
     tracer._tracer._exporter.getKnownTests(testConfiguration, (err, knownTests) => {
       resolve({
         err,
-        knownTests
+        knownTests,
       })
     })
   })
@@ -190,7 +190,7 @@ function getTestManagementTests (tracer, testConfiguration) {
     tracer._tracer._exporter.getTestManagementTests(testConfiguration, (err, testManagementTests) => {
       resolve({
         err,
-        testManagementTests
+        testManagementTests,
       })
     })
   })
@@ -200,7 +200,7 @@ function getModifiedFiles (testEnvironmentMetadata) {
   const {
     [GIT_PULL_REQUEST_BASE_BRANCH]: pullRequestBaseBranch,
     [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: pullRequestBaseBranchSha,
-    [GIT_COMMIT_HEAD_SHA]: commitHeadSha
+    [GIT_COMMIT_HEAD_SHA]: commitHeadSha,
   } = testEnvironmentMetadata
 
   const baseBranchSha = pullRequestBaseBranchSha || getPullRequestBaseBranch(pullRequestBaseBranch)
@@ -271,7 +271,7 @@ class CypressPlugin {
       [GIT_TAG]: tag,
       [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: pullRequestBaseSha,
       [GIT_COMMIT_HEAD_SHA]: commitHeadSha,
-      [GIT_COMMIT_HEAD_MESSAGE]: commitHeadMessage
+      [GIT_COMMIT_HEAD_MESSAGE]: commitHeadMessage,
     } = this.testEnvironmentMetadata
 
     this.repositoryRoot = repositoryRoot || process.cwd()
@@ -292,7 +292,7 @@ class CypressPlugin {
       tag,
       pullRequestBaseSha,
       commitHeadSha,
-      commitHeadMessage
+      commitHeadMessage,
     }
   }
 
@@ -330,8 +330,8 @@ class CypressPlugin {
               isKnownTestsEnabled,
               isTestManagementEnabled,
               testManagementAttemptToFixRetries,
-              isImpactedTestsEnabled
-            }
+              isImpactedTestsEnabled,
+            },
           } = libraryConfigurationResponse
           this.isSuitesSkippingEnabled = isSuitesSkippingEnabled
           this.isCodeCoverageEnabled = isCodeCoverageEnabled
@@ -395,16 +395,16 @@ class CypressPlugin {
       tags: {
         [COMPONENT]: TEST_FRAMEWORK_NAME,
         ...this.testEnvironmentMetadata,
-        ...testSuiteSpanMetadata
+        ...testSuiteSpanMetadata,
       },
-      integrationName: TEST_FRAMEWORK_NAME
+      integrationName: TEST_FRAMEWORK_NAME,
     })
   }
 
   getTestSpan ({ testName, testSuite, isUnskippable, isForcedToRun, testSourceFile, isDisabled, isQuarantined }) {
     const testSuiteTags = {
       [TEST_COMMAND]: this.command,
-      [TEST_MODULE]: TEST_FRAMEWORK_NAME
+      [TEST_MODULE]: TEST_FRAMEWORK_NAME,
     }
     if (this.testSuiteSpan) {
       testSuiteTags[TEST_SUITE_ID] = this.testSuiteSpan.context().toSpanId()
@@ -462,9 +462,9 @@ class CypressPlugin {
         [ORIGIN_KEY]: CI_APP_ORIGIN,
         ...testSpanMetadata,
         ...this.testEnvironmentMetadata,
-        ...testSuiteTags
+        ...testSuiteTags,
       },
-      integrationName: TEST_FRAMEWORK_NAME
+      integrationName: TEST_FRAMEWORK_NAME,
     })
   }
 
@@ -473,7 +473,7 @@ class CypressPlugin {
       testLevel,
       testFramework: 'cypress',
       isUnsupportedCIProvider: !this.ciProviderName,
-      ...tags
+      ...tags,
     })
   }
 
@@ -543,12 +543,14 @@ class CypressPlugin {
     }
 
     // `details.specs` are test files
-    details.specs?.forEach(({ absolute, relative }) => {
-      const isUnskippableSuite = isMarkedAsUnskippable({ path: absolute })
-      if (isUnskippableSuite) {
-        this.unskippableSuites.push(relative)
+    if (details.specs) {
+      for (const { absolute, relative } of details.specs) {
+        const isUnskippableSuite = isMarkedAsUnskippable({ path: absolute })
+        if (isUnskippableSuite) {
+          this.unskippableSuites.push(relative)
+        }
       }
-    })
+    }
 
     const childOf = getTestParentSpan(this.tracer)
 
@@ -573,13 +575,13 @@ class CypressPlugin {
       const metadataTags = {}
       for (const testLevel of TEST_LEVEL_EVENT_TYPES) {
         metadataTags[testLevel] = {
-          [TEST_SESSION_NAME]: testSessionName
+          [TEST_SESSION_NAME]: testSessionName,
         }
       }
       const libraryCapabilitiesTags = getLibraryCapabilitiesTags(this.constructor.id, false, this.frameworkVersion)
       metadataTags.test = {
         ...metadataTags.test,
-        ...libraryCapabilitiesTags
+        ...libraryCapabilitiesTags,
       }
 
       this.tracer._tracer._exporter.addMetadataTags(metadataTags)
@@ -590,9 +592,9 @@ class CypressPlugin {
       tags: {
         [COMPONENT]: TEST_FRAMEWORK_NAME,
         ...this.testEnvironmentMetadata,
-        ...testSessionSpanMetadata
+        ...testSessionSpanMetadata,
       },
-      integrationName: TEST_FRAMEWORK_NAME
+      integrationName: TEST_FRAMEWORK_NAME,
     })
     this.ciVisEvent(TELEMETRY_EVENT_CREATED, 'session')
 
@@ -601,9 +603,9 @@ class CypressPlugin {
       tags: {
         [COMPONENT]: TEST_FRAMEWORK_NAME,
         ...this.testEnvironmentMetadata,
-        ...testModuleSpanMetadata
+        ...testModuleSpanMetadata,
       },
-      integrationName: TEST_FRAMEWORK_NAME
+      integrationName: TEST_FRAMEWORK_NAME,
     })
     this.ciVisEvent(TELEMETRY_EVENT_CREATED, 'module')
 
@@ -630,7 +632,7 @@ class CypressPlugin {
           skippingType: 'test',
           skippingCount: this.skippedTests.length,
           hasForcedToRunSuites: this.hasForcedToRunSuites,
-          hasUnskippableSuites: this.hasUnskippableSuites
+          hasUnskippableSuites: this.hasUnskippableSuites,
         }
       )
 
@@ -644,7 +646,7 @@ class CypressPlugin {
       this.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
       incrementCountMetric(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
+        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER'),
       })
 
       finishAllTraceSpans(this.testSessionSpan)
@@ -680,19 +682,20 @@ class CypressPlugin {
       log.warn('There was an error creating the test suite event.')
       this.testSuiteSpan = this.getTestSuiteSpan({
         testSuite: spec.relative,
-        testSuiteAbsolutePath: spec.absolute
+        testSuiteAbsolutePath: spec.absolute,
       })
     }
 
     // Get tests that didn't go through `dd:afterEach`
     // and create a skipped test span for each of them
-    cypressTests.filter(({ title }) => {
+    for (const { title } of cypressTests) {
       const cypressTestName = title.join(' ')
       const isTestFinished = finishedTests.find(({ testName }) => cypressTestName === testName)
 
-      return !isTestFinished
-    }).forEach(({ title }) => {
-      const cypressTestName = title.join(' ')
+      if (isTestFinished) {
+        continue
+      }
+
       const isSkippedByItr = this.testsToSkip.find(test =>
         cypressTestName === test.name && spec.relative === test.suite
       )
@@ -719,7 +722,7 @@ class CypressPlugin {
       }
 
       skippedTestSpan.finish()
-    })
+    }
 
     // Make sure that reported test statuses are the same as Cypress reports.
     // This is not always the case, such as when an `after` hook fails:
@@ -734,13 +737,13 @@ class CypressPlugin {
       return acc
     }, {})
 
-    Object.entries(finishedTestsByTestName).forEach(([testName, finishedTestAttempts]) => {
-      finishedTestAttempts.forEach((finishedTest, attemptIndex) => {
+    for (const [testName, finishedTestAttempts] of Object.entries(finishedTestsByTestName)) {
+      for (const [attemptIndex, finishedTest] of finishedTestAttempts.entries()) {
         // TODO: there could be multiple if there have been retries!
         // potentially we need to match the test status!
         const cypressTest = cypressTests.find(test => test.title.join(' ') === testName)
         if (!cypressTest) {
-          return
+          continue
         }
         // finishedTests can include multiple tests with the same name if they have been retried
         // by early flake detection. Cypress is unaware of this so .attempts does not necessarily have
@@ -766,8 +769,10 @@ class CypressPlugin {
         if (cypressTest.displayError) {
           latestError = new Error(cypressTest.displayError)
         }
-        // Update test status
-        if (cypressTestStatus !== finishedTest.testStatus) {
+        // Update test status - but NOT for quarantined tests where we intentionally
+        // report 'fail' to Datadog even though Cypress sees it as 'pass'
+        const isQuarantinedTest = finishedTest.testSpan?.context()?._tags?.[TEST_MANAGEMENT_IS_QUARANTINED] === 'true'
+        if (cypressTestStatus !== finishedTest.testStatus && !isQuarantinedTest) {
           finishedTest.testSpan.setTag(TEST_STATUS, cypressTestStatus)
           finishedTest.testSpan.setTag('error', latestError)
         }
@@ -787,8 +792,8 @@ class CypressPlugin {
         }
 
         finishedTest.testSpan.finish(finishedTest.finishTime)
-      })
-    })
+      }
+    }
 
     if (this.testSuiteSpan) {
       const status = getSuiteStatus(stats)
@@ -817,7 +822,7 @@ class CypressPlugin {
           isImpactedTestsEnabled: this.isImpactedTestsEnabled,
           isModifiedTest: this.getIsTestModified(testSuiteAbsolutePath),
           repositoryRoot: this.repositoryRoot,
-          isTestIsolationEnabled: this.isTestIsolationEnabled
+          isTestIsolationEnabled: this.isTestIsolationEnabled,
         }
 
         if (this.testSuiteSpan) {
@@ -841,11 +846,12 @@ class CypressPlugin {
           return { shouldSkip: true }
         }
 
-        // TODO: I haven't found a way to trick cypress into ignoring a test
-        // The way we'll implement quarantine in cypress is by skipping the test altogether
-        if (!isAttemptToFix && (isDisabled || isQuarantined)) {
+        // For disabled tests (not attemptToFix), skip them
+        if (!isAttemptToFix && isDisabled) {
           return { shouldSkip: true }
         }
+        // Quarantined tests (not attemptToFix) run normally but their failures are caught
+        // by Cypress.on('fail') in support.js and suppressed, so Cypress sees them as passed
 
         if (!this.activeTestSpan) {
           this.activeTestSpan = this.getTestSpan({
@@ -854,7 +860,7 @@ class CypressPlugin {
             isUnskippable,
             isForcedToRun,
             isDisabled,
-            isQuarantined
+            isQuarantined,
           })
         }
 
@@ -876,7 +882,8 @@ class CypressPlugin {
           isNew,
           isEfdRetry,
           isAttemptToFix,
-          isModified
+          isModified,
+          isQuarantined: isQuarantinedFromSupport,
         } = test
         if (coverage && this.isCodeCoverageEnabled && this.tracer._tracer._exporter?.exportCoverage) {
           const coverageFiles = getCoveredFilenamesFromCoverage(coverage)
@@ -892,7 +899,7 @@ class CypressPlugin {
             sessionId: _traceId,
             suiteId: _spanId,
             testId: this.activeTestSpan.context()._spanId,
-            files: relativeCoverageFiles
+            files: relativeCoverageFiles,
           }
           this.tracer._tracer._exporter.exportCoverage(formattedCoverage)
         }
@@ -949,13 +956,19 @@ class CypressPlugin {
           }
         }
 
+        // Ensure quarantined tests reported from support.js are tagged
+        // (This catches cases where the test ran but failed, but Cypress saw it as passed)
+        if (isQuarantinedFromSupport) {
+          this.activeTestSpan.setTag(TEST_MANAGEMENT_IS_QUARANTINED, 'true')
+        }
+
         const finishedTest = {
           testName,
           testStatus,
           finishTime: this.activeTestSpan._getTime(), // we store the finish time here
           testSpan: this.activeTestSpan,
           isEfdRetry,
-          isAttemptToFix
+          isAttemptToFix,
         }
         if (this.finishedTestsByFile[testSuite]) {
           this.finishedTestsByFile[testSuite].push(finishedTest)
@@ -967,7 +980,7 @@ class CypressPlugin {
           hasCodeOwners: !!this.activeTestSpan.context()._tags[TEST_CODE_OWNERS],
           isNew,
           isRum: isRUMActive,
-          browserDriver: 'cypress'
+          browserDriver: 'cypress',
         })
         this.activeTestSpan = null
 
@@ -983,7 +996,7 @@ class CypressPlugin {
         // eslint-disable-next-line no-console
         console.log(`[datadog] ${message}`)
         return null
-      }
+      },
     }
   }
 

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

@@ -17,7 +17,7 @@ const noopTask = {
   },
   'dd:addTags': () => {
     return null
-  }
+  },
 }
 
 module.exports = function CypressPlugin (on, config) {