dd-trace 5.41.1 → 5.42.0

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

@@ -13,7 +13,7 @@ const testSessionFinishCh = channel('ci:playwright:session:finish')
 
 const libraryConfigurationCh = channel('ci:playwright:library-configuration')
 const knownTestsCh = channel('ci:playwright:known-tests')
-const quarantinedTestsCh = channel('ci:playwright:quarantined-tests')
+const testManagementTestsCh = channel('ci:playwright:test-management-tests')
 
 const testSuiteStartCh = channel('ci:playwright:test-suite:start')
 const testSuiteFinishCh = channel('ci:playwright:test-suite:finish')
@@ -42,23 +42,19 @@ let earlyFlakeDetectionNumRetries = 0
 let isFlakyTestRetriesEnabled = false
 let flakyTestRetriesCount = 0
 let knownTests = {}
-let isQuarantinedTestsEnabled = false
-let quarantinedTests = {}
+let isTestManagementTestsEnabled = false
+let testManagementTests = {}
 let rootDir = ''
 const MINIMUM_SUPPORTED_VERSION_RANGE_EFD = '>=1.38.0'
 
-function isQuarantineTest (test) {
+function getTestProperties (test) {
   const testName = getTestFullname(test)
   const testSuite = getTestSuitePath(test._requireFile, rootDir)
 
-  return quarantinedTests
-    ?.playwright
-    ?.suites
-    ?.[testSuite]
-    ?.tests
-    ?.[testName]
-    ?.properties
-    ?.quarantined
+  const { disabled, quarantined } =
+    testManagementTests?.playwright?.suites?.[testSuite]?.tests?.[testName]?.properties || {}
+
+  return { disabled, quarantined }
 }
 
 function isNewTest (test) {
@@ -283,7 +279,13 @@ function testBeginHandler (test, browserName) {
   const testAsyncResource = new AsyncResource('bound-anonymous-fn')
   testToAr.set(test, testAsyncResource)
   testAsyncResource.runInAsyncScope(() => {
-    testStartCh.publish({ testName, testSuiteAbsolutePath, testSourceLine, browserName })
+    testStartCh.publish({
+      testName,
+      testSuiteAbsolutePath,
+      testSourceLine,
+      browserName,
+      isDisabled: test._ddIsDisabled
+    })
   })
 }
 
@@ -442,12 +444,12 @@ function runnerHook (runnerExport, playwrightVersion) {
         earlyFlakeDetectionNumRetries = libraryConfig.earlyFlakeDetectionNumRetries
         isFlakyTestRetriesEnabled = libraryConfig.isFlakyTestRetriesEnabled
         flakyTestRetriesCount = libraryConfig.flakyTestRetriesCount
-        isQuarantinedTestsEnabled = libraryConfig.isQuarantinedTestsEnabled
+        isTestManagementTestsEnabled = libraryConfig.isTestManagementEnabled
       }
     } catch (e) {
       isEarlyFlakeDetectionEnabled = false
       isKnownTestsEnabled = false
-      isQuarantinedTestsEnabled = false
+      isTestManagementTestsEnabled = false
       log.error('Playwright session start error', e)
     }
 
@@ -467,17 +469,17 @@ function runnerHook (runnerExport, playwrightVersion) {
       }
     }
 
-    if (isQuarantinedTestsEnabled && satisfies(playwrightVersion, MINIMUM_SUPPORTED_VERSION_RANGE_EFD)) {
+    if (isTestManagementTestsEnabled && satisfies(playwrightVersion, MINIMUM_SUPPORTED_VERSION_RANGE_EFD)) {
       try {
-        const { err, quarantinedTests: receivedQuarantinedTests } = await getChannelPromise(quarantinedTestsCh)
+        const { err, testManagementTests: receivedTestManagementTests } = await getChannelPromise(testManagementTestsCh)
         if (!err) {
-          quarantinedTests = receivedQuarantinedTests
+          testManagementTests = receivedTestManagementTests
         } else {
-          isQuarantinedTestsEnabled = false
+          isTestManagementTestsEnabled = false
         }
       } catch (err) {
-        isQuarantinedTestsEnabled = false
-        log.error('Playwright quarantined tests error', err)
+        isTestManagementTestsEnabled = false
+        log.error('Playwright test management tests error', err)
       }
     }
 
@@ -513,7 +515,7 @@ function runnerHook (runnerExport, playwrightVersion) {
       testSessionFinishCh.publish({
         status: STATUS_TO_TEST_STATUS[sessionStatus],
         isEarlyFlakeDetectionEnabled,
-        isQuarantinedTestsEnabled,
+        isTestManagementTestsEnabled,
         onDone
       })
     })
