dd-trace 5.100.0 → 5.102.0

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

@@ -28,12 +28,12 @@ function wrapServer (server) {
 }
 
 function wrapStart (start) {
-  return shimmer.wrapFunction(start, start => function () {
+  return shimmer.wrapFunction(start, start => function (...args) {
     if (this && typeof this.ext === 'function') {
       this.ext('onPreResponse', onPreResponse)
     }
 
-    return start.apply(this, arguments)
+    return start.apply(this, args)
   })
 }
 

package/packages/datadog-instrumentations/src/helpers/callback-instrumentor.js

@@ -32,20 +32,20 @@ function createCallbackInstrumentor (prefix, { captureResult = false } = {}) {
 
   return function instrument (buildContext) {
     return function wrap (fn) {
-      return function () {
-        const lastIndex = arguments.length - 1
-        const cb = arguments[lastIndex]
+      return function (...args) {
+        const lastIndex = args.length - 1
+        const cb = args[lastIndex]
         if (!startCh.hasSubscribers || typeof cb !== 'function') {
-          return fn.apply(this, arguments)
+          return fn.apply(this, args)
         }
 
-        const ctx = buildContext(this, arguments)
+        const ctx = buildContext(this, args)
         if (ctx === undefined) {
-          return fn.apply(this, arguments)
+          return fn.apply(this, args)
         }
 
         return startCh.runStores(ctx, () => {
-          arguments[lastIndex] = shimmer.wrapFunction(cb, cb => function (error, ...rest) {
+          args[lastIndex] = shimmer.wrapFunction(cb, cb => function (error, ...rest) {
             if (error) {
               ctx.error = error
               errorCh.publish(ctx)
@@ -57,7 +57,7 @@ function createCallbackInstrumentor (prefix, { captureResult = false } = {}) {
           })
 
           try {
-            return fn.apply(this, arguments)
+            return fn.apply(this, args)
           } catch (error) {
             void error.stack // trigger getting the stack at the original throwing point
             ctx.error = error

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

@@ -21,9 +21,9 @@ exports.wrapThen = function wrapThen (origThen) {
 function wrapCallback (ar, callback) {
   if (typeof callback !== 'function') return callback
 
-  return function () {
+  return function (...args) {
     return ar.runInAsyncScope(() => {
-      return callback.apply(this, arguments)
+      return callback.apply(this, args)
     })
   }
 }

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

@@ -56,10 +56,10 @@ function wrapNext (req, route, next) {
   return shimmer.wrapFunction(
     next,
     (next) =>
-      function () {
+      function (...args) {
         nextChannel.publish({ req, route })
 
-        return next.apply(this, arguments)
+        return next.apply(this, args)
       }
   )
 }

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

@@ -26,10 +26,27 @@ function hookFn (http) {
   return http
 }
 
+// `inputURL` may be the user's options object (for the `http.request(options)`
+// shape); never write directly into it. The result is later mutated by
+// `normalizeHeaders` and read by `url.format`, so the merged object must be
+// owned by the tracer. `undefined` means "no URL supplied" — Node merges
+// with the options object or its defaults, so build a tracer-owned
+// options-only shape and let tracing proceed. `null`/primitive first args
+// are returned as-is so `normalizeHeaders` throws and the surrounding
+// try/catch in `instrumentRequest` falls through to the native request;
+// spreading a primitive yields `{}`, which would silently turn an invalid
+// `http.request(123)` into a synthesized localhost request.
 function combineOptions (inputURL, inputOptions) {
-  return inputOptions !== null && typeof inputOptions === 'object'
-    ? Object.assign(inputURL || {}, inputOptions)
-    : inputURL
+  if (inputURL === undefined) {
+    return inputOptions !== null && typeof inputOptions === 'object' ? { ...inputOptions } : {}
+  }
+  if (inputURL === null || (typeof inputURL !== 'object' && typeof inputURL !== 'function')) {
+    return inputURL
+  }
+  if (inputOptions !== null && typeof inputOptions === 'object') {
+    return { ...inputURL, ...inputOptions }
+  }
+  return { ...inputURL }
 }
 function normalizeHeaders (options) {
   options.headers ??= {}
@@ -90,8 +107,8 @@ function setupResponseInstrumentation (ctx, res) {
       // For 'readable' events, wrap the read() method
       if (eventName === 'readable' && !originalRead && !dataListenerAdded && typeof res.read === 'function') {
         originalRead = res.read
-        res.read = function () {
-          const chunk = originalRead.apply(this, arguments)
+        res.read = function (...args) {
+          const chunk = originalRead.apply(this, args)
           if (!dataListenerAdded) {
             dataReadStarted = true
             collectChunk(chunk)
@@ -172,9 +189,9 @@ function patch (http, methodName) {
         let callback = args.callback
 
         if (callback) {
-          callback = shimmer.wrapFunction(args.callback, cb => function () {
+          callback = shimmer.wrapFunction(args.callback, cb => function (...args) {
             return asyncStartChannel.runStores(ctx, () => {
-              return cb.apply(this, arguments)
+              return cb.apply(this, args)
             })
           })
         }
@@ -197,9 +214,9 @@ function patch (http, methodName) {
 
           // tracked to accurately discern custom request socket timeout
           let customRequestTimeout = false
-          req.setTimeout = function () {
+          req.setTimeout = function (...args) {
             customRequestTimeout = true
-            return setTimeout.apply(this, arguments)
+            return setTimeout.apply(this, args)
           }
 
           req.emit = function (eventName, arg) {

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

@@ -126,9 +126,9 @@ function wrapWriteHead (writeHead) {
 }
 
 function wrapWrite (write) {
-  return function wrappedWrite () {
+  return function wrappedWrite (...args) {
     if (!startWriteHeadCh.hasSubscribers) {
-      return write.apply(this, arguments)
+      return write.apply(this, args)
     }
 
     const abortController = new AbortController()
@@ -147,7 +147,7 @@ function wrapWrite (write) {
       return true
     }
 
-    return write.apply(this, arguments)
+    return write.apply(this, args)
   }
 }
 
@@ -177,9 +177,9 @@ function wrapSetHeader (setHeader) {
 }
 
 function wrapAppendOrRemoveHeader (originalMethod) {
-  return function wrappedAppendOrRemoveHeader () {
+  return function wrappedAppendOrRemoveHeader (...args) {
     if (!startSetHeaderCh.hasSubscribers) {
-      return originalMethod.apply(this, arguments)
+      return originalMethod.apply(this, args)
     }
 
     const abortController = new AbortController()
@@ -189,14 +189,14 @@ function wrapAppendOrRemoveHeader (originalMethod) {
       return this
     }
 
-    return originalMethod.apply(this, arguments)
+    return originalMethod.apply(this, args)
   }
 }
 
 function wrapEnd (end) {
-  return function wrappedEnd () {
+  return function wrappedEnd (...args) {
     if (!startWriteHeadCh.hasSubscribers) {
-      return end.apply(this, arguments)
+      return end.apply(this, args)
     }
 
     const abortController = new AbortController()
@@ -215,6 +215,6 @@ function wrapEnd (end) {
       return this
     }
 
-    return end.apply(this, arguments)
+    return end.apply(this, args)
   }
 }

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

@@ -4,6 +4,8 @@
 const realSetTimeout = setTimeout
 
 const path = require('path')
+const satisfies = require('../../../vendor/dist/semifies')
+const { DD_MAJOR } = require('../../../version')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
 const {
@@ -24,13 +26,13 @@ const {
   recordAttemptToFixExecution,
   logAttemptToFixTestExecution,
   logTestOptimizationSummary,
+  getEfdRetryCount,
 } = require('../../dd-trace/src/plugins/util/test')
 const {
   SEED_SUFFIX_RE,
   getFormattedJestTestParameters,
   getJestTestName,
   getJestSuitesToRun,
-  getEfdRetryCount,
 } = require('../../datadog-plugin-jest/src/util')
 const { addHook, channel } = require('./helpers/instrument')
 
@@ -126,7 +128,13 @@ const testSuiteJestObjects = new Map()
 
 const BREAKPOINT_HIT_GRACE_PERIOD_MS = 200
 const ATR_RETRY_SUPPRESSION_FLAG = '_ddDisableAtrRetry'
+const MINIMUM_JEST_VERSION = DD_MAJOR >= 6 ? '>=28.0.0' : '>=24.8.0'
+const MINIMUM_JEST_VERSION_BEFORE_30 = DD_MAJOR >= 6 ? '>=28.0.0 <30.0.0' : '>=24.8.0 <30.0.0'
+const MINIMUM_JEST_WORKER_VERSION_BEFORE_30 = DD_MAJOR >= 6 ? '>=28.0.0 <30.0.0' : '>=24.9.0 <30.0.0'
+const MINIMUM_JEST_CONFIG_ASYNC_VERSION = DD_MAJOR >= 6 ? '>=28.0.0' : '>=25.1.0'
+const MINIMUM_JEST_TEST_SCHEDULER_VERSION = DD_MAJOR >= 6 ? '>=28.0.0' : '>=27.0.0'
 const atrSuppressedErrors = new Map()
+let hasWarnedDeprecatedJestVersion = false
 
 // Track quarantined tests whose errors were suppressed, keyed by "suite › testName"
 const quarantinedFailingTests = new Set()
@@ -177,6 +185,20 @@ function formatJestError (errors) {
   return error
 }
 
+function warnDeprecatedJestVersion (frameworkVersion) {
+  if (DD_MAJOR >= 6 || hasWarnedDeprecatedJestVersion || !frameworkVersion ||
+      !satisfies(frameworkVersion, '<28.0.0')) {
+    return
+  }
+
+  hasWarnedDeprecatedJestVersion = true
+  // eslint-disable-next-line no-console
+  console.warn(
+    'dd-trace support for Jest<28.0.0 is deprecated and will be removed in dd-trace v6. ' +
+      'Please upgrade Jest to >=28.0.0.'
+  )
+}
+
 function getTestEnvironmentOptions (config) {
   if (config.projectConfig && config.projectConfig.testEnvironmentOptions) { // newer versions
     return config.projectConfig.testEnvironmentOptions
@@ -499,13 +521,13 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
       const setNameToParams = (name, params) => { this.nameToParams[name] = [...params] }
 
       if (event.name === 'setup' && this.global.test) {
-        shimmer.wrap(this.global.test, 'each', each => function () {
-          const testParameters = getFormattedJestTestParameters(arguments)
-          const eachBind = each.apply(this, arguments)
-          return function () {
-            const [testName] = arguments
+        shimmer.wrap(this.global.test, 'each', each => function (...args) {
+          const testParameters = getFormattedJestTestParameters(args)
+          const eachBind = each.apply(this, args)
+          return function (...args) {
+            const [testName] = args
             setNameToParams(testName, testParameters)
-            return eachBind.apply(this, arguments)
+            return eachBind.apply(this, args)
           }
         })
       }
@@ -602,16 +624,16 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             } else {
               originalHookFns.set(hook, hookFn)
             }
-            const newHookFn = shimmer.wrapFunction(hookFn, hookFn => function () {
-              return testFnCh.runStores(ctx, () => hookFn.apply(this, arguments))
+            const newHookFn = shimmer.wrapFunction(hookFn, hookFn => function (...args) {
+              return testFnCh.runStores(ctx, () => hookFn.apply(this, args))
             })
             hook.fn = newHookFn
           }
           const originalFn = event.test.fn
           originalTestFns.set(event.test, originalFn)
 
-          const newFn = shimmer.wrapFunction(event.test.fn, testFn => function () {
-            return testFnCh.runStores(ctx, () => testFn.apply(this, arguments))
+          const newFn = shimmer.wrapFunction(event.test.fn, testFn => function (...args) {
+            return testFnCh.runStores(ctx, () => testFn.apply(this, args))
           })
 
           event.test.fn = newFn
@@ -626,8 +648,8 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         } else {
           originalHookFns.set(event.hook, hookFn)
         }
-        event.hook.fn = shimmer.wrapFunction(hookFn, hookFn => function () {
-          return testSuiteHookFnCh.runStores(ctx, () => hookFn.apply(this, arguments))
+        event.hook.fn = shimmer.wrapFunction(hookFn, hookFn => function (...args) {
+          return testSuiteHookFnCh.runStores(ctx, () => hookFn.apply(this, args))
         })
       }
 
@@ -1073,12 +1095,12 @@ function applySuiteSkipping (originalTests, rootDir, frameworkVersion) {
 
 addHook({
   name: 'jest-environment-node',
-  versions: ['>=24.8.0'],
+  versions: [MINIMUM_JEST_VERSION],
 }, getTestEnvironment)
 
 addHook({
   name: 'jest-environment-jsdom',
-  versions: ['>=24.8.0'],
+  versions: [MINIMUM_JEST_VERSION],
 }, getTestEnvironment)
 
 addHook({
@@ -1150,6 +1172,8 @@ function searchSourceWrapper (searchSourcePackage, frameworkVersion) {
 
 function getCliWrapper (isNewJestVersion) {
   return function cliWrapper (cli, jestVersion) {
+    warnDeprecatedJestVersion(jestVersion)
+
     if (isNewJestVersion) {
       cli = shimmer.wrap(
         cli,
@@ -1520,14 +1544,14 @@ function coverageReporterWrapper (coverageReporter) {
    * in which case we'll leave it.
    */
   // `_addUntestedFiles` is an async function
-  shimmer.wrap(CoverageReporter.prototype, '_addUntestedFiles', addUntestedFiles => function () {
+  shimmer.wrap(CoverageReporter.prototype, '_addUntestedFiles', addUntestedFiles => function (...args) {
     if (DD_TEST_TIA_KEEP_COV_CONFIG) {
-      return addUntestedFiles.apply(this, arguments)
+      return addUntestedFiles.apply(this, args)
     }
     if (isCodeCoverageEnabledBecauseOfUs) {
       return Promise.resolve()
     }
-    return addUntestedFiles.apply(this, arguments)
+    return addUntestedFiles.apply(this, args)
   })
 
   return coverageReporter
@@ -1536,7 +1560,7 @@ function coverageReporterWrapper (coverageReporter) {
 addHook({
   name: '@jest/core',
   file: 'build/TestScheduler.js',
-  versions: ['>=27.0.0'],
+  versions: [MINIMUM_JEST_TEST_SCHEDULER_VERSION],
 }, (testSchedulerPackage, frameworkVersion) => {
   const oldCreateTestScheduler = testSchedulerPackage.createTestScheduler
   const newCreateTestScheduler = async function () {
@@ -1552,24 +1576,26 @@ addHook({
   return testSchedulerPackage
 })
 
-addHook({
-  name: '@jest/core',
-  file: 'build/TestScheduler.js',
-  versions: ['>=24.8.0 <27.0.0'],
-}, (testSchedulerPackage, frameworkVersion) => {
-  shimmer.wrap(
-    testSchedulerPackage.default.prototype,
-    'scheduleTests', scheduleTests => getWrappedScheduleTests(scheduleTests, frameworkVersion)
-  )
-  return testSchedulerPackage
-})
+if (DD_MAJOR < 6) {
+  addHook({
+    name: '@jest/core',
+    file: 'build/TestScheduler.js',
+    versions: ['>=24.8.0 <27.0.0'],
+  }, (testSchedulerPackage, frameworkVersion) => {
+    shimmer.wrap(
+      testSchedulerPackage.default.prototype,
+      'scheduleTests', scheduleTests => getWrappedScheduleTests(scheduleTests, frameworkVersion)
+    )
+    return testSchedulerPackage
+  })
+}
 
 addHook({
   name: '@jest/test-sequencer',
   versions: ['>=28'],
 }, (sequencerPackage, frameworkVersion) => {
-  shimmer.wrap(sequencerPackage.default.prototype, 'shard', shard => function () {
-    const shardedTests = shard.apply(this, arguments)
+  shimmer.wrap(sequencerPackage.default.prototype, 'shard', shard => function (...args) {
+    const shardedTests = shard.apply(this, args)
 
     if (!shardedTests.length || !isSuitesSkippingEnabled || !skippableSuites.length) {
       return shardedTests
@@ -1582,16 +1608,18 @@ addHook({
   return sequencerPackage
 })
 
-addHook({
-  name: '@jest/reporters',
-  file: 'build/coverage_reporter.js',
-  versions: ['>=24.8.0 <26.6.2'],
-}, coverageReporterWrapper)
+if (DD_MAJOR < 6) {
+  addHook({
+    name: '@jest/reporters',
+    file: 'build/coverage_reporter.js',
+    versions: ['>=24.8.0 <26.6.2'],
+  }, coverageReporterWrapper)
+}
 
 addHook({
   name: '@jest/reporters',
   file: 'build/CoverageReporter.js',
-  versions: ['>=26.6.2'],
+  versions: [DD_MAJOR >= 6 ? '>=28.0.0' : '>=26.6.2'],
 }, coverageReporterWrapper)
 
 addHook({
@@ -1604,7 +1632,7 @@ addHook({
 addHook({
   name: '@jest/core',
   file: 'build/cli/index.js',
-  versions: ['>=24.8.0 <30.0.0'],
+  versions: [MINIMUM_JEST_VERSION_BEFORE_30],
 }, getCliWrapper(false))
 
 addHook({
@@ -1614,10 +1642,10 @@ addHook({
 
 function jestAdapterWrapper (jestAdapter, jestVersion) {
   const adapter = jestAdapter.default ?? jestAdapter
-  const newAdapter = shimmer.wrapFunction(adapter, adapter => function () {
-    const environment = arguments[2]
+  const newAdapter = shimmer.wrapFunction(adapter, adapter => function (...args) {
+    const environment = args[2]
     if (!environment || !environment.testEnvironmentOptions) {
-      return adapter.apply(this, arguments)
+      return adapter.apply(this, args)
     }
     testSuiteStartCh.publish({
       testSuite: environment.testSuite,
@@ -1627,7 +1655,7 @@ function jestAdapterWrapper (jestAdapter, jestVersion) {
       frameworkVersion: jestVersion,
       testSuiteAbsolutePath: environment.testSuiteAbsolutePath,
     })
-    return adapter.apply(this, arguments).then(suiteResults => {
+    return adapter.apply(this, args).then(suiteResults => {
       const { numFailingTests, skipped, failureMessage: errorMessage } = suiteResults
       let status = 'pass'
       if (skipped) {
@@ -1691,7 +1719,7 @@ addHook({
 addHook({
   name: 'jest-circus',
   file: 'build/legacy-code-todo-rewrite/jestAdapter.js',
-  versions: ['>=24.8.0'],
+  versions: [MINIMUM_JEST_VERSION],
 }, jestAdapterWrapper)
 
 function configureTestEnvironment (readConfigsResult) {
@@ -1745,8 +1773,8 @@ function jestConfigAsyncWrapper (jestConfig) {
 }
 
 function jestConfigSyncWrapper (jestConfig) {
-  return shimmer.wrap(jestConfig, 'readConfigs', readConfigs => function () {
-    const readConfigsResult = readConfigs.apply(this, arguments)
+  return shimmer.wrap(jestConfig, 'readConfigs', readConfigs => function (...args) {
+    const readConfigsResult = readConfigs.apply(this, args)
     configureTestEnvironment(readConfigsResult)
     return readConfigsResult
   })
@@ -1828,7 +1856,7 @@ function wrapCreateScriptTransformer (createScriptTransformer) {
 
 addHook({
   name: '@jest/transform',
-  versions: ['>=24.8.0 <30.0.0'],
+  versions: [MINIMUM_JEST_VERSION_BEFORE_30],
   file: 'build/ScriptTransformer.js',
 }, transformPackage => {
   transformPackage.createScriptTransformer = wrapCreateScriptTransformer(transformPackage.createScriptTransformer)
@@ -1848,20 +1876,22 @@ addHook({
  */
 addHook({
   name: '@jest/core',
-  versions: ['>=24.8.0 <30.0.0'],
+  versions: [MINIMUM_JEST_VERSION_BEFORE_30],
   file: 'build/SearchSource.js',
 }, searchSourceWrapper)
 
 // from 25.1.0 on, readConfigs becomes async
 addHook({
   name: 'jest-config',
-  versions: ['>=25.1.0'],
+  versions: [MINIMUM_JEST_CONFIG_ASYNC_VERSION],
 }, jestConfigAsyncWrapper)
 
-addHook({
-  name: 'jest-config',
-  versions: ['24.8.0 - 24.9.0'],
-}, jestConfigSyncWrapper)
+if (DD_MAJOR < 6) {
+  addHook({
+    name: 'jest-config',
+    versions: ['24.8.0 - 24.9.0'],
+  }, jestConfigSyncWrapper)
+}
 
 const LIBRARIES_BYPASSING_JEST_REQUIRE_ENGINE = new Set([
   'selenium-webdriver',
@@ -1876,7 +1906,7 @@ const LIBRARIES_BYPASSING_JEST_REQUIRE_ENGINE = new Set([
 
 addHook({
   name: 'jest-runtime',
-  versions: ['>=24.8.0'],
+  versions: [MINIMUM_JEST_VERSION],
 }, (runtimePackage) => {
   const Runtime = runtimePackage.default ?? runtimePackage
 
@@ -1953,10 +1983,10 @@ addHook({
 })
 
 function onMessageWrapper (onMessage) {
-  return function () {
-    const response = arguments[0]
+  return function (...args) {
+    const response = args[0]
     if (!Array.isArray(response)) {
-      return onMessage.apply(this, arguments)
+      return onMessage.apply(this, args)
     }
 
     const [code, data] = response
@@ -1983,7 +2013,7 @@ function onMessageWrapper (onMessage) {
       }
       return
     }
-    return onMessage.apply(this, arguments)
+    return onMessage.apply(this, args)
   }
 }
 
@@ -2047,8 +2077,8 @@ function wrapWorker (worker) {
 }
 
 function enqueueWrapper (enqueue) {
-  return function () {
-    shimmer.wrap(arguments[0], 'onStart', onStart => function (worker) {
+  return function (...args) {
+    shimmer.wrap(args[0], 'onStart', onStart => function (worker) {
       if (worker) {
         const currentChannel = worker._child || worker._worker
         const previousChannel = wrappedWorkerChannels.get(worker)
@@ -2065,7 +2095,7 @@ function enqueueWrapper (enqueue) {
       }
       return onStart.apply(this, arguments)
     })
-    return enqueue.apply(this, arguments)
+    return enqueue.apply(this, args)
   }
 }
 
@@ -2077,7 +2107,7 @@ function enqueueWrapper (enqueue) {
 */
 addHook({
   name: 'jest-worker',
-  versions: ['>=24.9.0 <30.0.0'],
+  versions: [MINIMUM_JEST_WORKER_VERSION_BEFORE_30],
   file: 'build/workers/ChildProcessWorker.js',
 }, (childProcessWorker) => {
   const ChildProcessWorker = childProcessWorker.default
@@ -2092,7 +2122,7 @@ addHook({
 
 addHook({
   name: 'jest-worker',
-  versions: ['>=24.9.0 <30.0.0'],
+  versions: [MINIMUM_JEST_WORKER_VERSION_BEFORE_30],
   file: 'build/workers/NodeThreadsWorker.js',
 }, (nodeThreadsWorker) => {
   const ExperimentalWorker = nodeThreadsWorker.default

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

@@ -34,16 +34,16 @@ addHook({ name: 'kafkajs', file: 'src/index.js', versions: ['>=1.4'] }, (BaseKaf
     }
   }
 
-  shimmer.wrap(Kafka.prototype, 'producer', createProducer => function () {
-    const producer = createProducer.apply(this, arguments)
+  shimmer.wrap(Kafka.prototype, 'producer', createProducer => function (...args) {
+    const producer = createProducer.apply(this, args)
     const send = producer.send
     const bootstrapServers = this._brokers
 
     const kafkaClusterIdPromise = getKafkaClusterId(this)
 
-    producer.send = function () {
+    producer.send = function (...args) {
       const wrappedSend = (clusterId) => {
-        const { topic, messages = [] } = arguments[0]
+        const { topic, messages = [] } = args[0]
 
         const ctx = {
           bootstrapServers,
@@ -61,7 +61,7 @@ addHook({ name: 'kafkajs', file: 'src/index.js', versions: ['>=1.4'] }, (BaseKaf
 
         return producerStartCh.runStores(ctx, () => {
           try {
-            const result = send.apply(this, arguments)
+            const result = send.apply(this, args)
             result.then(
               (res) => {
                 ctx.result = res
@@ -110,9 +110,9 @@ addHook({ name: 'kafkajs', file: 'src/index.js', versions: ['>=1.4'] }, (BaseKaf
     return producer
   })
 
-  shimmer.wrap(Kafka.prototype, 'consumer', createConsumer => function () {
+  shimmer.wrap(Kafka.prototype, 'consumer', createConsumer => function (...args) {
     if (!consumerStartCh.hasSubscribers) {
-      return createConsumer.apply(this, arguments)
+      return createConsumer.apply(this, args)
     }
 
     const kafkaClusterIdPromise = getKafkaClusterId(this)
@@ -129,7 +129,7 @@ addHook({ name: 'kafkajs', file: 'src/index.js', versions: ['>=1.4'] }, (BaseKaf
       return { topic, partition, messages, groupId, clusterId }
     }
 
-    const consumer = createConsumer.apply(this, arguments)
+    const consumer = createConsumer.apply(this, args)
 
     consumer.on(consumer.events.COMMIT_OFFSETS, (event) => {
       const { payload: { groupId: commitGroupId, topics } } = event
@@ -149,7 +149,7 @@ addHook({ name: 'kafkajs', file: 'src/index.js', versions: ['>=1.4'] }, (BaseKaf
     })
 
     const run = consumer.run
-    const groupId = arguments[0].groupId
+    const groupId = args[0].groupId
 
     consumer.run = function ({ eachMessage, eachBatch, ...runArgs }) {
       const wrapConsume = (clusterId) => {