chore: update eslint-plugin-unicorn and fix related issues (#6836)

BridgeAR · web-flow · commit fe46784390e6 · 2025-11-04T14:55:46.000+01:00
As drive-by fix increase the minimum dependency versions in a few
cases.
diff --git a/package.json b/package.json
@@ -160,13 +160,13 @@
     "ttl-set": "^1.0.0"
   },
   "devDependencies": {
-    "@babel/helpers": "^7.27.6",
+    "@babel/helpers": "^7.28.4",
     "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.29.0",
+    "@eslint/js": "^9.39.0",
     "@msgpack/msgpack": "^3.1.2",
     "@openfeature/core": "^1.9.0",
     "@openfeature/server-sdk": "^1.20.0",
-    "@stylistic/eslint-plugin": "^5.0.0",
+    "@stylistic/eslint-plugin": "^5.5.0",
     "@types/chai": "^4.3.16",
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.106",
@@ -177,13 +177,13 @@
     "body-parser": "^2.2.0",
     "bun": "1.3.1",
     "chai": "^4.5.0",
-    "eslint": "^9.29.0",
-    "eslint-plugin-cypress": "^5.1.0",
+    "eslint": "^9.39.0",
+    "eslint-plugin-cypress": "^5.2.0",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-mocha": "^11.1.0",
-    "eslint-plugin-n": "^17.20.0",
+    "eslint-plugin-mocha": "^11.2.0",
+    "eslint-plugin-n": "^17.23.1",
     "eslint-plugin-promise": "^7.2.1",
-    "eslint-plugin-unicorn": "^61.0.2",
+    "eslint-plugin-unicorn": "^62.0.0",
     "express": "^5.1.0",
     "glob": "^10.4.5",
     "globals": "^16.3.0",
diff --git a/packages/datadog-plugin-grpc/src/util.js b/packages/datadog-plugin-grpc/src/util.js
@@ -3,6 +3,10 @@
 const pick = require('../../datadog-core/src/utils/src/pick')
 const log = require('../../dd-trace/src/log')
 
+function getEmptyObject () {
+  return {}
+}
+
 module.exports = {
   getMethodMetadata (path, kind) {
     const tags = {
@@ -57,6 +61,6 @@ module.exports = {
       log.error('Expected \'%s\' to be an array or function.', filter)
     }
 
-    return () => ({})
+    return getEmptyObject
   }
 }
diff --git a/packages/datadog-plugin-http/src/client.js b/packages/datadog-plugin-http/src/client.js
@@ -183,13 +183,17 @@ function normalizeClientConfig (config) {
   }
 }
 
+function is400ErrorCode (code) {
+  return code < 400 || code >= 500
+}
+
 function getStatusValidator (config) {
   if (typeof config.validateStatus === 'function') {
     return config.validateStatus
   } else if (config.hasOwnProperty('validateStatus')) {
     log.error('Expected `validateStatus` to be a function.')
   }
-  return code => code < 400 || code >= 500
+  return is400ErrorCode
 }
 
 function getFilter (config) {
diff --git a/packages/datadog-plugin-http2/src/client.js b/packages/datadog-plugin-http2/src/client.js
@@ -162,13 +162,17 @@ function hasAmazonSignature (headers, path) {
   return false
 }
 
+function is400ErrorCode (code) {
+  return code < 400 || code >= 500
+}
+
 function getStatusValidator (config) {
   if (typeof config.validateStatus === 'function') {
     return config.validateStatus
   } else if (config.hasOwnProperty('validateStatus')) {
     log.error('Expected `validateStatus` to be a function.')
   }
-  return code => code < 400 || code >= 500
+  return is400ErrorCode
 }
 
 function normalizeConfig (config) {
diff --git a/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/utils.js b/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/utils.js
@@ -8,8 +8,8 @@ const STRINGIFY_SENSITIVE_KEY = STRINGIFY_RANGE_KEY + 'SENSITIVE'
 const STRINGIFY_SENSITIVE_NOT_STRING_KEY = STRINGIFY_SENSITIVE_KEY + 'NOTSTRING'
 
 // eslint-disable-next-line @stylistic/max-len
-const KEYS_REGEX_WITH_SENSITIVE_RANGES = new RegExp(`(?:"(${STRINGIFY_RANGE_KEY}_\\d+_))|(?:"(${STRINGIFY_SENSITIVE_KEY}_\\d+_(\\d+)_))|("${STRINGIFY_SENSITIVE_NOT_STRING_KEY}_\\d+_([\\s0-9.a-zA-Z]*)")`, 'gm')
-const KEYS_REGEX_WITHOUT_SENSITIVE_RANGES = new RegExp(`"(${STRINGIFY_RANGE_KEY}_\\d+_)`, 'gm')
+const KEYS_REGEX_WITH_SENSITIVE_RANGES = new RegExp(String.raw`(?:"(${STRINGIFY_RANGE_KEY}_\d+_))|(?:"(${STRINGIFY_SENSITIVE_KEY}_\d+_(\d+)_))|("${STRINGIFY_SENSITIVE_NOT_STRING_KEY}_\d+_([\s0-9.a-zA-Z]*)")`, 'gm')
+const KEYS_REGEX_WITHOUT_SENSITIVE_RANGES = new RegExp(String.raw`"(${STRINGIFY_RANGE_KEY}_\d+_)`, 'gm')
 
 const sensitiveValueRegex = new RegExp(DEFAULT_IAST_REDACTION_VALUE_PATTERN, 'gmi')
 
diff --git a/packages/dd-trace/src/appsec/iast/vulnerability-reporter.js b/packages/dd-trace/src/appsec/iast/vulnerability-reporter.js
@@ -84,9 +84,10 @@ function sendVulnerabilities (vulnerabilities, span) {
     const jsonToSend = vulnerabilitiesFormatter.toJson(validatedVulnerabilities)
 
     if (jsonToSend.vulnerabilities.length > 0) {
-      const tags = {}
-      // TODO: Store this outside of the span and set the tag in the exporter.
-      tags[IAST_JSON_TAG_KEY] = JSON.stringify(jsonToSend)
+      const tags = {
+        // TODO: Store this outside of the span and set the tag in the exporter.
+        [IAST_JSON_TAG_KEY]: JSON.stringify(jsonToSend)
+      }
       span.addTags(tags)
     }
   }
diff --git a/packages/dd-trace/src/debugger/devtools_client/snapshot/index.js b/packages/dd-trace/src/debugger/devtools_client/snapshot/index.js
@@ -13,6 +13,10 @@ module.exports = {
   getLocalStateForCallFrame
 }
 
+function returnError () {
+  return new Error('Error getting local state')
+}
+
 async function getLocalStateForCallFrame (
   callFrame,
   {
@@ -37,7 +41,7 @@ async function getLocalStateForCallFrame (
     // TODO: We might be able to get part of the scope chain.
     // Consider if we could set errors just for the part of the scope chain that throws during collection.
     log.error('[debugger:devtools_client] Error getting local state for call frame', err)
-    return () => new Error('Error getting local state')
+    return returnError
   }
 
   // Delay calling `processRawState` so the caller gets a chance to resume the main thread before processing `rawState`
diff --git a/packages/dd-trace/src/exporters/common/docker.js b/packages/dd-trace/src/exporters/common/docker.js
@@ -12,7 +12,7 @@ const uuidSource =
 const containerSource = '[0-9a-f]{64}'
 const taskSource = String.raw`[0-9a-f]{32}-\d+`
 const lineReg = /^(\d+):([^:]*):(.+)$/m
-const entityReg = new RegExp(`.*(${uuidSource}|${containerSource}|${taskSource})(?:\\.scope)?$`, 'm')
+const entityReg = new RegExp(String.raw`.*(${uuidSource}|${containerSource}|${taskSource})(?:\.scope)?$`, 'm')
 
 let inode = 0
 let cgroup = ''
diff --git a/packages/dd-trace/src/exporters/span-stats/writer.js b/packages/dd-trace/src/exporters/span-stats/writer.js
@@ -36,13 +36,12 @@ function makeRequest (data, url, cb) {
       'Datadog-Meta-Lang': 'javascript',
       'Datadog-Meta-Tracer-Version': pkg.version,
       'Content-Type': 'application/msgpack'
-    }
+    },
+    protocol: url.protocol,
+    hostname: url.hostname,
+    port: url.port
   }
 
-  options.protocol = url.protocol
-  options.hostname = url.hostname
-  options.port = url.port
-
   log.debug('Request to the intake: %j', options)
 
   request(data, options, (err, res) => {
diff --git a/packages/dd-trace/src/llmobs/plugins/anthropic.js b/packages/dd-trace/src/llmobs/plugins/anthropic.js
@@ -242,12 +242,9 @@ class AnthropicLLMObsPlugin extends LLMObsPlugin {
     const cacheWriteTokens = usage.cache_creation_input_tokens
     const cacheReadTokens = usage.cache_read_input_tokens
 
-    const metrics = {}
-
-    metrics.inputTokens =
-      (inputTokens ?? 0) +
-      (cacheWriteTokens ?? 0) +
-      (cacheReadTokens ?? 0)
+    const metrics = {
+      inputTokens: (inputTokens ?? 0) + (cacheWriteTokens ?? 0) + (cacheReadTokens ?? 0)
+    }
 
     if (outputTokens) metrics.outputTokens = outputTokens
     const totalTokens = metrics.inputTokens + (outputTokens ?? 0)
diff --git a/packages/dd-trace/src/llmobs/plugins/langchain/handlers/index.js b/packages/dd-trace/src/llmobs/plugins/langchain/handlers/index.js
@@ -37,8 +37,9 @@ class LangChainLLMObsHandler {
       return message
     }
     try {
-      const messageContent = {}
-      messageContent.content = message.content || ''
+      const messageContent = {
+        content: message.content || ''
+      }
 
       const role = this.getRole(message)
       if (role) messageContent.role = role
diff --git a/packages/dd-trace/src/llmobs/span_processor.js b/packages/dd-trace/src/llmobs/span_processor.js
@@ -203,8 +203,8 @@ class LLMObsSpanProcessor {
   // This function can be reused for other fields if needed
   // Messages, Documents, and Metrics are safeguarded in `llmobs/tagger.js`
   #addObject (obj, carrier) {
-    const seenObjects = new WeakSet()
-    seenObjects.add(obj) // capture root object
+    // Capture root object by default
+    const seenObjects = new WeakSet([obj])
 
     const isCircular = value => {
       if (typeof value !== 'object') return false
diff --git a/packages/dd-trace/src/llmobs/util.js b/packages/dd-trace/src/llmobs/util.js
@@ -6,7 +6,7 @@ function encodeUnicode (str = '') {
   let result = ''
   for (let i = 0; i < str.length; i++) {
     const code = str.charCodeAt(i)
-    result += code > 127 ? `\\u${code.toString(16).padStart(4, '0')}` : str[i]
+    result += code > 127 ? String.raw`\u${code.toString(16).padStart(4, '0')}` : str[i]
   }
   return result
 }
diff --git a/packages/dd-trace/src/plugins/util/serverless.js b/packages/dd-trace/src/plugins/util/serverless.js
@@ -3,7 +3,6 @@
 const types = require('../../../../../ext/types')
 const web = require('./web')
 
-const serverless = { ...web }
-serverless.TYPE = types.SERVERLESS
+const serverless = { ...web, TYPE: types.SERVERLESS }
 
 module.exports = serverless
diff --git a/packages/dd-trace/src/plugins/util/web.js b/packages/dd-trace/src/plugins/util/web.js
@@ -577,13 +577,17 @@ function getHeadersToRecord (config) {
   return []
 }
 
+function isNot500ErrorCode (code) {
+  return code < 500
+}
+
 function getStatusValidator (config) {
   if (typeof config.validateStatus === 'function') {
     return config.validateStatus
   } else if (config.hasOwnProperty('validateStatus')) {
     log.error('Expected `validateStatus` to be a function.')
   }
-  return code => code < 500
+  return isNot500ErrorCode
 }
 
 const noop = () => {}
diff --git a/packages/dd-trace/src/startup-log.js b/packages/dd-trace/src/startup-log.js
@@ -10,18 +10,10 @@ const tracerVersion = require('../../../package.json').version
 const errors = {}
 let config
 let pluginManager
+/** @type {import('./sampling_rule')[]} */
 let samplingRules = []
 let alreadyRan = false
 
-/**
- * @returns {Record<string, unknown>}
- */
-function getIntegrationsAndAnalytics () {
-  return {
-    integrations_loaded: Object.keys(pluginManager._pluginsByName)
-  }
-}
-
 /**
  * @param {{ agentError: { code: string, message: string } }} [options]
  */
@@ -70,36 +62,30 @@ function tracerInfo () {
       return JSON.stringify(this, (_key_, value) => {
         return typeof value === 'bigint' || typeof value === 'symbol' ? String(value) : value
       })
-    }
-  }
-
-  out.date = new Date().toISOString()
-  out.os_name = os.type()
-  out.os_version = os.release()
-  out.architecture = os.arch()
-  out.version = tracerVersion
-  out.lang = 'nodejs'
-  out.lang_version = process.versions.node
-  out.env = config.env
-  out.enabled = config.enabled
-  out.service = config.service
-  out.agent_url = url
-  out.debug = !!config.debug
-  out.sample_rate = config.sampler.sampleRate
-  out.sampling_rules = samplingRules
-  out.tags = config.tags
-  if (config.tags && config.tags.version) {
-    out.dd_version = config.tags.version
+    },
+    date: new Date().toISOString(),
+    os_name: os.type(),
+    os_version: os.release(),
+    architecture: os.arch(),
+    version: tracerVersion,
+    lang: 'nodejs',
+    lang_version: process.versions.node,
+    env: config.env,
+    enabled: config.enabled,
+    service: config.service,
+    agent_url: url,
+    debug: !!config.debug,
+    sample_rate: config.sampler.sampleRate,
+    sampling_rules: samplingRules,
+    tags: config.tags,
+    ...(config.tags && config.tags.version && { dd_version: config.tags.version }),
+    log_injection_enabled: !!config.logInjection,
+    runtime_metrics_enabled: !!config.runtimeMetrics,
+    profiling_enabled: config.profiling?.enabled === 'true' || config.profiling?.enabled === 'auto',
+    integrations_loaded: Object.keys(pluginManager._pluginsByName),
+    appsec_enabled: !!config.appsec.enabled,
   }
 
-  out.log_injection_enabled = !!config.logInjection
-  out.runtime_metrics_enabled = !!config.runtimeMetrics
-  const profilingEnabled = config.profiling?.enabled
-  out.profiling_enabled = profilingEnabled === 'true' || profilingEnabled === 'auto'
-  Object.assign(out, getIntegrationsAndAnalytics())
-
-  out.appsec_enabled = !!config.appsec.enabled
-
   return out
 }
 
@@ -118,7 +104,7 @@ function setStartupLogPluginManager (thePluginManager) {
 }
 
 /**
- * @param {import('./sampling_rule')} theRules
+ * @param {import('./sampling_rule')[]} theRules
  */
 function setSamplingRules (theRules) {
   samplingRules = theRules
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,10 @@`
`3`	`3`	`const pick = require('../../datadog-core/src/utils/src/pick')`
`4`	`4`	`const log = require('../../dd-trace/src/log')`
`5`	`5`
	`6`	`+function getEmptyObject () {`
	`7`	`+ return {}`
	`8`	`+}`
	`9`	`+`
`6`	`10`	`module.exports = {`
`7`	`11`	`getMethodMetadata (path, kind) {`
`8`	`12`	`const tags = {`
`@@ -57,6 +61,6 @@ module.exports = {`
`57`	`61`	`log.error('Expected \'%s\' to be an array or function.', filter)`
`58`	`62`	`}`
`59`	`63`
`60`		`- return () => ({})`
	`64`	`+ return getEmptyObject`
`61`	`65`	`}`
`62`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -183,13 +183,17 @@ function normalizeClientConfig (config) {`
`183`	`183`	`}`
`184`	`184`	`}`
`185`	`185`
	`186`	`+function is400ErrorCode (code) {`
	`187`	`+ return code < 400 \|\| code >= 500`
	`188`	`+}`
	`189`	`+`
`186`	`190`	`function getStatusValidator (config) {`
`187`	`191`	`if (typeof config.validateStatus === 'function') {`
`188`	`192`	`return config.validateStatus`
`189`	`193`	`} else if (config.hasOwnProperty('validateStatus')) {`
`190`	`194`	log.error('Expected `validateStatus` to be a function.')
`191`	`195`	`}`
`192`		`- return code => code < 400 \|\| code >= 500`
	`196`	`+ return is400ErrorCode`
`193`	`197`	`}`
`194`	`198`
`195`	`199`	`function getFilter (config) {`
Original file line number	Diff line number	Diff line change
`@@ -162,13 +162,17 @@ function hasAmazonSignature (headers, path) {`
`162`	`162`	`return false`
`163`	`163`	`}`
`164`	`164`
	`165`	`+function is400ErrorCode (code) {`
	`166`	`+ return code < 400 \|\| code >= 500`
	`167`	`+}`
	`168`	`+`
`165`	`169`	`function getStatusValidator (config) {`
`166`	`170`	`if (typeof config.validateStatus === 'function') {`
`167`	`171`	`return config.validateStatus`
`168`	`172`	`} else if (config.hasOwnProperty('validateStatus')) {`
`169`	`173`	log.error('Expected `validateStatus` to be a function.')
`170`	`174`	`}`
`171`		`- return code => code < 400 \|\| code >= 500`
	`175`	`+ return is400ErrorCode`
`172`	`176`	`}`
`173`	`177`
`174`	`178`	`function normalizeConfig (config) {`
Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,10 @@ function sendVulnerabilities (vulnerabilities, span) {`
`84`	`84`	`const jsonToSend = vulnerabilitiesFormatter.toJson(validatedVulnerabilities)`
`85`	`85`
`86`	`86`	`if (jsonToSend.vulnerabilities.length > 0) {`
`87`		`- const tags = {}`
`88`		`- // TODO: Store this outside of the span and set the tag in the exporter.`
`89`		`- tags[IAST_JSON_TAG_KEY] = JSON.stringify(jsonToSend)`
	`87`	`+ const tags = {`
	`88`	`+ // TODO: Store this outside of the span and set the tag in the exporter.`
	`89`	`+ [IAST_JSON_TAG_KEY]: JSON.stringify(jsonToSend)`
	`90`	`+ }`
`90`	`91`	`span.addTags(tags)`
`91`	`92`	`}`
`92`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,10 @@ module.exports = {`
`13`	`13`	`getLocalStateForCallFrame`
`14`	`14`	`}`
`15`	`15`
	`16`	`+function returnError () {`
	`17`	`+ return new Error('Error getting local state')`
	`18`	`+}`
	`19`	`+`
`16`	`20`	`async function getLocalStateForCallFrame (`
`17`	`21`	`callFrame,`
`18`	`22`	`{`
`@@ -37,7 +41,7 @@ async function getLocalStateForCallFrame (`
`37`	`41`	`// TODO: We might be able to get part of the scope chain.`
`38`	`42`	`// Consider if we could set errors just for the part of the scope chain that throws during collection.`
`39`	`43`	`log.error('[debugger:devtools_client] Error getting local state for call frame', err)`
`40`		`- return () => new Error('Error getting local state')`
	`44`	`+ return returnError`
`41`	`45`	`}`
`42`	`46`
`43`	`47`	// Delay calling `processRawState` so the caller gets a chance to resume the main thread before processing `rawState`