fix: correct dev-deps required for the recent eslint@8 upgrade

.eslintrc.json

@@ -41,10 +41,6 @@
     "/test/types/transpile/index.js",
     "/test/types/transpile-default/index.js",
     "/test_output",
-    "tmp",
-    // These files use top-level await, which is *fine* for ESM files but, IIUC,
-    // not supported by eslint until v8.
-    "/test/instrumentation/modules/fixtures/use-fastify.mjs",
-    "/test/instrumentation/modules/http/fixtures/use-dynamic-import.mjs"
+    "tmp"
   ]
 }

dev-utils/bitrot.js

@@ -351,7 +351,7 @@ const options = [
 ]
 
 function main (argv) {
-  var parser = dashdash.createParser({ options: options })
+  var parser = dashdash.createParser({ options })
   try {
     var opts = parser.parse(argv)
   } catch (e) {

lib/agent.js

@@ -606,7 +606,7 @@ Agent.prototype.captureError = function (err, opts, cb) {
 
     errors.createAPMError({
       log: agent.logger,
-      id: id,
+      id,
       exception: errIsError ? err : null,
       logMessage: errIsError ? null : err,
       shouldCaptureAttributes,

lib/http-request.js

@@ -207,8 +207,8 @@ function main (argv) {
   const timeout = Number(argv[4])
 
   var req = httpRequest(url, {
-    timeout: timeout,
-    connectTimeout: connectTimeout
+    timeout,
+    connectTimeout
     // TODO: log support
   }, function onRes (res) {
     res.pipe(process.stdout)

lib/instrumentation/dropped-spans-stats.js

@@ -60,7 +60,7 @@ class DroppedSpansStats {
         }
       },
       destination_service_resource: resource,
-      outcome: outcome
+      outcome
     }
     if (serviceTargetType) {
       stats.service_target_type = serviceTargetType

lib/instrumentation/http-shared.js

@@ -99,7 +99,7 @@ exports.instrumentRequest = function (agent, moduleName) {
           const tracestate = req.headers.tracestate
           const trans = agent.startTransaction(null, null, {
             childOf: traceparent,
-            tracestate: tracestate
+            tracestate
           })
           trans.type = 'request'
           trans.req = req
@@ -186,7 +186,7 @@ exports.traceOutgoingRequest = function (agent, moduleName, method) {
       const parentRunContext = ins.currRunContext()
       var span = ins.createSpan(null, 'external', 'http', { exitSpan: true })
       var id = span && span.transaction.id
-      agent.logger.debug('intercepted call to %s.%s %o', moduleName, method, { id: id })
+      agent.logger.debug('intercepted call to %s.%s %o', moduleName, method, { id })
 
       // Reproduce the argument handling from node/lib/_http_client.js#ClientRequest().
       //
@@ -261,7 +261,7 @@ exports.traceOutgoingRequest = function (agent, moduleName, method) {
       var req = ins.withRunContext(spanRunContext, orig, this, ...newArgs)
 
       var protocol = req.agent && req.agent.protocol
-      agent.logger.debug('request details: %o', { protocol: protocol, host: getSafeHost(req), id: id })
+      agent.logger.debug('request details: %o', { protocol, host: getSafeHost(req), id })
 
       ins.bindEmitter(req)
 
@@ -280,15 +280,15 @@ exports.traceOutgoingRequest = function (agent, moduleName, method) {
 
       const url = getUrlFromRequestAndOptions(req, options, moduleName + ':')
       if (!url) {
-        agent.logger.warn('unable to identify http.ClientRequest url %o', { id: id })
+        agent.logger.warn('unable to identify http.ClientRequest url %o', { id })
       }
       let statusCode
       return req
 
       // In case the request is ended prematurely
       function onAbort (type) {
         if (span.ended) return
-        agent.logger.debug('intercepted http.ClientRequest abort event %o', { id: id })
+        agent.logger.debug('intercepted http.ClientRequest abort event %o', { id })
 
         onEnd()
       }
@@ -319,11 +319,11 @@ exports.traceOutgoingRequest = function (agent, moduleName, method) {
       }
 
       function onResponse (res) {
-        agent.logger.debug('intercepted http.ClientRequest response event %o', { id: id })
+        agent.logger.debug('intercepted http.ClientRequest response event %o', { id })
         ins.bindEmitterToRunContext(parentRunContext, res)
         statusCode = res.statusCode
         res.prependListener('end', function () {
-          agent.logger.debug('intercepted http.IncomingMessage end event %o', { id: id })
+          agent.logger.debug('intercepted http.IncomingMessage end event %o', { id })
           onEnd()
         })
       }

lib/instrumentation/modules/@aws-sdk/client-s3.js

@@ -192,7 +192,7 @@ function s3MiddlewareFactory (client, agent) {
         context[elasticAPMStash] = {
           protocol: req.protocol,
           hostname: req.hostname,
-          port: port
+          port
         }
         return next(args)
       },

lib/instrumentation/modules/elasticsearch.js

@@ -81,7 +81,7 @@ module.exports = function (elasticsearch, agent, { enabled }) {
       var method = params && params.method
       var path = params && params.path
 
-      agent.logger.debug('intercepted call to elasticsearch.Transport.prototype.request %o', { id: id, method: method, path: path })
+      agent.logger.debug('intercepted call to elasticsearch.Transport.prototype.request %o', { id, method, path })
 
       if (span && method && path) {
         span.name = `Elasticsearch: ${method} ${path}`
@@ -145,7 +145,7 @@ module.exports = function (elasticsearch, agent, { enabled }) {
           shimmer.wrap(inspectedPromise, 'abort', function wrapAbort (originalAbort) {
             return function wrappedAbort () {
               if (span.ended) return
-              agent.logger.debug('intercepted call to elasticsearch.Transport.request.abort %o', { id: id, method: method, path: path })
+              agent.logger.debug('intercepted call to elasticsearch.Transport.request.abort %o', { id, method, path })
               const originalReturn = originalAbort.apply(this, args)
               span.end()
               return originalReturn
@@ -155,7 +155,7 @@ module.exports = function (elasticsearch, agent, { enabled }) {
           return inspectedPromise
         }
       } else {
-        agent.logger.debug('could not instrument elasticsearch request %o', { id: id })
+        agent.logger.debug('could not instrument elasticsearch request %o', { id })
         return original.apply(this, arguments)
       }
     }

lib/instrumentation/modules/generic-pool.js

@@ -17,7 +17,7 @@ module.exports = function (generic, agent, { version }) {
       return function wrappedPool () {
         var trans = agent._instrumentation.currTransaction()
         var id = trans && trans.id
-        agent.logger.debug('intercepted call to generic-pool.Pool %o', { id: id })
+        agent.logger.debug('intercepted call to generic-pool.Pool %o', { id })
 
         var pool
         if (this instanceof generic.Pool) {
@@ -32,7 +32,7 @@ module.exports = function (generic, agent, { version }) {
           return function wrappedAcquire () {
             var trans = agent._instrumentation.currTransaction()
             var id = trans && trans.id
-            agent.logger.debug('intercepted call to pool.acquire %o', { id: id })
+            agent.logger.debug('intercepted call to pool.acquire %o', { id })
 
             var cb = arguments[0]
             if (typeof cb === 'function') {
@@ -59,7 +59,7 @@ module.exports = function (generic, agent, { version }) {
       return function wrappedEnqueue () {
         var trans = agent._instrumentation.currTransaction()
         var id = trans && trans.id
-        agent.logger.debug('intercepted call to generic-pool.PriorityQueue.prototype.enqueue %o', { id: id })
+        agent.logger.debug('intercepted call to generic-pool.PriorityQueue.prototype.enqueue %o', { id })
 
         var obj = arguments[0]
         // Expect obj to of type Deferred

lib/instrumentation/modules/graphql.js

@@ -202,6 +202,6 @@ module.exports = function (graphql, agent, { version, enabled }) {
       agent.logger.debug('unexpected document format - skipping graphql query extraction')
     }
 
-    return { queries: queries, operation: operation }
+    return { queries, operation }
   }
 }

lib/instrumentation/modules/http2.js

@@ -109,7 +109,7 @@ module.exports = function (http2, agent, { enabled }) {
         var tracestate = req.headers.tracestate
         const trans = agent.startTransaction(null, null, {
           childOf: traceparent,
-          tracestate: tracestate
+          tracestate
         })
         trans.type = 'request'
         trans.req = req

lib/instrumentation/modules/mongodb-core.js

@@ -45,7 +45,7 @@ module.exports = function (mongodb, agent, { version, enabled }) {
       var id = trans && trans.id
       var span
 
-      agent.logger.debug('intercepted call to mongodb-core.Server.prototype.command %o', { id: id, ns: ns })
+      agent.logger.debug('intercepted call to mongodb-core.Server.prototype.command %o', { id, ns })
 
       if (trans && arguments.length > 0) {
         var index = arguments.length - 1
@@ -69,7 +69,7 @@ module.exports = function (mongodb, agent, { version, enabled }) {
       return orig.apply(this, arguments)
 
       function wrappedCallback (_err, commandResult) {
-        agent.logger.debug('intercepted mongodb-core.Server.prototype.command callback %o', { id: id })
+        agent.logger.debug('intercepted mongodb-core.Server.prototype.command callback %o', { id })
         if (commandResult && commandResult.connection) {
           span._setDestinationContext(getDBDestination(
             commandResult.connection.host, commandResult.connection.port))
@@ -86,7 +86,7 @@ module.exports = function (mongodb, agent, { version, enabled }) {
       var id = trans && trans.id
       var span
 
-      agent.logger.debug('intercepted call to mongodb-core.Server.prototype.%s %o', name, { id: id, ns: ns })
+      agent.logger.debug('intercepted call to mongodb-core.Server.prototype.%s %o', name, { id, ns })
 
       if (trans && arguments.length > 0) {
         var index = arguments.length - 1
@@ -103,7 +103,7 @@ module.exports = function (mongodb, agent, { version, enabled }) {
       return orig.apply(this, arguments)
 
       function wrappedCallback (_err, commandResult) {
-        agent.logger.debug('intercepted mongodb-core.Server.prototype.%s callback %o', name, { id: id })
+        agent.logger.debug('intercepted mongodb-core.Server.prototype.%s callback %o', name, { id })
         if (commandResult && commandResult.connection) {
           span._setDestinationContext(getDBDestination(
             commandResult.connection.host, commandResult.connection.port))
@@ -119,7 +119,7 @@ module.exports = function (mongodb, agent, { version, enabled }) {
       var id = trans && trans.id
       var span
 
-      agent.logger.debug('intercepted call to mongodb-core.Cursor.prototype.%s %o', name, { id: id })
+      agent.logger.debug('intercepted call to mongodb-core.Cursor.prototype.%s %o', name, { id })
 
       if (trans && arguments.length > 0) {
         var cb = arguments[0]
@@ -143,7 +143,7 @@ module.exports = function (mongodb, agent, { version, enabled }) {
       return orig.apply(this, arguments)
 
       function wrappedCallback () {
-        agent.logger.debug('intercepted mongodb-core.Cursor.prototype.%s callback %o', name, { id: id })
+        agent.logger.debug('intercepted mongodb-core.Cursor.prototype.%s callback %o', name, { id })
         span.end()
         return cb.apply(this, arguments)
       }

lib/instrumentation/modules/mysql.js

@@ -81,7 +81,7 @@ module.exports = function (mysql, agent, { version, enabled }) {
       var cb = arguments[0]
 
       if (typeof cb === 'function') {
-        arguments[0] = agent._instrumentation.bindFunction(function wrapedCallback (err, connection) { // eslint-disable-line node/handle-callback-err
+        arguments[0] = agent._instrumentation.bindFunction(function wrapedCallback (err, connection) { // eslint-disable-line n/handle-callback-err
           if (connection) wrapQueryable(connection, 'getConnection() > connection', agent)
           return cb.apply(this, arguments)
         })

lib/instrumentation/modules/redis.js

@@ -79,7 +79,7 @@ module.exports = function (redis, agent, { version, enabled }) {
       }
 
       const command = commandObj.command
-      agent.logger.debug({ command: command }, 'intercepted call to RedisClient.prototype.internal_send_command')
+      agent.logger.debug({ command }, 'intercepted call to RedisClient.prototype.internal_send_command')
       const span = ins.createSpan(command.toUpperCase(), TYPE, SUBTYPE, ACTION, { exitSpan: true })
       if (!span) {
         return original.apply(this, arguments)
@@ -112,7 +112,7 @@ module.exports = function (redis, agent, { version, enabled }) {
         return original.apply(this, arguments)
       }
 
-      agent.logger.debug({ command: command }, 'intercepted call to RedisClient.prototype.send_command')
+      agent.logger.debug({ command }, 'intercepted call to RedisClient.prototype.send_command')
       var span = ins.createSpan(command.toUpperCase(), TYPE, SUBTYPE, ACTION, { exitSpan: true })
       if (!span) {
         return original.apply(this, arguments)

lib/instrumentation/patch-async.js

@@ -303,8 +303,8 @@ module.exports = function (ins) {
   }
 
   // only wrap lchown and lchmod on systems that have them.
-  if (fs.lchown) wrap(fs, 'lchown', activator) // eslint-disable-line node/no-deprecated-api
-  if (fs.lchmod) wrap(fs, 'lchmod', activator) // eslint-disable-line node/no-deprecated-api
+  if (fs.lchown) wrap(fs, 'lchown', activator) // eslint-disable-line n/no-deprecated-api
+  if (fs.lchmod) wrap(fs, 'lchmod', activator) // eslint-disable-line n/no-deprecated-api
 
   // only wrap ftruncate in versions of node that have it
   if (fs.ftruncate) wrap(fs, 'ftruncate', activator)

lib/instrumentation/template-shared.js

@@ -13,8 +13,8 @@ exports.wrapCompile = function (agent, moduleName) {
       var id = span && span.transaction.id
 
       agent.logger.debug('intercepted call to %s render %o', moduleName, {
-        id: id,
-        data: data
+        id,
+        data
       })
 
       var ret = original.apply(this, arguments)
@@ -30,8 +30,8 @@ exports.wrapCompile = function (agent, moduleName) {
       var id = span && span.transaction.id
 
       agent.logger.debug('intercepted call to %s compile %o', moduleName, {
-        id: id,
-        input: input
+        id,
+        input
       })
 
       var ret = original.apply(this, arguments)

lib/instrumentation/transaction.js

@@ -120,7 +120,7 @@ Object.defineProperty(Transaction.prototype, 'name', {
       this._agent.logger.debug('tried to set transaction.name on already ended transaction %o', { trans: this.id, parent: this.parentId, trace: this.traceId })
       return
     }
-    this._agent.logger.debug('setting transaction name %o', { trans: this.id, parent: this.parentId, trace: this.traceId, name: name })
+    this._agent.logger.debug('setting transaction name %o', { trans: this.id, parent: this.parentId, trace: this.traceId, name })
     this._customName = name
   }
 })
@@ -136,7 +136,7 @@ Object.defineProperty(Transaction.prototype, 'result', {
       this._agent.logger.debug('tried to set transaction.result on already ended transaction %o', { trans: this.id, parent: this.parentId, trace: this.traceId })
       return
     }
-    this._agent.logger.debug('setting transaction result %o', { trans: this.id, parent: this.parentId, trace: this.traceId, result: result })
+    this._agent.logger.debug('setting transaction result %o', { trans: this.id, parent: this.parentId, trace: this.traceId, result })
     this._result = result
   }
 })

lib/lambda.js

@@ -391,7 +391,7 @@ function setSnsData (agent, trans, event, context, faasId, isColdStart) {
   const cloudContext = {
     origin: {
       provider: 'aws',
-      region: region,
+      region,
       service: {
         name: 'sns'
       },
@@ -625,7 +625,7 @@ function elasticApmAwsLambda (agent) {
       // Start the transaction and set some possibly trigger-specific data.
       const trans = agent.startTransaction(context.functionName, type, {
         childOf: traceparent,
-        tracestate: tracestate
+        tracestate
       })
       switch (triggerType) {
         case TRIGGER_API_GATEWAY:

lib/logging.js

@@ -129,7 +129,7 @@ function createLogger (levelName, customLogger) {
       }
 
       return customLogger.child({
-        serializers: serializers
+        serializers
       })
     }
 
@@ -150,7 +150,7 @@ function createLogger (levelName, customLogger) {
     name: 'elastic-apm-node',
     base: {}, // Don't want pid and hostname fields.
     level: pinoLevel,
-    serializers: serializers,
+    serializers,
     ...ecsFormat({ apmIntegration: false })
   }, dest)
 
@@ -175,8 +175,8 @@ function setLogLevel (logger, levelName) {
 }
 
 module.exports = {
-  DEFAULT_LOG_LEVEL: DEFAULT_LOG_LEVEL,
-  createLogger: createLogger,
-  isLoggerCustom: isLoggerCustom,
-  setLogLevel: setLogLevel
+  DEFAULT_LOG_LEVEL,
+  createLogger,
+  isLoggerCustom,
+  setLogLevel
 }

lib/stacktraces.js

@@ -306,7 +306,7 @@ function frameFromCallSite (log, callsite, cwd, sourceLinesAppFrames, sourceLine
     let mappedLineno = null
 
     if (sourceMapErr) {
-      log.debug({ filename: filename, err: sourceMapErr },
+      log.debug({ filename, err: sourceMapErr },
         'could not process file source map')
     } else if (sourceMapConsumer) {
       let pos
@@ -316,7 +316,7 @@ function frameFromCallSite (log, callsite, cwd, sourceLinesAppFrames, sourceLine
           column: callsite.getColumnNumber()
         })
       } catch (posErr) {
-        log.debug({ filename: filename, line: lineno, err: sourceMapErr },
+        log.debug({ filename, line: lineno, err: sourceMapErr },
           'could not get position from sourcemap')
         pos = {
           source: null,