dd-trace 5.42.0 → 5.44.0

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 isAttemptToFixCh = channel('ci:vitest:test:is-attempt-to-fix')
 const isDisabledCh = channel('ci:vitest:test:is-disabled')
 const isQuarantinedCh = channel('ci:vitest:test:is-quarantined')
 
@@ -30,7 +31,9 @@ const taskToStatuses = new WeakMap()
 const newTasks = new WeakSet()
 const disabledTasks = new WeakSet()
 const quarantinedTasks = new WeakSet()
+const attemptToFixTasks = new WeakSet()
 let isRetryReasonEfd = false
+let isRetryReasonAttemptToFix = false
 const switchedStatuses = new WeakSet()
 const sessionAsyncResource = new AsyncResource('bound-anonymous-fn')
 
@@ -53,6 +56,7 @@ function getProvidedContext () {
       _ddEarlyFlakeDetectionNumRetries: numRepeats,
       _ddIsKnownTestsEnabled: isKnownTestsEnabled,
       _ddIsTestManagementTestsEnabled: isTestManagementTestsEnabled,
+      _ddTestManagementAttemptToFixRetries: testManagementAttemptToFixRetries,
       _ddTestManagementTests: testManagementTests,
       _ddIsFlakyTestRetriesEnabled: isFlakyTestRetriesEnabled
     } = globalThis.__vitest_worker__.providedContext
@@ -64,6 +68,7 @@ function getProvidedContext () {
       numRepeats,
       isKnownTestsEnabled,
       isTestManagementTestsEnabled,
+      testManagementAttemptToFixRetries,
       testManagementTests,
       isFlakyTestRetriesEnabled
     }
@@ -76,6 +81,7 @@ function getProvidedContext () {
       numRepeats: 0,
       isKnownTestsEnabled: false,
       isTestManagementTestsEnabled: false,
+      testManagementAttemptToFixRetries: 0,
       testManagementTests: {}
     }
   }
@@ -94,6 +100,10 @@ function isReporterPackageNewest (vitestPackage) {
   return vitestPackage.h?.name === 'BaseSequencer'
 }
 
