chore(eslint): enable rules globally and fix violations (#7548)

watson · web-flow · commit 323fd0d6edea · 2026-02-17T16:11:53.000+01:00
* chore(eslint): enable rules globally and fix violations

The following rules now apply to all files (enabled in global config):

- `eslint-rules/eslint-safe-typeof-object`
- `no-implicit-coercion`
- `no-useless-assignment`
- `no-void`
- `operator-assignment`
- `prefer-exponentiation-operator`
- `prefer-object-has-own`
- `n/no-restricted-require` (using shared `GLOBAL_RESTRICTED_REQUIRES`)

Removed these from the `dd-trace/src/all` block to avoid duplication.

Fix tests and app code for the new global rules:

- Safe typeof checks
- Remove useless assignments
- Use `**` and template literals
- Use `filter.includes()` instead of `~indexOf`)
- Fix typo in vertexai test (`} if` → `} else if`).
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -41,6 +41,33 @@ const TEST_FILES = [
   '**/*.spec.js',
 ]
 
+const GLOBAL_RESTRICTED_REQUIRES = [
+  {
+    name: 'diagnostics_channel',
+    message: 'Please use `dc-polyfill` instead.',
+  },
+  {
+    name: 'get-port',
+    message: 'Please listen on port 0 instead.',
+  },
+  {
+    name: 'rimraf',
+    message: 'Please use `fs.rm(path, { recursive: true, force: true })` instead.',
+  },
+  {
+    name: 'koalas',
+    message: 'Please use nullish coalescing operator (??) instead.',
+  },
+  {
+    name: 'chai',
+    message: 'Please use `node:assert/strict` instead.',
+  },
+  {
+    name: 'tap',
+    message: 'Please use `mocha` instead.',
+  },
+]
+
 export default [
   {
     name: 'dd-trace/global-ignore',
@@ -381,17 +408,18 @@ export default [
         importAttributes: 'always-multiline',
         dynamicImports: 'always-multiline',
       }],
+      'eslint-rules/eslint-safe-typeof-object': 'error',
       'eslint-rules/eslint-require-export-exists': 'error',
       'import/no-extraneous-dependencies': 'error',
+      'n/hashbang': 'off', // TODO: Enable this rule once we have a plan to address it
       'n/no-extraneous-require': ['error', {
         allowModules: Object.keys(dependencies),
       }],
+      'n/no-process-exit': 'off', // TODO: Enable this rule once we have a plan to address it
+      'n/no-restricted-require': ['error', GLOBAL_RESTRICTED_REQUIRES],
       'n/no-unpublished-require': ['error', {
         allowModules: Object.keys(dependencies),
       }],
-      'n/no-restricted-require': ['error', ['diagnostics_channel']],
-      'n/hashbang': 'off', // TODO: Enable this rule once we have a plan to address it
-      'n/no-process-exit': 'off', // TODO: Enable this rule once we have a plan to address it
       'n/no-unsupported-features/node-builtins': ['error', {
         ignores: [
           'Request',
@@ -404,8 +432,14 @@ export default [
         ],
       }],
       'no-console': 'error',
+      'no-implicit-coercion': ['error', { boolean: true, number: true, string: true, allow: ['!!'] }],
       'no-prototype-builtins': 'off', // Override (turned on by @eslint/js/recommended)
+      'no-useless-assignment': 'error',
       'no-var': 'error',
+      'no-void': ['error', { allowAsStatement: true }],
+      'operator-assignment': 'error',
+      'prefer-exponentiation-operator': 'error',
+      'prefer-object-has-own': 'error',
       'prefer-object-spread': 'error',
       'require-await': 'error',
       strict: 'error',
@@ -420,48 +454,19 @@ export default [
     rules: {
       'eslint-rules/eslint-process-env': 'error',
       'eslint-rules/eslint-env-aliases': 'error',
-      'eslint-rules/eslint-safe-typeof-object': 'error',
       'eslint-rules/eslint-log-printf-style': 'error',
+
       'n/no-restricted-require': ['error', [
-        {
-          name: 'diagnostics_channel',
-          message: 'Please use `dc-polyfill` instead.',
-        },
+        ...GLOBAL_RESTRICTED_REQUIRES,
         {
           name: 'semver',
           message: 'Please use `semifies` instead.',
         },
-        {
-          name: 'get-port',
-          message: 'Please listen on port 0 instead.',
-        },
-        {
-          name: 'rimraf',
-          message: 'Please use `fs.rm(path, { recursive: true, force: true })` instead.',
-        },
-        {
-          name: 'koalas',
-          message: 'Please use nullish coalescing operator (??) instead.',
-        },
-        {
-          name: 'chai',
-          message: 'Please use `node:assert/strict` instead.',
-        },
-        {
-          name: 'tap',
-          message: 'Please use `mocha` instead.',
-        },
       ]],
 
       'no-await-in-loop': 'error',
       'no-else-return': ['error', { allowElseIf: true }],
-      'no-implicit-coercion': ['error', { boolean: true, number: true, string: true, allow: ['!!'] }],
       'no-unused-expressions': 'error',
-      'no-useless-assignment': 'error',
-      'no-void': ['error', { allowAsStatement: true }],
-      'operator-assignment': 'error',
-      'prefer-exponentiation-operator': 'error',
-      'prefer-object-has-own': 'error',
 
       // Too strict for now. Slowly migrate to this rule by using rest parameters.
       // 'prefer-rest-params': 'error',
diff --git a/packages/datadog-plugin-ai/test/index.spec.js b/packages/datadog-plugin-ai/test/index.spec.js
@@ -490,7 +490,7 @@ describe('Plugin', () => {
       })
 
       let tools
-      let maxStepsArg = {}
+      let maxStepsArg
       const toolSchema = ai.jsonSchema({
         type: 'object',
         properties: {
diff --git a/packages/datadog-plugin-google-cloud-pubsub/test/index.spec.js b/packages/datadog-plugin-google-cloud-pubsub/test/index.spec.js
@@ -602,7 +602,7 @@ describe('Plugin', () => {
           prefixedResource = resource
         }
 
-        let defaultOpName = 'pubsub.receive'
+        let defaultOpName
         if (spanKind === 'consumer') {
           defaultOpName = expectedSchema.receive.opName
         } else if (spanKind === 'producer') {
diff --git a/packages/datadog-plugin-google-cloud-vertexai/test/index.spec.js b/packages/datadog-plugin-google-cloud-vertexai/test/index.spec.js
@@ -29,7 +29,7 @@ function useScenario ({ scenario, statusCode = 200, stream = false }) {
 
       if (statusCode !== 200) {
         body = '{}'
-      } if (stream) {
+      } else if (stream) {
         body = fs.createReadStream(path.join(__dirname, 'resources', `${scenario}.txt`))
       } else {
         const contents = require(`./resources/${scenario}.json`)
diff --git a/packages/datadog-plugin-next/test/app/api/appDir/error/route.js b/packages/datadog-plugin-next/test/app/api/appDir/error/route.js
@@ -1,13 +1,7 @@
 import { NextResponse } from 'next/server'
 
 export async function GET (req) {
-  let status = 200
-  try {
-    throw new Error('error in app dir api route')
-  } catch (error) {
-    req.error = error
-    status = 500
-  }
+  req.error = new Error('error in app dir api route')
 
-  return NextResponse.json({}, { status })
+  return NextResponse.json({}, { status: 500 })
 }
diff --git a/packages/dd-trace/test/appsec/iast/analyzers/code-injection-analyzer.express.plugin.spec.js b/packages/dd-trace/test/appsec/iast/analyzers/code-injection-analyzer.express.plugin.spec.js
@@ -73,7 +73,7 @@ describe('Code injection vulnerability', () => {
 
           testThatRequestHasNoVulnerability({
             fn: (req, res) => {
-              res.send('' + require(evalFunctionsPath).runFakeEval(req.query.script))
+              res.send(`${require(evalFunctionsPath).runFakeEval(req.query.script)}`)
             },
             vulnerability: 'CODE_INJECTION',
             makeRequest: (done, config) => {
@@ -82,7 +82,7 @@ describe('Code injection vulnerability', () => {
           })
 
           testThatRequestHasNoVulnerability((req, res) => {
-            res.send('' + require(evalFunctionsPath).runEval('1 + 2'))
+            res.send(`${require(evalFunctionsPath).runEval('1 + 2')}`)
           }, 'CODE_INJECTION')
         })
     })
diff --git a/packages/dd-trace/test/appsec/iast/taint-tracking/plugin.spec.js b/packages/dd-trace/test/appsec/iast/taint-tracking/plugin.spec.js
@@ -54,25 +54,29 @@ describe('IAST Taint tracking plugin', () => {
   })
 
   it('Should subscribe to body parser, qs, cookie and process_params channel', () => {
-    assert.strictEqual(taintTrackingPlugin._subscriptions.length, 17)
-    let i = 0
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'datadog:body-parser:read:finish')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'datadog:multer:read:finish')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'datadog:fastify:body-parser:finish')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'apm:express:middleware:next')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'datadog:query:read:finish')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'datadog:fastify:query-params:finish')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'datadog:express:query:finish')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'datadog:cookie:parse:finish')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'datadog:fastify-cookie:read:finish')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'datadog:sequelize:query:finish')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'apm:pg:query:finish')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'datadog:express:process_params:start')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'datadog:router:param:start')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'datadog:fastify:path-params:finish')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'apm:graphql:resolve:start')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'datadog:url:parse:finish')
-    assert.strictEqual(taintTrackingPlugin._subscriptions[i++]._channel.name, 'datadog:url:getter:finish')
+    const expectedChannels = [
+      'datadog:body-parser:read:finish',
+      'datadog:multer:read:finish',
+      'datadog:fastify:body-parser:finish',
+      'apm:express:middleware:next',
+      'datadog:query:read:finish',
+      'datadog:fastify:query-params:finish',
+      'datadog:express:query:finish',
+      'datadog:cookie:parse:finish',
+      'datadog:fastify-cookie:read:finish',
+      'datadog:sequelize:query:finish',
+      'apm:pg:query:finish',
+      'datadog:express:process_params:start',
+      'datadog:router:param:start',
+      'datadog:fastify:path-params:finish',
+      'apm:graphql:resolve:start',
+      'datadog:url:parse:finish',
+      'datadog:url:getter:finish',
+    ]
+    assert.strictEqual(taintTrackingPlugin._subscriptions.length, expectedChannels.length)
+    for (let i = 0; i < expectedChannels.length; i++) {
+      assert.strictEqual(taintTrackingPlugin._subscriptions[i]._channel.name, expectedChannels[i])
+    }
   })
 
   describe('taint sources', () => {
diff --git a/packages/dd-trace/test/appsec/iast/utils.js b/packages/dd-trace/test/appsec/iast/utils.js
@@ -201,8 +201,8 @@ function checkVulnerabilityInRequest (
       assert.notStrictEqual(vulnerabilitiesTrace, null)
       const vulnerabilitiesCount = new Map()
       vulnerabilitiesTrace.vulnerabilities.forEach(v => {
-        let count = vulnerabilitiesCount.get(v.type) || 0
-        vulnerabilitiesCount.set(v.type, ++count)
+        const count = (vulnerabilitiesCount.get(v.type) || 0) + 1
+        vulnerabilitiesCount.set(v.type, count)
       })
 
       assert.ok(((vulnerabilitiesCount.get(vulnerability)) > (0)))
diff --git a/packages/dd-trace/test/llmobs/plugins/ai/index.spec.js b/packages/dd-trace/test/llmobs/plugins/ai/index.spec.js
@@ -350,7 +350,7 @@ describe('Plugin', () => {
 
     it('creates a span for a tool call', async () => {
       let tools
-      let additionalOptions = {}
+      let additionalOptions
       const toolSchema = ai.jsonSchema({
         type: 'object',
         properties: {
@@ -495,7 +495,7 @@ describe('Plugin', () => {
 
     it('created a span for a tool call from a stream', async () => {
       let tools
-      let additionalOptions = {}
+      let additionalOptions
       const toolSchema = ai.jsonSchema({
         type: 'object',
         properties: {
diff --git a/packages/dd-trace/test/opentelemetry/logs.spec.js b/packages/dd-trace/test/opentelemetry/logs.spec.js
@@ -380,7 +380,7 @@ describe('OpenTelemetry Logs', () => {
 
         // Integer body (protobuf returns Long objects for int64)
         const intValue = logRecords[1].body.intValue
-        assert.strictEqual(typeof intValue === 'object' ? intValue.toNumber() : intValue, 42)
+        assert.strictEqual(intValue !== null && typeof intValue === 'object' ? intValue.toNumber() : intValue, 42)
 
         // Double/float body
         assert(logRecords[2].body.doubleValue !== undefined)
@@ -396,7 +396,7 @@ describe('OpenTelemetry Logs', () => {
         assert.strictEqual(logRecords[4].body.kvlistValue.values[0].value.stringValue, 'bar')
         assert.strictEqual(logRecords[4].body.kvlistValue.values[1].key, 'baz')
         const bazValue = logRecords[4].body.kvlistValue.values[1].value.intValue
-        assert.strictEqual(typeof bazValue === 'object' ? bazValue.toNumber() : bazValue, 123)
+        assert.strictEqual(bazValue !== null && typeof bazValue === 'object' ? bazValue.toNumber() : bazValue, 123)
 
         // Default case (symbol) - should convert to string
         assert.strictEqual(logRecords[5].body.stringValue, 'Symbol(test)')
diff --git a/packages/dd-trace/test/plugins/plugin-structure.spec.js b/packages/dd-trace/test/plugins/plugin-structure.spec.js
@@ -153,7 +153,7 @@ describe('Plugin Structure Validation', () => {
 
     for (const hook of Object.values(hooks)) {
       let hookFn = hook
-      if (typeof hook === 'object' && hook.fn) {
+      if (hook !== null && typeof hook === 'object' && hook.fn) {
         hookFn = hook.fn
       }
       const hookString = hookFn.toString()
diff --git a/packages/dd-trace/test/profiling/exporters/agent.spec.js b/packages/dd-trace/test/profiling/exporters/agent.spec.js
@@ -296,7 +296,7 @@ describe('exporters/agent', function () {
         assert.strictEqual(Number.isInteger(call.args[0].timeout), true)
 
         // Retry is 1-indexed so add 1 to i
-        assert.strictEqual(call.args[0].timeout, initialTimeout * Math.pow(2, i + 1))
+        assert.strictEqual(call.args[0].timeout, initialTimeout * 2 ** (i + 1))
       }
     })
 
diff --git a/packages/dd-trace/test/profiling/profilers/poisson.spec.js b/packages/dd-trace/test/profiling/profilers/poisson.spec.js
@@ -181,7 +181,7 @@ describe('PoissonProcessSamplingFilter', () => {
     const initialCount = filter.samplingInstantCount
     for (let i = 0; i < 5; i++) {
       nowValue += 20
-      const event = { startTime: 0, duration: filter.nextSamplingInstant - 0 }
+      const event = { startTime: 0, duration: filter.nextSamplingInstant }
       filter.filter(event)
     }
     assert.ok(filter.samplingInstantCount > initialCount)
diff --git a/packages/dd-trace/test/setup/services.js b/packages/dd-trace/test/setup/services.js
@@ -16,7 +16,7 @@ function waitForServices () {
 
   if (process.env.SERVICES !== '*') {
     const filter = process.env.SERVICES.split('|')
-    names = names.filter(name => ~filter.indexOf(name))
+    names = names.filter(name => filter.includes(name))
   }
 
   const promises = names

Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ describe('Plugin', () => {`
`602`	`602`	`prefixedResource = resource`
`603`	`603`	`}`
`604`	`604`
`605`		`- let defaultOpName = 'pubsub.receive'`
	`605`	`+ let defaultOpName`
`606`	`606`	`if (spanKind === 'consumer') {`
`607`	`607`	`defaultOpName = expectedSchema.receive.opName`
`608`	`608`	`} else if (spanKind === 'producer') {`