fix: correct dev-deps required for the recent eslint@8 upgrade (elastic#3449)

The upgrade to eslint@8 in elastic#3409 subtly broke peer-dependencies.
`npm ls` unhelpfully does not complain, but `npm ls -a` shows some
errors, and `./dev-utils/make-distribution.sh` was broken.

The upgrade bumped "eslint-config-standard" from ^14.1.1 to ^16.
However, v16 has:
    "peerDependencies": {
      "eslint": "^7.12.1",
      "eslint-plugin-import": "^2.22.1",
      "eslint-plugin-node": "^11.1.0",
      "eslint-plugin-promise": "^4.2.1 || ^5.0.0"
    },
so is incompatible with eslint@8. We need eslint-config-standard@17,
which has:
    "peerDependencies": {
      "eslint": "^8.0.1",
      "eslint-plugin-import": "^2.25.2",
      "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
      "eslint-plugin-promise": "^6.0.0"
    },

Also:
- eslint-plugin-node (unmaintained) is replaced by "eslint-plugin-n"
- eslint-config-standard@17 added https://eslint.org/docs/latest/rules/object-shorthand
  as a warning. It'll become "error" in a subsequent major.
- eslint@8 means support for top-level await, so there are some 
  files we no longer need to skip

Author: trentm

.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

@@ -610,7 +610,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 }
   }
 }