+function isBaseSequencer (vitestPackage) {
+  return vitestPackage.b?.name === 'BaseSequencer'
+}
+
 function getChannelPromise (channelToPublishTo) {
   return new Promise(resolve => {
     sessionAsyncResource.runInAsyncScope(() => {
@@ -172,6 +182,7 @@ function getSortWrapper (sort) {
     let isEarlyFlakeDetectionFaulty = false
     let isKnownTestsEnabled = false
     let isTestManagementTestsEnabled = false
+    let testManagementAttemptToFixRetries = 0
     let isDiEnabled = false
     let knownTests = {}
     let testManagementTests = {}
@@ -186,6 +197,7 @@ function getSortWrapper (sort) {
         isDiEnabled = libraryConfig.isDiEnabled
         isKnownTestsEnabled = libraryConfig.isKnownTestsEnabled
         isTestManagementTestsEnabled = libraryConfig.isTestManagementEnabled
+        testManagementAttemptToFixRetries = libraryConfig.testManagementAttemptToFixRetries
       }
     } catch (e) {
       isFlakyTestRetriesEnabled = false
@@ -258,6 +270,7 @@ function getSortWrapper (sort) {
         try {
           const workspaceProject = this.ctx.getCoreWorkspaceProject()
           workspaceProject._provided._ddIsTestManagementTestsEnabled = isTestManagementTestsEnabled
+          workspaceProject._provided._ddTestManagementAttemptToFixRetries = testManagementAttemptToFixRetries
           workspaceProject._provided._ddTestManagementTests = testManagementTests
         } catch (e) {
           log.warn('Could not send test management tests to workers so Test Management will not work.')
@@ -349,10 +362,24 @@ addHook({
       isKnownTestsEnabled,
       numRepeats,
       isTestManagementTestsEnabled,
+      testManagementAttemptToFixRetries,
       testManagementTests
     } = getProvidedContext()
 
     if (isTestManagementTestsEnabled) {
+      isAttemptToFixCh.publish({
+        testManagementTests,
+        testSuiteAbsolutePath: task.file.filepath,
+        testName,
+        onDone: (isAttemptToFix) => {
+          if (isAttemptToFix) {
+            isRetryReasonAttemptToFix = task.repeats !== testManagementAttemptToFixRetries
+            task.repeats = testManagementAttemptToFixRetries
+            attemptToFixTasks.add(task)
+            taskToStatuses.set(task, [])
+          }
+        }
+      })
       isDisabledCh.publish({
         testManagementTests,
         testSuiteAbsolutePath: task.file.filepath,
@@ -360,7 +387,10 @@ addHook({
         onDone: (isTestDisabled) => {
           if (isTestDisabled) {
             disabledTasks.add(task)
-            task.mode = 'skip'
+            if (!attemptToFixTasks.has(task)) {
+              // we only actually skip if the test is not being attempted to be fixed
+              task.mode = 'skip'
+            }
           }
         }
       })
@@ -372,7 +402,7 @@ addHook({
         testSuiteAbsolutePath: task.file.filepath,
         testName,
         onDone: (isNew) => {
-          if (isNew) {
+          if (isNew && !attemptToFixTasks.has(task)) {
             if (isEarlyFlakeDetectionEnabled) {
               isRetryReasonEfd = task.repeats !== numRepeats
               task.repeats = numRepeats
@@ -392,19 +422,28 @@ addHook({
   shimmer.wrap(VitestTestRunner.prototype, 'onAfterRunTask', onAfterRunTask => function (task) {
     const { isEarlyFlakeDetectionEnabled, isTestManagementTestsEnabled } = getProvidedContext()
 
-    if (isEarlyFlakeDetectionEnabled && taskToStatuses.has(task)) {
-      const statuses = taskToStatuses.get(task)
-      // If the test has passed at least once, we consider it passed
-      if (statuses.includes('pass')) {
+    if (isTestManagementTestsEnabled) {
+      const isAttemptingToFix = attemptToFixTasks.has(task)
+      const isDisabled = disabledTasks.has(task)
+      const isQuarantined = quarantinedTasks.has(task)
+
+      if (isAttemptingToFix && (isDisabled || isQuarantined)) {
         if (task.result.state === 'fail') {
           switchedStatuses.add(task)
         }
         task.result.state = 'pass'
+      } else if (isQuarantined) {
+        task.result.state = 'pass'
       }
     }
 
-    if (isTestManagementTestsEnabled) {
-      if (quarantinedTasks.has(task)) {
+    if (isEarlyFlakeDetectionEnabled && taskToStatuses.has(task) && !attemptToFixTasks.has(task)) {
+      const statuses = taskToStatuses.get(task)
+      // If the test has passed at least once, we consider it passed
+      if (statuses.includes('pass')) {
+        if (task.result.state === 'fail') {
+          switchedStatuses.add(task)
+        }
         task.result.state = 'pass'
       }
     }
@@ -477,6 +516,8 @@ addHook({
     }
 
     const lastExecutionStatus = task.result.state
+    const shouldFlipStatus = isEarlyFlakeDetectionEnabled || attemptToFixTasks.has(task)
+    const statuses = taskToStatuses.get(task)
 
     // These clauses handle task.repeats, whether EFD is enabled or not
     // The only thing that EFD does is to forcefully pass the test if it has passed at least once
@@ -497,15 +538,21 @@ addHook({
             testPassCh.publish({ task })
           })
         }
-        if (isEarlyFlakeDetectionEnabled) {
-          const statuses = taskToStatuses.get(task)
+        if (shouldFlipStatus) {
           statuses.push(lastExecutionStatus)
           // If we don't "reset" the result.state to "pass", once a repetition fails,
           // vitest will always consider the test as failed, so we can't read the actual status
+          // This means that we change vitest's behavior:
+          // if the last attempt passes, vitest would consider the test as failed
+          // but after this change, it will consider the test as passed
           task.result.state = 'pass'
         }
       }
     } else if (numRepetition === task.repeats) {
+      if (shouldFlipStatus) {
+        statuses.push(lastExecutionStatus)
+      }
+
       const asyncResource = taskToAsync.get(task)
       if (lastExecutionStatus === 'fail') {
         const testError = task.result?.errors?.[0]
@@ -528,8 +575,11 @@ addHook({
         testSuiteAbsolutePath: task.file.filepath,
         isRetry: numAttempt > 0 || numRepetition > 0,
         isRetryReasonEfd,
+        isRetryReasonAttemptToFix: isRetryReasonAttemptToFix && numRepetition > 0,
         isNew,
         mightHitProbe: isDiEnabled && numAttempt > 0,
+        isAttemptToFix: attemptToFixTasks.has(task),
+        isDisabled: disabledTasks.has(task),
         isQuarantined
       })
     })
@@ -544,6 +594,8 @@ addHook({
       }
       const result = await onAfterTryTask.apply(this, arguments)
 
+      const { testManagementAttemptToFixRetries } = getProvidedContext()
+
       const status = getVitestTestStatus(task, retryCount)
       const asyncResource = taskToAsync.get(task)
 
@@ -553,10 +605,18 @@ addHook({
         await waitForHitProbe()
       }
 
+      let attemptToFixPassed = false
+      if (attemptToFixTasks.has(task)) {
+        const statuses = taskToStatuses.get(task)
+        if (statuses.length === testManagementAttemptToFixRetries && statuses.every(status => status === 'pass')) {
+          attemptToFixPassed = true
+        }
+      }
+
       if (asyncResource) {
         // We don't finish here because the test might fail in a later hook (afterEach)
         asyncResource.runInAsyncScope(() => {
-          testFinishTimeCh.publish({ status, task })
+          testFinishTimeCh.publish({ status, task, attemptToFixPassed })
         })
       }
 
@@ -615,11 +675,22 @@ addHook({
 
 addHook({
   name: 'vitest',
-  versions: ['>=3.0.0'],
+  versions: ['>=3.0.9'],
+  filePattern: 'dist/chunks/coverage.*'
+}, (coveragePackage) => {
+  if (isBaseSequencer(coveragePackage)) {
+    shimmer.wrap(coveragePackage.b.prototype, 'sort', getSortWrapper)
+  }
+  return coveragePackage
+})
+
+addHook({
+  name: 'vitest',
+  versions: ['>=3.0.0 <3.0.9'],
   filePattern: 'dist/chunks/resolveConfig.*'
-}, (randomSequencerPackage) => {
-  shimmer.wrap(randomSequencerPackage.B.prototype, 'sort', getSortWrapper)
-  return randomSequencerPackage
+}, (resolveConfigPackage) => {
+  shimmer.wrap(resolveConfigPackage.B.prototype, 'sort', getSortWrapper)
+  return resolveConfigPackage
 })
 
 // Can't specify file because compiled vitest includes hashes in their files
@@ -650,15 +721,11 @@ 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,
-        isFlakyTestRetriesEnabled,
-        isEarlyFlakeDetectionEnabled
+        frameworkVersion
       })
     })
     const startTestsResponse = await startTests.apply(this, arguments)
@@ -700,11 +767,19 @@ addHook({
             testError = errors[0]
           }
 
+          let hasFailedAllRetries = false
+          if (attemptToFixTasks.has(task)) {
+            const statuses = taskToStatuses.get(task)
+            if (statuses.every(status => status === 'fail')) {
+              hasFailedAllRetries = true
+            }
+          }
+
           if (testAsyncResource) {
             const isRetry = task.result?.retryCount > 0
             // `duration` is the duration of all the retries, so it can't be used if there are retries
             testAsyncResource.runInAsyncScope(() => {
-              testErrorCh.publish({ duration: !isRetry ? duration : undefined, error: testError })
+              testErrorCh.publish({ duration: !isRetry ? duration : undefined, error: testError, hasFailedAllRetries })
             })
           }
           if (errors?.length) {

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

@@ -30,7 +30,10 @@ const {
   TEST_RETRY_REASON,
   TEST_MANAGEMENT_ENABLED,
   TEST_MANAGEMENT_IS_QUARANTINED,
-  TEST_MANAGEMENT_IS_DISABLED
+  TEST_MANAGEMENT_IS_DISABLED,
+  TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
+  TEST_HAS_FAILED_ALL_RETRIES,
+  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT, ERROR_MESSAGE } = require('../../dd-trace/src/constants')
@@ -328,6 +331,10 @@ class CucumberPlugin extends CiPlugin {
       isNew,
       isEfdRetry,
       isFlakyRetry,
+      isAttemptToFix,
+      isAttemptToFixRetry,
+      hasFailedAllRetries,
+      hasPassedAllRetries,
       isDisabled,
       isQuarantined
     }) => {
@@ -358,6 +365,22 @@ class CucumberPlugin extends CiPlugin {
         span.setTag(TEST_IS_RETRY, 'true')
       }
 
+      if (hasFailedAllRetries) {
+        span.setTag(TEST_HAS_FAILED_ALL_RETRIES, 'true')
+      }
+
+      if (isAttemptToFix) {
+        span.setTag(TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX, 'true')
+      }
+
+      if (isAttemptToFixRetry) {
+        span.setTag(TEST_IS_RETRY, 'true')
+        span.setTag(TEST_RETRY_REASON, 'attempt_to_fix')
+        if (hasPassedAllRetries) {
+          span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'true')
+        }
+      }
+
       if (isDisabled) {
         span.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')
       }

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

@@ -37,9 +37,10 @@ const {
   TEST_MANAGEMENT_IS_QUARANTINED,
   TEST_MANAGEMENT_ENABLED,
   TEST_MANAGEMENT_IS_DISABLED,
-  DD_CAPABILITIES_EARLY_FLAKE_DETECTION,
-  DD_CAPABILITIES_AUTO_TEST_RETRIES,
-  DD_CAPABILITIES_TEST_IMPACT_ANALYSIS
+  TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
+  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
+  TEST_HAS_FAILED_ALL_RETRIES,
+  getLibraryCapabilitiesTags
 } = require('../../dd-trace/src/plugins/util/test')
 const { isMarkedAsUnskippable } = require('../../datadog-plugin-jest/src/util')
 const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
@@ -64,7 +65,8 @@ const {
   GIT_COMMIT_SHA,
   GIT_BRANCH,
   CI_PROVIDER_NAME,
-  CI_WORKSPACE_PATH
+  CI_WORKSPACE_PATH,
+  GIT_COMMIT_MESSAGE
 } = require('../../dd-trace/src/plugins/util/tags')
 const {
   OS_VERSION,
@@ -201,7 +203,8 @@ class CypressPlugin {
       [RUNTIME_VERSION]: runtimeVersion,
       [GIT_BRANCH]: branch,
       [CI_PROVIDER_NAME]: ciProviderName,
-      [CI_WORKSPACE_PATH]: repositoryRoot
+      [CI_WORKSPACE_PATH]: repositoryRoot,
+      [GIT_COMMIT_MESSAGE]: commitMessage
     } = this.testEnvironmentMetadata
 
     this.repositoryRoot = repositoryRoot
@@ -217,9 +220,11 @@ class CypressPlugin {
       runtimeName,
       runtimeVersion,
       branch,
-      testLevel: 'test'
+      testLevel: 'test',
+      commitMessage
     }
     this.finishedTestsByFile = {}
+    this.testStatuses = {}
 
     this.isTestsSkipped = false
     this.isSuitesSkippingEnabled = false
@@ -233,6 +238,8 @@ class CypressPlugin {
     this.hasUnskippableSuites = false
     this.unskippableSuites = []
     this.knownTests = []
+    this.isTestManagementTestsEnabled = false
+    this.testManagementAttemptToFixRetries = 0
   }
 
   // Init function returns a promise that resolves with the Cypress configuration
@@ -261,7 +268,8 @@ class CypressPlugin {
               isFlakyTestRetriesEnabled,
               flakyTestRetriesCount,
               isKnownTestsEnabled,
-              isTestManagementEnabled
+              isTestManagementEnabled,
+              testManagementAttemptToFixRetries
             }
           } = libraryConfigurationResponse
           this.isSuitesSkippingEnabled = isSuitesSkippingEnabled
@@ -273,17 +281,22 @@ class CypressPlugin {
             this.cypressConfig.retries.runMode = flakyTestRetriesCount
           }
           this.isTestManagementTestsEnabled = isTestManagementEnabled
+          this.testManagementAttemptToFixRetries = testManagementAttemptToFixRetries
         }
         return this.cypressConfig
       })
     return this.libraryConfigurationPromise
   }
 
+  getTestSuiteProperties (testSuite) {
+    return this.testManagementTests?.cypress?.suites?.[testSuite]?.tests || {}
+  }
+
   getTestProperties (testSuite, testName) {
-    const { disabled: isDisabled, quarantined: isQuarantined } =
-      this.testManagementTests?.cypress?.suites?.[testSuite]?.tests?.[testName]?.properties || {}
+    const { attempt_to_fix: isAttemptToFix, disabled: isDisabled, quarantined: isQuarantined } =
+      this.getTestSuiteProperties(testSuite)?.[testName]?.properties || {}
 
-    return { isDisabled, isQuarantined }
+    return { isAttemptToFix, isDisabled, isQuarantined }
   }
 
   getTestSuiteSpan ({ testSuite, testSuiteAbsolutePath }) {
@@ -312,7 +325,7 @@ class CypressPlugin {
     })
   }
 
-  getTestSpan ({ testName, testSuite, isUnskippable, isForcedToRun, testSourceFile }) {
+  getTestSpan ({ testName, testSuite, isUnskippable, isForcedToRun, testSourceFile, isDisabled, isQuarantined }) {
     const testSuiteTags = {
       [TEST_COMMAND]: this.command,
       [TEST_COMMAND]: this.command,
@@ -357,6 +370,14 @@ class CypressPlugin {
       testSpanMetadata[TEST_ITR_FORCED_RUN] = 'true'
     }
 
+    if (isDisabled) {
+      testSpanMetadata[TEST_MANAGEMENT_IS_DISABLED] = 'true'
+    }
+
+    if (isQuarantined) {
+      testSpanMetadata[TEST_MANAGEMENT_IS_QUARANTINED] = 'true'
+    }
+
     this.ciVisEvent(TELEMETRY_EVENT_CREATED, 'test', { hasCodeOwners: !!codeOwners })
 
     return this.tracer.startSpan(`${TEST_FRAMEWORK_NAME}.test`, {
@@ -459,11 +480,10 @@ class CypressPlugin {
           [TEST_SESSION_NAME]: testSessionName
         }
       }
+      const libraryCapabilitiesTags = getLibraryCapabilitiesTags(this.constructor.id)
       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'
+        ...libraryCapabilitiesTags
       }
 
       this.tracer._tracer._exporter.addMetadataTags(metadataTags)
@@ -691,7 +711,10 @@ class CypressPlugin {
           isEarlyFlakeDetectionEnabled: this.isEarlyFlakeDetectionEnabled,
           knownTestsForSuite: this.knownTestsByTestSuite?.[testSuite] || [],
           earlyFlakeDetectionNumRetries: this.earlyFlakeDetectionNumRetries,
-          isKnownTestsEnabled: this.isKnownTestsEnabled
+          isKnownTestsEnabled: this.isKnownTestsEnabled,
+          isTestManagementEnabled: this.isTestManagementTestsEnabled,
+          testManagementAttemptToFixRetries: this.testManagementAttemptToFixRetries,
+          testManagementTests: this.getTestSuiteProperties(testSuite)
         }
 
         if (this.testSuiteSpan) {
@@ -707,8 +730,7 @@ class CypressPlugin {
         })
         const isUnskippable = this.unskippableSuites.includes(testSuite)
         const isForcedToRun = shouldSkip && isUnskippable
-        const { isDisabled, isQuarantined } = this.getTestProperties(testSuite, testName)
-
+        const { isAttemptToFix, isDisabled, isQuarantined } = this.getTestProperties(testSuite, testName)
         // skip test
         if (shouldSkip && !isUnskippable) {
           this.skippedTests.push(test)
@@ -718,7 +740,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 (isDisabled || isQuarantined) {
+        if (!isAttemptToFix && (isDisabled || isQuarantined)) {
           return { shouldSkip: true }
         }
 
@@ -727,7 +749,9 @@ class CypressPlugin {
             testName,
             testSuite,
             isUnskippable,
-            isForcedToRun
+            isForcedToRun,
+            isDisabled,
+            isQuarantined
           })
         }
 
@@ -747,7 +771,8 @@ class CypressPlugin {
           testSuiteAbsolutePath,
           testName,
           isNew,
-          isEfdRetry
+          isEfdRetry,
+          isAttemptToFix
         } = test
         if (coverage && this.isCodeCoverageEnabled && this.tracer._tracer._exporter?.exportCoverage) {
           const coverageFiles = getCoveredFilenamesFromCoverage(coverage)
@@ -770,6 +795,14 @@ class CypressPlugin {
         const testStatus = CYPRESS_STATUS_TO_TEST_STATUS[state]
         this.activeTestSpan.setTag(TEST_STATUS, testStatus)
 
+        // Save the test status to know if it has passed all retries
+        if (!this.testStatuses[testName]) {
+          this.testStatuses[testName] = [testStatus]
+        } else {
+          this.testStatuses[testName].push(testStatus)
+        }
+        const testStatuses = this.testStatuses[testName]
+
         if (error) {
           this.activeTestSpan.setTag('error', error)
         }
@@ -786,6 +819,22 @@ class CypressPlugin {
             this.activeTestSpan.setTag(TEST_RETRY_REASON, 'efd')
           }
         }
+        if (isAttemptToFix) {
+          this.activeTestSpan.setTag(TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX, 'true')
+          if (testStatuses.length > 1) {
+            this.activeTestSpan.setTag(TEST_IS_RETRY, 'true')
+            this.activeTestSpan.setTag(TEST_RETRY_REASON, 'attempt_to_fix')
+          }
+          const isLastAttempt = testStatuses.length === this.testManagementAttemptToFixRetries + 1
+          if (isLastAttempt) {
+            if (testStatuses.every(status => status === 'fail')) {
+              this.activeTestSpan.setTag(TEST_HAS_FAILED_ALL_RETRIES, 'true')
+            } else if (testStatuses.every(status => status === 'pass')) {
+              this.activeTestSpan.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'true')
+            }
+          }
+        }
+
         const finishedTest = {
           testName,
           testStatus,

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

@@ -4,6 +4,9 @@ let isKnownTestsEnabled = false
 let knownTestsForSuite = []
 let suiteTests = []
 let earlyFlakeDetectionNumRetries = 0
+let isTestManagementEnabled = false
+let testManagementAttemptToFixRetries = 0
+let testManagementTests = {}
 // We need to grab the original window as soon as possible,
 // in case the test changes the origin. If the test does change the origin,
 // any call to `cy.window()` will result in a cross origin error.
@@ -23,31 +26,53 @@ function isNewTest (test) {
   return !knownTestsForSuite.includes(test.fullTitle())
 }
 
-function retryTest (test, suiteTests) {
-  for (let retryIndex = 0; retryIndex < earlyFlakeDetectionNumRetries; retryIndex++) {
+function getTestProperties (testName) {
+  // We neeed to do it in this way because of compatibility with older versions as '?' is not supported in older versions of Cypress
+  const properties = testManagementTests[testName] && testManagementTests[testName].properties || {};
+
+  const { attempt_to_fix: isAttemptToFix, disabled: isDisabled, quarantined: isQuarantined } = properties;
+
+  return { isAttemptToFix, isDisabled, isQuarantined };
+}
+
+function retryTest (test, suiteTests, numRetries, tags) {
+  for (let retryIndex = 0; retryIndex < numRetries; retryIndex++) {
     const clonedTest = test.clone()
     // TODO: signal in framework logs that this is a retry.
     // TODO: Change it so these tests are allowed to fail.
     // TODO: figure out if reported duration is skewed.
     suiteTests.unshift(clonedTest)
-    clonedTest._ddIsNew = true
-    clonedTest._ddIsEfdRetry = true
+    tags.forEach(tag => {
+      clonedTest[tag] = true
+    })
   }
 }
 
 
 const oldRunTests = Cypress.mocha.getRunner().runTests
 Cypress.mocha.getRunner().runTests = function (suite, fn) {
-  if (!isKnownTestsEnabled) {
+  if (!isKnownTestsEnabled && !isTestManagementEnabled) {
     return oldRunTests.apply(this, arguments)
   }
   // We copy the new tests at the beginning of the suite run (runTests), so that they're run
   // multiple times.
   suite.tests.forEach(test => {
-    if (!test._ddIsNew && !test.isPending() && isNewTest(test)) {
-      test._ddIsNew = true
-      if (isEarlyFlakeDetectionEnabled) {
-        retryTest(test, suite.tests)
+    const testName = test.fullTitle()
+
+    const { isAttemptToFix } = getTestProperties(testName)
+
+    if (isTestManagementEnabled) {
+      if (isAttemptToFix && !test.isPending()) {
+        test._ddIsAttemptToFix = true
+        retryTest(test, suite.tests, testManagementAttemptToFixRetries, ['_ddIsAttemptToFix'])
+      }
+    }
+    if (isKnownTestsEnabled) {
+      if (!test._ddIsNew && !test.isPending() && isNewTest(test)) {
+        test._ddIsNew = true
+        if (isEarlyFlakeDetectionEnabled && !isAttemptToFix) {
+          retryTest(test, suite.tests, earlyFlakeDetectionNumRetries, ['_ddIsNew', '_ddIsEfdRetry'])
+        }
       }
     }
   })
@@ -80,6 +105,9 @@ before(function () {
       isKnownTestsEnabled = suiteConfig.isKnownTestsEnabled
       knownTestsForSuite = suiteConfig.knownTestsForSuite
       earlyFlakeDetectionNumRetries = suiteConfig.earlyFlakeDetectionNumRetries
+      isTestManagementEnabled = suiteConfig.isTestManagementEnabled
+      testManagementAttemptToFixRetries = suiteConfig.testManagementAttemptToFixRetries
+      testManagementTests = suiteConfig.testManagementTests
     }
   })
 })
@@ -104,7 +132,8 @@ afterEach(function () {
     state: currentTest.state,
     error: currentTest.err,
     isNew: currentTest._ddIsNew,
-    isEfdRetry: currentTest._ddIsEfdRetry
+    isEfdRetry: currentTest._ddIsEfdRetry,
+    isAttemptToFix: currentTest._ddIsAttemptToFix
   }
   try {
     testInfo.testSourceLine = Cypress.mocha.getRunner().currentRunnable.invocationDetails.line