[test optimization] Prevent ATF tests from being incorrectly tagged as new in jest (#7960)

Author: juan-fernandez

integration-tests/jest/jest.spec.js

@@ -5560,6 +5560,74 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
         ])
       })
 
+      it('does not tag known attempt to fix tests as new', async () => {
+        receiver.setKnownTests({
+          jest: {
+            'ci-visibility/jest-flaky/flaky-fails.js': [
+              'test-flaky-test-retries can retry failed tests',
+            ],
+          },
+        })
+        receiver.setSettings({
+          test_management: { enabled: true, attempt_to_fix_retries: 2 },
+          early_flake_detection: {
+            enabled: true,
+            slow_test_retries: {
+              '5s': 2,
+            },
+            faulty_session_threshold: 100,
+          },
+          known_tests_enabled: true,
+        })
+
+        receiver.setTestManagementTests({
+          jest: {
+            suites: {
+              'ci-visibility/jest-flaky/flaky-fails.js': {
+                tests: {
+                  'test-flaky-test-retries can retry failed tests': {
+                    properties: {
+                      attempt_to_fix: true,
+                    },
+                  },
+                },
+              },
+            },
+          },
+        })
+        const eventsPromise = receiver
+          .gatherPayloadsMaxTimeout(({ url }) => url.endsWith('/api/v2/citestcycle'), (payloads) => {
+            const events = payloads.flatMap(({ payload }) => payload.events)
+            const tests = events.filter(event => event.type === 'test').map(event => event.content)
+            const atfTests = tests.filter(
+              t => t.meta[TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX] === 'true'
+            )
+            assert.ok(atfTests.length > 0)
+            for (const test of atfTests) {
+              assert.ok(
+                !(TEST_IS_NEW in test.meta),
+                'ATF test that is in known tests should not be tagged as new'
+              )
+            }
+          })
+
+        childProcess = exec(
+          runTestsCommand,
+          {
+            cwd,
+            env: {
+              ...getCiVisAgentlessConfig(receiver.port),
+              TESTS_TO_RUN: 'jest-flaky/flaky-fails.js',
+            },
+          }
+        )
+
+        await Promise.all([
+          once(childProcess, 'exit'),
+          eventsPromise,
+        ])
+      })
+
       it('resets mock state between attempt to fix retries', async () => {
         const NUM_RETRIES = 3
         receiver.setSettings({ test_management: { enabled: true, attempt_to_fix_retries: NUM_RETRIES } })

packages/datadog-instrumentations/src/jest.js

@@ -111,6 +111,8 @@ const efdDeterminedRetries = new Map()
 const efdSlowAbortedTests = new Set()
 // Tests added as EFD new-test candidates (not ATF, not impacted).
 const efdNewTestCandidates = new Set()
+// Tests that are genuinely new (not in known tests list).
+const newTests = new Set()
 const testSuiteAbsolutePathsWithFastCheck = new Set()
 const testSuiteJestObjects = new Map()
 
@@ -485,7 +487,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         }
 
         if (this.isKnownTestsEnabled) {
-          isNewTest = retriedTestsToNumAttempts.has(testName)
+          isNewTest = newTests.has(testName)
         }
 
         const willRunEfd = this.isEarlyFlakeDetectionEnabled && (isNewTest || isModified)
@@ -605,6 +607,9 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         }
         if (!isAttemptToFix && this.isKnownTestsEnabled) {
           const isNew = !this.knownTestsForThisSuite.includes(testFullName)
+          if (isNew && !isSkipped) {
+            newTests.add(testFullName)
+          }
           if (isNew && !isSkipped && !retriedTestsToNumAttempts.has(testFullName)) {
             if (DYNAMIC_NAME_RE.test(testFullName)) {
               // Populated directly for runInBand; for parallel workers the main process
@@ -715,7 +720,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         let isEfdRetry = false
         // We'll store the test statuses of the retries
         if (this.isKnownTestsEnabled) {
-          const isNewTest = retriedTestsToNumAttempts.has(testName)
+          const isNewTest = newTests.has(testName)
           if (isNewTest) {
             if (newTestsTestStatuses.has(testName)) {
               newTestsTestStatuses.get(testName).push(status)
@@ -811,6 +816,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         efdDeterminedRetries.clear()
         efdSlowAbortedTests.clear()
         efdNewTestCandidates.clear()
+        newTests.clear()
         retriedTestsToNumAttempts.clear()
         attemptToFixRetriedTestsStatuses.clear()
         testsToBeRetried.clear()