Upgrade ESLint from v8 to v9 (#5215)

Author: watson

eslint.config.mjs

@@ -22,6 +22,7 @@ const TEST_FILES = [
 
 export default [
   {
+    name: 'dd-trace/global-ignore',
     ignores: [
       '**/coverage', // Just coverage reports.
       '**/dist', // Generated

integration-tests/ci-visibility/dynamic-instrumentation/test-hit-breakpoint.js

@@ -1,4 +1,3 @@
-/* eslint-disable */
 const sum = require('./dependency')
 const { expect } = require('chai')
 

integration-tests/ci-visibility/dynamic-instrumentation/test-not-hit-breakpoint.js

@@ -1,4 +1,3 @@
-/* eslint-disable */
 const sum = require('./dependency')
 const { expect } = require('chai')
 

integration-tests/ci-visibility/jest-flaky/flaky-fails.js

@@ -1,6 +1,5 @@
 describe('test-flaky-test-retries', () => {
   it('can retry failed tests', () => {
-    // eslint-disable-next-line
     expect(1).toEqual(2)
   })
 })

integration-tests/ci-visibility/jest-flaky/flaky-passes.js

@@ -2,12 +2,10 @@ let counter = 0
 
 describe('test-flaky-test-retries', () => {
   it('can retry flaky tests', () => {
-    // eslint-disable-next-line
     expect(++counter).toEqual(3)
   })
 
   it('will not retry passed tests', () => {
-    // eslint-disable-next-line
     expect(3).toEqual(3)
   })
 })

integration-tests/ci-visibility/jestEnvironmentBadInit.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line
 require('dd-trace').init({
   service: 'dd-trace-bad-init'
 })

integration-tests/ci-visibility/run-workerpool.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line
 const workerpool = require('workerpool')
 const pool = workerpool.pool({ workerType: 'process' })
 

integration-tests/ci-visibility/subproject/cypress/support/e2e.js

@@ -1,2 +1 @@
-// eslint-disable-next-line
 require('dd-trace/ci/cypress/support')

integration-tests/ci-visibility/subproject/subproject-test.js

@@ -1,10 +1,8 @@
-// eslint-disable-next-line
 const { expect } = require('chai')
 const dependency = require('./dependency')
 
 describe('subproject-test', () => {
   it('can run', () => {
-    // eslint-disable-next-line
     expect(dependency(1, 2)).to.equal(3)
   })
 })

integration-tests/ci-visibility/test-early-flake-detection/jest-snapshot.js

@@ -1,6 +1,5 @@
 describe('test', () => {
   it('can do snapshot', () => {
-    // eslint-disable-next-line
     expect(1 + 2).toMatchSnapshot()
   })
 })

integration-tests/cypress-esm-config.mjs

@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
 import cypress from 'cypress'
 
 async function runCypress () {

integration-tests/package-guardrails/index.js

@@ -1,7 +1,6 @@
 'use strict'
 
 /* eslint-disable no-console */
-/* eslint-disable import/no-extraneous-dependencies */
 
 try {
   const P = require('bluebird')

loader-hook.mjs

@@ -1,5 +1 @@
-// TODO(bengl): Not sure why `import/export` fails on this line, but it's just
-// a passthrough to another module so it should be fine. Disabling for now.
-
-// eslint-disable-next-line import/export
 export * from 'import-in-the-middle/hook.mjs'

package.json

@@ -116,10 +116,10 @@
   },
   "devDependencies": {
     "@apollo/server": "^4.11.0",
-    "@eslint/eslintrc": "^3.1.0",
-    "@eslint/js": "^8.57.1",
+    "@eslint/eslintrc": "^3.2.0",
+    "@eslint/js": "^9.19.0",
     "@msgpack/msgpack": "^3.0.0-beta3",
-    "@stylistic/eslint-plugin-js": "^2.8.0",
+    "@stylistic/eslint-plugin-js": "^3.0.1",
     "@types/node": "^16.0.0",
     "autocannon": "^4.5.2",
     "aws-sdk": "^2.1446.0",
@@ -132,12 +132,12 @@
     "cli-table3": "^0.6.3",
     "dotenv": "16.3.1",
     "esbuild": "0.16.12",
-    "eslint": "^8.57.0",
+    "eslint": "^9.19.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-mocha": "^10.4.3",
-    "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-promise": "^6.4.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-mocha": "^10.5.0",
+    "eslint-plugin-n": "^17.15.1",
+    "eslint-plugin-promise": "^7.2.1",
     "express": "^4.21.2",
     "get-port": "^3.2.0",
     "glob": "^7.1.6",

packages/datadog-instrumentations/test/generic-pool.spec.js

@@ -28,7 +28,6 @@ describe('Instrumentation', () => {
         const store = 'store'
 
         storage('legacy').run(store, () => {
-          // eslint-disable-next-line n/handle-callback-err
           pool.acquire((err, resource) => {
             pool.release(resource)
             expect(storage('legacy').getStore()).to.equal(store)

packages/datadog-instrumentations/test/mongoose.spec.js

@@ -178,7 +178,6 @@ describe('mongoose instrumentations', () => {
                   Test.deleteOne({ type: 'test' }, (err) => {
                     expect(err).to.be.null
 
-                    // eslint-disable-next-line n/handle-callback-err
                     Test.count({ type: 'test' }, (err, res) => {
                       expect(res).to.be.equal(2) // 3 -> delete 1 -> 2
 
@@ -259,7 +258,6 @@ describe('mongoose instrumentations', () => {
                     expect(item).not.to.be.null
                     expect(item.name).to.be.equal('test1')
 
-                    // eslint-disable-next-line n/handle-callback-err
                     Test.count({ type: 'test' }, (err, res) => {
                       expect(res).to.be.equal(2) // 3 -> delete 1 -> 2
 
@@ -425,7 +423,6 @@ describe('mongoose instrumentations', () => {
                   $set: {
                     other: 'modified-other'
                   }
-                // eslint-disable-next-line n/handle-callback-err
                 }).then((err) => {
                   Test.find({ type: 'test' }).then((items) => {
                     expect(items.length).to.be.equal(3)

packages/datadog-instrumentations/test/url.spec.js

@@ -34,7 +34,6 @@ names.forEach(name => {
 
     describe('url.parse', () => {
       it('should publish', () => {
-        // eslint-disable-next-line n/no-deprecated-api
         const result = url.parse('https://www.datadoghq.com')
 
         sinon.assert.calledOnceWithExactly(parseFinishedChannelCb, {

packages/datadog-plugin-aerospike/test/index.spec.js

@@ -214,7 +214,6 @@ describe('Plugin', () => {
                 index: 'tags_idx',
                 datatype: aerospike.indexDataType.STRING
               }
-              // eslint-disable-next-line n/handle-callback-err
               client.createIndex(index, (error, job) => {
                 job.waitUntilDone((waitError) => {
                   const query = client.query(ns, 'demo')

packages/datadog-plugin-amqplib/test/index.spec.js

@@ -276,7 +276,6 @@ describe('Plugin', () => {
                 channel.assertQueue('', {}, (err, ok) => {
                   if (err) return
                   channel.sendToQueue(ok.queue, Buffer.from('content'))
-                  // eslint-disable-next-line n/handle-callback-err
                   channel.consume(ok.queue, () => {}, {}, (err, ok) => {})
                 })
               },

packages/datadog-plugin-aws-sdk/test/stepfunctions.spec.js

@@ -1,4 +1,3 @@
-/* eslint-disable @stylistic/js/max-len */
 'use strict'
 
 const semver = require('semver')

packages/datadog-plugin-connect/test/index.spec.js

@@ -490,7 +490,6 @@ describe('Plugin', () => {
           const error = new Error('boom')
 
           app.use((req, res) => { throw error })
-          // eslint-disable-next-line n/handle-callback-err
           app.use((error, req, res, next) => {
             res.statusCode = 500
             res.end()
@@ -661,7 +660,6 @@ describe('Plugin', () => {
           const error = new Error('boom')
 
           app.use((req, res) => { throw error })
-          // eslint-disable-next-line n/handle-callback-err
           app.use((error, req, res, next) => {
             res.statusCode = 500
             res.end()
@@ -803,7 +801,6 @@ describe('Plugin', () => {
           const error = new Error('boom')
 
           app.use((req, res) => { throw error })
-          // eslint-disable-next-line n/handle-callback-err
           app.use((error, req, res, next) => {
             res.statusCode = 500
             res.end()

packages/datadog-plugin-express/test/index.spec.js

@@ -64,7 +64,6 @@ describe('Plugin', () => {
           const app = express()
 
           app.use(() => { throw new Error('boom') })
-          // eslint-disable-next-line n/handle-callback-err
           app.use((err, req, res, next) => {
             res.status(200).send()
           })
@@ -334,7 +333,6 @@ describe('Plugin', () => {
             next = _next
           })
           app.use(() => { throw error })
-          // eslint-disable-next-line n/handle-callback-err
           app.use((err, req, res, next) => next())
           app.get('/user/:id', (req, res) => {
             res.status(200).send()
@@ -1155,7 +1153,6 @@ describe('Plugin', () => {
           const error = new Error('boom')
 
           app.use((req, res, next) => next(error))
-          // eslint-disable-next-line n/handle-callback-err
           app.use((error, req, res, next) => res.status(500).send())
 
           appListener = app.listen(0, 'localhost', () => {
@@ -1193,7 +1190,6 @@ describe('Plugin', () => {
           const error = new Error('boom')
 
           app.use((req, res) => { throw error })
-          // eslint-disable-next-line n/handle-callback-err
           app.use((error, req, res, next) => res.status(500).send())
 
           appListener = app.listen(0, 'localhost', () => {
@@ -1711,7 +1707,6 @@ describe('Plugin', () => {
           const error = new Error('boom')
 
           app.use((req, res) => { throw error })
-          // eslint-disable-next-line n/handle-callback-err
           app.use((error, req, res, next) => res.status(500).send())
 
           appListener = app.listen(0, 'localhost', () => {

packages/datadog-plugin-fastify/test/tracing.spec.js

@@ -435,7 +435,6 @@ describe('Plugin', () => {
             it('should handle reply exceptions', done => {
               let error
 
-              // eslint-disable-next-line n/handle-callback-err
               app.setErrorHandler((error, request, reply) => {
                 reply.statusCode = 500
                 reply.send()
@@ -469,7 +468,6 @@ describe('Plugin', () => {
             })
 
             it('should ignore reply exceptions if the request succeeds', done => {
-              // eslint-disable-next-line n/handle-callback-err
               app.setErrorHandler((error, request, reply) => {
                 reply.statusCode = 200
                 reply.send()

packages/datadog-plugin-fs/test/index.spec.js

@@ -187,7 +187,6 @@ describe('Plugin', () => {
 
         it('should handle errors', (done) => {
           const filename = path.join(__filename, Math.random().toString())
-          // eslint-disable-next-line n/handle-callback-err
           fs.open(filename, 'r', (err) => {
             expectOneSpan(agent, done, {
               resource: 'open',
@@ -242,7 +241,6 @@ describe('Plugin', () => {
 
           it('should handle errors', (done) => {
             const filename = path.join(__filename, Math.random().toString())
-            // eslint-disable-next-line n/handle-callback-err
             fs.promises.open(filename, 'r').catch((err) => {
               expectOneSpan(agent, done, {
                 resource: 'promises.open',
@@ -1366,7 +1364,6 @@ describe('Plugin', () => {
               'file.path': __filename
             }
           })
-          // eslint-disable-next-line n/handle-callback-err
           // eslint-disable-next-line n/no-deprecated-api
           fs.exists(__filename, () => {})
         })
@@ -1962,7 +1959,6 @@ function testHandleErrors (fs, name, tested, args, agent) {
       if (err) reject(err)
       else resolve()
     }
-    // eslint-disable-next-line n/handle-callback-err
     tested(fs, args, null, err => {
       expectOneSpan(agent, done, {
         resource: name,

packages/datadog-plugin-http2/test/client.spec.js

@@ -534,7 +534,6 @@ describe('Plugin', () => {
             .catch(done)
 
           const client = http2.connect(`${protocol}://localhost:7357`)
-            // eslint-disable-next-line n/handle-callback-err
             .on('error', (err) => {})
 
           const req = client.request({ ':path': '/user' })

packages/datadog-plugin-mariadb/test/index.spec.js

@@ -67,7 +67,6 @@ describe('Plugin', () => {
           tracer.scope().activate(span, () => {
             const span = tracer.scope().active()
 
-            // eslint-disable-next-line n/handle-callback-err
             connection.query('SELECT 1 + 1 AS solution', (err, results, fields) => {
               try {
                 expect(results).to.not.be.null

packages/datadog-plugin-mysql/test/index.spec.js

@@ -47,7 +47,6 @@ describe('Plugin', () => {
 
           tracer.scope().activate(span, () => {
             const span = tracer.scope().active()
-            // eslint-disable-next-line n/handle-callback-err
             connection.query('SELECT 1 + 1 AS solution', (err, results, fields) => {
               expect(results).to.not.be.null
               expect(fields).to.not.be.null

packages/datadog-plugin-mysql2/test/index.spec.js

@@ -57,7 +57,6 @@ describe('Plugin', () => {
           tracer.scope().activate(span, () => {
             const span = tracer.scope().active()
 
-            // eslint-disable-next-line n/handle-callback-err
             connection.query('SELECT 1 + 1 AS solution', (err, results, fields) => {
               try {
                 expect(results).to.not.be.null

packages/datadog-plugin-next/test/server.js

@@ -5,7 +5,7 @@ const { PORT, HOSTNAME } = process.env
 const { createServer } = require('http')
 // eslint-disable-next-line n/no-deprecated-api
 const { parse } = require('url')
-const next = require('next') // eslint-disable-line import/no-extraneous-dependencies
+const next = require('next')
 
 const app = next({ dir: __dirname, dev: false, quiet: true, hostname: HOSTNAME, port: PORT })
 const handle = app.getRequestHandler()

packages/datadog-plugin-openai/src/tracing.js

@@ -15,7 +15,6 @@ let normalize
 
 function safeRequire (path) {
   try {
-    // eslint-disable-next-line import/no-extraneous-dependencies
     return require(path)
   } catch {
     return null

packages/datadog-plugin-router/test/index.spec.js

@@ -145,7 +145,6 @@ describe('Plugin', () => {
             }
           }, { rejectFirst: true })
 
-          // eslint-disable-next-line n/handle-callback-err
           const httpd = server(router, (req, res) => err => res.end()).listen(0, 'localhost')
           await once(httpd, 'listening')
           const port = httpd.address().port

packages/dd-trace/src/spanleak.js

@@ -83,7 +83,6 @@ module.exports.addSpan = function (span) {
 
   const now = Date.now()
   const expiration = now + LIFETIME
-  // eslint-disable-next-line no-undef
   const wrapped = new WeakRef(span)
   spans.add(wrapped, expiration)
   // registry.register(span, span._name)

packages/dd-trace/test/appsec/iast/analyzers/resources/fs-async-way-method.js

@@ -4,7 +4,6 @@ const fs = require('fs')
 
 module.exports = function (methodName, args, cb) {
   return new Promise((resolve, reject) => {
-    // eslint-disable-next-line n/handle-callback-err
     fs[methodName](...args, (err, res) => {
       resolve(cb(res))
     })

packages/dd-trace/test/appsec/iast/resources/eval.js

@@ -10,7 +10,6 @@ const app = express()
 const port = process.env.APP_PORT || 3000
 
 app.get('/eval', async (req, res) => {
-  // eslint-disable-next-line no-eval
   require('./eval-methods').runEval(req.query.code, 'test-result')
 
   res.end('OK')

packages/dd-trace/test/appsec/next/pages-dir/server.js

@@ -5,7 +5,7 @@ const { PORT, HOSTNAME } = process.env
 const { createServer } = require('http')
 // eslint-disable-next-line n/no-deprecated-api
 const { parse } = require('url')
-const next = require('next') // eslint-disable-line import/no-extraneous-dependencies
+const next = require('next')
 
 const app = next({ dir: __dirname, dev: false, quiet: true, hostname: HOSTNAME })
 const handle = app.getRequestHandler()

packages/dd-trace/test/ci-visibility/dynamic-instrumentation/target-app/di-dependency.js

@@ -1,7 +1,6 @@
 'use strict'
 
 module.exports = function (a, b) {
-  // eslint-disable-next-line no-console
   const localVar = 1
   if (a > 10) {
     throw new Error('a is too big')

packages/dd-trace/test/custom-metrics.spec.js

@@ -53,7 +53,6 @@ describe('Custom Metrics', () => {
       if (stdout) console.log(stdout)
       if (stderr) console.error(stderr)
 
-      // eslint-disable-next-line no-undef
       expect(metricsData.split('#')[0]).to.equal('page.views.data:1|c|')
 
       done()