dd-trace 6.11.0 → 6.12.0

package/LICENSE-3rdparty.csv

@@ -44,18 +44,21 @@
 "@oxc-project/types","https://github.com/oxc-project/oxc","['MIT']","['Boshen and oxc contributors']"
 "@tybys/wasm-util","https://github.com/toyobayashi/wasm-util","['MIT']","['toyobayashi']"
 "@types/estree","https://github.com/DefinitelyTyped/DefinitelyTyped","['MIT']","['DefinitelyTyped']"
+"agent-base","https://github.com/TooTallNate/proxy-agents","['MIT']","['Nathan Rajlich']"
 "argparse","https://github.com/nodeca/argparse","['Python-2.0']","['nodeca']"
 "astring","https://github.com/davidbonnet/astring","['MIT']","['David Bonnet']"
 "cjs-module-lexer","https://github.com/nodejs/cjs-module-lexer","['MIT']","['Guy Bedford']"
 "crypto-randomuuid","npm:crypto-randomuuid","['MIT']","['Stephen Belanger']"
 "dc-polyfill","https://github.com/DataDog/dc-polyfill","['MIT']","['Thomas Hunter II']"
 "dd-trace","https://github.com/DataDog/dd-trace-js","['(Apache-2.0 OR BSD-3-Clause)']","['Datadog Inc. <info@datadoghq.com>']"
+"debug","https://github.com/debug-js/debug","['MIT']","['Josh Junon']"
 "detect-newline","https://github.com/sindresorhus/detect-newline","['MIT']","['Sindre Sorhus']"
 "es-module-lexer","https://github.com/guybedford/es-module-lexer","['MIT']","['Guy Bedford']"
 "escape-string-regexp","https://github.com/sindresorhus/escape-string-regexp","['MIT']","['Sindre Sorhus']"
 "esquery","https://github.com/estools/esquery","['BSD-3-Clause']","['Joel Feenstra']"
 "estraverse","https://github.com/estools/estraverse","['BSD-2-Clause']","['estools']"
 "fast-fifo","https://github.com/mafintosh/fast-fifo","['MIT']","['Mathias Buus']"
+"https-proxy-agent","https://github.com/TooTallNate/proxy-agents","['MIT']","['Nathan Rajlich']"
 "import-in-the-middle","https://github.com/nodejs/import-in-the-middle","['Apache-2.0']","['Bryan English']"
 "istanbul-lib-coverage","https://github.com/istanbuljs/istanbuljs","['BSD-3-Clause']","['Krishnan Anantheswaran']"
 "jest-docblock","https://github.com/jestjs/jest","['MIT']","['jestjs']"
@@ -68,6 +71,7 @@
 "lru-cache","https://github.com/isaacs/node-lru-cache","['ISC']","['Isaac Z. Schlueter']"
 "meriyah","https://github.com/meriyah/meriyah","['ISC']","['Kenny F.']"
 "module-details-from-path","https://github.com/watson/module-details-from-path","['MIT']","['Thomas Watson']"
+"ms","https://github.com/vercel/ms","['MIT']","['vercel']"
 "mutexify","https://github.com/mafintosh/mutexify","['MIT']","['Mathias Buus']"
 "node-addon-api","https://github.com/nodejs/node-addon-api","['MIT']","['nodejs']"
 "node-gyp-build","https://github.com/prebuild/node-gyp-build","['MIT']","['Mathias Buus']"
@@ -75,6 +79,7 @@
 "oxc-parser","https://github.com/oxc-project/oxc","['MIT']","['Boshen and oxc contributors']"
 "pprof-format","https://github.com/DataDog/pprof-format","['MIT']","['Datadog Inc.']"
 "protobufjs","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
+"proxy-from-env","https://github.com/Rob--W/proxy-from-env","['MIT']","['Rob Wu']"
 "queue-tick","https://github.com/mafintosh/queue-tick","['MIT']","['Mathias Buus']"
 "retry","https://github.com/tim-kos/node-retry","['MIT']","['Tim Koschützki']"
 "rfdc","https://github.com/davidmarkclements/rfdc","['MIT']","['David Mark Clements']"

package/index.d.ts

@@ -3804,7 +3804,8 @@ declare namespace tracer {
         id?: string,
         inputData: JSONType,
         expectedOutput?: JSONType,
-        metadata?: Record<string, JSONType>
+        metadata?: Record<string, JSONType>,
+        tags?: string[]
       }>
     }
 
