dd-trace 6.16.0 → 6.17.0

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

@@ -0,0 +1,97 @@
+'use strict'
+
+const shimmer = require('../../datadog-shimmer')
+const { channel } = require('./helpers/instrument')
+
+const configureCh = channel('ci:log-submission:console:configure')
+const logSubmissionCh = channel('ci:log-submission:console')
+const vitestSuiteStartCh = channel('ci:vitest:test-suite:start')
+const methods = ['error', 'warn']
+const methodSet = new Set(methods)
+const wrappedTargets = new WeakSet()
+
+let callDepth = 0
+let configuredGetLogHolder
+let isVitestConsoleSubscribed = false
+
+/**
+ * @param {string} method
+ * @param {unknown[]} args
+ * @param {(() => { dd: object } | undefined) | undefined} getLogHolder
+ */
+function publishLog (method, args, getLogHolder) {
+  if (!logSubmissionCh.hasSubscribers) return
+
+  try {
+    const logHolder = (getLogHolder || configuredGetLogHolder)?.()
+    if (logHolder) logSubmissionCh.publish({ args, logHolder, method })
+  } catch {}
+}
+
+/**
+ * @param {object} target
+ * @param {(() => { dd: object } | undefined) | undefined} [getLogHolder]
+ */
+function wrapConsole (target, getLogHolder) {
+  if (!target || wrappedTargets.has(target)) return
+
+  wrappedTargets.add(target)
+  for (const method of methods) {
+    if (typeof target[method] !== 'function') continue
+
+    // Global console methods are bound at runtime, so source rewriting cannot intercept them.
+    try {
+      shimmer.wrap(target, method, original => function () {
+        const shouldPublish = callDepth++ === 0
+        try {
+          const result = original.apply(this, arguments)
+          if (shouldPublish) publishLog(method, [...arguments], getLogHolder)
+          return result
+        } finally {
+          callDepth--
+        }
+      })
+    } catch {}
+  }
+}
+
+/**
+ * @param {{ BufferedConsole?: Function, CustomConsole?: Function }} jestConsole
+ * @param {(() => { dd: object } | undefined) | undefined} [getLogHolder]
+ */
+function wrapJestConsole (jestConsole, getLogHolder) {
+  if (!getLogHolder && !configuredGetLogHolder) return
+
+  const { BufferedConsole, CustomConsole } = jestConsole
+
+  if (BufferedConsole && !wrappedTargets.has(BufferedConsole)) {
+    wrappedTargets.add(BufferedConsole)
+    // Jest bundles and exports these adapter classes differently across versions, so wrap their runtime exports.
+    shimmer.wrap(BufferedConsole, 'write', original => function (buffer, method, message) {
+      const result = original.apply(this, arguments)
+      if (methodSet.has(method)) publishLog(method, [message], getLogHolder)
+      return result
+    })
+  }
+
+  if (CustomConsole && !wrappedTargets.has(CustomConsole)) {
+    wrappedTargets.add(CustomConsole)
+    shimmer.wrap(CustomConsole.prototype, '_logError', original => function (method, message) {
+      const result = original.apply(this, arguments)
+      if (methodSet.has(method)) publishLog(method, [message], getLogHolder)
+      return result
+    })
+  }
+}
+
+configureCh.subscribe(({ getLogHolder } = {}) => {
+  configuredGetLogHolder = getLogHolder
+  wrapConsole(globalThis.console)
+  if (!isVitestConsoleSubscribed) {
+    isVitestConsoleSubscribed = true
+    // Vitest replaces the global console after tracer startup and before the first suite starts.
+    vitestSuiteStartCh.subscribe(() => wrapConsole(globalThis.console))
+  }
+})
+
+module.exports = { wrapConsole, wrapJestConsole }

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

@@ -12,6 +12,7 @@ const {
   getEfdRetryCountForDuration,
   hasEfdRetries,
 } = require('../../dd-trace/src/ci-visibility/efd-retry-policy')
