dd-trace 5.84.0 → 5.86.0

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

@@ -5,7 +5,7 @@ const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 const producerStartCh = channel('apm:kafkajs:produce:start')
@@ -33,7 +33,7 @@ function commitsFromEvent (event) {
         groupId,
         partition,
         offset,
-        topic
+        topic,
       })
     }
   }
@@ -66,7 +66,7 @@ addHook({ name: 'kafkajs', file: 'src/index.js', versions: ['>=1.4'] }, (BaseKaf
           clusterId,
           disableHeaderInjection: disabledHeaderWeakSet.has(producer),
           messages,
-          topic
+          topic,
         }
 
         for (const message of messages) {
@@ -93,9 +93,10 @@ addHook({ name: 'kafkajs', file: 'src/index.js', versions: ['>=1.4'] }, (BaseKaf
                   // This approach is implemented by other tracers as well.
                   if (err.name === 'KafkaJSProtocolError' && err.type === 'UNKNOWN') {
                     disabledHeaderWeakSet.add(producer)
-                    log.error('Kafka Broker responded with UNKNOWN_SERVER_ERROR (-1). ' +
-                      'Please look at broker logs for more information. ' +
-                      'Tracer message header injection for Kafka is disabled.')
+                    log.error(
+                      // eslint-disable-next-line @stylistic/max-len
+                      'Kafka Broker responded with UNKNOWN_SERVER_ERROR (-1). Please look at broker logs for more information. Tracer message header injection for Kafka is disabled.'
+                    )
                   }
                   producerErrorCh.publish(err)
                 }
@@ -169,7 +170,7 @@ addHook({ name: 'kafkajs', file: 'src/index.js', versions: ['>=1.4'] }, (BaseKaf
             eachBatchExtractor,
             clusterId
           ),
-          ...runArgs
+          ...runArgs,
         })
       }
 
@@ -193,7 +194,7 @@ const wrappedCallback = (fn, startCh, finishCh, errorCh, extractArgs, clusterId)
     ? function (...args) {
       const extractedArgs = extractArgs(args, clusterId)
       const ctx = {
-        extractedArgs
+        extractedArgs,
       }
 
       return startCh.runStores(ctx, () => {

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

@@ -16,7 +16,7 @@ function patch (file) {
   addHook({
     name: 'knex',
     versions: ['>=0.8.0'],
-    file
+    file,
   }, Builder => {
     shimmer.wrap(Builder.prototype, 'then', wrapThen)
     return Builder
@@ -30,7 +30,7 @@ function finish (context, cb) {
 addHook({
   name: 'knex',
   versions: ['>=2'],
-  file: 'lib/knex-builder/Knex.js'
+  file: 'lib/knex-builder/Knex.js',
 }, Knex => {
   shimmer.wrap(Knex.Client.prototype, 'raw', raw => function () {
     if (!startRawQueryCh.hasSubscribers) {

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

@@ -57,7 +57,9 @@ function wrapRouterUse (use) {
   return function useWithTrace () {
     const router = use.apply(this, arguments)
 
-    router.stack.forEach(wrapStack)
+    for (const layer of router.stack) {
+      wrapStack(layer)
+    }
 
     return router
   }

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

@@ -4,7 +4,7 @@ const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook,
-  AsyncResource
+  AsyncResource,
 } = require('./helpers/instrument')
 
 function isString (value) {

package/packages/datadog-instrumentations/src/light-my-request.js

@@ -14,7 +14,7 @@
 const shimmer = require('../../datadog-shimmer')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 // Reuse the same channels as HTTP server instrumentation

package/packages/datadog-instrumentations/src/limitd-client.js

@@ -14,7 +14,7 @@ function wrapRequest (original) {
 addHook({
   name: 'limitd-client',
   versions: ['>=2.8'],
-  file: ['client.js']
+  file: ['client.js'],
 }, LimitdClient => {
   shimmer.wrap(LimitdClient.prototype, '_directRequest', wrapRequest)
   shimmer.wrap(LimitdClient.prototype, '_retriedRequest', wrapRequest)

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

@@ -65,7 +65,7 @@ function createWrapQuery (options) {
           finishCh.publish(ctx)
           return result
         }, error => {
-          ctx.error
+          ctx.error = error
           errorCh.publish(ctx)
           finishCh.publish(ctx)
           throw error

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

@@ -3,7 +3,7 @@
 const shimmer = require('../../datadog-shimmer')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 addHook({ name: 'memcached', versions: ['>=2.2'] }, Memcached => {

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

@@ -11,7 +11,7 @@ const patched = new WeakSet()
 // mocha-each support
 addHook({
   name: 'mocha-each',
-  versions: ['>=2.0.1']
+  versions: ['>=2.0.1'],
 }, mochaEach => {
   if (patched.has(mochaEach)) return mochaEach
 
@@ -25,7 +25,7 @@ addHook({
         parameterizedTestCh.publish({ title, params })
         it.apply(this, arguments)
       },
-      ...rest
+      ...rest,
     }
   })
 })
@@ -34,7 +34,7 @@ addHook({
 addHook({
   name: 'mocha',
   versions: ['>=5.2.0'],
-  file: 'lib/suite.js'
+  file: 'lib/suite.js',
 }, (Suite) => {
   shimmer.wrap(Suite.prototype, 'addTest', addTest => function (test) {
     const callSites = getCallSites()

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

@@ -13,7 +13,7 @@ const {
   getCoveredFilenamesFromCoverage,
   mergeCoverage,
   resetCoverage,
-  getIsFaultyEarlyFlakeDetection
+  getIsFaultyEarlyFlakeDetection,
 } = require('../../../dd-trace/src/plugins/util/test')
 
 const {
@@ -33,7 +33,7 @@ const {
   getTestFullName,
   getRunTestsWrapper,
   testsAttemptToFix,
-  testsStatuses
+  testsStatuses,
 } = require('./utils')
 
 require('./common')
@@ -165,6 +165,15 @@ function getOnEndHandler (isParallel) {
       this.failures -= numFailedQuarantinedTests + numFailedRetriedQuarantinedOrDisabledTests
     }
 
+    // Recompute status after EFD and quarantine adjustments have reduced failure counts
+    if (status === 'fail') {
+      if (this.stats) {
+        status = this.stats.failures === 0 ? 'pass' : 'fail'
+      } else {
+        status = this.failures === 0 ? 'pass' : 'fail'
+      }
+    }
+
     if (status === 'fail') {
       error = new Error(`Failed tests: ${this.failures}.`)
     }
@@ -196,7 +205,7 @@ function getOnEndHandler (isParallel) {
       isEarlyFlakeDetectionEnabled: config.isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty: config.isEarlyFlakeDetectionFaulty,
       isTestManagementEnabled: config.isTestManagementTestsEnabled,
-      isParallel
+      isParallel,
     })
   }
 }
@@ -204,7 +213,7 @@ function getOnEndHandler (isParallel) {
 function getExecutionConfiguration (runner, isParallel, frameworkVersion, onFinishRequest) {
   const ctx = {
     isParallel,
-    frameworkVersion
+    frameworkVersion,
   }
 
   const onReceivedSkippableSuites = ({ err, skippableSuites, itrCorrelationId: responseItrCorrelationId }) => {
@@ -220,9 +229,7 @@ function getExecutionConfiguration (runner, isParallel, frameworkVersion, onFini
 
     isSuitesSkipped = suitesToRun.length !== runner.suite.suites.length
 
-    log.debug(
-      () => `${suitesToRun.length} out of ${runner.suite.suites.length} suites are going to run.`
-    )
+    log.debug('%d out of %d suites are going to run.', suitesToRun.length, runner.suite.suites.length)
 
     runner.suite.suites = suitesToRun
 
@@ -343,7 +350,7 @@ function getExecutionConfiguration (runner, isParallel, frameworkVersion, onFini
 addHook({
   name: 'mocha',
   versions: ['>=5.2.0'],
-  file: 'lib/mocha.js'
+  file: 'lib/mocha.js',
 }, (Mocha, frameworkVersion) => {
   shimmer.wrap(Mocha.prototype, 'run', run => function () {
     // Workers do not need to request any data, just run the tests
@@ -357,7 +364,8 @@ addHook({
 
     const runner = run.apply(this, arguments)
 
-    this.files.forEach(path => {
+    // eslint-disable-next-line unicorn/no-array-for-each
+    this.files.forEach((path) => {
       const isUnskippable = isMarkedAsUnskippable({ path })
       if (isUnskippable) {
         unskippableSuites.push(path)
@@ -383,7 +391,7 @@ addHook({
           onDone: (receivedCodeCoverage) => {
             untestedCoverage = receivedCodeCoverage
             global.run()
-          }
+          },
         })
       } else {
         global.run()
@@ -398,7 +406,7 @@ addHook({
 addHook({
   name: 'mocha',
   versions: ['>=5.2.0'],
-  file: 'lib/cli/run-helpers.js'
+  file: 'lib/cli/run-helpers.js',
 }, (run) => {
   // `runMocha` is an async function
   shimmer.wrap(run, 'runMocha', runMocha => function () {
@@ -429,7 +437,7 @@ addHook({
 addHook({
   name: 'mocha',
   versions: ['>=5.2.0'],
-  file: 'lib/runner.js'
+  file: 'lib/runner.js',
 }, function (Runner, frameworkVersion) {
   if (patched.has(Runner)) return Runner
 
@@ -473,7 +481,7 @@ addHook({
           testSuiteAbsolutePath: suite.file,
           isUnskippable,
           isForcedToRun,
-          itrCorrelationId
+          itrCorrelationId,
         }
         testFileToSuiteCtx.set(suite.file, ctx)
         testSuiteStartCh.runStores(ctx, () => {})
@@ -496,6 +504,7 @@ addHook({
         status = 'skip'
       } else {
         // has to check every test in the test file
+        // eslint-disable-next-line unicorn/no-array-for-each
         suitesInTestFile.forEach(suite => {
           suite.eachTest(test => {
             if (test.state === 'failed' || test.timedOut) {
@@ -510,7 +519,7 @@ addHook({
 
         testSuiteCodeCoverageCh.publish({
           coverageFiles,
-          suiteFile: suite.file
+          suiteFile: suite.file,
         })
         // We need to reset coverage to get a code coverage per suite
         // Before that, we preserve the original coverage
@@ -537,7 +546,7 @@ addHook({
 addHook({
   name: 'mocha',
   versions: ['>=5.2.0'],
-  file: 'lib/runnable.js'
+  file: 'lib/runnable.js',
 }, (runnablePackage) => runnableWrapper(runnablePackage, config))
 
 function onMessage (message) {
@@ -557,7 +566,7 @@ addHook({
   // The version they use is 6.0.0:
   // https://github.com/mochajs/mocha/blob/612fa31228c695f16173ac675f40ccdf26b4cfb5/package.json#L75
   versions: ['>=6.0.0'],
-  file: 'src/WorkerHandler.js'
+  file: 'src/WorkerHandler.js',
 }, (workerHandlerPackage) => {
   shimmer.wrap(workerHandlerPackage.prototype, 'exec', exec => function (_, path) {
     if (!testFinishCh.hasSubscribers) {
@@ -607,7 +616,7 @@ addHook({
 addHook({
   name: 'mocha',
   versions: ['>=8.0.0'],
-  file: 'lib/nodejs/parallel-buffered-runner.js'
+  file: 'lib/nodejs/parallel-buffered-runner.js',
 }, (ParallelBufferedRunner, frameworkVersion) => {
   shimmer.wrap(ParallelBufferedRunner.prototype, 'run', run => function (cb, { files }) {
     if (!testFinishCh.hasSubscribers) {
@@ -646,7 +655,7 @@ addHook({
 addHook({
   name: 'mocha',
   versions: ['>=8.0.0'],
-  file: 'lib/nodejs/buffered-worker-pool.js'
+  file: 'lib/nodejs/buffered-worker-pool.js',
 }, (BufferedWorkerPoolPackage) => {
   const { BufferedWorkerPool } = BufferedWorkerPoolPackage
 
@@ -670,8 +679,8 @@ addHook({
         newWorkerArgs._ddIsKnownTestsEnabled = true
         newWorkerArgs._ddKnownTests = {
           mocha: {
-            [testPath]: testSuiteKnownTests
-          }
+            [testPath]: testSuiteKnownTests,
+          },
         }
       } else {
         config.isEarlyFlakeDetectionEnabled = false
@@ -689,9 +698,9 @@ addHook({
       newWorkerArgs._ddTestManagementTests = {
         mocha: {
           suites: {
-            [testPath]: testSuiteTestManagementTests
-          }
-        }
+            [testPath]: testSuiteTestManagementTests,
+          },
+        },
       }
     }
 
@@ -705,7 +714,7 @@ addHook({
       this,
       [
         testSuiteAbsolutePath,
-        newWorkerArgs
+        newWorkerArgs,
       ]
     )
 

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

@@ -64,11 +64,11 @@ function retryTest (test, numRetries, tags) {
   for (let retryIndex = 0; retryIndex < numRetries; retryIndex++) {
     const clonedTest = test.clone()
     suite.addTest(clonedTest)
-    tags.forEach(tag => {
+    for (const tag of tags) {
       if (tag) {
         clonedTest[tag] = true
       }
-    })
+    }
   }
 }
 
@@ -82,6 +82,7 @@ function getSuitesByTestFile (root) {
         suitesByTestFile[suite.file] = [suite]
       }
     }
+    // eslint-disable-next-line unicorn/no-array-for-each
     suite.suites.forEach(suite => {
       getSuites(suite)
     })
@@ -201,14 +202,14 @@ function getOnTestHandler (isMain) {
       _ddIsAttemptToFix: isAttemptToFix,
       _ddIsDisabled: isDisabled,
       _ddIsQuarantined: isQuarantined,
-      _ddIsModified: isModified
+      _ddIsModified: isModified,
     } = test
 
     const testInfo = {
       testName: test.fullTitle(),
       testSuiteAbsolutePath,
       title,
-      testStartLine
+      testStartLine,
     }
 
     if (!isMain) {
@@ -298,7 +299,7 @@ function getOnTestEndHandler (config) {
         attemptToFixFailed,
         isAttemptToFixRetry,
         isAtrRetry,
-        ...ctx.currentStore
+        ...ctx.currentStore,
       })
     }
   }
@@ -318,7 +319,7 @@ function getOnHookEndHandler () {
             status,
             hasBeenRetried: isMochaRetry(test),
             isLastRetry: getIsLastRetry(test),
-            ...ctx.currentStore
+            ...ctx.currentStore,
           })
         }
       }
@@ -389,14 +390,14 @@ function getOnPendingHandler () {
     const testStartLine = testToStartLine.get(test)
     const {
       file: testSuiteAbsolutePath,
-      title
+      title,
     } = test
 
     const testInfo = {
       testName: test.fullTitle(),
       testSuiteAbsolutePath,
       title,
-      testStartLine
+      testStartLine,
     }
 
     const ctx = getTestContext(test)
@@ -420,6 +421,7 @@ function getOnPendingHandler () {
 function getRunTestsWrapper (runTests, config) {
   return function (suite) {
     if (config.isTestManagementTestsEnabled) {
+      // eslint-disable-next-line unicorn/no-array-for-each
       suite.tests.forEach((test) => {
         const { isAttemptToFix, isDisabled, isQuarantined } = getTestProperties(test, config.testManagementTests)
         if (isAttemptToFix && !test.isPending()) {
@@ -443,6 +445,7 @@ function getRunTestsWrapper (runTests, config) {
     }
 
     if (config.isImpactedTestsEnabled) {
+      // eslint-disable-next-line unicorn/no-array-for-each
       suite.tests.forEach((test) => {
         isModifiedCh.publish({
           modifiedFiles: config.modifiedFiles,
@@ -458,14 +461,15 @@ function getRunTestsWrapper (runTests, config) {
                 )
               }
             }
-          }
+          },
         })
       })
     }
 
     if (config.isKnownTestsEnabled) {
       // by the time we reach `this.on('test')`, it is too late. We need to add retries here
-      suite.tests.forEach(test => {
+      // eslint-disable-next-line unicorn/no-array-for-each
+      suite.tests.forEach((test) => {
         if (!test.isPending() && isNewTest(test, config.knownTests)) {
           test._ddIsNew = true
           if (config.isEarlyFlakeDetectionEnabled && !test._ddIsAttemptToFix && !test._ddIsModified) {
@@ -506,5 +510,5 @@ module.exports = {
   newTests,
   testsQuarantined,
   testsAttemptToFix,
-  testsStatuses
+  testsStatuses,
 }

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

@@ -10,7 +10,7 @@ const {
   getOnHookEndHandler,
   getOnFailHandler,
   getOnPendingHandler,
-  getRunTestsWrapper
+  getRunTestsWrapper,
 } = require('./utils')
 require('./common')
 
@@ -21,7 +21,7 @@ const config = {}
 addHook({
   name: 'mocha',
   versions: ['>=8.0.0'],
-  file: 'lib/mocha.js'
+  file: 'lib/mocha.js',
 }, (Mocha) => {
   shimmer.wrap(Mocha.prototype, 'run', run => function () {
     if (this.options._ddIsKnownTestsEnabled) {
@@ -58,7 +58,7 @@ addHook({
 addHook({
   name: 'mocha',
   versions: ['>=5.2.0'],
-  file: 'lib/runner.js'
+  file: 'lib/runner.js',
 }, function (Runner) {
   shimmer.wrap(Runner.prototype, 'runTests', runTests => getRunTestsWrapper(runTests, config))
 
@@ -91,6 +91,6 @@ addHook({
 addHook({
   name: 'mocha',
   versions: ['>=5.2.0'],
-  file: 'lib/runnable.js'
+  file: 'lib/runnable.js',
 }, runnableWrapper)
 // TODO: parallel mode does not support flaky test retries, so no library config is passed.

package/packages/datadog-instrumentations/src/moleculer/server.js

@@ -47,7 +47,7 @@ function createMiddleware () {
           }
         })
       })
-    }
+    },
   }
 }
 

package/packages/datadog-instrumentations/src/mongodb-core.js

@@ -4,7 +4,7 @@ const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook,
-  AsyncResource
+  AsyncResource,
 } = require('./helpers/instrument')
 
 const startCh = channel('apm:mongodb:query:start')
@@ -161,7 +161,7 @@ function instrument (operation, command, instance, args, server, ns, ops, option
     ns,
     ops,
     options: serverInfo,
-    name
+    name,
   }
   return startCh.runStores(ctx, () => {
     args[index] = shimmer.wrapFunction(callback, callback => function (err, res) {
@@ -193,7 +193,7 @@ function instrumentPromise (operation, command, instance, args, server, ns, ops,
     ns,
     ops,
     options: serverInfo,
-    name
+    name,
   }
 
   return startCh.runStores(ctx, () => {

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

@@ -5,7 +5,7 @@ require('./mongodb-core')
 const shimmer = require('../../datadog-shimmer')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 // collection methods with filter
@@ -17,20 +17,20 @@ const collectionMethodsWithFilter = [
   'find',
   'findOneAndDelete',
   'findOneAndReplace',
-  'replaceOne'
+  'replaceOne',
 ] // findOne is ignored because it calls to find
 
 const collectionMethodsWithTwoFilters = [
   'findOneAndUpdate',
   'updateMany',
-  'updateOne'
+  'updateOne',
 ]
 
 const startCh = channel('datadog:mongodb:collection:filter:start')
 
 addHook({ name: 'mongodb', versions: ['>=3.3 <5', '5', '>=6'] }, mongodb => {
-  [...collectionMethodsWithFilter, ...collectionMethodsWithTwoFilters].forEach(methodName => {
-    if (!(methodName in mongodb.Collection.prototype)) return
+  for (const methodName of [...collectionMethodsWithFilter, ...collectionMethodsWithTwoFilters]) {
+    if (!(methodName in mongodb.Collection.prototype)) continue
 
     const useTwoArguments = collectionMethodsWithTwoFilters.includes(methodName)
 
@@ -42,7 +42,7 @@ addHook({ name: 'mongodb', versions: ['>=3.3 <5', '5', '>=6'] }, mongodb => {
 
         const ctx = {
           filters: [arguments[0]],
-          methodName
+          methodName,
         }
 
         if (useTwoArguments) {
@@ -54,6 +54,6 @@ addHook({ name: 'mongodb', versions: ['>=3.3 <5', '5', '>=6'] }, mongodb => {
         })
       }
     })
-  })
+  }
   return mongodb
 })

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

@@ -25,7 +25,7 @@ function wrapAddQueue (addQueue) {
 addHook({
   name: 'mongoose',
   versions: ['>=4.6.4 <5', '5', '6', '>=7'],
-  file: 'lib/index.js'
+  file: 'lib/index.js',
 }, mongoose => {
   // As of Mongoose 7, custom promise libraries are no longer supported and mongoose.Promise may be undefined
   if (mongoose.Promise && mongoose.Promise !== global.Promise) {
@@ -47,23 +47,23 @@ const collectionMethodsWithFilter = [
   'findOneAndDelete',
   'findOneAndReplace',
   'replaceOne',
-  'remove'
+  'remove',
 ]
 
 const collectionMethodsWithTwoFilters = [
   'findOneAndUpdate',
   'updateMany',
-  'updateOne'
+  'updateOne',
 ]
 
 addHook({
   name: 'mongoose',
   versions: ['>=4.6.4 <5', '5', '6', '>=7'],
-  file: 'lib/model.js'
+  file: 'lib/model.js',
 }, Model => {
-  [...collectionMethodsWithFilter, ...collectionMethodsWithTwoFilters].forEach(methodName => {
+  for (const methodName of [...collectionMethodsWithFilter, ...collectionMethodsWithTwoFilters]) {
     const useTwoArguments = collectionMethodsWithTwoFilters.includes(methodName)
-    if (!(methodName in Model)) return
+    if (!(methodName in Model)) continue
 
     shimmer.wrap(Model, methodName, method => {
       return function wrappedModelMethod () {
@@ -97,7 +97,7 @@ addHook({
 
         const ctx = {
           filters,
-          methodName
+          methodName,
         }
 
         return startCh.runStores(ctx, () => {
@@ -153,7 +153,7 @@ addHook({
         })
       }
     })
-  })
+  }
 
   return Model
 })
@@ -163,14 +163,14 @@ const sanitizeFilterFinishCh = channel('datadog:mongoose:sanitize-filter:finish'
 addHook({
   name: 'mongoose',
   versions: ['6', '>=7'],
-  file: 'lib/helpers/query/sanitizeFilter.js'
+  file: 'lib/helpers/query/sanitizeFilter.js',
 }, sanitizeFilter => {
   return shimmer.wrapFunction(sanitizeFilter, sanitizeFilter => function wrappedSanitizeFilter () {
     const sanitizedObject = sanitizeFilter.apply(this, arguments)
 
     if (sanitizeFilterFinishCh.hasSubscribers) {
       sanitizeFilterFinishCh.publish({
-        sanitizedObject
+        sanitizedObject,
       })
     }