@@ -3837,6 +3838,8 @@ declare namespace tracer {
       expectedRecordCount?: number
       /** Maximum total time to wait, in ms. Default 30000. */
       maxWaitMs?: number
+      /** Filter records by these tags. */
+      tags?: string[]
     }
 
     interface ExperimentResultRow {
@@ -3954,7 +3957,12 @@ declare namespace tracer {
     }
 
     interface Dataset {
-      addRecord (input: JSONType, expectedOutput?: JSONType, metadata?: Record<string, JSONType>): Dataset
+      addRecord (
+        input: JSONType,
+        expectedOutput?: JSONType,
+        metadata?: Record<string, JSONType>,
+        tags?: string[]
+      ): Dataset
       /** Update fields on an existing dataset record. */
       update (index: number, fields: {
         input?: JSONType
@@ -3963,6 +3971,12 @@ declare namespace tracer {
       }): Dataset
       /** Delete an existing dataset record. */
       delete (index: number): Dataset
+      /** Add tags to a dataset record. */
+      addTags (index: number, tags: string[]): Dataset
+      /** Remove tags from a dataset record. */
+      removeTags (index: number, tags: string[]): Dataset
+      /** Replace all tags on a dataset record. */
+      replaceTags (index: number, tags: string[]): Dataset
       /** Creates the dataset remotely if needed and pushes any unpushed records. */
       push (): Promise<DatasetPushResult>
       name (): string
@@ -3975,8 +3989,11 @@ declare namespace tracer {
         id: string | null,
         input: JSONType,
         expectedOutput: JSONType,
-        metadata: Record<string, JSONType>
+        metadata: Record<string, JSONType>,
+        tags: string[]
       }>
+      /** Return the tags used to filter this dataset. */
+      filterTags (): string[]
       /** Dashboard URL for the dataset, or null until pushed. */
       url (): string | null
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "6.11.0",
+  "version": "6.12.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -57,13 +57,14 @@
     "test:core:ci": "node scripts/c8-ci.js test:core",
     "test:code-origin": "mocha \"packages/datadog-code-origin/test/**/*.spec.js\"",
     "test:code-origin:ci": "node scripts/c8-ci.js test:code-origin",
+    "test:evp_proxy": "mocha \"packages/dd-trace/test/evp_proxy/**/*.spec.js\"",
     "test:lambda": "mocha \"packages/dd-trace/test/lambda/**/*.spec.js\"",
     "test:lambda:ci": "node scripts/c8-ci.js test:lambda",
     "test:llmobs:sdk": "mocha --exclude \"packages/dd-trace/test/llmobs/plugins/**/*.spec.js\" \"packages/dd-trace/test/llmobs/**/*.spec.js\"",
     "test:llmobs:sdk:ci": "node scripts/c8-ci.js test:llmobs:sdk",
     "test:llmobs:plugins": "mocha \"packages/dd-trace/test/llmobs/plugins/@(${PLUGINS})/*.spec.js\"",
     "test:llmobs:plugins:ci": "yarn services && node scripts/c8-ci.js test:llmobs:plugins",
-    "test:openfeature": "mocha \"packages/dd-trace/test/openfeature/**/*.spec.js\"",
+    "test:openfeature": "mocha \"packages/dd-trace/test/evp_proxy/**/*.spec.js\" \"packages/dd-trace/test/openfeature/**/*.spec.js\"",
     "test:openfeature:ci": "node scripts/c8-ci.js test:openfeature",
     "test:plugins": "node --expose-gc ./node_modules/mocha/bin/mocha.js --fail-zero \"packages/datadog-plugin-@(${PLUGINS})/test/**/${SPEC:-*}*.spec.js\"",
     "test:plugins:ci": "yarn services && node scripts/c8-ci.js test:plugins",
@@ -186,7 +187,7 @@
     "@datadog/native-appsec": "11.0.1",
     "@datadog/native-iast-taint-tracking": "4.2.0",
     "@datadog/native-metrics": "3.1.2",
-    "@datadog/pprof": "5.18.0",
+    "@datadog/pprof": "5.18.1",
     "@datadog/wasm-js-rewriter": "5.0.3",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
     "@opentelemetry/api-logs": "<1.0.0",
@@ -196,58 +197,58 @@
     "@actions/core": "^3.0.1",
     "@actions/github": "^9.1.1",
     "@babel/helpers": "^8.0.0",
-    "@eslint/eslintrc": "^3.3.5",
+    "@eslint/eslintrc": "^3.3.6",
     "@eslint/js": "^10.0.1",
     "@eslint/plugin-kit": "^0.7.2",
     "@datadog/openfeature-node-server": "2.1.0",
     "@msgpack/msgpack": "^3.1.3",
-    "@openfeature/core": "^1.11.0",
-    "@openfeature/server-sdk": "~1.22.0",
+    "@openfeature/core": "^1.12.0",
+    "@openfeature/server-sdk": "~1.23.0",
     "@stylistic/eslint-plugin": "^5.10.0",
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.106",
     "@types/sinon": "^22.0.0",
     "@vercel/nft": "^1.10.2",
     "@yarnpkg/lockfile": "^1.1.0",
-    "axios": "^1.18.1",
+    "axios": "^1.19.0",
     "benchmark": "^2.1.4",
     "body-parser": "^2.3.0",
     "bun": "1.3.14",
     "c8": "^12.0.0",
     "codeowners-audit": "^2.9.0",
-    "eslint": "^10.5.0",
-    "eslint-plugin-cypress": "^6.4.2",
+    "eslint": "^10.8.1",
+    "eslint-plugin-cypress": "^7.0.0",
     "eslint-plugin-import-x": "^4.16.2",
-    "eslint-plugin-jsdoc": "^63.0.12",
+    "eslint-plugin-jsdoc": "^64.2.0",
     "eslint-plugin-mocha": "^11.3.0",
-    "eslint-plugin-n": "^18.2.1",
+    "eslint-plugin-n": "^18.3.0",
     "eslint-plugin-promise": "^7.3.0",
     "eslint-plugin-sonarjs": "^4.2.0",
     "eslint-plugin-unicorn": "^73.0.0",
     "express": "^5.1.0",
     "glob": "^10.4.5",
-    "globals": "^17.7.0",
+    "globals": "^17.11.0",
     "graphql": "*",
     "husky": "^9.1.7",
     "istanbul-lib-report": "^3.0.0",
     "istanbul-reports": "^3.0.2",
     "jsonc-parser": "^3.3.1",
     "jszip": "^3.10.1",
-    "minimatch": "^10.2.5",
-    "mocha": "^11.7.6",
+    "minimatch": "^10.2.6",
+    "mocha": "^11.8.0",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
     "multer": "^2.2.0",
-    "nock": "^14.0.16",
+    "nock": "^14.0.17",
     "node-preload": "^0.2.1",
     "nyc": "^18.0.0",
     "octokit": "^5.0.3",
-    "p-limit": "^7.2.0",
+    "p-limit": "^7.3.1",
     "proxyquire": "^2.1.3",
     "retry": "^0.13.1",
     "semifies": "^1.0.0",
     "semver": "^7.8.5",
-    "sinon": "^22.0.0",
+    "sinon": "^22.1.0",
     "source-map-support": "^0.5.21",
     "test-exclude": "^8.0.0",
     "tiktoken": "^1.0.21",

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

@@ -1482,14 +1482,14 @@ function getWrappedRunTestCase (runTestCaseFunction, isNewerCucumberVersion = fa
 
     this.options.retry = originalRetry
 
-    if (isNewerCucumberVersion && shouldRunEarlyFlakeDetection() && (isNew || isModified)) {
-      return shouldBePassedByEFD
-    }
-
     if (isNewerCucumberVersion && isTestManagementTestsEnabled && !isAttemptToFix && (isQuarantined || isDisabled)) {
       return shouldBePassedByTestManagement
     }
 
+    if (isNewerCucumberVersion && shouldRunEarlyFlakeDetection() && (isNew || isModified)) {
+      return shouldBePassedByEFD
+    }
+
     if (isNewerCucumberVersion && isAttemptToFix && shouldBeFailedByAttemptToFix) {
       return false
     }

package/packages/datadog-instrumentations/src/mocha/utils.js

@@ -299,6 +299,9 @@ function retryTest (test, numRetries, tags, retryPolicy) {
         clonedTest[tag] = true
       }
     }
+    if (clonedTest._ddIsQuarantined && !clonedTest._ddIsAttemptToFix) {
+      testsQuarantined.add(clonedTest)
+    }
   }
 }
 
@@ -1146,7 +1149,7 @@ function getRunTestsWrapper (runTests, config) {
                 retryTest(
                   test,
                   config.earlyFlakeDetectionRetryPolicy.schedulingRetryCount,
-                  ['_ddIsModified', '_ddIsEfdRetry'],
+                  ['_ddIsModified', '_ddIsEfdRetry', test._ddIsQuarantined && '_ddIsQuarantined'],
                   config.earlyFlakeDetectionRetryPolicy
                 )
               }
@@ -1165,7 +1168,7 @@ function getRunTestsWrapper (runTests, config) {
             retryTest(
               test,
               config.earlyFlakeDetectionRetryPolicy.schedulingRetryCount,
-              ['_ddIsNew', '_ddIsEfdRetry'],
+              ['_ddIsNew', '_ddIsEfdRetry', test._ddIsQuarantined && '_ddIsQuarantined'],
               config.earlyFlakeDetectionRetryPolicy
             )
           }

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

@@ -3,6 +3,9 @@
 const { channel } = require('dc-polyfill')
 
 const reporterErrorCh = channel('ci:playwright:reporter:error')
+const reporterRunSummaryCh = channel('ci:playwright:reporter:run-summary')
+const reporterSuiteHookErrorCh = channel('ci:playwright:reporter:suite-hook-error')
+const suitesWithHookErrors = new Set()
 const PLAYWRIGHT_REPORTER_ERROR_MESSAGE = 'Error in reporter'
 const PLAYWRIGHT_REPORTER_ERROR_CALLER_RE =
   /^\s*at wrapAsync .*?[\\/]playwright[\\/]lib[\\/]runner[\\/]index\.js:\d+:\d+\)?$/
