dd-trace 5.54.0 → 5.55.0

package/packages/datadog-plugin-aws-sdk/src/services/sqs.js

@@ -27,11 +27,10 @@ class Sqs extends BaseAwsSdkPlugin {
         obj.needsFinish = true
         const options = {
           childOf: contextExtraction.datadogContext,
-          tags: Object.assign(
-            {},
-            this.requestTags.get(request) || {},
-            { 'span.kind': 'server' }
-          )
+          tags: {
+            ...this.requestTags.get(request),
+            'span.kind': 'server'
+          }
         }
         parsedMessageAttributes = contextExtraction.parsedAttributes
         span = this.tracer.startSpan('aws.response', options)
@@ -89,20 +88,18 @@ class Sqs extends BaseAwsSdkPlugin {
   }
 
   generateTags (params, operation, response) {
-    const tags = {}
-
-    if (!params || (!params.QueueName && !params.QueueUrl)) return tags
+    if (!params || (!params.QueueName && !params.QueueUrl)) return {}
     // 'https://sqs.us-east-1.amazonaws.com/123456789012/my-queue';
     let queueName = params.QueueName
     if (params.QueueUrl) {
       queueName = params.QueueUrl.split('/').at(-1)
     }
 
-    Object.assign(tags, {
+    const tags = {
       'resource.name': `${operation} ${params.QueueName || params.QueueUrl}`,
       'aws.sqs.queue_name': params.QueueName || params.QueueUrl,
       queuename: queueName
-    })
+    }
 
     switch (operation) {
       case 'receiveMessage':

package/packages/datadog-plugin-cucumber/src/index.js

@@ -2,6 +2,7 @@
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 const {
   TEST_SKIP_REASON,
@@ -58,7 +59,7 @@ const id = require('../../dd-trace/src/id')
 
 const BREAKPOINT_HIT_GRACE_PERIOD_MS = 200
 const BREAKPOINT_SET_GRACE_PERIOD_MS = 200
-const isCucumberWorker = !!process.env.CUCUMBER_WORKER_ID
+const isCucumberWorker = !!getEnvironmentVariable('CUCUMBER_WORKER_ID')
 
 function getTestSuiteTags (testSuiteSpan) {
   const suiteTags = {
@@ -134,7 +135,7 @@ class CucumberPlugin extends CiPlugin {
       finishAllTraceSpans(this.testSessionSpan)
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
 
       this.libraryConfig = null

package/packages/datadog-plugin-cypress/src/cypress-plugin.js

@@ -49,6 +49,7 @@ const {
 } = require('../../dd-trace/src/plugins/util/test')
 const { isMarkedAsUnskippable } = require('../../datadog-plugin-jest/src/util')
 const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 const { appClosing: appClosingTelemetry } = require('../../dd-trace/src/telemetry')
 const log = require('../../dd-trace/src/log')
 
@@ -615,7 +616,7 @@ class CypressPlugin {
       this.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
       incrementCountMetric(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
 
       finishAllTraceSpans(this.testSessionSpan)

package/packages/datadog-plugin-dd-trace-api/src/index.js

@@ -3,12 +3,13 @@
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 const telemetryMetrics = require('../../dd-trace/src/telemetry/metrics')
 const apiMetrics = telemetryMetrics.manager.namespace('tracers')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 // api ==> here
 const objectMap = new WeakMap()
 
 const injectionEnabledTag =
-  `injection_enabled:${process.env.DD_INJECTION_ENABLED ? 'yes' : 'no'}`
+  `injection_enabled:${getEnvironmentVariable('DD_INJECTION_ENABLED') ? 'yes' : 'no'}`
 
 module.exports = class DdTraceApiPlugin extends Plugin {
   static get id () {

package/packages/datadog-plugin-elasticsearch/src/index.js

@@ -35,7 +35,7 @@ function getBody (body) {
 }
 
 function quantizePath (path) {
-  return path && path.replace(/[0-9]+/g, '?')
+  return path && path.replaceAll(/[0-9]+/g, '?')
 }
 
 module.exports = ElasticsearchPlugin

package/packages/datadog-plugin-google-cloud-vertexai/src/tracing.js

@@ -82,7 +82,7 @@ class GoogleCloudVertexAITracingPlugin extends TracingPlugin {
 
     const generationConfig = instance.generationConfig || {}
     for (const key of Object.keys(generationConfig)) {
-      const transformedKey = key.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase()
+      const transformedKey = key.replaceAll(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase()
       tags[`vertexai.request.generation_config.${transformedKey}`] = JSON.stringify(generationConfig[key])
     }
 

package/packages/datadog-plugin-graphql/src/index.js

@@ -27,12 +27,13 @@ class GraphQLPlugin extends CompositePlugin {
 // config validator helpers
 
 function validateConfig (config) {
-  return Object.assign({}, config, {
+  return {
+    ...config,
     depth: getDepth(config),
     variables: getVariablesFilter(config),
     collapse: config.collapse === undefined || !!config.collapse,
     hooks: getHooks(config)
-  })
+  }
 }
 
 function getDepth (config) {

package/packages/datadog-plugin-graphql/src/resolve.js

@@ -16,13 +16,14 @@ class GraphQLResolvePlugin extends TracingPlugin {
     const computedPathString = path.join('.')
 
     if (this.config.collapse) {
+      if (context.fields[computedPathString]) return
+
       if (!context[collapsedPathSym]) {
         context[collapsedPathSym] = {}
+      } else if (context[collapsedPathSym][computedPathString]) {
+        return
       }
 
-      if (context.fields[computedPathString]) return
-      if (context[collapsedPathSym][computedPathString]) return
-
       context[collapsedPathSym][computedPathString] = true
     }
 
@@ -47,10 +48,9 @@ class GraphQLResolvePlugin extends TracingPlugin {
       const variables = this.config.variables(info.variableValues)
 
       fieldNode.arguments
-        .filter(arg => arg.value && arg.value.kind === 'Variable')
-        .filter(arg => arg.value.name && variables[arg.value.name.value])
-        .map(arg => arg.value.name.value)
-        .forEach(name => {
+        .filter(arg => arg.value?.name && arg.value.kind === 'Variable' && variables[arg.value.name.value])
+        .forEach(arg => {
+          const name = arg.value.name.value
           span.setTag(`graphql.variables.${name}`, variables[name])
         })
     }
@@ -89,7 +89,12 @@ class GraphQLResolvePlugin extends TracingPlugin {
 // helpers
 
 function shouldInstrument (config, path) {
-  const depth = path.filter(item => typeof item === 'string').length
+  let depth = 0
+  for (const item of path) {
+    if (typeof item === 'string') {
+      depth += 1
+    }
+  }
 
   return config.depth < 0 || config.depth >= depth
 }
@@ -126,6 +131,7 @@ function getResolverInfo (info, args) {
     Object.assign(resolverVars, args)
   }
 
+  let hasResolvers = false
   const directives = info.fieldNodes?.[0]?.directives
   if (Array.isArray(directives)) {
     for (const directive of directives) {
@@ -134,13 +140,14 @@ function getResolverInfo (info, args) {
         argList[argument.name.value] = argument.value.value
       }
 
-      if (Object.keys(argList).length) {
+      if (directive.arguments.length > 0) {
+        hasResolvers = true
         resolverVars[directive.name.value] = argList
       }
     }
   }
 
-  if (Object.keys(resolverVars).length) {
+  if (hasResolvers || args && Object.keys(resolverVars).length) {
     resolverInfo = { [info.fieldName]: resolverVars }
   }
 

package/packages/datadog-plugin-http/src/client.js

@@ -63,7 +63,7 @@ class HttpClientPlugin extends ClientPlugin {
       // Implemented due to aws-sdk issue where request signing is broken if we mutate the headers
       // Explained further in:
       // https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1609#issuecomment-1826167348
-      options.headers = Object.assign({}, options.headers)
+      options.headers = { ...options.headers }
       this.tracer.inject(span, HTTP_HEADERS, options.headers)
     }
 
@@ -173,13 +173,14 @@ function normalizeClientConfig (config) {
   const headers = getHeaders(config)
   const hooks = getHooks(config)
 
-  return Object.assign({}, config, {
+  return {
+    ...config,
     validateStatus,
     filter,
     propagationFilter,
     headers,
     hooks
-  })
+  }
 }
 
 function getStatusValidator (config) {
@@ -192,9 +193,7 @@ function getStatusValidator (config) {
 }
 
 function getFilter (config) {
-  config = Object.assign({}, config, {
-    blocklist: config.blocklist || []
-  })
+  config = { ...config, blocklist: config.blocklist || [] }
 
   return urlFilter.getFilter(config)
 }

package/packages/datadog-plugin-http2/src/client.js

@@ -124,9 +124,9 @@ function extractSessionDetails (authority, options) {
   }
 
   const protocol = authority.protocol || options.protocol || 'https:'
-  let port = '' + (authority.port === ''
-    ? (authority.protocol === 'http:' ? 80 : 443)
-    : authority.port)
+  let port = authority.port === ''
+    ? authority.protocol === 'http:' ? '80' : '443'
+    : String(authority.port)
   let host = authority.hostname || authority.host || 'localhost'
 
   if (protocol === 'https:' && options) {
@@ -174,17 +174,16 @@ function normalizeConfig (config) {
   const filter = getFilter(config)
   const headers = getHeaders(config)
 
-  return Object.assign({}, config, {
+  return {
+    ...config,
     validateStatus,
     filter,
     headers
-  })
+  }
 }
 
 function getFilter (config) {
-  config = Object.assign({}, config, {
-    blocklist: config.blocklist || []
-  })
+  config = { ...config, blocklist: config.blocklist || [] }
 
   return urlFilter.getFilter(config)
 }

package/packages/datadog-plugin-jest/src/index.js

@@ -1,5 +1,6 @@
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 const {
   TEST_STATUS,
@@ -48,7 +49,7 @@ const {
   TELEMETRY_TEST_SESSION
 } = require('../../dd-trace/src/ci-visibility/telemetry')
 
-const isJestWorker = !!process.env.JEST_WORKER_ID
+const isJestWorker = !!getEnvironmentVariable('JEST_WORKER_ID')
 
 // https://github.com/facebook/jest/blob/d6ad15b0f88a05816c2fe034dd6900d28315d570/packages/jest-worker/src/types.ts#L38
 const CHILD_MESSAGE_END = 2
@@ -158,7 +159,7 @@ class JestPlugin extends CiPlugin {
 
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
 
       this.tracer._exporter.flush(() => {

package/packages/datadog-plugin-mocha/src/index.js

@@ -2,6 +2,7 @@
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 const {
   TEST_STATUS,
@@ -429,7 +430,7 @@ class MochaPlugin extends CiPlugin {
         finishAllTraceSpans(this.testSessionSpan)
         this.telemetry.count(TELEMETRY_TEST_SESSION, {
           provider: this.ciProviderName,
-          autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+          autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
         })
       }
       this.libraryConfig = null
@@ -466,6 +467,10 @@ class MochaPlugin extends CiPlugin {
         this.tracer._exporter.export(trace)
       })
     })
+
+    this.addBind('ci:mocha:global:run', (ctx) => {
+      return ctx.currentStore
+    })
   }
 
   startTestSpan (testInfo) {

package/packages/datadog-plugin-mongodb-core/src/index.js

@@ -3,6 +3,7 @@
 const { isTrue } = require('../../dd-trace/src/util')
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 const coalesce = require('koalas')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 class MongodbCorePlugin extends DatabasePlugin {
   static get id () { return 'mongodb-core' }
@@ -14,7 +15,7 @@ class MongodbCorePlugin extends DatabasePlugin {
   configure (config) {
     super.configure(config)
 
-    const heartbeatFromEnv = process.env.DD_TRACE_MONGODB_HEARTBEAT_ENABLED
+    const heartbeatFromEnv = getEnvironmentVariable('DD_TRACE_MONGODB_HEARTBEAT_ENABLED')
 
     this.config.heartbeatEnabled = coalesce(
       config.heartbeatEnabled,

package/packages/datadog-plugin-mysql/src/index.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { storage } = require('../../datadog-core')
 const CLIENT_PORT_KEY = require('../../dd-trace/src/constants')
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 
@@ -7,6 +8,16 @@ class MySQLPlugin extends DatabasePlugin {
   static get id () { return 'mysql' }
   static get system () { return 'mysql' }
 
+  constructor () {
+    super(...arguments)
+
+    this.addSub(`apm:${this.component}:connection:start`, ctx => {
+      ctx.parentStore = storage('legacy').getStore()
+    })
+
+    this.addBind(`apm:${this.component}:connection:finish`, ctx => ctx.parentStore)
+  }
+
   bindStart (ctx) {
     const service = this.serviceName({ pluginConfig: this.config, dbConfig: ctx.conf, system: this.system })
     const span = this.startSpan(this.operationName(), {

package/packages/datadog-plugin-next/src/index.js

@@ -134,7 +134,7 @@ function normalizeConfig (config) {
     ? config.validateStatus
     : code => code < 500
 
-  return Object.assign({}, config, { hooks, validateStatus })
+  return { ...config, hooks, validateStatus }
 }
 
 const noop = () => {}

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

@@ -766,19 +766,17 @@ function usageExtraction (tags, body, methodName, openaiStore) {
   } else if (body.model && ['chat.completions.create', 'completions.create'].includes(methodName)) {
     // estimate tokens based on method name for completions and chat completions
     const { model } = body
-    let promptEstimated = false
-    let completionEstimated = false
 
     // prompt tokens
     const payload = openaiStore
     const promptTokensCount = countPromptTokens(methodName, payload, model)
     promptTokens = promptTokensCount.promptTokens
-    promptEstimated = promptTokensCount.promptEstimated
+    const promptEstimated = promptTokensCount.promptEstimated
 
     // completion tokens
     const completionTokensCount = countCompletionTokens(body, model)
     completionTokens = completionTokensCount.completionTokens
-    completionEstimated = completionTokensCount.completionEstimated
+    const completionEstimated = completionTokensCount.completionEstimated
 
     // total tokens
     totalTokens = promptTokens + completionTokens

package/packages/datadog-plugin-playwright/src/index.js

@@ -3,6 +3,7 @@
 const { storage } = require('../../datadog-core')
 const id = require('../../dd-trace/src/id')
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 const {
   TEST_STATUS,
@@ -102,7 +103,7 @@ class PlaywrightPlugin extends CiPlugin {
       finishAllTraceSpans(this.testSessionSpan)
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
       appClosingTelemetry()
       this.tracer._exporter.flush(onDone)
@@ -384,7 +385,7 @@ class PlaywrightPlugin extends CiPlugin {
       span.finish()
 
       finishAllTraceSpans(span)
-      if (process.env.DD_PLAYWRIGHT_WORKER) {
+      if (getEnvironmentVariable('DD_PLAYWRIGHT_WORKER')) {
         this.tracer._exporter.flush(onDone)
       }
     })

package/packages/datadog-plugin-protobufjs/src/schema_iterator.js

@@ -102,17 +102,16 @@ class SchemaExtractor {
         }
       }
       return true
-    } else {
-      if (!builder.shouldExtractSchema(schemaName, depth)) {
-        return false
-      }
-      for (const field of schema.fieldsArray) {
-        if (!this.extractProperty(field, schemaName, field.name, builder, depth)) {
-          log.warn(`DSM: Unable to extract field with name: ${field.name} from Avro schema with name: ${schemaName}`)
-        }
+    }
+    if (!builder.shouldExtractSchema(schemaName, depth)) {
+      return false
+    }
+    for (const field of schema.fieldsArray) {
+      if (!this.extractProperty(field, schemaName, field.name, builder, depth)) {
+        log.warn(`DSM: Unable to extract field with name: ${field.name} from Avro schema with name: ${schemaName}`)
       }
-      return true
     }
+    return true
   }
 
   static extractSchemas (descriptor, dataStreamsProcessor) {

package/packages/datadog-plugin-redis/src/index.js

@@ -77,9 +77,7 @@ function normalizeConfig (config) {
 
   const filter = urlFilter.getFilter(config)
 
-  return Object.assign({}, config, {
-    filter
-  })
+  return { ...config, filter }
 }
 
 function uppercaseAllEntries (entries) {

package/packages/datadog-plugin-vitest/src/index.js

@@ -1,5 +1,6 @@
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 const {
   TEST_STATUS,
@@ -275,11 +276,11 @@ class VitestPlugin extends CiPlugin {
     this.addBind('ci:vitest:test-suite:start', (ctx) => {
       const { testSuiteAbsolutePath, frameworkVersion } = ctx
 
-      this.command = process.env.DD_CIVISIBILITY_TEST_COMMAND
+      this.command = getEnvironmentVariable('DD_CIVISIBILITY_TEST_COMMAND')
       this.frameworkVersion = frameworkVersion
       const testSessionSpanContext = this.tracer.extract('text_map', {
-        'x-datadog-trace-id': process.env.DD_CIVISIBILITY_TEST_SESSION_ID,
-        'x-datadog-parent-id': process.env.DD_CIVISIBILITY_TEST_MODULE_ID
+        'x-datadog-trace-id': getEnvironmentVariable('DD_CIVISIBILITY_TEST_SESSION_ID'),
+        'x-datadog-parent-id': getEnvironmentVariable('DD_CIVISIBILITY_TEST_MODULE_ID')
       })
 
       const trimmedCommand = DD_MAJOR < 6 ? this.command : 'vitest run'
@@ -396,7 +397,7 @@ class VitestPlugin extends CiPlugin {
       finishAllTraceSpans(this.testSessionSpan)
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
       this.tracer._exporter.flush(onFinish)
     })

package/packages/dd-trace/src/appsec/iast/analyzers/analyzers.js

@@ -5,7 +5,6 @@ module.exports = {
   COMMAND_INJECTION_ANALYZER: require('./command-injection-analyzer'),
   HARCODED_PASSWORD_ANALYZER: require('./hardcoded-password-analyzer'),
   HARCODED_SECRET_ANALYZER: require('./hardcoded-secret-analyzer'),
-  HEADER_INJECTION_ANALYZER: require('./header-injection-analyzer'),
   HSTS_HEADER_MISSING_ANALYZER: require('./hsts-header-missing-analyzer'),
   INSECURE_COOKIE_ANALYZER: require('./insecure-cookie-analyzer'),
   LDAP_ANALYZER: require('./ldap-injection-analyzer'),

package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-password-rules.js

@@ -1,4 +1,3 @@
-/* eslint-disable @stylistic/max-len */
 'use strict'
 
 const { NameAndValue } = require('./hardcoded-rule-type')

package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-secret-rules.js

@@ -1,4 +1,3 @@
-/* eslint-disable @stylistic/max-len */
 'use strict'
 
 const { ValueOnly, NameAndValue } = require('./hardcoded-rule-type')

package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-secrets-rules.js

@@ -1,4 +1,3 @@
-/* eslint-disable @stylistic/max-len */
 'use strict'
 
 const { ValueOnly, NameAndValue } = require('./hardcoded-rule-type')

package/packages/dd-trace/src/appsec/iast/analyzers/missing-header-analyzer.js

@@ -32,9 +32,8 @@ class MissingHeaderAnalyzer extends Analyzer {
     const headerValue = res.getHeader(headerName)
     if (Array.isArray(headerValue)) {
       return headerValue
-    } else {
-      return headerValue ? [headerValue.toString()] : []
     }
+    return headerValue ? [headerValue.toString()] : []
   }
 
   _getLocation () {}

package/packages/dd-trace/src/appsec/iast/security-controls/index.js

@@ -150,19 +150,18 @@ function addSecureMarks (value, secureMarks, createNewTainted = true) {
 
   if (typeof value === 'string') {
     return TaintTrackingOperations.addSecureMark(iastContext, value, secureMarks, createNewTainted)
-  } else {
-    iterateObjectStrings(value, (value, levelKeys, parent, lastKey) => {
-      try {
-        const securedTainted = TaintTrackingOperations.addSecureMark(iastContext, value, secureMarks, createNewTainted)
-        if (createNewTainted) {
-          parent[lastKey] = securedTainted
-        }
-      } catch {
-        // if it is a readonly property, do nothing
-      }
-    })
-    return value
   }
+  iterateObjectStrings(value, (value, levelKeys, parent, lastKey) => {
+    try {
+      const securedTainted = TaintTrackingOperations.addSecureMark(iastContext, value, secureMarks, createNewTainted)
+      if (createNewTainted) {
+        parent[lastKey] = securedTainted
+      }
+    } catch {
+      // if it is a readonly property, do nothing
+    }
+  })
+  return value
 }
 
 function disable () {

package/packages/dd-trace/src/appsec/iast/taint-tracking/plugin.js

@@ -207,7 +207,7 @@ class TaintTrackingPlugin extends SourceIastPlugin {
 
     if (Array.isArray(result)) {
       for (let i = 0; i < result.length && i < this._rowsToTaint; i++) {
-        const nextName = name ? `${name}.${i}` : '' + i
+        const nextName = name ? `${name}.${i}` : String(i)
         result[i] = this._taintDatabaseResult(result[i], dbOrigin, iastContext, nextName)
       }
     } else if (result && typeof result === 'object') {

package/packages/dd-trace/src/appsec/iast/taint-tracking/rewriter.js

@@ -14,6 +14,7 @@ const log = require('../../../log')
 const { isMainThread } = require('worker_threads')
 const { LOG_MESSAGE, REWRITTEN_MESSAGE } = require('./constants')
 const orchestrionConfig = require('../../../../../datadog-instrumentations/src/orchestrion-config')
+const { getEnvironmentVariable } = require('../../../config-helper')
 
 let config
 const hardcodedSecretCh = dc.channel('datadog:secrets:result')
@@ -26,7 +27,7 @@ let kSymbolPrepareStackTrace
 function noop () {}
 
 function isFlagPresent (flag) {
-  return process.env.NODE_OPTIONS?.includes(flag) ||
+  return getEnvironmentVariable('NODE_OPTIONS')?.includes(flag) ||
     process.execArgv?.some(arg => arg.includes(flag))
 }
 

package/packages/dd-trace/src/appsec/iast/telemetry/span-tags.js

@@ -45,7 +45,7 @@ function filterTags (tags) {
 
 function processTagValue (tags) {
   return tags.map(tag => tag.includes(':') ? tag.split(':')[1] : tag)
-    .join('_').replace(/\./g, '_')
+    .join('_').replaceAll('.', '_')
 }
 
 module.exports = {

package/packages/dd-trace/src/appsec/iast/telemetry/verbosity.js

@@ -19,9 +19,8 @@ function getVerbosity (verbosity) {
   if (verbosity) {
     verbosity = verbosity.toUpperCase()
     return Verbosity[verbosity] === undefined ? Verbosity.INFORMATION : Verbosity[verbosity]
-  } else {
-    return Verbosity.INFORMATION
   }
+  return Verbosity.INFORMATION
 }
 
 function getName (verbosityValue) {

package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/range-utils.js

@@ -16,18 +16,17 @@ function remove (range, rangeToRemove) {
     return [range]
   } else if (contains(rangeToRemove, range)) {
     return []
-  } else {
-    const result = []
-    if (rangeToRemove.start > range.start) {
-      const offset = rangeToRemove.start - range.start
-      result.push({ start: range.start, end: range.start + offset })
-    }
-    if (rangeToRemove.end < range.end) {
-      const offset = range.end - rangeToRemove.end
-      result.push({ start: rangeToRemove.end, end: rangeToRemove.end + offset })
-    }
-    return result
   }
+  const result = []
+  if (rangeToRemove.start > range.start) {
+    const offset = rangeToRemove.start - range.start
+    result.push({ start: range.start, end: range.start + offset })
+  }
+  if (rangeToRemove.end < range.end) {
+    const offset = range.end - rangeToRemove.end
+    result.push({ start: rangeToRemove.end, end: rangeToRemove.end + offset })
+  }
+  return result
 }
 
 module.exports = {