dd-trace 6.15.0 → 6.17.0

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

@@ -149,7 +149,6 @@ function createPoolAcquisition (pool, options, queryCtx, mode) {
  * Queues a delayed acquisition for pool events that no longer carry its async-local context.
  *
  * @param {PoolAcquisition} acquisition
- * @returns {void}
  */
 function queuePoolAcquisition (acquisition) {
   let pending = pendingPoolAcquisitions.get(acquisition.pool)
@@ -164,7 +163,6 @@ function queuePoolAcquisition (acquisition) {
  * Reports whether an acquisition still needs a matching pool event.
  *
  * @param {PoolAcquisition} acquisition
- * @returns {boolean}
  */
 function isPoolAcquisitionPending (acquisition) {
   return !acquisition.acquired && !acquisition.finished && !acquisition.errorReported
@@ -174,7 +172,6 @@ function isPoolAcquisitionPending (acquisition) {
  * Releases a consumed acquisition and periodically compacts its queue.
  *
  * @param {PendingPoolAcquisitions} pending
- * @returns {void}
  */
 function discardPoolAcquisition (pending) {
   pending.acquisitions[pending.index++] = undefined
@@ -195,7 +192,6 @@ function discardPoolAcquisition (pending) {
  * Removes completed entries from the front of a pool's acquisition queue.
  *
  * @param {object} pool
- * @returns {void}
  */
 function prunePoolAcquisitions (pool) {
   const pending = pendingPoolAcquisitions.get(pool)
@@ -235,7 +231,6 @@ function takePoolAcquisition (pool) {
  * Records the pool wait when MariaDB announces that the calling operation acquired a connection.
  *
  * @param {object} pool
- * @returns {void}
  */
 function recordPoolAcquisition (pool) {
   let acquisition = poolAcquisitionStorage?.getStore()
@@ -263,7 +258,6 @@ function recordPoolAcquisition (pool) {
  * Starts a pooled command after MariaDB has acquired the connection that will execute it.
  *
  * @param {PoolAcquisition} acquisition
- * @returns {void}
  */
 function startPoolCommand (acquisition) {
   const queryCtx = acquisition.queryCtx
@@ -277,7 +271,6 @@ function startPoolCommand (acquisition) {
  * Starts a command lifecycle without running connector work inside its span store.
  *
  * @param {object} ctx
- * @returns {void}
  */
 function runCommandStart (ctx) {
   startCh.runStores(ctx, noop)
@@ -288,7 +281,6 @@ function runCommandStart (ctx) {
  *
  * @param {PoolAcquisition | undefined} acquisition
  * @param {unknown} error
- * @returns {void}
  */
 function reportPoolQueryAcquireError (acquisition, error) {
   if (acquisition === undefined || acquisition.acquired || acquisition.errorReported) return
@@ -346,7 +338,6 @@ function runPoolAcquisition (acquisition, method, receiver, args) {
  *
  * @param {PoolAcquisition | undefined} acquisition
  * @param {unknown} [error]
- * @returns {void}
  */
 function finishPoolCommandAcquisition (acquisition, error) {
   if (acquisition === undefined) return
@@ -375,7 +366,6 @@ function runSkippedPoolMethod (method, receiver, args) {
  *
  * @param {PoolAcquisition} acquisition
  * @param {unknown} [error]
- * @returns {void}
  */
 function finishExplicitPoolAcquisition (acquisition, error) {
   if (acquisition.finished) return
@@ -395,7 +385,6 @@ function finishExplicitPoolAcquisition (acquisition, error) {
  *
  * @param {object} pool
  * @param {Function} observer
- * @returns {void}
  */
 function restorePoolAcquisitionObserver (pool, observer) {
   const listeners = pool.listeners('acquire')
@@ -409,7 +398,6 @@ function restorePoolAcquisitionObserver (pool, observer) {
  * Observes public acquire events forwarded by a bundled pool.
  *
  * @param {object} pool
- * @returns {void}
  */
 function observePoolAcquisitions (pool) {
   const observer = () => {
@@ -428,7 +416,6 @@ function observePoolAcquisitions (pool) {
  * Marks a command as active on its owning public connection.
  *
  * @param {object | undefined} owner
- * @returns {void}
  */
 function startCommand (owner) {
   if (owner === undefined) return
@@ -439,7 +426,6 @@ function startCommand (owner) {
  * Releases one active command without clearing concurrent commands.
  *
  * @param {object | undefined} owner
- * @returns {void}
  */
 function endCommand (owner) {
   if (owner === undefined) return
@@ -458,7 +444,6 @@ function endCommand (owner) {
  * @param {object | undefined} owner
  * @param {Error} [error]
  * @param {unknown} [result]
- * @returns {void}
  */
 function finishCommandState (ctx, owner, error, result) {
   endCommand(owner)
@@ -476,7 +461,6 @@ function finishCommandState (ctx, owner, error, result) {
  * @param {object | undefined} owner
  * @param {Error} [error]
  * @param {unknown} [result]
- * @returns {void}
  */
 function finishCommand (ctx, owner, error, result) {
   finishCommandState(ctx, owner, error, result)
@@ -490,7 +474,6 @@ function finishCommand (ctx, owner, error, result) {
  * @param {number} callbackIndex
  * @param {unknown} callback
  * @param {(callback?: Function) => Function} createCallback
- * @returns {void}
  */
 function setCommandCallback (args, callbackIndex, callback, createCallback) {
   if (typeof callback === 'function') {
@@ -750,7 +733,6 @@ function createWrapStream (options, preparedSql, commandOwner) {
  *
  * @param {object} client
  * @param {(command: Function) => Function} wrapper
- * @returns {void}
  */
 function wrapClientCommands (client, wrapper) {
   if (wrappedClients.has(client)) return
@@ -769,7 +751,6 @@ function wrapClientCommands (client, wrapper) {
  * @param {(options: object, sql?: unknown, owner?: object, commandArity?: number,
  *   trackActiveCommands?: boolean, poolAcquisition?: 'measure' | 'observe') =>
  *   (command: Function) => Function} createWrapper
- * @returns {void}
  */
 function wrapPoolCommands (pool, options, createWrapper) {
   if (wrappedClients.has(pool)) return
@@ -789,7 +770,6 @@ function wrapPoolCommands (pool, options, createWrapper) {
  * @param {object} options
  * @param {(options: object, sql: string, owner?: object, commandArity?: number) =>
  *   (command: Function) => Function} createWrapper
- * @returns {void}
  */
 function wrapTransactionMethods (client, options, createWrapper) {
   for (const [method, sql] of transactionMethods) {
@@ -1115,7 +1095,6 @@ function createWrapCallbackGetConnection (options) {
  * @param {object} pool
  * @param {object} options
  * @param {(connection: object, options: object) => object} wrapConnection
- * @returns {void}
  */
 function wrapPoolConnectionEvent (pool, options, wrapConnection) {
   shimmer.wrap(pool, 'emit', emit => function (event, connection) {
@@ -1131,7 +1110,6 @@ function wrapPoolConnectionEvent (pool, options, wrapConnection) {
  * @param {object} cluster
  * @param {Function} defaultOptions
  * @param {ClusterSelectionStorage} selectionStorage
- * @returns {void}
  */
 function captureClusterOptions (cluster, defaultOptions, selectionStorage) {
   /** @type {Map<string, ClusterNodeOptions>} */
@@ -1198,7 +1176,6 @@ function captureClusterOptions (cluster, defaultOptions, selectionStorage) {
  *
  * @param {Map<string, ClusterNodeOptions>} optionsByIdentifier
  * @param {string} pattern
- * @returns {void}
  */
 function removeClusterOptions (optionsByIdentifier, pattern) {
   const regularExpression = new RegExp(pattern)
@@ -1227,7 +1204,6 @@ function runClusterGetConnection (getConnection, receiver, args) {
  * @param {ClusterSelection} selection
  * @param {number | undefined} start
  * @param {unknown} error
- * @returns {void}
  */
 function reportBundledClusterAcquireError (selection, start, error) {
   if (!acquireStartCh.hasSubscribers) return

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

@@ -208,7 +208,6 @@ function wrapPoolQuery (method) {
 
 /**
  * @param {Function} Pool
- * @returns {boolean}
  */
 function claimPoolWrap (Pool) {
   if (wrappedPools.has(Pool)) return false
@@ -267,7 +266,6 @@ function startPoolAcquireTiming (timing) {
 
 /**
  * @param {PoolAcquireTiming} timing
- * @returns {number}
  */
 function finishPoolAcquireTiming (timing) {
   const poolWaitTime = (timing.poolWaitTime ?? 0) + acquireWait(timing.poolAcquireStart)

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

@@ -6,6 +6,6 @@
 
 const { addHook, getHooks } = require('./helpers/instrument')
 
-for (const hook of getHooks('mercurius')) {
+for (const hook of getHooks('mercurius').values()) {
   addHook(hook, exports => exports)
 }

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

@@ -16,7 +16,6 @@ const patched = new WeakSet()
  *
  * @param {string[]} versions
  * @param {(Mocha: Function, frameworkVersion: string) => Function} wrapMochaRun
- * @returns {void}
  */
 function addMochaRunHooks (versions, wrapMochaRun) {
   const patchedMochaConstructors = new WeakSet()

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

@@ -224,7 +224,6 @@ function getCoverageRootDir () {
  * from the suite path.
  *
  * @param {string} testSuiteAbsolutePath
- * @returns {boolean}
  */
 function isModifiedTestSuite (testSuiteAbsolutePath) {
   const testPath = getTestSuitePath(testSuiteAbsolutePath, getCoverageRootDir())
@@ -318,7 +317,7 @@ function getOnEndHandler (isParallel, onDone) {
     let error = frameworkError
     if (this.stats) {
       status = this.stats.failures === 0 ? 'pass' : 'fail'
-      if (this.stats.tests === 0) {
+      if (this.stats.tests === 0 && this.stats.failures === 0) {
         status = 'skip'
       }
     } else if (this.failures !== 0) {
@@ -330,6 +329,7 @@ function getOnEndHandler (isParallel, onDone) {
     } else if (status === 'fail') {
       error = new Error(`Failed tests: ${this.failures}.`)
     }
+    const isExpectedEmptySession = arguments.length === 0 && status === 'skip'
 
     testFileToSuiteCtx.clear()
 
@@ -373,6 +373,7 @@ function getOnEndHandler (isParallel, onDone) {
       isTestManagementEnabled: config.isTestManagementTestsEnabled,
       isParallel,
       isFrameworkError: arguments.length > 0,
+      isExpectedEmptySession,
     }, () => {
       try {
         onDone()
@@ -394,7 +395,6 @@ function getOnEndHandler (isParallel, onDone) {
  * Applies Test Optimization failure suppression once per runner execution.
  *
  * @param {object} runner
- * @returns {void}
  */
 function adjustRunnerFailuresOnce (runner) {
   if (runnerFailuresAdjusted.has(runner)) return
@@ -427,7 +427,6 @@ function getRunnerRecoveryState (runner) {
  *
  * @param {object} runner
  * @param {object} test
- * @returns {void}
  */
 function markTestPending (runner, test) {
   const state = getRunnerRecoveryState(runner)
@@ -447,7 +446,6 @@ function markTestPending (runner, test) {
  *
  * @param {object} runner
  * @param {object} test
- * @returns {void}
  */
 function markTestTerminal (runner, test) {
   getRunnerRecoveryState(runner).tests.add(test)
@@ -458,7 +456,6 @@ function markTestTerminal (runner, test) {
  * Restores test and hook state changed only to abort the current run.
  *
  * @param {object} runner
- * @returns {void}
  */
 function restoreReporterMutations (runner) {
   const state = runnerRecoveryStates.get(runner)
@@ -490,7 +487,6 @@ function restoreReporterMutations (runner) {
  *
  * @param {object} runner
  * @param {object} test
- * @returns {void}
  */
 function stopCurrentTest (runner, test) {
   const hookDown = runner.hookDown
@@ -512,7 +508,6 @@ function stopCurrentTest (runner, test) {
  *
  * @param {object} runner
  * @param {object} hook
- * @returns {void}
  */
 function stopCurrentHook (runner, hook) {
   const hookMethod = runner.hook
@@ -556,7 +551,6 @@ function stopCurrentHook (runner, hook) {
  *
  * @param {object} runner
  * @param {object} test
- * @returns {void}
  */
 function stopAfterEachHooks (runner, test) {
   const hookUp = runner.hookUp
@@ -572,7 +566,6 @@ function stopAfterEachHooks (runner, test) {
  * Prevents Mocha from entering any subsequent user hooks after a reporter error.
  *
  * @param {object} runner
- * @returns {void}
  */
 function stopFutureHooks (runner) {
   if (runnerHookMethods.has(runner)) return
@@ -587,7 +580,6 @@ function stopFutureHooks (runner) {
  * Restores the runner hook method after reporter-error finalization.
  *
  * @param {object} runner
- * @returns {void}
  */
 function restoreFutureHooks (runner) {
   const hook = runnerHookMethods.get(runner)
@@ -602,7 +594,6 @@ function restoreFutureHooks (runner) {
  *
  * @param {object} runner
  * @param {object} hook
- * @returns {boolean} whether the completed hook was a before-each hook
  */
 function stopRemainingCurrentHooks (runner, hook) {
   const hookLists = [hook.parent?._beforeAll, hook.parent?._beforeEach, hook.parent?._afterEach, hook.parent?._afterAll]
@@ -631,7 +622,6 @@ function stopRemainingCurrentHooks (runner, hook) {
  *
  * @param {object} runner
  * @param {object} hook
- * @returns {void}
  */
 function stopAfterHookEnd (runner, hook) {
   if (!stopRemainingCurrentHooks(runner, hook) || !runner.test) return
@@ -643,7 +633,6 @@ function stopAfterHookEnd (runner, hook) {
  * Prevents Mocha from entering the root suite after a run-start reporter error.
  *
  * @param {object} runner
- * @returns {void}
  */
 function stopRootSuite (runner) {
   const runSuite = runner.runSuite
@@ -664,7 +653,6 @@ function createSkippedParallelFileRunner () {
  * Prevents a parallel run-start reporter error from scheduling test workers.
  *
  * @param {object} runner
- * @returns {void}
  */
 function stopParallelWorkers (runner) {
   const state = getRunnerRecoveryState(runner)
@@ -680,7 +668,6 @@ function stopParallelWorkers (runner) {
  * Resets suite coverage after every reporter has observed the completed suite.
  *
  * @param {object} runner
- * @returns {void}
  */
 function resetPendingSuiteCoverage (runner) {
   if (!runnersWithPendingCoverageReset.delete(runner) || !global.__coverage__) return
@@ -734,7 +721,6 @@ function getFrameworkFinalizationError (frameworkError) {
  * runs Datadog's end handler and propagates the original error after finalization.
  *
  * @param {Function} Runner
- * @returns {void}
  */
 function wrapRunnerEmit (Runner) {
   if (wrappedRunnerEmitPrototypes.has(Runner.prototype)) return
@@ -875,7 +861,6 @@ function isFailedTestReplayEnabled () {
  * Mirrors Mocha 5's private exclusivity check.
  *
  * @param {MochaSuite} suite
- * @returns {boolean}
  */
 function hasOnly (suite) {
   if (suite._onlyTests.length || suite._onlySuites.length) return true
@@ -890,7 +875,6 @@ function hasOnly (suite) {
  * Mirrors Mocha 5's private exclusivity filter.
  *
  * @param {MochaSuite} suite
- * @returns {boolean}
  */
 function filterOnly (suite) {
   if (suite._onlyTests.length) {
@@ -1038,6 +1022,8 @@ function getExecutionConfiguration (runner, isParallel, frameworkVersion, onFini
     config.isSuitesSkippingEnabled = config.isItrEnabled && libraryConfig.isSuitesSkippingEnabled
     config.isFlakyTestRetriesEnabled = libraryConfig.isFlakyTestRetriesEnabled
     config.flakyTestRetriesCount = libraryConfig.flakyTestRetriesCount
+    config.isDynamicAtrEnabled = libraryConfig.isDynamicAtrEnabled
+    config.dynamicAtrBuckets = libraryConfig.dynamicAtrBuckets
     config.isDiEnabled = libraryConfig.isDiEnabled
     config.isTestDynamicInstrumentationEnabled = isTestDynamicInstrumentationEnabled
 
@@ -1072,7 +1058,6 @@ function getExecutionConfiguration (runner, isParallel, frameworkVersion, onFini
 
 /**
  * @param {import('mocha').Runner} runner
- * @returns {void}
  */
 function startMochaRunner (runner) {
   if (readyRunners.has(runner)) {
@@ -1122,9 +1107,16 @@ function wrapMochaRun (Mocha, frameworkVersion) {
 
     // `options.delay` does not work in parallel mode, so we can't delay the execution this way
     // This needs to be both here and in `runMocha` hook. Read the comment in `runMocha` hook for more info.
+    const originalDelay = this.options.delay
     this.options.delay = true
 
-    const runner = run.apply(this, args)
+    let runner
+    try {
+      runner = run.apply(this, args)
+    } finally {
+      // Only this runner needs the configuration delay, including when the next run disables the plugin.
+      this.options.delay = originalDelay
+    }
 
     this.files.forEach((path) => {
       const isUnskippable = isMarkedAsUnskippable({ path })
@@ -1134,7 +1126,7 @@ function wrapMochaRun (Mocha, frameworkVersion) {
     })
 
     getExecutionConfiguration(runner, false, frameworkVersion, () => {
-      if (isFailedTestReplayEnabled()) {
+      if (isFailedTestReplayEnabled() || config.isFlakyTestRetriesEnabled) {
         patchFailedTestReplayHookUp(runner.constructor)
       }
       if (config.isKnownTestsEnabled) {
@@ -1204,8 +1196,10 @@ addHook({
   name: 'mocha',
   versions: [MINIMUM_MOCHA_VERSION],
   filePattern: String.raw`lib/runner\.(?:c?js)$`,
-}, function (Runner, frameworkVersion) {
-  if (patched.has(Runner)) return Runner
+}, function (runnerPackage, frameworkVersion) {
+  const Runner = runnerPackage.Runner ?? runnerPackage.default ?? runnerPackage
+  if (typeof Runner !== 'function') return
+  if (patched.has(Runner)) return
 
   patched.add(Runner)
   wrapRunnerEmit(Runner)
@@ -1214,6 +1208,7 @@ addHook({
 
   shimmer.wrap(Runner.prototype, 'run', run => function (...args) {
     if (!testFinishCh.hasSubscribers) {
+      resetRunState(this.suite)
       return runMochaRunner(run, this, args)
     }
 
@@ -1550,7 +1545,7 @@ addHook({
     return runMochaRunner(run, this, args)
   })
 
-  return Runner
+  return runnerPackage
 })
 
 // Used both in serial and parallel mode, and by both the main process and the workers
@@ -1796,6 +1791,8 @@ addHook({
     if (config.isFlakyTestRetriesEnabled) {
       newWorkerArgs._ddIsFlakyTestRetriesEnabled = true
       newWorkerArgs._ddFlakyTestRetriesCount = config.flakyTestRetriesCount
+      newWorkerArgs._ddIsDynamicAtrEnabled = config.isDynamicAtrEnabled
+      newWorkerArgs._ddDynamicAtrBuckets = config.dynamicAtrBuckets
     }
 
     if (isFailedTestReplayEnabled()) {