@@ -27,7 +30,53 @@ function isPlaywrightReporterError (message) {
   }
 }
 
+/**
+ * Returns whether a finalized Playwright result contains a failed suite hook.
+ *
+ * @param {Array<object>} steps
+ * @returns {boolean}
+ */
+function hasFailedSuiteHook (steps) {
+  if (!steps) return false
+
+  for (const step of steps) {
+    if (step.error && (step.title === 'beforeAll hook' || step.title === 'afterAll hook')) return true
+    if (hasFailedSuiteHook(step.steps)) return true
+  }
+  return false
+}
+
 class DatadogPlaywrightReporter {
+  /**
+   * Creates a reporter that observes the finalized Playwright result independently of user reporters.
+   *
+   * @param {object} [options]
+   * @param {boolean} [options.captureReporterErrors]
+   */
+  constructor ({ captureReporterErrors = true } = {}) {
+    this.captureReporterErrors = captureReporterErrors
+    this.fatalErrorCount = 0
+  }
+
+  /**
+   * Identifies this reporter as implementing Playwright's reporter v2 contract.
+   *
+   * @returns {'v2'}
+   */
+  version () {
+    return 'v2'
+  }
+
+  /**
+   * Implements the reporter v2 lifecycle hook required by older Playwright versions.
+   *
+   * @param {object} config
+   * @returns {void}
+   */
+  onConfigure (config) {
+    this.failOnFlakyTests = config.failOnFlakyTests
+  }
+
   /**
    * Restores console error after Playwright completes the reporter lifecycle.
    *
@@ -45,12 +94,96 @@ class DatadogPlaywrightReporter {
     DatadogPlaywrightReporter.originalConsoleError = undefined
   }
 
+  /**
+   * Records the suite so finalized test outcomes can be counted in onEnd.
+   *
+   * @param {object} configOrSuite
+   * @param {object} [suite]
+   * @returns {void}
+   */
+  onBegin (configOrSuite, suite) {
+    this.suite = suite || configOrSuite
+    if (suite) this.failOnFlakyTests = configOrSuite.failOnFlakyTests
+    suitesWithHookErrors.clear()
+  }
+
+  /**
+   * Implements the reporter v2 lifecycle hook required by older Playwright versions.
+   *
+   * @returns {void}
+   */
+  onTestBegin () {}
+
+  /**
+   * Implements the reporter v2 lifecycle hook required by older Playwright versions.
+   *
+   * @returns {void}
+   */
+  onStdOut () {}
+
+  /**
+   * Implements the reporter v2 lifecycle hook required by older Playwright versions.
+   *
+   * @returns {void}
+   */
+  onStdErr () {}
+
+  /**
+   * Implements the reporter v2 lifecycle hook required by older Playwright versions.
+   *
+   * @returns {void}
+   */
+  onTestEnd () {}
+
+  /**
+   * Implements the reporter v2 lifecycle hook required by older Playwright versions.
+   *
+   * @returns {void}
+   */
+  onStepBegin () {}
+
+  /**
+   * Implements the reporter v2 lifecycle hook required by older Playwright versions.
+   *
+   * @returns {void}
+   */
+  onStepEnd () {}
+
   /**
    * Marks the beginning of reporter finalization so later reporter errors can be identified.
    *
    * @returns {void}
    */
   onEnd () {
+    let failureCount = this.fatalErrorCount
+    let quarantinedFailureCount = 0
+    let hasIncompleteTests = suitesWithHookErrors.size > 0
+    const tests = this.suite?.allTests?.()
+    if (tests) {
+      for (const test of tests) {
+        const outcome = test.outcome()
+        const finalResult = test.results.at(-1)
+        hasIncompleteTests ||= hasFailedSuiteHook(finalResult?.steps)
+        if (outcome === 'unexpected' || (outcome === 'flaky' && this.failOnFlakyTests)) {
+          failureCount += 1
+          const finalResultStatus = finalResult?.status
+          const hasFailed = finalResultStatus === 'failed' || finalResultStatus === 'timedOut'
+          if (outcome === 'unexpected' && hasFailed && test._ddIsQuarantined && !test._ddIsAttemptToFix) {
+            quarantinedFailureCount += 1
+          }
+        } else if (outcome === 'skipped' && !test._ddShouldSkipEfdRetry &&
+          (!test._ddIsDisabled || test._ddIsAttemptToFix)) {
+          const { results } = test
+          hasIncompleteTests ||= results.some(result => result.status === 'interrupted') ||
+            !results.length || test.expectedStatus !== 'skipped'
+        }
+      }
+    }
+    reporterRunSummaryCh.publish({ failureCount, quarantinedFailureCount, hasIncompleteTests })
+    suitesWithHookErrors.clear()
+
+    if (!this.captureReporterErrors) return
+
     this.isFinalizing = true
     // Playwright 1.60 and 1.61 only expose reporter errors through this exact console call.
     // eslint-disable-next-line no-console
@@ -76,6 +209,13 @@ class DatadogPlaywrightReporter {
     DatadogPlaywrightReporter.consoleError = consoleError
   }
 
+  /**
+   * Implements the reporter v2 lifecycle hook required by older Playwright versions.
+   *
+   * @returns {void}
+   */
+  onExit () {}
+
   /**
    * Reports errors emitted by Playwright while later reporters are finalizing.
    *
@@ -83,7 +223,11 @@ class DatadogPlaywrightReporter {
    * @returns {void}
    */
   onError (error) {
-    if (this.isFinalizing) reporterErrorCh.publish(error)
+    if (this.isFinalizing) {
+      reporterErrorCh.publish(error)
+    } else {
+      this.fatalErrorCount += 1
+    }
   }
 
   /**
@@ -96,4 +240,8 @@ class DatadogPlaywrightReporter {
   }
 }
 
+reporterSuiteHookErrorCh.subscribe((testSuiteAbsolutePath) => {
+  suitesWithHookErrors.add(testSuiteAbsolutePath)
+})
+
 module.exports = DatadogPlaywrightReporter

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

@@ -46,6 +46,8 @@ const testSessionStartCh = channel('ci:playwright:session:start')
 const testSessionConfigurationCh = channel('ci:playwright:session:configuration')
 const testSessionFinishCh = channel('ci:playwright:session:finish')
 const reporterErrorCh = channel('ci:playwright:reporter:error')
+const reporterRunSummaryCh = channel('ci:playwright:reporter:run-summary')
+const reporterSuiteHookErrorCh = channel('ci:playwright:reporter:suite-hook-error')
 
 const libraryConfigurationCh = channel('ci:playwright:library-configuration')
 const knownTestsCh = channel('ci:playwright:known-tests')
@@ -111,7 +113,7 @@ let testManagementAttemptToFixRetries = 0
 let testManagementTests = {}
 let isImpactedTestsEnabled = false
 let modifiedFiles = {}
-let quarantinedButNotAttemptToFixFqns = new Set()
+let playwrightRunSummary
 let recordedTestOptimizationExecutions = new Set()
 let testsReportedInGenerateSummary = new Set()
 const newTestsWithDynamicNames = new Set()
@@ -785,6 +787,7 @@ function finishTestSuiteIfDone (testSuiteAbsolutePath, projects) {
       testSourceLine: test.location.line,
       browserName,
       isNew: test._ddIsNew,
+      isAttemptToFix: test._ddIsAttemptToFix,
       isDisabled: test._ddIsDisabled,
       isModified: test._ddIsModified,
       isQuarantined: test._ddIsQuarantined,
@@ -832,6 +835,7 @@ function testEndHandler ({
 
     if (hookError) {
       addErrorToTestSuite(testSuiteAbsolutePath, hookError)
+      reporterSuiteHookErrorCh.publish(testSuiteAbsolutePath)
     }
     return
   }
@@ -917,9 +921,7 @@ function testEndHandler ({
 
   // Check if all EFD retries failed
   const efdRetryCount = getEfdRetryCountForTest(test)
-  if (efdRetryCount > 0 && testStatuses.length === efdRetryCount + 1 &&
-    (test._ddIsNew || test._ddIsModified) &&
-    isEarlyFlakeDetectionEnabled &&
+  if (isEfdManagedTest && efdRetryCount > 0 && testStatuses.length === efdRetryCount + 1 &&
     testStatuses.every(status => status === 'fail')) {
     test._ddHasFailedAllRetries = true
   }
@@ -1259,6 +1261,7 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
   return async function (config) {
     reporterError = undefined
     hasReporterError = false
+    playwrightRunSummary = undefined
     let restoreReporterConsoleError
     if (satisfies(playwrightVersion, '>=1.60.0') && config?.config) {
       const DatadogPlaywrightReporter = require('./playwright-reporter')
@@ -1433,23 +1436,8 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
     const sessionStatus = runAllTestsReturn.status || runAllTestsReturn
 
     if (isTestManagementTestsEnabled && sessionStatus === 'failed') {
-      let totalFailedTestCount = 0
-      let totalPureQuarantinedFailedTestCount = 0
-
-      for (const [fqn, testStatuses] of testsToTestStatuses) {
-        // Only count as failed if the final status (after retries) is 'fail'
-        const lastStatus = testStatuses.at(-1)
-        if (lastStatus === 'fail') {
-          totalFailedTestCount += 1
-          if (quarantinedButNotAttemptToFixFqns.has(fqn)) {
-            totalPureQuarantinedFailedTestCount += 1
-          }
-        }
-      }
-
-      const totalIgnorableFailures = totalPureQuarantinedFailedTestCount
-
-      if (totalFailedTestCount > 0 && totalFailedTestCount === totalIgnorableFailures) {
+      const { failureCount, quarantinedFailureCount, hasIncompleteTests } = playwrightRunSummary || {}
+      if (!hasIncompleteTests && quarantinedFailureCount > 0 && quarantinedFailureCount === failureCount) {
         runAllTestsReturn = 'passed'
         preventedToFail = true
       }
@@ -1476,7 +1464,7 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
 
     startedSuites = []
     remainingTestsByFile = {}
-    quarantinedButNotAttemptToFixFqns = new Set()
+    playwrightRunSummary = undefined
     recordedTestOptimizationExecutions = new Set()
     testsReportedInGenerateSummary = new Set()
     efdManagedTestKeys.clear()
@@ -1507,6 +1495,8 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
 function reportersHook (reportersPackage) {
   return shimmer.wrap(reportersPackage, 'createReporters', createReporters => async function () {
     const reporters = await createReporters.apply(this, arguments)
+    const DatadogPlaywrightReporter = require('./playwright-reporter')
+    reporters.unshift(new DatadogPlaywrightReporter({ captureReporterErrors: false }))
     for (const reporter of reporters) {
       if (instrumentedPlaywrightReporters.has(reporter)) continue
 
@@ -1663,6 +1653,10 @@ reporterErrorCh.subscribe((error) => {
   recordReporterError(error)
 })
 
+reporterRunSummaryCh.subscribe((runSummary) => {
+  playwrightRunSummary = runSummary
+})
+
 /**
  * Records a reporter failure even when the reporter throws a falsy value.
  *
@@ -1894,11 +1888,6 @@ function processRootSuite (createRootSuiteReturnValue) {
       }
       if (testProperties.quarantined) {
         test._ddIsQuarantined = true
-        if (!testProperties.attemptToFix) {
-          // Do not skip quarantined tests, let them run and overwrite results post-run if they fail
-          const testFqn = getTestFullyQualifiedName(test)
-          quarantinedButNotAttemptToFixFqns.add(testFqn)
-        }
       }
       if (testProperties.attemptToFix) {
         test._ddIsAttemptToFix = true
@@ -1938,7 +1927,10 @@ function processRootSuite (createRootSuiteReturnValue) {
     const fileSuitesWithImpactedTestsToProjects = new Map()
     for (const impactedTest of impactedTests) {
       impactedTest._ddIsModified = true
-      if (shouldRunEarlyFlakeDetection() && impactedTest.expectedStatus !== 'skipped') {
+      if (shouldRunEarlyFlakeDetection() && impactedTest.expectedStatus !== 'skipped' &&
+        !impactedTest._ddIsAttemptToFix) {
+        // Prevent ATR or `--retries` from retrying tests that EFD manages.
+        impactedTest.retries = 0
         markEfdManagedTest(impactedTest)
         const fileSuite = getSuiteType(impactedTest, 'file')
         if (!fileSuitesWithImpactedTestsToProjects.has(fileSuite)) {
@@ -1946,14 +1938,15 @@ function processRootSuite (createRootSuiteReturnValue) {
         }
       }
     }
-    // If something change in the file, all tests in the file are impacted, hence the () => true filter
+    // If something changes in the file, all tests in the file are impacted, except attempt-to-fix tests managed above.
     applyRetriesToTests(
       fileSuitesWithImpactedTestsToProjects,
-      () => true,
+      (test) => !test._ddIsAttemptToFix,
       [
         '_ddIsModified',
         '_ddIsEfdRetry',
         (test) => (isKnownTestsEnabled && isNewTest(test) ? '_ddIsNew' : null),
+        (test) => test._ddIsQuarantined && '_ddIsQuarantined',
       ],
       earlyFlakeDetectionRetryPolicy.schedulingRetryCount,
       (copiedTest, originalTest, retryIndex) => {
@@ -1981,7 +1974,8 @@ function processRootSuite (createRootSuiteReturnValue) {
       const fileSuitesWithNewTestsToProjects = new Map()
       for (const newTest of newTests) {
         newTest._ddIsNew = true
-        if (shouldRunEarlyFlakeDetection() && newTest.expectedStatus !== 'skipped' && !newTest._ddIsModified) {
+        if (shouldRunEarlyFlakeDetection() && newTest.expectedStatus !== 'skipped' &&
+          !newTest._ddIsModified && !newTest._ddIsAttemptToFix) {
           // Prevent ATR or `--retries` from retrying tests that EFD manages.
           newTest.retries = 0
           markEfdManagedTest(newTest)
@@ -1994,8 +1988,12 @@ function processRootSuite (createRootSuiteReturnValue) {
 
       applyRetriesToTests(
         fileSuitesWithNewTestsToProjects,
-        isNewTest,
-        ['_ddIsNew', '_ddIsEfdRetry'],
+        (test) => !test._ddIsAttemptToFix && isNewTest(test),
+        [
+          '_ddIsNew',
+          '_ddIsEfdRetry',
+          (test) => test._ddIsQuarantined && '_ddIsQuarantined',
+        ],
         earlyFlakeDetectionRetryPolicy.schedulingRetryCount,
         (copiedTest, originalTest, retryIndex) => {
           markEfdRetryTest(copiedTest, retryIndex, originalTest)
@@ -2447,6 +2445,7 @@ function generateSummaryWrapper (generateSummary) {
             line: testSourceLine,
           },
           _ddIsNew: isNew,
+          _ddIsAttemptToFix: isAttemptToFix,
           _ddIsDisabled: isDisabled,
           _ddIsModified: isModified,
           _ddIsQuarantined: isQuarantined,
@@ -2461,6 +2460,7 @@ function generateSummaryWrapper (generateSummary) {
           testSourceLine,
           browserName,
           isNew,
+          isAttemptToFix,
           isDisabled,
           isModified,
           isQuarantined,