dd-trace 5.123.0 → 6.11.0

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

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

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

@@ -3,9 +3,6 @@
 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+\)?$/
@@ -30,53 +27,7 @@ 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.
    *
@@ -94,96 +45,12 @@ 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
@@ -209,13 +76,6 @@ 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.
    *
@@ -223,11 +83,7 @@ class DatadogPlaywrightReporter {
    * @returns {void}
    */
   onError (error) {
-    if (this.isFinalizing) {
-      reporterErrorCh.publish(error)
-    } else {
-      this.fatalErrorCount += 1
-    }
+    if (this.isFinalizing) reporterErrorCh.publish(error)
   }
 
   /**
@@ -240,8 +96,4 @@ class DatadogPlaywrightReporter {
   }
 }
 
-reporterSuiteHookErrorCh.subscribe((testSuiteAbsolutePath) => {
-  suitesWithHookErrors.add(testSuiteAbsolutePath)
-})
-
 module.exports = DatadogPlaywrightReporter

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

@@ -46,8 +46,6 @@ 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')
@@ -113,7 +111,7 @@ let testManagementAttemptToFixRetries = 0
 let testManagementTests = {}
 let isImpactedTestsEnabled = false
 let modifiedFiles = {}
-let playwrightRunSummary
+let quarantinedButNotAttemptToFixFqns = new Set()
 let recordedTestOptimizationExecutions = new Set()
 let testsReportedInGenerateSummary = new Set()
 const newTestsWithDynamicNames = new Set()
@@ -787,7 +785,6 @@ function finishTestSuiteIfDone (testSuiteAbsolutePath, projects) {
       testSourceLine: test.location.line,
       browserName,
       isNew: test._ddIsNew,
-      isAttemptToFix: test._ddIsAttemptToFix,
       isDisabled: test._ddIsDisabled,
       isModified: test._ddIsModified,
       isQuarantined: test._ddIsQuarantined,
@@ -835,7 +832,6 @@ function testEndHandler ({
 
     if (hookError) {
       addErrorToTestSuite(testSuiteAbsolutePath, hookError)
-      reporterSuiteHookErrorCh.publish(testSuiteAbsolutePath)
     }
     return
   }
@@ -921,7 +917,9 @@ function testEndHandler ({
 
   // Check if all EFD retries failed
   const efdRetryCount = getEfdRetryCountForTest(test)
-  if (isEfdManagedTest && efdRetryCount > 0 && testStatuses.length === efdRetryCount + 1 &&
+  if (efdRetryCount > 0 && testStatuses.length === efdRetryCount + 1 &&
+    (test._ddIsNew || test._ddIsModified) &&
+    isEarlyFlakeDetectionEnabled &&
     testStatuses.every(status => status === 'fail')) {
     test._ddHasFailedAllRetries = true
   }
@@ -1261,7 +1259,6 @@ 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')
@@ -1436,8 +1433,23 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
     const sessionStatus = runAllTestsReturn.status || runAllTestsReturn
 
     if (isTestManagementTestsEnabled && sessionStatus === 'failed') {
-      const { failureCount, quarantinedFailureCount, hasIncompleteTests } = playwrightRunSummary || {}
-      if (!hasIncompleteTests && quarantinedFailureCount > 0 && quarantinedFailureCount === failureCount) {
+      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) {
         runAllTestsReturn = 'passed'
         preventedToFail = true
       }
@@ -1464,7 +1476,7 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
 
     startedSuites = []
     remainingTestsByFile = {}
-    playwrightRunSummary = undefined
+    quarantinedButNotAttemptToFixFqns = new Set()
     recordedTestOptimizationExecutions = new Set()
     testsReportedInGenerateSummary = new Set()
     efdManagedTestKeys.clear()
@@ -1495,8 +1507,6 @@ 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
 
@@ -1653,10 +1663,6 @@ reporterErrorCh.subscribe((error) => {
   recordReporterError(error)
 })
 
-reporterRunSummaryCh.subscribe((runSummary) => {
-  playwrightRunSummary = runSummary
-})
-
 /**
  * Records a reporter failure even when the reporter throws a falsy value.
  *
@@ -1888,6 +1894,11 @@ 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
@@ -1927,10 +1938,7 @@ function processRootSuite (createRootSuiteReturnValue) {
     const fileSuitesWithImpactedTestsToProjects = new Map()
     for (const impactedTest of impactedTests) {
       impactedTest._ddIsModified = true
-      if (shouldRunEarlyFlakeDetection() && impactedTest.expectedStatus !== 'skipped' &&
-        !impactedTest._ddIsAttemptToFix) {
-        // Prevent ATR or `--retries` from retrying tests that EFD manages.
-        impactedTest.retries = 0
+      if (shouldRunEarlyFlakeDetection() && impactedTest.expectedStatus !== 'skipped') {
         markEfdManagedTest(impactedTest)
         const fileSuite = getSuiteType(impactedTest, 'file')
         if (!fileSuitesWithImpactedTestsToProjects.has(fileSuite)) {
@@ -1938,15 +1946,14 @@ function processRootSuite (createRootSuiteReturnValue) {
         }
       }
     }
-    // If something changes in the file, all tests in the file are impacted, except attempt-to-fix tests managed above.
+    // If something change in the file, all tests in the file are impacted, hence the () => true filter
     applyRetriesToTests(
       fileSuitesWithImpactedTestsToProjects,
-      (test) => !test._ddIsAttemptToFix,
+      () => true,
       [
         '_ddIsModified',
         '_ddIsEfdRetry',
         (test) => (isKnownTestsEnabled && isNewTest(test) ? '_ddIsNew' : null),
-        (test) => test._ddIsQuarantined && '_ddIsQuarantined',
       ],
       earlyFlakeDetectionRetryPolicy.schedulingRetryCount,
       (copiedTest, originalTest, retryIndex) => {
@@ -1974,8 +1981,7 @@ function processRootSuite (createRootSuiteReturnValue) {
       const fileSuitesWithNewTestsToProjects = new Map()
       for (const newTest of newTests) {
         newTest._ddIsNew = true
-        if (shouldRunEarlyFlakeDetection() && newTest.expectedStatus !== 'skipped' &&
-          !newTest._ddIsModified && !newTest._ddIsAttemptToFix) {
+        if (shouldRunEarlyFlakeDetection() && newTest.expectedStatus !== 'skipped' && !newTest._ddIsModified) {
           // Prevent ATR or `--retries` from retrying tests that EFD manages.
           newTest.retries = 0
           markEfdManagedTest(newTest)
@@ -1988,12 +1994,8 @@ function processRootSuite (createRootSuiteReturnValue) {
 
       applyRetriesToTests(
         fileSuitesWithNewTestsToProjects,
-        (test) => !test._ddIsAttemptToFix && isNewTest(test),
-        [
-          '_ddIsNew',
-          '_ddIsEfdRetry',
-          (test) => test._ddIsQuarantined && '_ddIsQuarantined',
-        ],
+        isNewTest,
+        ['_ddIsNew', '_ddIsEfdRetry'],
         earlyFlakeDetectionRetryPolicy.schedulingRetryCount,
         (copiedTest, originalTest, retryIndex) => {
           markEfdRetryTest(copiedTest, retryIndex, originalTest)
@@ -2445,7 +2447,6 @@ function generateSummaryWrapper (generateSummary) {
             line: testSourceLine,
           },
           _ddIsNew: isNew,
-          _ddIsAttemptToFix: isAttemptToFix,
           _ddIsDisabled: isDisabled,
           _ddIsModified: isModified,
           _ddIsQuarantined: isQuarantined,
@@ -2460,7 +2461,6 @@ function generateSummaryWrapper (generateSummary) {
           testSourceLine,
           browserName,
           isNew,
-          isAttemptToFix,
           isDisabled,
           isModified,
           isQuarantined,

package/packages/datadog-instrumentations/src/vitest-main-no-worker-init.js

@@ -1058,7 +1058,7 @@ function getRepeatedTestReport (task, testName, testSuiteAbsolutePath, testPrope
   const errors = browserEnvironment
     ? normalizeVitestBrowserErrors(result?.errors)
     : result?.errors || []
-  const finalAttemptStatus = finalStatus(statuses, testProperties)
+  const finalAttemptStatus = finalStatus(statuses)
   const hasFailure = finalAttemptStatus === 'fail'
   const attempts = []
   const attemptCount = getRepeatedAttemptCount(task, statuses)
@@ -1095,7 +1095,8 @@ function getRepeatedTestReport (task, testName, testSuiteAbsolutePath, testPrope
         testProperties,
         type,
         statuses,
-        isFinalAttempt
+        isFinalAttempt,
+        hasFailure
       ),
       isRetry: index > 0,
       status: attemptStatus,
@@ -1135,10 +1136,11 @@ function getRepeatedTestReport (task, testName, testSuiteAbsolutePath, testPrope
  * @param {'attempt_to_fix'|'early_flake_detection'|'external'} type
  * @param {string[]} statuses
  * @param {boolean} isFinalAttempt
+ * @param {boolean} hasFailure
  * @returns {boolean}
  */
-function hasFailedAllManagedRetries (task, testProperties, type, statuses, isFinalAttempt) {
-  if (!isFinalAttempt || statuses.length === 0 || !statuses.every(status => status === 'fail')) {
+function hasFailedAllManagedRetries (task, testProperties, type, statuses, isFinalAttempt, hasFailure) {
+  if (!isFinalAttempt || !hasFailure || statuses.length === 0 || !statuses.every(status => status === 'fail')) {
     return false
   }
 
@@ -1163,8 +1165,7 @@ function getAttemptToFixFinalStatus (statuses) {
   return statuses.includes('fail') ? 'fail' : 'pass'
 }
 
-function getEarlyFlakeDetectionFinalStatus (statuses, testProperties) {
-  if (testProperties.isDisabled || testProperties.isQuarantined) return 'skip'
+function getEarlyFlakeDetectionFinalStatus (statuses) {
   return statuses.includes('pass') ? 'pass' : 'fail'
 }
 
@@ -1273,6 +1274,7 @@ function reportFinalTestAttempt (testReport) {
         testProperties,
         'external',
         ['fail'],
+        true,
         true
       ),
       isRetry: (result?.retryCount || 0) > 0 || (result?.repeatCount || 0) > 0,

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

@@ -534,7 +534,6 @@ class PlaywrightPlugin extends CiPlugin {
       testSourceLine,
       browserName,
       isNew,
-      isAttemptToFix,
       isDisabled,
       isModified,
       isQuarantined,
@@ -560,9 +559,6 @@ class PlaywrightPlugin extends CiPlugin {
       if (isNew) {
         span.setTag(TEST_IS_NEW, 'true')
       }
-      if (isAttemptToFix) {
-        span.setTag(TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX, 'true')
-      }
       if (isDisabled) {
         span.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')
       }

package/packages/dd-trace/src/appsec/reporter.js

@@ -15,7 +15,6 @@ const {
   incrementWafUpdatesMetric,
   incrementWafConfigErrorsMetric,
   incrementWafRequestsMetric,
-  incrementRequestDurationMetrics,
   updateWafRequestsMetricTags,
   updateRaspRequestsMetricTags,
   updateRaspRuleSkippedMetricTags,
@@ -609,7 +608,6 @@ function finishRequest (req, res, storedResponseHeaders, requestBody, rootSpan)
 
   if (!req) return
 
-  incrementRequestDurationMetrics(req)
   incrementWafRequestsMetric(req)
 
   const tags = rootSpan.context().getTags()

package/packages/dd-trace/src/appsec/telemetry/index.js

@@ -12,7 +12,6 @@ const {
   trackRaspMetrics,
   trackRaspRuleMatch,
   trackRaspRuleSkipped,
-  incrementRaspDurationMetrics,
 } = require('./rasp')
 const {
   addWafRequestMetrics,
@@ -21,7 +20,6 @@ const {
   incrementWafUpdates,
   incrementWafConfigErrors,
   incrementWafRequests,
-  incrementWafDurationMetrics,
 } = require('./waf')
 
 const metricsStoreMap = new WeakMap()
@@ -144,16 +142,6 @@ function incrementWafRequestsMetric (req) {
   metricsStoreMap.delete(req)
 }
 
-function incrementRequestDurationMetrics (req) {
-  if (!req || !enabled) return
-
-  const store = getStore(req)
-  const requestMetrics = store[DD_TELEMETRY_REQUEST_METRICS]
-
-  incrementWafDurationMetrics(requestMetrics)
-  incrementRaspDurationMetrics(requestMetrics)
-}
-
 function incrementMissingUserLoginMetric (framework, eventType) {
   if (!enabled) return
 
@@ -211,7 +199,6 @@ module.exports = {
   incrementWafUpdatesMetric,
   incrementWafConfigErrorsMetric,
   incrementWafRequestsMetric,
-  incrementRequestDurationMetrics,
   incrementMissingUserLoginMetric,
   incrementMissingUserIdMetric,
   incrementSdkEventMetric,

package/packages/dd-trace/src/appsec/telemetry/rasp.js

@@ -77,21 +77,6 @@ function trackRaspRuleMatch (store, raspRule, blockTriggered, blocked) {
   appsecMetrics.count('rasp.rule.match', tags).inc(1)
 }
 
-function incrementRaspDurationMetrics (requestMetrics) {
-  const { raspDuration, raspDurationExt, wafVersion, rulesVersion } = requestMetrics
-  if (!raspDuration && !raspDurationExt) return
-
-  const versionsTags = getVersionsTags(wafVersion, rulesVersion)
-
-  if (raspDuration) {
-    appsecMetrics.distribution('rasp.duration', versionsTags).track(raspDuration)
-  }
-
-  if (raspDurationExt) {
-    appsecMetrics.distribution('rasp.duration_ext', versionsTags).track(raspDurationExt)
-  }
-}
-
 function trackRaspRuleSkipped (raspRule, reason) {
   const tags = { reason, rule_type: raspRule.type }
 
@@ -115,5 +100,4 @@ module.exports = {
   trackRaspMetrics,
   trackRaspRuleMatch,
   trackRaspRuleSkipped,
-  incrementRaspDurationMetrics,
 }

package/packages/dd-trace/src/appsec/telemetry/waf.js

@@ -34,14 +34,6 @@ function addWafRequestMetrics (store, { duration, durationExt, wafTimeout, error
 function trackWafMetrics (store, metrics) {
   const versionsTags = getVersionsTags(metrics.wafVersion, metrics.rulesVersion)
 
-  const requestMetrics = store[DD_TELEMETRY_REQUEST_METRICS]
-  if (metrics.wafVersion) {
-    requestMetrics.wafVersion = metrics.wafVersion
-  }
-  if (metrics.rulesVersion) {
-    requestMetrics.rulesVersion = metrics.rulesVersion
-  }
-
   const metricTags = getOrCreateMetricTags(store, versionsTags)
 
   if (metrics.blockFailed) {
@@ -126,21 +118,6 @@ function incrementWafRequests (store) {
   }
 }
 
-function incrementWafDurationMetrics (requestMetrics) {
-  const { duration, durationExt, wafVersion, rulesVersion } = requestMetrics
-  if (!duration && !durationExt) return
-
-  const versionsTags = getVersionsTags(wafVersion, rulesVersion)
-
-  if (duration) {
-    appsecMetrics.distribution('waf.duration', versionsTags).track(duration)
-  }
-
-  if (durationExt) {
-    appsecMetrics.distribution('waf.duration_ext', versionsTags).track(durationExt)
-  }
-}
-
 function incrementTruncatedMetrics (metrics, truncationReason) {
   const truncationTags = { truncation_reason: truncationReason }
   appsecMetrics.count('waf.input_truncated', truncationTags).inc(1)
@@ -163,5 +140,4 @@ module.exports = {
   incrementWafUpdates,
   incrementWafConfigErrors,
   incrementWafRequests,
-  incrementWafDurationMetrics,
 }