dd-trace 5.53.0 → 5.55.0

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

@@ -1,6 +1,6 @@
 const satisfies = require('semifies')
 
-const { addHook, channel, AsyncResource } = require('./helpers/instrument')
+const { addHook, channel } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const {
   parseAnnotations,
@@ -8,6 +8,7 @@ const {
   PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE
 } = require('../../dd-trace/src/plugins/util/test')
 const log = require('../../dd-trace/src/log')
+const { DD_MAJOR } = require('../../../version')
 
 const testStartCh = channel('ci:playwright:test:start')
 const testFinishCh = channel('ci:playwright:test:finish')
@@ -18,6 +19,8 @@ const testSessionFinishCh = channel('ci:playwright:session:finish')
 const libraryConfigurationCh = channel('ci:playwright:library-configuration')
 const knownTestsCh = channel('ci:playwright:known-tests')
 const testManagementTestsCh = channel('ci:playwright:test-management-tests')
+const impactedTestsCh = channel('ci:playwright:modified-tests')
+const isModifiedCh = channel('ci:playwright:test:is-modified')
 
 const testSuiteStartCh = channel('ci:playwright:test-suite:start')
 const testSuiteFinishCh = channel('ci:playwright:test-suite:finish')
@@ -30,7 +33,6 @@ const testSuiteToCtx = new Map()
 const testSuiteToTestStatuses = new Map()
 const testSuiteToErrors = new Map()
 const testsToTestStatuses = new Map()
-const testSessionAsyncResource = new AsyncResource('bound-anonymous-fn')
 
 let applyRepeatEachIndex = null
 
@@ -53,9 +55,11 @@ let knownTests = {}
 let isTestManagementTestsEnabled = false
 let testManagementAttemptToFixRetries = 0
 let testManagementTests = {}
+let isImpactedTestsEnabled = false
+let modifiedTests = {}
 const quarantinedOrDisabledTestsAttemptToFix = []
 let rootDir = ''
-const MINIMUM_SUPPORTED_VERSION_RANGE_EFD = '>=1.38.0'
+const MINIMUM_SUPPORTED_VERSION_RANGE_EFD = '>=1.38.0' // TODO: remove this once we drop support for v5
 
 function getTestProperties (test) {
   const testName = getTestFullname(test)
@@ -105,9 +109,10 @@ function deepCloneSuite (suite, filterTest, tags = []) {
 function getTestsBySuiteFromTestGroups (testGroups) {
   return testGroups.reduce((acc, { requireFile, tests }) => {
     if (acc[requireFile]) {
-      acc[requireFile] = acc[requireFile].concat(tests)
+      acc[requireFile].push(...tests)
     } else {
-      acc[requireFile] = tests
+      // Copy the tests, otherwise we modify the original tests
+      acc[requireFile] = [...tests]
     }
     return acc
   }, {})
@@ -132,10 +137,10 @@ function getTestsBySuiteFromTestsById (testsById) {
 function getPlaywrightConfig (playwrightRunner) {
   try {
     return playwrightRunner._configLoader.fullConfig()
-  } catch (e) {
+  } catch {
     try {
       return playwrightRunner._loader.fullConfig()
-    } catch (e) {
+    } catch {
       return playwrightRunner._config || {}
     }
   }
@@ -235,14 +240,12 @@ function getTestByTestId (dispatcher, testId) {
   }
 }
 
-function getChannelPromise (channelToPublishTo) {
+function getChannelPromise (channelToPublishTo, params) {
   return new Promise(resolve => {
-    testSessionAsyncResource.runInAsyncScope(() => {
-      channelToPublishTo.publish({ onDone: resolve })
-    })
+    channelToPublishTo.publish({ onDone: resolve, ...params })
   })
 }
-// eslint-disable-next-line
+
 // Inspired by https://github.com/microsoft/playwright/blob/2b77ed4d7aafa85a600caa0b0d101b72c8437eeb/packages/playwright/src/reporters/base.ts#L293
 // We can't use test.outcome() directly because it's set on follow up handlers:
 // our `testEndHandler` is called before the outcome is set.
@@ -281,7 +284,7 @@ function testBeginHandler (test, browserName, isMainProcess) {
     startedSuites.push(testSuiteAbsolutePath)
     const testSuiteCtx = { testSuiteAbsolutePath }
     testSuiteToCtx.set(testSuiteAbsolutePath, testSuiteCtx)
-    testSuiteStartCh.runStores(testSuiteCtx, () => { })
+    testSuiteStartCh.runStores(testSuiteCtx, () => {})
   }
 
   // We disable retries by default if attemptToFix is true
@@ -301,7 +304,7 @@ function testBeginHandler (test, browserName, isMainProcess) {
     }
     testToCtx.set(test, testCtx)
 
-    testStartCh.runStores(testCtx, () => { })
+    testStartCh.runStores(testCtx, () => {})
   }
 }
 
@@ -333,7 +336,7 @@ function testEndHandler (test, annotations, testStatus, error, isTimeout, isMain
   }
 
   if (testStatuses.length === testManagementAttemptToFixRetries + 1) {
-    if (testStatuses.some(status => status === 'fail')) {
+    if (testStatuses.includes('fail')) {
       test._ddHasFailedAttemptToFixRetries = true
     }
     if (testStatuses.every(status => status === 'fail')) {
@@ -345,7 +348,7 @@ function testEndHandler (test, annotations, testStatus, error, isTimeout, isMain
 
   // this handles tests that do not go through the worker process (because they're skipped)
   if (isMainProcess) {
-    const testResult = results[results.length - 1]
+    const testResult = results.at(-1)
     const testCtx = testToCtx.get(test)
     const isAtrRetry = testResult?.retry > 0 &&
       isFlakyTestRetriesEnabled &&
@@ -366,6 +369,7 @@ function testEndHandler (test, annotations, testStatus, error, isTimeout, isMain
       hasPassedAttemptToFixRetries: test._ddHasPassedAttemptToFixRetries,
       hasFailedAttemptToFixRetries: test._ddHasFailedAttemptToFixRetries,
       isAtrRetry,
+      isModified: test._ddIsModified,
       ...testCtx.currentStore
     })
   }
@@ -389,7 +393,7 @@ function testEndHandler (test, annotations, testStatus, error, isTimeout, isMain
   if (!remainingTestsByFile[testSuiteAbsolutePath].length) {
     const testStatuses = testSuiteToTestStatuses.get(testSuiteAbsolutePath)
     let testSuiteStatus = 'pass'
-    if (testStatuses.some(status => status === 'fail')) {
+    if (testStatuses.includes('fail')) {
       testSuiteStatus = 'fail'
     } else if (testStatuses.every(status => status === 'skip')) {
       testSuiteStatus = 'skip'
@@ -413,9 +417,9 @@ function dispatcherRunWrapperNew (run) {
     if (!this._allTests) {
       // Removed in https://github.com/microsoft/playwright/commit/1e52c37b254a441cccf332520f60225a5acc14c7
       // Not available from >=1.44.0
-      this._ddAllTests = testGroups.map(g => g.tests).flat()
+      this._ddAllTests = testGroups.flatMap(g => g.tests)
     }
-    remainingTestsByFile = getTestsBySuiteFromTestGroups(arguments[0])
+    remainingTestsByFile = getTestsBySuiteFromTestGroups(testGroups)
     return run.apply(this, arguments)
   }
 }
@@ -435,7 +439,7 @@ function dispatcherHook (dispatcherExport) {
         const { test } = dispatcher._testById.get(params.testId)
 
         const { results } = test
-        const testResult = results[results.length - 1]
+        const testResult = results.at(-1)
 
         const isTimeout = testResult.status === 'timedOut'
         testEndHandler(
@@ -471,7 +475,7 @@ function dispatcherHookNew (dispatcherExport, runWrapper) {
 
       const isTimeout = status === 'timedOut'
       testEndHandler(test, annotations, STATUS_TO_TEST_STATUS[status], errors && errors[0], isTimeout, false)
-      const testResult = test.results[test.results.length - 1]
+      const testResult = test.results.at(-1)
       const isAtrRetry = testResult?.retry > 0 &&
         isFlakyTestRetriesEnabled &&
         !test._ddIsAttemptToFix &&
@@ -490,7 +494,8 @@ function dispatcherHookNew (dispatcherExport, runWrapper) {
           _ddHasFailedAllRetries: test._ddHasFailedAllRetries,
           _ddHasPassedAttemptToFixRetries: test._ddHasPassedAttemptToFixRetries,
           _ddHasFailedAttemptToFixRetries: test._ddHasFailedAttemptToFixRetries,
-          _ddIsAtrRetry: isAtrRetry
+          _ddIsAtrRetry: isAtrRetry,
+          _ddIsModified: test._ddIsModified
         }
       })
     })
@@ -508,9 +513,7 @@ function runnerHook (runnerExport, playwrightVersion) {
 
     const processArgv = process.argv.slice(2).join(' ')
     const command = `playwright ${processArgv}`
-    testSessionAsyncResource.runInAsyncScope(() => {
-      testSessionStartCh.publish({ command, frameworkVersion: playwrightVersion, rootDir })
-    })
+    testSessionStartCh.publish({ command, frameworkVersion: playwrightVersion, rootDir })
 
     try {
       const { err, libraryConfig } = await getChannelPromise(libraryConfigurationCh)
@@ -522,22 +525,24 @@ function runnerHook (runnerExport, playwrightVersion) {
         flakyTestRetriesCount = libraryConfig.flakyTestRetriesCount
         isTestManagementTestsEnabled = libraryConfig.isTestManagementEnabled
         testManagementAttemptToFixRetries = libraryConfig.testManagementAttemptToFixRetries
+        isImpactedTestsEnabled = libraryConfig.isImpactedTestsEnabled
       }
     } catch (e) {
       isEarlyFlakeDetectionEnabled = false
       isKnownTestsEnabled = false
       isTestManagementTestsEnabled = false
+      isImpactedTestsEnabled = false
       log.error('Playwright session start error', e)
     }
 
     if (isKnownTestsEnabled && satisfies(playwrightVersion, MINIMUM_SUPPORTED_VERSION_RANGE_EFD)) {
       try {
         const { err, knownTests: receivedKnownTests } = await getChannelPromise(knownTestsCh)
-        if (!err) {
-          knownTests = receivedKnownTests
-        } else {
+        if (err) {
           isEarlyFlakeDetectionEnabled = false
           isKnownTestsEnabled = false
+        } else {
+          knownTests = receivedKnownTests
         }
       } catch (err) {
         isEarlyFlakeDetectionEnabled = false
@@ -549,10 +554,10 @@ function runnerHook (runnerExport, playwrightVersion) {
     if (isTestManagementTestsEnabled && satisfies(playwrightVersion, MINIMUM_SUPPORTED_VERSION_RANGE_EFD)) {
       try {
         const { err, testManagementTests: receivedTestManagementTests } = await getChannelPromise(testManagementTestsCh)
-        if (!err) {
-          testManagementTests = receivedTestManagementTests
-        } else {
+        if (err) {
           isTestManagementTestsEnabled = false
+        } else {
+          testManagementTests = receivedTestManagementTests
         }
       } catch (err) {
         isTestManagementTestsEnabled = false
@@ -560,6 +565,20 @@ function runnerHook (runnerExport, playwrightVersion) {
       }
     }
 
+    if (isImpactedTestsEnabled && satisfies(playwrightVersion, MINIMUM_SUPPORTED_VERSION_RANGE_EFD)) {
+      try {
+        const { err, modifiedTests: receivedModifiedTests } = await getChannelPromise(impactedTestsCh)
+        if (err) {
+          isImpactedTestsEnabled = false
+        } else {
+          modifiedTests = receivedModifiedTests
+        }
+      } catch (err) {
+        isImpactedTestsEnabled = false
+        log.error('Playwright impacted tests error', err)
+      }
+    }
+
     const projects = getProjectsFromRunner(this)
 
     const shouldSetRetries = isFlakyTestRetriesEnabled &&
@@ -611,13 +630,11 @@ function runnerHook (runnerExport, playwrightVersion) {
     const flushWait = new Promise(resolve => {
       onDone = resolve
     })
-    testSessionAsyncResource.runInAsyncScope(() => {
-      testSessionFinishCh.publish({
-        status: STATUS_TO_TEST_STATUS[sessionStatus],
-        isEarlyFlakeDetectionEnabled,
-        isTestManagementTestsEnabled,
-        onDone
-      })
+    testSessionFinishCh.publish({
+      status: STATUS_TO_TEST_STATUS[sessionStatus],
+      isEarlyFlakeDetectionEnabled,
+      isTestManagementTestsEnabled,
+      onDone
     })
     await flushWait
 
@@ -632,37 +649,38 @@ function runnerHook (runnerExport, playwrightVersion) {
   return runnerExport
 }
 
-addHook({
-  name: '@playwright/test',
-  file: 'lib/runner.js',
-  versions: ['>=1.18.0 <=1.30.0']
-}, runnerHook)
-
-addHook({
-  name: '@playwright/test',
-  file: 'lib/dispatcher.js',
-  versions: ['>=1.18.0 <1.30.0']
-}, dispatcherHook)
-
-addHook({
-  name: '@playwright/test',
-  file: 'lib/dispatcher.js',
-  versions: ['>=1.30.0 <1.31.0']
-}, (dispatcher) => dispatcherHookNew(dispatcher, dispatcherRunWrapper))
-
-addHook({
-  name: '@playwright/test',
-  file: 'lib/runner/dispatcher.js',
-  versions: ['>=1.31.0 <1.38.0']
-}, (dispatcher) => dispatcherHookNew(dispatcher, dispatcherRunWrapperNew))
-
-addHook({
-  name: '@playwright/test',
-  file: 'lib/runner/runner.js',
-  versions: ['>=1.31.0 <1.38.0']
-}, runnerHook)
+if (DD_MAJOR < 6) { // <1.38.0 is only supported up to version 5
+  addHook({
+    name: '@playwright/test',
+    file: 'lib/runner.js',
+    versions: ['>=1.18.0 <=1.30.0']
+  }, runnerHook)
+
+  addHook({
+    name: '@playwright/test',
+    file: 'lib/dispatcher.js',
+    versions: ['>=1.18.0 <1.30.0']
+  }, dispatcherHook)
+
+  addHook({
+    name: '@playwright/test',
+    file: 'lib/dispatcher.js',
+    versions: ['>=1.30.0 <1.31.0']
+  }, (dispatcher) => dispatcherHookNew(dispatcher, dispatcherRunWrapper))
+
+  addHook({
+    name: '@playwright/test',
+    file: 'lib/runner/dispatcher.js',
+    versions: ['>=1.31.0 <1.38.0']
+  }, (dispatcher) => dispatcherHookNew(dispatcher, dispatcherRunWrapperNew))
+
+  addHook({
+    name: '@playwright/test',
+    file: 'lib/runner/runner.js',
+    versions: ['>=1.31.0 <1.38.0']
+  }, runnerHook)
+}
 
-// From >=1.38.0
 addHook({
   name: 'playwright',
   file: 'lib/runner/runner.js',
@@ -675,11 +693,10 @@ addHook({
   versions: ['>=1.38.0']
 }, (dispatcher) => dispatcherHookNew(dispatcher, dispatcherRunWrapperNew))
 
-// Hook used for early flake detection. EFD only works from >=1.38.0
 addHook({
   name: 'playwright',
   file: 'lib/common/suiteUtils.js',
-  versions: [MINIMUM_SUPPORTED_VERSION_RANGE_EFD]
+  versions: ['>=1.38.0']
 }, suiteUtilsPackage => {
   // We grab `applyRepeatEachIndex` to use it later
   // `applyRepeatEachIndex` needs to be applied to a cloned suite
@@ -687,16 +704,15 @@ addHook({
   return suiteUtilsPackage
 })
 
-// Hook used for early flake detection. EFD only works from >=1.38.0
 addHook({
   name: 'playwright',
   file: 'lib/runner/loadUtils.js',
-  versions: [MINIMUM_SUPPORTED_VERSION_RANGE_EFD]
+  versions: ['>=1.38.0']
 }, (loadUtilsPackage) => {
   const oldCreateRootSuite = loadUtilsPackage.createRootSuite
 
   async function newCreateRootSuite () {
-    if (!isKnownTestsEnabled && !isTestManagementTestsEnabled) {
+    if (!isKnownTestsEnabled && !isTestManagementTestsEnabled && !isImpactedTestsEnabled) {
       return oldCreateRootSuite.apply(this, arguments)
     }
     const rootSuite = await oldCreateRootSuite.apply(this, arguments)
@@ -735,13 +751,41 @@ addHook({
       }
     }
 
+    if (isImpactedTestsEnabled) {
+      await Promise.all(allTests.map(async (test) => {
+        const { isModified } = await getChannelPromise(isModifiedCh, {
+          filePath: test._requireFile,
+          modifiedTests
+        })
+        if (isModified) {
+          test._ddIsModified = true
+        }
+        if (isEarlyFlakeDetectionEnabled && test.expectedStatus !== 'skipped') {
+          const isNew = isKnownTestsEnabled && isNewTest(test)
+          const fileSuite = getSuiteType(test, 'file')
+          const projectSuite = getSuiteType(test, 'project')
+          // If something change in the file, all tests in the file are impacted
+          const isModifiedTest = () => isModified
+          for (let repeatEachIndex = 1; repeatEachIndex <= earlyFlakeDetectionNumRetries; repeatEachIndex++) {
+            const copyFileSuite = deepCloneSuite(fileSuite, isModifiedTest, [
+              isNew && '_ddIsNew',
+              '_ddIsModified',
+              '_ddIsEfdRetry'
+            ])
+            applyRepeatEachIndex(projectSuite._fullProject, copyFileSuite, repeatEachIndex + 1)
+            projectSuite._addSuite(copyFileSuite)
+          }
+        }
+      }))
+    }
+
     if (isKnownTestsEnabled) {
       const newTests = allTests.filter(isNewTest)
 
       for (const newTest of newTests) {
         // No need to filter out attempt to fix tests here because attempt to fix tests are never new
         newTest._ddIsNew = true
-        if (isEarlyFlakeDetectionEnabled && newTest.expectedStatus !== 'skipped') {
+        if (isEarlyFlakeDetectionEnabled && newTest.expectedStatus !== 'skipped' && !newTest._ddIsModified) {
           const fileSuite = getSuiteType(newTest, 'file')
           const projectSuite = getSuiteType(newTest, 'project')
           for (let repeatEachIndex = 1; repeatEachIndex <= earlyFlakeDetectionNumRetries; repeatEachIndex++) {
@@ -814,11 +858,7 @@ addHook({
     try {
       if (page) {
         const isRumActive = await page.evaluate(() => {
-          if (window.DD_RUM && window.DD_RUM.getInternalContext) {
-            return !!window.DD_RUM.getInternalContext()
-          } else {
-            return false
-          }
+          return window.DD_RUM && window.DD_RUM.getInternalContext ? !!window.DD_RUM.getInternalContext() : false
         })
 
         if (isRumActive) {
@@ -828,7 +868,7 @@ addHook({
           })
         }
       }
-    } catch (e) {
+    } catch {
       // ignore errors such as redirects, context destroyed, etc
     }
 
@@ -897,9 +937,8 @@ addHook({
                   if (window.DD_RUM && window.DD_RUM.stopSession) {
                     window.DD_RUM.stopSession()
                     return true
-                  } else {
-                    return false
                   }
+                  return false
                 })
 
                 if (isRumActive) {
@@ -916,7 +955,7 @@ addHook({
                   }
                 }
               }
-            } catch (e) {
+            } catch {
               // ignore errors
             }
           },
@@ -984,6 +1023,7 @@ addHook({
       hasPassedAttemptToFixRetries: test._ddHasPassedAttemptToFixRetries,
       hasFailedAttemptToFixRetries: test._ddHasFailedAttemptToFixRetries,
       isAtrRetry: test._ddIsAtrRetry,
+      isModified: test._ddIsModified,
       onDone,
       ...testCtx.currentStore
     })

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

@@ -102,11 +102,10 @@ addHook({
         wrapProtobufClasses(root)
         return root
       })
-    } else {
-      // If result is not a promise, directly wrap the protobuf classes
-      wrapProtobufClasses(result)
-      return result
     }
+    // If result is not a promise, directly wrap the protobuf classes
+    wrapProtobufClasses(result)
+    return result
   })
 
   shimmer.wrap(protobuf.Root.prototype, 'loadSync', original => function () {

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

@@ -45,9 +45,9 @@ function wrapCommandQueueClass (cls) {
         try {
           const parsed = new URL(createClientUrl)
           if (parsed) {
-            this._url = { host: parsed.hostname, port: +parsed.port || 6379 }
+            this._url = { host: parsed.hostname, port: Number(parsed.port) || 6379 }
           }
-        } catch (error) {
+        } catch {
           // ignore
         }
       }
@@ -130,8 +130,8 @@ addHook({ name: 'redis', versions: ['>=0.12 <2.6'] }, redis => {
       if (typeof callback === 'function') {
         const cb = callbackResource.bind(callback)
         arguments[2] = asyncResource.bind(wrapCallback(finishCh, errorCh, cb))
-      } else if (Array.isArray(args) && typeof args[args.length - 1] === 'function') {
-        const cb = callbackResource.bind(args[args.length - 1])
+      } else if (Array.isArray(args) && typeof args.at(-1) === 'function') {
+        const cb = callbackResource.bind(args.at(-1))
         args[args.length - 1] = asyncResource.bind(wrapCallback(finishCh, errorCh, cb))
       } else {
         arguments[2] = asyncResource.bind(wrapCallback(finishCh, errorCh))

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

@@ -20,25 +20,21 @@ function wrapSetupRequest (setupRequest) {
 }
 
 function wrapMethod (method) {
-  return function (path) {
-    const middleware = wrapMiddleware(Array.prototype.slice.call(arguments, 1))
+  return function (path, ...middlewares) {
+    const wrappedMiddlewares = middlewares.map(wrapFn)
 
-    return method.apply(this, [path].concat(middleware))
+    return method.apply(this, [path, ...wrappedMiddlewares])
   }
 }
 
 function wrapHandler (method) {
-  return function () {
-    return method.apply(this, wrapMiddleware(arguments))
+  return function (...middlewares) {
+    return method.apply(this, middlewares.map(wrapFn))
   }
 }
 
-function wrapMiddleware (middleware) {
-  return Array.prototype.map.call(middleware, wrapFn)
-}
-
 function wrapFn (fn) {
-  if (Array.isArray(fn)) return wrapMiddleware(fn)
+  if (Array.isArray(fn)) return fn.map(wrapFn)
 
   return shimmer.wrapFunction(fn, fn => function (req, res, next) {
     if (typeof next === 'function') {
@@ -51,11 +47,11 @@ function wrapFn (fn) {
 
     try {
       const result = fn.apply(this, arguments)
-      if (result !== null && typeof result === 'object' && typeof result.then === 'function') {
-        return result.then(function () {
+      if (typeof result?.then === 'function') {
+        return result.then(function (result) {
           nextChannel.publish({ req })
           finishChannel.publish({ req })
-          return arguments[0]
+          return result
         }).catch(function (error) {
           errorChannel.publish({ req, error })
           nextChannel.publish({ req })