@@ -523,7 +525,7 @@ function runnerHook (runnerExport, playwrightVersion) {
     remainingTestsByFile = {}
 
     // TODO: we can trick playwright into thinking the session passed by returning
-    // 'passed' here. We might be able to use this for both EFD and Quarantined tests.
+    // 'passed' here. We might be able to use this for both EFD and Test Management tests.
     return runAllTestsReturn
   })
 
@@ -594,19 +596,24 @@ addHook({
   const oldCreateRootSuite = loadUtilsPackage.createRootSuite
 
   async function newCreateRootSuite () {
-    if (!isKnownTestsEnabled && !isQuarantinedTestsEnabled) {
+    if (!isKnownTestsEnabled && !isTestManagementTestsEnabled) {
       return oldCreateRootSuite.apply(this, arguments)
     }
     const rootSuite = await oldCreateRootSuite.apply(this, arguments)
 
     const allTests = rootSuite.allTests()
 
-    if (isQuarantinedTestsEnabled) {
-      const testsToBeIgnored = allTests.filter(isQuarantineTest)
-      testsToBeIgnored.forEach(test => {
-        test._ddIsQuarantined = true
-        test.expectedStatus = 'skipped'
-      })
+    if (isTestManagementTestsEnabled) {
+      for (const test of allTests) {
+        const testProperties = getTestProperties(test)
+        if (testProperties.disabled) {
+          test._ddIsDisabled = true
+          test.expectedStatus = 'skipped'
+        } else if (testProperties.quarantined) {
+          test._ddIsQuarantined = true
+          test.expectedStatus = 'skipped'
+        }
+      }
     }
 
     if (isKnownTestsEnabled) {

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

@@ -9,6 +9,7 @@ const testPassCh = channel('ci:vitest:test:pass')
 const testErrorCh = channel('ci:vitest:test:error')
 const testSkipCh = channel('ci:vitest:test:skip')
 const isNewTestCh = channel('ci:vitest:test:is-new')
+const isDisabledCh = channel('ci:vitest:test:is-disabled')
 const isQuarantinedCh = channel('ci:vitest:test:is-quarantined')
 
 // test suite hooks
@@ -22,11 +23,12 @@ const testSessionFinishCh = channel('ci:vitest:session:finish')
 const libraryConfigurationCh = channel('ci:vitest:library-configuration')
 const knownTestsCh = channel('ci:vitest:known-tests')
 const isEarlyFlakeDetectionFaultyCh = channel('ci:vitest:is-early-flake-detection-faulty')
-const quarantinedTestsCh = channel('ci:vitest:quarantined-tests')
+const testManagementTestsCh = channel('ci:vitest:test-management-tests')
 
 const taskToAsync = new WeakMap()
 const taskToStatuses = new WeakMap()
 const newTasks = new WeakSet()
+const disabledTasks = new WeakSet()
 const quarantinedTasks = new WeakSet()
 let isRetryReasonEfd = false
 const switchedStatuses = new WeakSet()
@@ -50,8 +52,9 @@ function getProvidedContext () {
       _ddKnownTests: knownTests,
       _ddEarlyFlakeDetectionNumRetries: numRepeats,
       _ddIsKnownTestsEnabled: isKnownTestsEnabled,
-      _ddIsQuarantinedTestsEnabled: isQuarantinedTestsEnabled,
-      _ddQuarantinedTests: quarantinedTests
+      _ddIsTestManagementTestsEnabled: isTestManagementTestsEnabled,
+      _ddTestManagementTests: testManagementTests,
+      _ddIsFlakyTestRetriesEnabled: isFlakyTestRetriesEnabled
     } = globalThis.__vitest_worker__.providedContext
 
     return {
@@ -60,8 +63,9 @@ function getProvidedContext () {
       knownTests,
       numRepeats,
       isKnownTestsEnabled,
-      isQuarantinedTestsEnabled,
-      quarantinedTests
+      isTestManagementTestsEnabled,
+      testManagementTests,
+      isFlakyTestRetriesEnabled
     }
   } catch (e) {
     log.error('Vitest workers could not parse provided context, so some features will not work.')
@@ -71,8 +75,8 @@ function getProvidedContext () {
       knownTests: {},
       numRepeats: 0,
       isKnownTestsEnabled: false,
-      isQuarantinedTestsEnabled: false,
-      quarantinedTests: {}
+      isTestManagementTestsEnabled: false,
+      testManagementTests: {}
     }
   }
 }
@@ -167,10 +171,10 @@ function getSortWrapper (sort) {
     let earlyFlakeDetectionNumRetries = 0
     let isEarlyFlakeDetectionFaulty = false
     let isKnownTestsEnabled = false
-    let isQuarantinedTestsEnabled = false
+    let isTestManagementTestsEnabled = false
     let isDiEnabled = false
     let knownTests = {}
-    let quarantinedTests = {}
+    let testManagementTests = {}
 
     try {
       const { err, libraryConfig } = await getChannelPromise(libraryConfigurationCh)
@@ -181,7 +185,7 @@ function getSortWrapper (sort) {
         earlyFlakeDetectionNumRetries = libraryConfig.earlyFlakeDetectionNumRetries
         isDiEnabled = libraryConfig.isDiEnabled
         isKnownTestsEnabled = libraryConfig.isKnownTestsEnabled
-        isQuarantinedTestsEnabled = libraryConfig.isQuarantinedTestsEnabled
+        isTestManagementTestsEnabled = libraryConfig.isTestManagementEnabled
       }
     } catch (e) {
       isFlakyTestRetriesEnabled = false
@@ -192,6 +196,12 @@ function getSortWrapper (sort) {
 
     if (isFlakyTestRetriesEnabled && !this.ctx.config.retry && flakyTestRetriesCount > 0) {
       this.ctx.config.retry = flakyTestRetriesCount
+      try {
+        const workspaceProject = this.ctx.getCoreWorkspaceProject()
+        workspaceProject._provided._ddIsFlakyTestRetriesEnabled = isFlakyTestRetriesEnabled
+      } catch (e) {
+        log.warn('Could not send library configuration to workers.')
+      }
     }
 
     if (isKnownTestsEnabled) {
@@ -241,20 +251,20 @@ function getSortWrapper (sort) {
       }
     }
 
-    if (isQuarantinedTestsEnabled) {
-      const { err, quarantinedTests: receivedQuarantinedTests } = await getChannelPromise(quarantinedTestsCh)
+    if (isTestManagementTestsEnabled) {
+      const { err, testManagementTests: receivedTestManagementTests } = await getChannelPromise(testManagementTestsCh)
       if (!err) {
-        quarantinedTests = receivedQuarantinedTests
+        testManagementTests = receivedTestManagementTests
         try {
           const workspaceProject = this.ctx.getCoreWorkspaceProject()
-          workspaceProject._provided._ddIsQuarantinedTestsEnabled = isQuarantinedTestsEnabled
-          workspaceProject._provided._ddQuarantinedTests = quarantinedTests
+          workspaceProject._provided._ddIsTestManagementTestsEnabled = isTestManagementTestsEnabled
+          workspaceProject._provided._ddTestManagementTests = testManagementTests
         } catch (e) {
-          log.warn('Could not send quarantined tests to workers so Quarantine will not work.')
+          log.warn('Could not send test management tests to workers so Test Management will not work.')
         }
       } else {
-        isQuarantinedTestsEnabled = false
-        log.error('Could not get quarantined tests.')
+        isTestManagementTestsEnabled = false
+        log.error('Could not get test management tests.')
       }
     }
 
@@ -292,7 +302,7 @@ function getSortWrapper (sort) {
           error,
           isEarlyFlakeDetectionEnabled,
           isEarlyFlakeDetectionFaulty,
-          isQuarantinedTestsEnabled,
+          isTestManagementTestsEnabled,
           onFinish
         })
       })
@@ -337,9 +347,25 @@ addHook({
       knownTests,
       isEarlyFlakeDetectionEnabled,
       isKnownTestsEnabled,
-      numRepeats
+      numRepeats,
+      isTestManagementTestsEnabled,
+      testManagementTests
     } = getProvidedContext()
 
+    if (isTestManagementTestsEnabled) {
+      isDisabledCh.publish({
+        testManagementTests,
+        testSuiteAbsolutePath: task.file.filepath,
+        testName,
+        onDone: (isTestDisabled) => {
+          if (isTestDisabled) {
+            disabledTasks.add(task)
+            task.mode = 'skip'
+          }
+        }
+      })
+    }
+
     if (isKnownTestsEnabled) {
       isNewTestCh.publish({
         knownTests,
@@ -364,7 +390,7 @@ addHook({
   // `onAfterRunTask` is run after all repetitions or attempts are run
   // `onAfterRunTask` is an async function
   shimmer.wrap(VitestTestRunner.prototype, 'onAfterRunTask', onAfterRunTask => function (task) {
-    const { isEarlyFlakeDetectionEnabled, isQuarantinedTestsEnabled } = getProvidedContext()
+    const { isEarlyFlakeDetectionEnabled, isTestManagementTestsEnabled } = getProvidedContext()
 
     if (isEarlyFlakeDetectionEnabled && taskToStatuses.has(task)) {
       const statuses = taskToStatuses.get(task)
@@ -377,7 +403,7 @@ addHook({
       }
     }
 
-    if (isQuarantinedTestsEnabled) {
+    if (isTestManagementTestsEnabled) {
       if (quarantinedTasks.has(task)) {
         task.result.state = 'pass'
       }
@@ -400,17 +426,17 @@ addHook({
       isKnownTestsEnabled,
       isEarlyFlakeDetectionEnabled,
       isDiEnabled,
-      isQuarantinedTestsEnabled,
-      quarantinedTests
+      isTestManagementTestsEnabled,
+      testManagementTests
     } = getProvidedContext()
 
     if (isKnownTestsEnabled) {
       isNew = newTasks.has(task)
     }
 
-    if (isQuarantinedTestsEnabled) {
+    if (isTestManagementTestsEnabled) {
       isQuarantinedCh.publish({
-        quarantinedTests,
+        testManagementTests,
         testSuiteAbsolutePath: task.file.filepath,
         testName,
         onDone: (isTestQuarantined) => {
@@ -624,9 +650,16 @@ addHook({
     // From >=3.0.1, the first arguments changes from a string to an object containing the filepath
     const testSuiteAbsolutePath = testPaths[0]?.filepath || testPaths[0]
 
+    const { isEarlyFlakeDetectionEnabled, isFlakyTestRetriesEnabled } = getProvidedContext()
+
     const testSuiteAsyncResource = new AsyncResource('bound-anonymous-fn')
     testSuiteAsyncResource.runInAsyncScope(() => {
-      testSuiteStartCh.publish({ testSuiteAbsolutePath, frameworkVersion })
+      testSuiteStartCh.publish({
+        testSuiteAbsolutePath,
+        frameworkVersion,
+        isFlakyTestRetriesEnabled,
+        isEarlyFlakeDetectionEnabled
+      })
     })
     const startTestsResponse = await startTests.apply(this, arguments)
 
@@ -651,7 +684,8 @@ addHook({
           testSkipCh.publish({
             testName: getTestName(task),
             testSuiteAbsolutePath: task.file.filepath,
-            isNew: newTasks.has(task)
+            isNew: newTasks.has(task),
+            isDisabled: disabledTasks.has(task)
           })
         } else if (state === 'pass' && !isSwitchedStatus) {
           if (testAsyncResource) {
@@ -681,7 +715,8 @@ addHook({
         testSkipCh.publish({
           testName: getTestName(task),
           testSuiteAbsolutePath: task.file.filepath,
-          isNew: newTasks.has(task)
+          isNew: newTasks.has(task),
+          isDisabled: disabledTasks.has(task)
         })
       }
     })

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

@@ -29,7 +29,8 @@ const {
   CUCUMBER_IS_PARALLEL,
   TEST_RETRY_REASON,
   TEST_MANAGEMENT_ENABLED,
-  TEST_MANAGEMENT_IS_QUARANTINED
+  TEST_MANAGEMENT_IS_QUARANTINED,
+  TEST_MANAGEMENT_IS_DISABLED
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT, ERROR_MESSAGE } = require('../../dd-trace/src/constants')
@@ -86,7 +87,7 @@ class CucumberPlugin extends CiPlugin {
       hasForcedToRunSuites,
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
-      isQuarantinedTestsEnabled,
+      isTestManagementTestsEnabled,
       isParallel
     }) => {
       const { isSuitesSkippingEnabled, isCodeCoverageEnabled } = this.libraryConfig || {}
@@ -113,7 +114,7 @@ class CucumberPlugin extends CiPlugin {
       if (isParallel) {
         this.testSessionSpan.setTag(CUCUMBER_IS_PARALLEL, 'true')
       }
-      if (isQuarantinedTestsEnabled) {
+      if (isTestManagementTestsEnabled) {
         this.testSessionSpan.setTag(TEST_MANAGEMENT_ENABLED, 'true')
       }
 
@@ -124,7 +125,10 @@ class CucumberPlugin extends CiPlugin {
       this.testSessionSpan.finish()
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
       finishAllTraceSpans(this.testSessionSpan)
-      this.telemetry.count(TELEMETRY_TEST_SESSION, { provider: this.ciProviderName })
+      this.telemetry.count(TELEMETRY_TEST_SESSION, {
+        provider: this.ciProviderName,
+        autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+      })
 
       this.libraryConfig = null
       this.tracer._exporter.flush()
@@ -324,6 +328,7 @@ class CucumberPlugin extends CiPlugin {
       isNew,
       isEfdRetry,
       isFlakyRetry,
+      isDisabled,
       isQuarantined
     }) => {
       const span = storage('legacy').getStore().span
@@ -353,6 +358,10 @@ class CucumberPlugin extends CiPlugin {
         span.setTag(TEST_IS_RETRY, 'true')
       }
 
+      if (isDisabled) {
+        span.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')
+      }
+
       if (isQuarantined) {
         span.setTag(TEST_MANAGEMENT_IS_QUARANTINED, 'true')
       }

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

@@ -35,7 +35,11 @@ const {
   TEST_RETRY_REASON,
   DD_TEST_IS_USER_PROVIDED_SERVICE,
   TEST_MANAGEMENT_IS_QUARANTINED,
-  TEST_MANAGEMENT_ENABLED
+  TEST_MANAGEMENT_ENABLED,
+  TEST_MANAGEMENT_IS_DISABLED,
+  DD_CAPABILITIES_EARLY_FLAKE_DETECTION,
+  DD_CAPABILITIES_AUTO_TEST_RETRIES,
+  DD_CAPABILITIES_TEST_IMPACT_ANALYSIS
 } = require('../../dd-trace/src/plugins/util/test')
 const { isMarkedAsUnskippable } = require('../../datadog-plugin-jest/src/util')
 const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
@@ -154,15 +158,15 @@ function getKnownTests (tracer, testConfiguration) {
   })
 }
 
-function getQuarantinedTests (tracer, testConfiguration) {
+function getTestManagementTests (tracer, testConfiguration) {
   return new Promise(resolve => {
-    if (!tracer._tracer._exporter?.getQuarantinedTests) {
+    if (!tracer._tracer._exporter?.getTestManagementTests) {
       return resolve({ err: new Error('Test Optimization was not initialized correctly') })
     }
-    tracer._tracer._exporter.getQuarantinedTests(testConfiguration, (err, quarantinedTests) => {
+    tracer._tracer._exporter.getTestManagementTests(testConfiguration, (err, testManagementTests) => {
       resolve({
         err,
-        quarantinedTests
+        testManagementTests
       })
     })
   })
@@ -257,7 +261,7 @@ class CypressPlugin {
               isFlakyTestRetriesEnabled,
               flakyTestRetriesCount,
               isKnownTestsEnabled,
-              isQuarantinedTestsEnabled
+              isTestManagementEnabled
             }
           } = libraryConfigurationResponse
           this.isSuitesSkippingEnabled = isSuitesSkippingEnabled
@@ -268,22 +272,18 @@ class CypressPlugin {
           if (isFlakyTestRetriesEnabled) {
             this.cypressConfig.retries.runMode = flakyTestRetriesCount
           }
-          this.isQuarantinedTestsEnabled = isQuarantinedTestsEnabled
+          this.isTestManagementTestsEnabled = isTestManagementEnabled
         }
         return this.cypressConfig
       })
     return this.libraryConfigurationPromise
   }
 
-  getIsQuarantinedTest (testSuite, testName) {
-    return this.quarantinedTests
-      ?.cypress
-      ?.suites
-      ?.[testSuite]
-      ?.tests
-      ?.[testName]
-      ?.properties
-      ?.quarantined
+  getTestProperties (testSuite, testName) {
+    const { disabled: isDisabled, quarantined: isQuarantined } =
+      this.testManagementTests?.cypress?.suites?.[testSuite]?.tests?.[testName]?.properties || {}
+
+    return { isDisabled, isQuarantined }
   }
 
   getTestSuiteSpan ({ testSuite, testSuiteAbsolutePath }) {
@@ -418,16 +418,16 @@ class CypressPlugin {
       }
     }
 
-    if (this.isQuarantinedTestsEnabled) {
-      const quarantinedTestsResponse = await getQuarantinedTests(
+    if (this.isTestManagementTestsEnabled) {
+      const testManagementTestsResponse = await getTestManagementTests(
         this.tracer,
         this.testConfiguration
       )
-      if (quarantinedTestsResponse.err) {
-        log.error('Cypress quarantined tests response error', quarantinedTestsResponse.err)
-        this.isQuarantinedTestsEnabled = false
+      if (testManagementTestsResponse.err) {
+        log.error('Cypress test management tests response error', testManagementTestsResponse.err)
+        this.isTestManagementTestsEnabled = false
       } else {
-        this.quarantinedTests = quarantinedTestsResponse.quarantinedTests
+        this.testManagementTests = testManagementTestsResponse.testManagementTests
       }
     }
 
@@ -452,14 +452,21 @@ class CypressPlugin {
 
     const testSessionName = getTestSessionName(this.tracer._tracer._config, this.command, this.testEnvironmentMetadata)
 
-    if (this.tracer._tracer._exporter?.setMetadataTags) {
+    if (this.tracer._tracer._exporter?.addMetadataTags) {
       const metadataTags = {}
       for (const testLevel of TEST_LEVEL_EVENT_TYPES) {
         metadataTags[testLevel] = {
           [TEST_SESSION_NAME]: testSessionName
         }
       }
-      this.tracer._tracer._exporter.setMetadataTags(metadataTags)
+      metadataTags.test = {
+        ...metadataTags.test,
+        [DD_CAPABILITIES_TEST_IMPACT_ANALYSIS]: this.isSuitesSkippingEnabled ? 'true' : 'false',
+        [DD_CAPABILITIES_EARLY_FLAKE_DETECTION]: this.isEarlyFlakeDetectionEnabled ? 'true' : 'false',
+        [DD_CAPABILITIES_AUTO_TEST_RETRIES]: this.isFlakyTestRetriesEnabled ? 'true' : 'false'
+      }
+
+      this.tracer._tracer._exporter.addMetadataTags(metadataTags)
     }
 
     this.testSessionSpan = this.tracer.startSpan(`${TEST_FRAMEWORK_NAME}.test_session`, {
@@ -509,7 +516,7 @@ class CypressPlugin {
         }
       )
 
-      if (this.isQuarantinedTestsEnabled) {
+      if (this.isTestManagementTestsEnabled) {
         this.testSessionSpan.setTag(TEST_MANAGEMENT_ENABLED, 'true')
       }
 
@@ -518,7 +525,8 @@ class CypressPlugin {
       this.testSessionSpan.finish()
       this.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
       incrementCountMetric(TELEMETRY_TEST_SESSION, {
-        provider: this.ciProviderName
+        provider: this.ciProviderName,
+        autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
       })
 
       finishAllTraceSpans(this.testSessionSpan)
@@ -588,9 +596,11 @@ class CypressPlugin {
         skippedTestSpan.setTag(ITR_CORRELATION_ID, this.itrCorrelationId)
       }
 
-      const isQuarantined = this.getIsQuarantinedTest(spec.relative, cypressTestName)
+      const { isDisabled, isQuarantined } = this.getTestProperties(spec.relative, cypressTestName)
 
-      if (isQuarantined) {
+      if (isDisabled) {
+        skippedTestSpan.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')
+      } else if (isQuarantined) {
         skippedTestSpan.setTag(TEST_MANAGEMENT_IS_QUARANTINED, 'true')
       }
 
@@ -697,7 +707,7 @@ class CypressPlugin {
         })
         const isUnskippable = this.unskippableSuites.includes(testSuite)
         const isForcedToRun = shouldSkip && isUnskippable
-        const isQuarantined = this.getIsQuarantinedTest(testSuite, testName)
+        const { isDisabled, isQuarantined } = this.getTestProperties(testSuite, testName)
 
         // skip test
         if (shouldSkip && !isUnskippable) {
@@ -708,7 +718,7 @@ class CypressPlugin {
 
         // 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 (isQuarantined) {
+        if (isDisabled || isQuarantined) {
           return { shouldSkip: true }
         }
 
@@ -737,8 +747,7 @@ class CypressPlugin {
           testSuiteAbsolutePath,
           testName,
           isNew,
-          isEfdRetry,
-          isQuarantined
+          isEfdRetry
         } = test
         if (coverage && this.isCodeCoverageEnabled && this.tracer._tracer._exporter?.exportCoverage) {
           const coverageFiles = getCoveredFilenamesFromCoverage(coverage)
@@ -777,9 +786,6 @@ class CypressPlugin {
             this.activeTestSpan.setTag(TEST_RETRY_REASON, 'efd')
           }
         }
-        if (isQuarantined) {
-          this.activeTestSpan.setTag(TEST_MANAGEMENT_IS_QUARANTINED, 'true')
-        }
         const finishedTest = {
           testName,
           testStatus,

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

@@ -1,5 +1,6 @@
 const NoopTracer = require('../../dd-trace/src/noop/tracer')
 const cypressPlugin = require('./cypress-plugin')
+const satisfies = require('semifies')
 
 const noopTask = {
   'dd:testSuiteStart': () => {
@@ -19,6 +20,15 @@ const noopTask = {
 module.exports = (on, config) => {
   const tracer = require('../../dd-trace')
 
+  if (satisfies(config.version, '<10.2.0')) {
+    // console.warn does not seem to work in cypress, so using console.log instead
+    // eslint-disable-next-line no-console
+    console.log(
+      'WARNING: dd-trace support for Cypress<10.2.0 is deprecated' +
+      ' and will not be supported in future versions of dd-trace.'
+    )
+  }
+
   // The tracer was not init correctly for whatever reason (such as invalid DD_SITE)
   if (tracer._tracer instanceof NoopTracer) {
     // We still need to register these tasks or the support file will fail