+const { getDynamicAtrRetryCount } = require('../../dd-trace/src/ci-visibility/dynamic-atr-retries')
 const {
   getCoveredFilesFromCoverage,
   getExecutableFilesFromCoverage,
@@ -77,7 +78,6 @@ const CUCUMBER_RETRY_NAME_SUFFIX = / ?\(attempt \d+(?:, retried)?\) ?$/
  *
  * @param {string} testName
  * @param {boolean} isRetry
- * @returns {string}
  */
 function getCucumberTestName (testName, isRetry) {
   return isRetry ? testName.replace(CUCUMBER_RETRY_NAME_SUFFIX, '') : testName
@@ -129,6 +129,8 @@ let earlyFlakeDetectionRetryPolicy = EMPTY_EFD_RETRY_POLICY
 let earlyFlakeDetectionFaultyThreshold = 0
 let isEarlyFlakeDetectionFaulty = false
 let isFlakyTestRetriesEnabled = false
+let isDynamicAtrEnabled = false
+let dynamicAtrBuckets
 let isKnownTestsEnabled = false
 let isTestManagementTestsEnabled = false
 let isImpactedTestsEnabled = false
@@ -140,11 +142,9 @@ let knownTests = {}
 let skippedSuites = []
 let isSuitesSkipped = false
 let areAllSuitesSkipped = false
+let hasTestsToRun = false
 let repositoryRoot
 
-/**
- * @returns {boolean}
- */
 function shouldRunEarlyFlakeDetection () {
   return isEarlyFlakeDetectionEnabled && hasEfdRetries(earlyFlakeDetectionRetryPolicy)
 }
@@ -243,7 +243,9 @@ function configureParallelWorkerWorldParameters (options) {
     isKnownTestsEnabled = false
     options.worldParameters._ddIsEarlyFlakeDetectionEnabled = false
     options.worldParameters._ddIsKnownTestsEnabled = false
-    options.worldParameters._ddEarlyFlakeDetectionRetryPolicy = EMPTY_EFD_RETRY_POLICY
+    options.worldParameters._ddEarlyFlakeDetectionRetryPolicy = isDynamicAtrEnabled
+      ? earlyFlakeDetectionRetryPolicy
+      : EMPTY_EFD_RETRY_POLICY
   }
 
   if (isImpactedTestsEnabled) {
@@ -253,6 +255,8 @@ function configureParallelWorkerWorldParameters (options) {
 
   options.worldParameters._ddIsFlakyTestRetriesEnabled = isFlakyTestRetriesEnabled
   options.worldParameters._ddNumTestRetries = numTestRetries
+  options.worldParameters._ddIsDynamicAtrEnabled = isDynamicAtrEnabled
+  options.worldParameters._ddDynamicAtrBuckets = dynamicAtrBuckets
 
   if (isTestManagementTestsEnabled) {
     options.worldParameters._ddIsTestManagementTestsEnabled = true
@@ -282,8 +286,7 @@ function readParallelWorkerWorldParameters (options) {
   if (isImpactedTestsEnabled) {
     modifiedFiles = worldParameters._ddModifiedFiles
   }
-  isFlakyTestRetriesEnabled = !!worldParameters._ddIsFlakyTestRetriesEnabled
-  numTestRetries = worldParameters._ddNumTestRetries ?? 0
+  readParallelWorkerAtrParameters(worldParameters)
   isTestManagementTestsEnabled = !!worldParameters._ddIsTestManagementTestsEnabled
   if (isTestManagementTestsEnabled) {
     testManagementTests = worldParameters._ddTestManagementTests
@@ -291,6 +294,25 @@ function readParallelWorkerWorldParameters (options) {
   }
 }
 
+/**
+ * @param {object} worldParameters
+ * @param {boolean} [worldParameters._ddIsFlakyTestRetriesEnabled]
+ * @param {number} [worldParameters._ddNumTestRetries]
+ * @param {boolean} [worldParameters._ddIsDynamicAtrEnabled]
+ * @param {number[]} [worldParameters._ddDynamicAtrBuckets]
+ * @param {import('../../dd-trace/src/ci-visibility/efd-retry-policy').EfdRetryPolicy}
+ *   [worldParameters._ddEarlyFlakeDetectionRetryPolicy]
+ */
+function readParallelWorkerAtrParameters (worldParameters) {
+  isFlakyTestRetriesEnabled = !!worldParameters._ddIsFlakyTestRetriesEnabled
+  numTestRetries = worldParameters._ddNumTestRetries ?? 0
+  isDynamicAtrEnabled = !!worldParameters._ddIsDynamicAtrEnabled
+  dynamicAtrBuckets = worldParameters._ddDynamicAtrBuckets
+  if (isDynamicAtrEnabled) {
+    earlyFlakeDetectionRetryPolicy = worldParameters._ddEarlyFlakeDetectionRetryPolicy ?? EMPTY_EFD_RETRY_POLICY
+  }
+}
+
 function handleDdWorkerMessage (message) {
   if (Array.isArray(message)) {
     const [messageCode, payload] = message
@@ -430,7 +452,8 @@ function getWrappedHandleWorkerThreadEvent (handleEventFromWorker) {
 
     const result = handleEventFromWorker.apply(this, arguments)
 
-    if (envelope.testCaseFinished && assembledTestCase?.pickle && eventDataCollector) {
+    if (envelope.testCaseFinished && !envelope.testCaseFinished.willBeRetried &&
+      assembledTestCase?.pickle && eventDataCollector) {
       const worstTestStepResult =
         eventDataCollector.getTestCaseAttempt(envelope.testCaseFinished.testCaseStartedId).worstTestStepResult
       handleParallelTestCaseFinished(assembledTestCase.pickle, worstTestStepResult)
@@ -713,6 +736,17 @@ function publishRetriedAttempt (runner, state) {
   const isFirstAttempt = currentAttempt === 0
   const isAtrRetry = !isFirstAttempt && isFlakyTestRetriesEnabled
 
+  if (isFirstAttempt && isDynamicAtrEnabled && isFlakyTestRetriesEnabled) {
+    state.dynamicAtrRetryCount = getDynamicAtrRetryCount(
+      performance.now() - state.executionStart,
+      earlyFlakeDetectionRetryPolicy,
+      dynamicAtrBuckets
+    )
+    // Native retries revisit maxAttempts before the next attempt in both runner
+    // generations. EFD and Attempt to Fix disable native retries, so never reach here.
+    runner.maxAttempts = state.dynamicAtrRetryCount + 1
+  }
+
   // ATR: record this attempt as failed so when run().finally runs (after retry) we have all statuses
   if (isFlakyTestRetriesEnabled) {
     const nameForKey = getCucumberTestName(runner.pickle.name, currentAttempt > 0)
@@ -768,6 +802,12 @@ function wrapRun (pl, isLatestVersion, version) {
       return run.apply(this, args)
     }
 
+    // Cucumber 8–10 workers construct runners directly, without the newer
+    // runTestCase wrapper that reads the coordinator's configuration.
+    if (getEnvironmentVariable('CUCUMBER_WORKER_ID') && satisfies(version, '>=8.0.0 <11.0.0')) {
+      readParallelWorkerAtrParameters(this.worldParameters)
+    }
+
     const testFileAbsolutePath = this.pickle.uri
     const testSuitePath = getTestSuitePath(testFileAbsolutePath, process.cwd())
 
@@ -808,6 +848,7 @@ function wrapRun (pl, isLatestVersion, version) {
       }
       let promise
       const executionStart = performance.now()
+      state.executionStart = executionStart
 
       testFnCh.runStores(ctx, () => {
         promise = run.apply(this, args)
@@ -922,7 +963,9 @@ function wrapRun (pl, isLatestVersion, version) {
           const atrStatuses = atrStatusesByScenarioKey.get(atrKey)
           const pickleStatuses = lastStatusByPickleId.get(this.pickle.id)
           const statusesToCheck = atrStatuses?.length >= (numTestRetries + 1) ? atrStatuses : pickleStatuses
-          if (statusesToCheck && statusesToCheck.length === numTestRetries + 1 &&
+          if (state.dynamicAtrRetryCount !== undefined) {
+            hasFailedAllRetries = status === 'fail' && state.numAttempt === state.dynamicAtrRetryCount
+          } else if (statusesToCheck && statusesToCheck.length === numTestRetries + 1 &&
             statusesToCheck.every(s => s === 'fail')) {
             hasFailedAllRetries = true
           }
@@ -959,7 +1002,8 @@ function wrapRun (pl, isLatestVersion, version) {
 
         // Notice that ATR is handled using cucumber native retries features.
         // Therefore, if we reach this point, we are certain that it's the last ATR execution
-        const isLastAtrRetry = isFlakyTestRetriesEnabled && !isAttemptToFix && !isEfdRetry && numTestRetries > 0
+        const isLastAtrRetry = isFlakyTestRetriesEnabled && !isAttemptToFix && !isEfdRetry &&
+          numTestRetries > 0 && this.maxAttempts > 1
 
         const statuses = lastStatusByPickleId.get(this.pickle.id)
         const isLastEfdRetry = isEfdRetry && statuses?.length === efdRetryCount + 1
@@ -1100,8 +1144,17 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
     isSuitesSkippingEnabled = isItrEnabled && configurationResponse.libraryConfig?.isSuitesSkippingEnabled
     isCoverageReportUploadEnabled = configurationResponse.libraryConfig?.isCoverageReportUploadEnabled
     isFlakyTestRetriesEnabled = configurationResponse.libraryConfig?.isFlakyTestRetriesEnabled
+    isDynamicAtrEnabled = configurationResponse.libraryConfig?.isDynamicAtrEnabled === true &&
+      satisfies(frameworkVersion, '>=8.0.0')
+    dynamicAtrBuckets = configurationResponse.libraryConfig?.dynamicAtrBuckets
     const configRetryCount = configurationResponse.libraryConfig?.flakyTestRetriesCount
     numTestRetries = (typeof configRetryCount === 'number' && configRetryCount > 0) ? configRetryCount : 0
+    if (isDynamicAtrEnabled) {
+      // Reserve enough native attempts until the first failure determines its budget.
+      numTestRetries = Math.max(1, dynamicAtrBuckets
+        ? Math.max(...dynamicAtrBuckets)
+        : earlyFlakeDetectionRetryPolicy.schedulingRetryCount)
+    }
     isKnownTestsEnabled = configurationResponse.libraryConfig?.isKnownTestsEnabled
     isTestManagementTestsEnabled = configurationResponse.libraryConfig?.isTestManagementEnabled
     testManagementAttemptToFixRetries = configurationResponse.libraryConfig?.testManagementAttemptToFixRetries
@@ -1165,6 +1218,7 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
       }
     }
 
+    hasTestsToRun = isCoordinator ? this.sourcedPickles.length > 0 : this.pickleIds.length > 0
     pickleByFile = isCoordinator ? getPickleByFileNew(this) : getPickleByFile(this)
 
     if (isKnownTestsEnabled) {
@@ -1204,6 +1258,10 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
       options.retry = numTestRetries
     }
 
+    if (isParallel && !isCoordinator) {
+      configureParallelWorkerWorldParameters(options)
+    }
+
     atrStatusesByScenarioKey.clear()
     attemptToFixTestsByTestFullname.clear()
     efdRetryCountByPickleId.clear()
@@ -1272,8 +1330,10 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
       global.__coverage__ = fromCoverageMapToCoverage(originalCoverageMap)
     }
 
+    const isExpectedEmptySession = success && !hasTestsToRun
     const flushPromise = getChannelPromise(sessionFinishCh, {
-      status: success ? 'pass' : 'fail',
+      status: isExpectedEmptySession ? 'skip' : (success ? 'pass' : 'fail'),
+      isExpectedEmptySession,
       isSuitesSkipped,
       testCodeCoverageLinesTotal,
       testSessionCoverageFiles,
@@ -1550,7 +1610,7 @@ function getWrappedParseWorkerMessage (parseWorkerMessageFunction, isNewVersion,
     const parseWorkerResponse = parseWorkerMessageFunction.apply(this, arguments)
 
     // after calling `parseWorkerMessageFunction`, the test status can already be read
-    if (parsed.testCaseFinished) {
+    if (parsed.testCaseFinished && !parsed.testCaseFinished.willBeRetried) {
       let worstTestStepResult
       if (isNewVersion && eventDataCollector) {
         pickle = this.inProgress[worker.id].pickle

package/packages/datadog-instrumentations/src/cypress-config.js

@@ -51,7 +51,6 @@ const noopTask = {
 /**
  * @param {FileSystemError} error filesystem error
  * @param {string} fallbackPath path used when the error does not include one
- * @returns {string} concise error description
  */
 function formatFileSystemError (error, fallbackPath) {
   const code = error?.code || error?.name || 'UNKNOWN'
@@ -64,7 +63,6 @@ function formatFileSystemError (error, fallbackPath) {
  * @param {FileCreationFailure[]} failures failed directory attempts
  * @param {string} consequence effect on Cypress instrumentation
  * @param {boolean} [customerVisible] whether to report the failure without requiring debug logging
- * @returns {void}
  */
 function warnFileCreationFailures (artifact, failures, consequence, customerVisible = false) {
   let details = ''
@@ -89,7 +87,6 @@ function warnFileCreationFailures (artifact, failures, consequence, customerVisi
  *
  * @param {string} message printf-style error message
  * @param {...unknown} args message arguments
- * @returns {void}
  */
 function logBrowserInstrumentationError (message, ...args) {
   // eslint-disable-next-line no-console
@@ -98,7 +95,6 @@ function logBrowserInstrumentationError (message, ...args) {
 
 /**
  * @param {string} filePath generated file to remove
- * @returns {void}
  */
 function removeGeneratedFile (filePath) {
   try {
@@ -118,7 +114,6 @@ function removeGeneratedFile (filePath) {
  * Removes project-local support files when Cypress exits without firing
  * after:run, as happens in open mode without experimental run events.
  *
- * @returns {void}
  */
 function removeGeneratedFilesAtExit () {
   exitCleanupRegistered = false
@@ -128,7 +123,6 @@ function removeGeneratedFilesAtExit () {
 
 /**
  * @param {string[]} filePaths generated support files
- * @returns {void}
  */
 function registerGeneratedFilesForExitCleanup (filePaths) {
   for (const filePath of filePaths) generatedFilesForExitCleanup.add(filePath)
@@ -140,7 +134,6 @@ function registerGeneratedFilesForExitCleanup (filePaths) {
 
 /**
  * @param {string[]} filePaths generated support files
- * @returns {void}
  */
 function cleanupGeneratedFiles (filePaths) {
   for (const filePath of filePaths) {
@@ -160,7 +153,6 @@ function cleanupGeneratedFiles (filePaths) {
  *
  * @param {string} filePath generated file path
  * @param {string} content generated file content
- * @returns {void}
  */
 function writeExclusiveFile (filePath, content) {
   let descriptor
@@ -189,7 +181,6 @@ function writeExclusiveFile (filePath, content) {
 
 /**
  * @param {unknown} handler Cypress task registration
- * @returns {boolean}
  */
 function isDatadogTaskRegistration (handler) {
   return !!handler && typeof handler === 'object' &&
@@ -201,7 +192,6 @@ function isDatadogTaskRegistration (handler) {
 
 /**
  * @param {unknown} handler Cypress after:run handler
- * @returns {boolean} whether this is the handler registered by the manual Datadog plugin
  */
 function isDatadogAfterRunHandler (handler) {
   return typeof handler === 'function' && handler[DD_CYPRESS_AFTER_RUN_HANDLER] === true
@@ -209,7 +199,6 @@ function isDatadogAfterRunHandler (handler) {
 
 /**
  * @param {unknown} handler Cypress after:spec handler
- * @returns {boolean} whether this is the handler registered by the manual Datadog plugin
  */
 function isDatadogAfterSpecHandler (handler) {
   return typeof handler === 'function' && handler[DD_CYPRESS_AFTER_SPEC_HANDLER] === true
@@ -217,7 +206,6 @@ function isDatadogAfterSpecHandler (handler) {
 
 /**
  * @param {object} manualPlugin manual plugin registration state
- * @returns {boolean} whether the manual plugin supports error-aware finalization
  */
 function supportsErrorAwareFinalization (manualPlugin) {
   return isDatadogAfterSpecHandler(manualPlugin.afterSpecHandler) &&
@@ -226,7 +214,6 @@ function supportsErrorAwareFinalization (manualPlugin) {
 
 /**
  * @param {unknown} handler Cypress task handler map
- * @returns {boolean} whether the current manual Datadog plugin owns the task map
  */
 function isCurrentDatadogTaskRegistration (handler) {
   return !!handler && handler[DD_CYPRESS_TASK_HANDLER] === manualPluginOwner
@@ -234,7 +221,6 @@ function isCurrentDatadogTaskRegistration (handler) {
 
 /**
  * @param {unknown} handler Cypress task handler map
- * @returns {boolean} whether the manual plugin registered only fallback tasks
  */
 function isDatadogNoopTaskRegistration (handler) {
   return !!handler && handler[DD_CYPRESS_NOOP_TASK_HANDLER] === true
@@ -242,7 +228,6 @@ function isDatadogNoopTaskRegistration (handler) {
 
 /**
  * @param {unknown} value
- * @returns {boolean}
  */
 function isPlainObject (value) {
   if (!value || typeof value !== 'object') return false
@@ -278,7 +263,6 @@ function mergeReturnedConfig (config, updatedConfig) {
 /**
  * @param {string} rootPath parent path
  * @param {string} candidatePath path that should be inside rootPath
- * @returns {boolean}
  */
 function isPathInside (rootPath, candidatePath) {
   const relativePath = path.relative(path.resolve(rootPath), path.resolve(candidatePath))
@@ -288,7 +272,6 @@ function isPathInside (rootPath, candidatePath) {
 /**
  * @param {string} fromDirectory directory containing the importing file
  * @param {string} importedFile file to import
- * @returns {string}
  */
 function getRelativeImportPath (fromDirectory, importedFile) {
   let relativePath = path.relative(fromDirectory, importedFile).split(path.sep).join('/')
@@ -420,7 +403,6 @@ function injectSupportFile (config) {
  * @param {Function} on Cypress event registration function
  * @param {Function[]} handlers collected after:screenshot handlers
  * @param {Function|undefined} datadogHandler manual Datadog screenshot handler
- * @returns {void}
  */
 function registerManualAfterScreenshotHandlers (on, handlers, datadogHandler) {
   const userHandlers = handlers.filter(handler => handler !== datadogHandler)
@@ -451,7 +433,6 @@ function registerManualAfterScreenshotHandlers (on, handlers, datadogHandler) {
  * @param {Function[]} handlers collected after:spec handlers
  * @param {Function} [datadogHandler] manual Datadog after:spec handler
  * @param {Function} [cleanup] removes generated support files after an error
- * @returns {void}
  */
 function registerAfterSpecHandlers (on, handlers, datadogHandler, cleanup) {
   const userHandlers = datadogHandler
@@ -495,7 +476,6 @@ function registerAfterSpecHandlers (on, handlers, datadogHandler, cleanup) {
  * sessions in interactive mode.
  *
  * @param {object} config Cypress resolved config object
- * @returns {void}
  */
 function enableInteractiveRunEvents (config) {
   if (config.isInteractive && config.experimentalInteractiveRunEvents !== true) {
@@ -740,7 +720,6 @@ function wrapConfig (config) {
  * (`.js`, `.ts`) are loaded as ESM or CJS.
  *
  * @param {string} filePath absolute path to a file under the project
- * @returns {boolean}
  */
 function isUnderEsmPackage (filePath) {
   let dir = path.dirname(filePath)
@@ -759,7 +738,6 @@ function isUnderEsmPackage (filePath) {
 /**
  * @param {string} originalConfigFile absolute path to the original config file
  * @param {string} wrapperDirectory directory for the generated wrapper
- * @returns {string} path to the generated wrapper file
  */
 function createConfigWrapper (originalConfigFile, wrapperDirectory) {
   // Match the module mode Cypress would use for the user's original config
@@ -815,7 +793,6 @@ module.exports = cypressConfig.wrapConfig(originalConfig)
 
 /**
  * @param {string} projectRoot
- * @returns {boolean}
  */
 function isTypeScript6OrNewer (projectRoot) {
   try {

package/packages/datadog-instrumentations/src/helpers/channel.js

@@ -20,7 +20,6 @@ function getCompletion (onDone) {
  * @param {import('node:diagnostics_channel').Channel} channel
  * @param {Record<string, unknown>} payload
  * @param {(...args: T) => void} onDone
- * @returns {void}
  */
 function publishWithCompletion (channel, payload, onDone) {
   const complete = getCompletion(onDone)
@@ -33,7 +32,6 @@ function publishWithCompletion (channel, payload, onDone) {
  * @param {import('node:diagnostics_channel').Channel} channel
  * @param {Record<string, unknown> & { onDone?: (...args: T) => void }} payload
  * @param {(...args: T) => void} onDone
- * @returns {void}
  */
 function runStoresWithCompletion (channel, payload, onDone) {
   const complete = getCompletion(onDone)

package/packages/datadog-instrumentations/src/helpers/graphql-jit-runtime.js

@@ -214,7 +214,6 @@ function createGraphqlJitRuntime ({
    * @param {string} resolverCall
    * @param {string} resolverName
    * @param {number | undefined} descriptorId
-   * @returns {string}
    */
   function compileResolverCall (context, resolverCall, resolverName, descriptorId) {
     const openParenthesis = resolverCall.indexOf('(')
@@ -254,7 +253,6 @@ function createGraphqlJitRuntime ({
    * @param {CompiledArguments} args
    * @param {string} argumentSource
    * @param {string} compiledField
-   * @returns {string}
    */
   function compileDefaultField (
     context,
@@ -377,7 +375,6 @@ function createDescriptor (context, compilerPath, input, fieldNode, createFieldM
  * @param {JitFieldDescriptor} descriptor
  * @param {CompiledArguments['missing']} missing
  * @param {string} argumentSource
- * @returns {string}
  */
 function compileArgumentFactory (context, descriptor, missing, argumentSource) {
   if (missing.length === 0 && argumentSource === '{}') return 'undefined'
@@ -418,7 +415,6 @@ function compileArgumentFactory (context, descriptor, missing, argumentSource) {
 
 /**
  * @param {ArgumentPath} path
- * @returns {string}
  */
 function compileArgumentPath (path) {
   let source = 'args'
@@ -430,7 +426,6 @@ function compileArgumentPath (path) {
 
 /**
  * @param {string} value
- * @returns {string}
  */
 function quoteString (value) {
   const json = JSON.stringify(value)

package/packages/datadog-instrumentations/src/helpers/hooks.js

@@ -2,6 +2,12 @@
 
 module.exports = {
   // Only list unprefixed node modules. They will automatically be instrumented as prefixed and unprefixed.
+  '@supabase/auth-js': { esmFirst: true, fn: () => require('../supabase') },
+  '@supabase/functions-js': { esmFirst: true, fn: () => require('../supabase') },
+  '@supabase/postgrest-js': { esmFirst: true, fn: () => require('../supabase') },
+  '@supabase/realtime-js': { esmFirst: true, fn: () => require('../supabase') },
+  '@supabase/storage-js': { esmFirst: true, fn: () => require('../supabase') },
+  '@supabase/supabase-js': { esmFirst: true, fn: () => require('../supabase') },
   child_process: () => require('../child_process'),
   crypto: () => require('../crypto'),
   dns: () => require('../dns'),
@@ -42,6 +48,7 @@ module.exports = {
   '@grpc/grpc-js': () => require('../grpc'),
   '@hapi/hapi': () => require('../hapi'),
   '@happy-dom/jest-environment': () => require('../jest'),
+  '@jest/console': () => require('../jest'),
   '@jest/core': () => require('../jest'),
   '@jest/reporters': () => require('../jest'),
   '@jest/test-sequencer': () => require('../jest'),
@@ -141,6 +148,7 @@ module.exports = {
   'pino-pretty': () => require('../pino'),
   playwright: () => require('../playwright'),
   'playwright-core': () => require('../playwright'),
+  postgres: { esmFirst: true, fn: () => require('../postgres') },
   'promise-js': () => require('../promise-js'),
   promise: () => require('../promise'),
   protobufjs: () => require('../protobufjs'),

package/packages/datadog-instrumentations/src/helpers/instrumentation-utils.js

@@ -9,7 +9,6 @@ const { isRelativeRequire } = require('./shared-utils')
 /**
  * @param {string|undefined} version
  * @param {string[]|undefined} ranges
- * @returns {boolean}
  */
 function matchVersion (version, ranges) {
   return !version || !ranges || ranges.some(range => satisfies(version, range))
@@ -18,7 +17,6 @@ function matchVersion (version, ranges) {
 /**
  * @param {string} name
  * @param {string} [file]
- * @returns {string}
  */
 function filename (name, file) {
   return file ? `${name}/${file}` : name
@@ -29,7 +27,6 @@ function filename (name, file) {
  * @param {string|undefined} version
  * @param {string} moduleName
  * @param {{ file?: string, filePattern?: string, versions?: string[] }} instrumentation
- * @returns {boolean}
  */
 function matchesInstrumentation (name, version, moduleName, instrumentation) {
   const { file, filePattern, versions } = instrumentation

package/packages/datadog-instrumentations/src/helpers/pool-acquire.js

@@ -400,9 +400,6 @@ function getConnectionForAcquire (getConnection, pool, args, acquireCtx, start,
   }
 }
 
-/**
- * @returns {boolean}
- */
 function isPoolQueryAcquire () {
   return currentPoolQueryAcquire !== undefined
 }
@@ -436,7 +433,6 @@ function runWithPoolQueryAcquire (acquire, method, receiver, args) {
 
 /**
  * @param {object} pool
- * @returns {boolean}
  */
 function takeDeferredPoolQueryAcquire (pool) {
   const acquire = deferredPoolQueryAcquireStorage?.getStore()
@@ -579,7 +575,6 @@ function setPoolAcquireCaptureWaitTime (capture, waitTime) {
  * @param {Record<string, unknown>} receiver
  * @param {string} acquireMethod
  * @param {unknown[]} args
- * @returns {boolean}
  */
 function dispatchesAcquireSynchronously (method, receiver, acquireMethod, args) {
   let dispatched = false
@@ -618,7 +613,6 @@ function acquireStart (pool, acquire) {
 
 /**
  * @param {number|undefined} start
- * @returns {number}
  */
 function acquireWait (start) {
   return start === undefined ? 0 : performance.now() - start

package/packages/datadog-instrumentations/src/helpers/register.js

@@ -35,6 +35,10 @@ if (!disabledInstrumentations.has('process')) {
   require('../process')
 }
 
+if (!disabledInstrumentations.has('console')) {
+  require('../console')
+}
+
 const debugEnabled = DD_TRACE_DEBUG
 checkRequireCache.checkForRequiredModules()
 if (debugEnabled) {