dd-trace 5.53.0 → 5.54.0

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

@@ -37,7 +37,9 @@ const {
   TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
   TEST_HAS_FAILED_ALL_RETRIES,
   TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
-  TEST_RETRY_REASON_TYPES
+  TEST_RETRY_REASON_TYPES,
+  TEST_IS_MODIFIED,
+  isModifiedTest
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const {
@@ -131,11 +133,9 @@ class MochaPlugin extends CiPlugin {
         testSuiteMetadata[TEST_ITR_FORCED_RUN] = 'true'
         this.telemetry.count(TELEMETRY_ITR_FORCED_TO_RUN, { testLevel: 'suite' })
       }
-      if (this.repositoryRoot !== this.sourceRoot && !!this.repositoryRoot) {
-        testSuiteMetadata[TEST_SOURCE_FILE] = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
-      } else {
-        testSuiteMetadata[TEST_SOURCE_FILE] = testSuite
-      }
+      testSuiteMetadata[TEST_SOURCE_FILE] = this.repositoryRoot !== this.sourceRoot && !!this.repositoryRoot
+        ? getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
+        : testSuite
       if (testSuiteMetadata[TEST_SOURCE_FILE]) {
         testSuiteMetadata[TEST_SOURCE_START] = 1
       }
@@ -192,6 +192,19 @@ class MochaPlugin extends CiPlugin {
       return ctx.currentStore
     })
 
+    this.addSub('ci:mocha:test:is-modified', ({ modifiedTests, file, onDone }) => {
+      const testPath = getTestSuitePath(file, this.repositoryRoot)
+      const isModified = isModifiedTest(
+        testPath,
+        null,
+        null,
+        modifiedTests,
+        this.constructor.id
+      )
+
+      onDone(isModified)
+    })
+
     this.addBind('ci:mocha:test:fn', (ctx) => {
       return ctx.currentStore
     })
@@ -466,7 +479,8 @@ class MochaPlugin extends CiPlugin {
       isParallel,
       isAttemptToFix,
       isDisabled,
-      isQuarantined
+      isQuarantined,
+      isModified
     } = testInfo
 
     const extraTags = {}
@@ -495,20 +509,26 @@ class MochaPlugin extends CiPlugin {
       extraTags[TEST_MANAGEMENT_IS_QUARANTINED] = 'true'
     }
 
+    if (isModified) {
+      extraTags[TEST_IS_MODIFIED] = 'true'
+      if (isEfdRetry) {
+        extraTags[TEST_IS_RETRY] = 'true'
+        extraTags[TEST_RETRY_REASON] = TEST_RETRY_REASON_TYPES.efd
+      }
+    }
+
     const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.sourceRoot)
     const testSuiteSpan = this._testSuites.get(testSuite)
 
-    if (this.repositoryRoot !== this.sourceRoot && !!this.repositoryRoot) {
-      extraTags[TEST_SOURCE_FILE] = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
-    } else {
-      extraTags[TEST_SOURCE_FILE] = testSuite
-    }
+    extraTags[TEST_SOURCE_FILE] = this.repositoryRoot !== this.sourceRoot && !!this.repositoryRoot
+      ? getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
+      : testSuite
 
     if (isNew) {
       extraTags[TEST_IS_NEW] = 'true'
       if (isEfdRetry) {
         extraTags[TEST_IS_RETRY] = 'true'
-        extraTags[TEST_RETRY_REASON] = 'early_flake_detection'
+        extraTags[TEST_RETRY_REASON] = TEST_RETRY_REASON_TYPES.efd
       }
     }
 

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

@@ -103,7 +103,7 @@ function getResource (plugin, ns, query, operationName) {
 }
 
 function truncate (input) {
-  return input.slice(0, Math.min(input.length, 10000))
+  return input.slice(0, Math.min(input.length, 10_000))
 }
 
 function shouldSimplify (input) {

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

@@ -7,22 +7,24 @@ class MySQLPlugin extends DatabasePlugin {
   static get id () { return 'mysql' }
   static get system () { return 'mysql' }
 
-  start (payload) {
-    const service = this.serviceName({ pluginConfig: this.config, dbConfig: payload.conf, system: this.system })
+  bindStart (ctx) {
+    const service = this.serviceName({ pluginConfig: this.config, dbConfig: ctx.conf, system: this.system })
     const span = this.startSpan(this.operationName(), {
       service,
-      resource: payload.sql,
+      resource: ctx.sql,
       type: 'sql',
       kind: 'client',
       meta: {
         'db.type': this.system,
-        'db.user': payload.conf.user,
-        'db.name': payload.conf.database,
-        'out.host': payload.conf.host,
-        [CLIENT_PORT_KEY]: payload.conf.port
+        'db.user': ctx.conf.user,
+        'db.name': ctx.conf.database,
+        'out.host': ctx.conf.host,
+        [CLIENT_PORT_KEY]: ctx.conf.port
       }
-    })
-    payload.sql = this.injectDbmQuery(span, payload.sql, service)
+    }, ctx)
+    ctx.sql = this.injectDbmQuery(span, ctx.sql, service)
+
+    return ctx.currentStore
   }
 }
 

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

@@ -1,9 +1,25 @@
 'use strict'
 
+const { storage } = require('../../datadog-core')
 const MySQLPlugin = require('../../datadog-plugin-mysql/src')
 
 class MySQL2Plugin extends MySQLPlugin {
   static get id () { return 'mysql2' }
+
+  constructor () {
+    super(...arguments)
+
+    this.addSub(`apm:${this.component}:command:add`, ctx => {
+      ctx.parentStore = storage('legacy').getStore()
+    })
+
+    this.addBind(`apm:${this.component}:command:start`, ctx => ctx.parentStore)
+    this.addBind(`apm:${this.component}:command:finish`, ctx => ctx.parentStore)
+  }
+
+  bindStart (ctx) {
+    return storage('legacy').run(ctx.parentStore, () => super.bindStart(ctx))
+  }
 }
 
 module.exports = MySQL2Plugin

package/packages/datadog-plugin-net/src/tcp.js

@@ -31,7 +31,7 @@ class NetTCPPlugin extends ClientPlugin {
 
     this.startSpan('tcp.connect', {
       service: this.config.service,
-      resource: [host, port].filter(val => val).join(':'),
+      resource: [host, port].filter(Boolean).join(':'),
       kind: 'client',
       meta: {
         'tcp.remote.host': host,

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

@@ -6,7 +6,7 @@ const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const web = require('../../dd-trace/src/plugins/util/web')
 
-const errorPages = ['/404', '/500', '/_error', '/_not-found', '/_not-found/page']
+const errorPages = new Set(['/404', '/500', '/_error', '/_not-found', '/_not-found/page'])
 
 class NextPlugin extends ServerPlugin {
   static get id () {
@@ -97,7 +97,7 @@ class NextPlugin extends ServerPlugin {
 
     // Only use error page names if there's not already a name
     const current = span.context()._tags['next.page']
-    const isErrorPage = errorPages.includes(page)
+    const isErrorPage = errorPages.has(page)
 
     if (current && isErrorPage) {
       return
@@ -106,7 +106,7 @@ class NextPlugin extends ServerPlugin {
     // remove ending /route or /page for appDir projects
     // need to check if not an error page too, as those are marked as app directory
     // in newer versions
-    if (isAppPath && !isErrorPage) page = page.substring(0, page.lastIndexOf('/'))
+    if (isAppPath && !isErrorPage) page = page.slice(0, Math.max(0, page.lastIndexOf('/')))
 
     // handle static resource
     if (isStatic) {
@@ -137,9 +137,10 @@ function normalizeConfig (config) {
   return Object.assign({}, config, { hooks, validateStatus })
 }
 
+const noop = () => {}
+
 function getHooks (config) {
-  const noop = () => {}
-  const request = (config.hooks && config.hooks.request) || noop
+  const request = config.hooks?.request ?? noop
 
   return { request }
 }

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

@@ -11,8 +11,8 @@ let logger = null
 let interval = null
 
 module.exports.init = function (tracerConfig) {
-  if (tracerConfig && tracerConfig.dogstatsd) {
-    metrics = new DogStatsDClient({
+  metrics = tracerConfig && tracerConfig.dogstatsd
+    ? new DogStatsDClient({
       host: tracerConfig.dogstatsd.hostname,
       port: tracerConfig.dogstatsd.port,
       tags: [
@@ -21,21 +21,17 @@ module.exports.init = function (tracerConfig) {
         `version:${tracerConfig.tags.version}`
       ]
     })
-  } else {
-    metrics = new NoopDogStatsDClient()
-  }
+    : new NoopDogStatsDClient()
 
-  if (tracerConfig && tracerConfig.apiKey) {
-    logger = new ExternalLogger({
+  logger = tracerConfig && tracerConfig.apiKey
+    ? new ExternalLogger({
       ddsource: 'openai',
       hostname: tracerConfig.hostname,
       service: tracerConfig.service,
       apiKey: tracerConfig.apiKey,
       interval: FLUSH_INTERVAL
     })
-  } else {
-    logger = new NoopExternalLogger()
-  }
+    : new NoopExternalLogger()
 
   interval = setInterval(() => {
     metrics.flush()

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

@@ -261,9 +261,11 @@ class OpenAiTracingPlugin extends TracingPlugin {
     if (error) {
       this.metrics.increment('openai.request.error', 1, tags)
     } else {
-      tags.push(`org:${headers['openai-organization']}`)
-      tags.push(`endpoint:${endpoint}`) // just "/v1/models", no method
-      tags.push(`model:${headers['openai-model'] || body.model}`)
+      tags.push(
+        `org:${headers['openai-organization']}`,
+        `endpoint:${endpoint}`,
+        `model:${headers['openai-model'] || body.model}`
+      )
     }
 
     this.metrics.distribution('openai.request.duration', duration * 1000, tags)
@@ -329,7 +331,7 @@ class OpenAiTracingPlugin extends TracingPlugin {
   sendLog (methodName, span, tags, openaiStore, error) {
     if (!openaiStore) return
     if (!Object.keys(openaiStore).length) return
-    if (!this.sampler.isSampled()) return
+    if (!this.sampler.isSampled(span)) return
 
     const log = {
       status: error ? 'error' : 'info',
@@ -725,7 +727,7 @@ function commonCreateResponseExtraction (tags, body, openaiStore, methodName) {
     const choice = body.choices[choiceIdx]
 
     // logprobs can be null and we still want to tag it as 'returned' even when set to 'null'
-    const specifiesLogProb = Object.keys(choice).indexOf('logprobs') !== -1
+    const specifiesLogProb = Object.keys(choice).includes('logprobs')
 
     tags[`openai.response.choices.${choiceIdx}.finish_reason`] = choice.finish_reason
     tags[`openai.response.choices.${choiceIdx}.logprobs`] = specifiesLogProb ? 'returned' : undefined
@@ -790,7 +792,7 @@ function usageExtraction (tags, body, methodName, openaiStore) {
 }
 
 function truncateApiKey (apiKey) {
-  return apiKey && `sk-...${apiKey.substr(apiKey.length - 4)}`
+  return apiKey && `sk-...${apiKey.slice(-4)}`
 }
 
 function tagChatCompletionRequestContent (contents, messageIdx, tags) {
@@ -989,15 +991,9 @@ function normalizeStringOrTokenArray (input, truncate) {
 
 function defensiveArrayLength (maybeArray) {
   if (maybeArray) {
-    if (Array.isArray(maybeArray)) {
-      return maybeArray.length
-    } else {
-      // case of a singular item (ie body.training_file vs body.training_files)
-      return 1
-    }
+    // Detect singular item (ie body.training_file vs body.training_files)
+    return Array.isArray(maybeArray) ? maybeArray.length : 1
   }
-
-  return undefined
 }
 
 module.exports = OpenAiTracingPlugin

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

@@ -20,7 +20,7 @@ class OracledbPlugin extends DatabasePlugin {
       kind: 'client',
       meta: {
         'db.user': this.config.user,
-        'db.instance': url.pathname && url.pathname.substring(1),
+        'db.instance': url.pathname && url.pathname.slice(1),
         'db.hostname': url.hostname,
         [CLIENT_PORT_KEY]: url.port
       }

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

@@ -34,7 +34,9 @@ const {
   TEST_NAME,
   TEST_IS_RUM_ACTIVE,
   TEST_BROWSER_VERSION,
-  TEST_RETRY_REASON_TYPES
+  TEST_RETRY_REASON_TYPES,
+  TEST_IS_MODIFIED,
+  isModifiedTest
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT } = require('../../dd-trace/src/constants')
@@ -56,6 +58,16 @@ class PlaywrightPlugin extends CiPlugin {
     this.numFailedTests = 0
     this.numFailedSuites = 0
 
+    this.addSub('ci:playwright:test:is-modified', ({
+      filePath,
+      modifiedTests,
+      onDone
+    }) => {
+      const testSuite = getTestSuitePath(filePath, this.repositoryRoot)
+      const isModified = isModifiedTest(testSuite, 0, 0, modifiedTests, this.constructor.id)
+      onDone({ isModified })
+    })
+
     this.addSub('ci:playwright:session:finish', ({
       status,
       isEarlyFlakeDetectionEnabled,
@@ -277,6 +289,7 @@ class PlaywrightPlugin extends CiPlugin {
       hasPassedAttemptToFixRetries,
       hasFailedAttemptToFixRetries,
       isAtrRetry,
+      isModified,
       onDone
     }) => {
       if (!span) return
@@ -327,6 +340,13 @@ class PlaywrightPlugin extends CiPlugin {
       if (isQuarantined) {
         span.setTag(TEST_MANAGEMENT_IS_QUARANTINED, 'true')
       }
+      if (isModified) {
+        span.setTag(TEST_IS_MODIFIED, 'true')
+        if (isEfdRetry) {
+          span.setTag(TEST_IS_RETRY, 'true')
+          span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.efd)
+        }
+      }
       steps.forEach(step => {
         const stepStartTime = step.startTime.getTime()
         const stepSpan = this.tracer.startSpan('playwright.step', {
@@ -342,7 +362,7 @@ class PlaywrightPlugin extends CiPlugin {
           stepSpan.setTag('error', step.error)
         }
         let stepDuration = step.duration
-        if (stepDuration <= 0 || isNaN(stepDuration)) {
+        if (stepDuration <= 0 || Number.isNaN(stepDuration)) {
           stepDuration = 0
         }
         stepSpan.finish(stepStartTime + stepDuration)

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

@@ -63,7 +63,7 @@ function formatArg (arg) {
 
 function trim (str, maxlen) {
   if (str.length > maxlen) {
-    str = str.substr(0, maxlen - 3) + '...'
+    str = str.slice(0, maxlen - 3) + '...'
   }
 
   return str

package/packages/datadog-plugin-rhea/src/consumer.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
-const { storage } = require('../../datadog-core')
 const { getAmqpMessageSize } = require('../../dd-trace/src/datastreams')
 
 class RheaConsumerPlugin extends ConsumerPlugin {
@@ -10,13 +9,14 @@ class RheaConsumerPlugin extends ConsumerPlugin {
   constructor (...args) {
     super(...args)
 
-    this.addTraceSub('dispatch', ({ state }) => {
-      const span = storage('legacy').getStore().span
-      span.setTag('amqp.delivery.state', state)
+    this.addTraceSub('dispatch', (ctx) => {
+      const span = ctx.currentStore.span
+      span.setTag('amqp.delivery.state', ctx.state)
     })
   }
 
-  start ({ msgObj }) {
+  bindStart (ctx) {
+    const { msgObj } = ctx
     const name = getResourceNameFromMessage(msgObj)
     const childOf = extractTextMap(msgObj, this.tracer)
 
@@ -29,7 +29,7 @@ class RheaConsumerPlugin extends ConsumerPlugin {
         'amqp.link.source.address': name,
         'amqp.link.role': 'receiver'
       }
-    })
+    }, ctx)
 
     if (
       this.config.dsmEnabled &&
@@ -42,6 +42,8 @@ class RheaConsumerPlugin extends ConsumerPlugin {
       this.tracer
         .setCheckpoint(['direction:in', `topic:${name}`, 'type:rabbitmq'], span, payloadSize)
     }
+
+    return ctx.currentStore
   }
 }
 

package/packages/datadog-plugin-rhea/src/producer.js

@@ -13,7 +13,8 @@ class RheaProducerPlugin extends ProducerPlugin {
     this.addTraceSub('encode', this.encode.bind(this))
   }
 
-  start ({ targetAddress, host, port }) {
+  bindStart (ctx) {
+    const { targetAddress, host, port } = ctx
     const name = targetAddress || 'amq.topic'
     this.startSpan({
       resource: name,
@@ -24,7 +25,9 @@ class RheaProducerPlugin extends ProducerPlugin {
         'out.host': host,
         [CLIENT_PORT_KEY]: port
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 
   encode (msg) {

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

@@ -90,7 +90,7 @@ class RouterPlugin extends WebPlugin {
     if (!context) return
     if (context.middleware.length === 0) return context.span
 
-    return context.middleware[context.middleware.length - 1]
+    return context.middleware.at(-1)
   }
 
   _getStoreSpan () {

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

@@ -44,12 +44,7 @@ class SeleniumPlugin extends CiPlugin {
       if (!span) {
         return
       }
-      let testSpan
-      if (isTestSpan(span)) {
-        testSpan = span
-      } else {
-        testSpan = getTestSpanFromTrace(span.context()._trace)
-      }
+      const testSpan = isTestSpan(span) ? span : getTestSpanFromTrace(span.context()._trace)
       if (!testSpan) {
         return
       }

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

@@ -26,7 +26,9 @@ const {
   TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
   TEST_HAS_FAILED_ALL_RETRIES,
   getLibraryCapabilitiesTags,
-  TEST_RETRY_REASON_TYPES
+  TEST_RETRY_REASON_TYPES,
+  isModifiedTest,
+  TEST_IS_MODIFIED
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const {
@@ -34,6 +36,7 @@ const {
   TELEMETRY_EVENT_FINISHED,
   TELEMETRY_TEST_SESSION
 } = require('../../dd-trace/src/ci-visibility/telemetry')
+const { DD_MAJOR } = require('../../../version')
 
 // Milliseconds that we subtract from the error test duration
 // so that they do not overlap with the following test
@@ -82,6 +85,13 @@ class VitestPlugin extends CiPlugin {
       onDone(isQuarantined)
     })
 
+    this.addSub('ci:vitest:test:is-modified', ({ modifiedTests, testSuiteAbsolutePath, onDone }) => {
+      const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
+      const isModified = isModifiedTest(testSuite, 0, 0, modifiedTests, this.constructor.id)
+
+      onDone(isModified)
+    })
+
     this.addSub('ci:vitest:is-early-flake-detection-faulty', ({
       knownTests,
       testFilepaths,
@@ -107,7 +117,8 @@ class VitestPlugin extends CiPlugin {
         mightHitProbe,
         isRetryReasonEfd,
         isRetryReasonAttemptToFix,
-        isRetryReasonAtr
+        isRetryReasonAtr,
+        isModified
       } = ctx
 
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
@@ -140,6 +151,9 @@ class VitestPlugin extends CiPlugin {
       if (isDisabled) {
         extraTags[TEST_MANAGEMENT_IS_DISABLED] = 'true'
       }
+      if (isModified) {
+        extraTags[TEST_IS_MODIFIED] = 'true'
+      }
 
       const span = this.startTestSpan(
         testName,
@@ -204,37 +218,38 @@ class VitestPlugin extends CiPlugin {
       hasFailedAllRetries,
       attemptToFixFailed
     }) => {
-      if (span) {
-        if (shouldSetProbe && this.di) {
-          const probeInformation = this.addDiProbe(error)
-          if (probeInformation) {
-            const { file, line, stackIndex, setProbePromise } = probeInformation
-            this.runningTestProbe = { file, line }
-            this.testErrorStackIndex = stackIndex
-            promises.setProbePromise = setProbePromise
-          }
+      if (!span) {
+        return
+      }
+      if (shouldSetProbe && this.di && error?.stack) {
+        const probeInformation = this.addDiProbe(error)
+        if (probeInformation) {
+          const { file, line, stackIndex, setProbePromise } = probeInformation
+          this.runningTestProbe = { file, line }
+          this.testErrorStackIndex = stackIndex
+          promises.setProbePromise = setProbePromise
         }
-        this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', {
-          hasCodeowners: !!span.context()._tags[TEST_CODE_OWNERS]
-        })
-        span.setTag(TEST_STATUS, 'fail')
+      }
+      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', {
+        hasCodeowners: !!span.context()._tags[TEST_CODE_OWNERS]
+      })
+      span.setTag(TEST_STATUS, 'fail')
 
-        if (error) {
-          span.setTag('error', error)
-        }
-        if (hasFailedAllRetries) {
-          span.setTag(TEST_HAS_FAILED_ALL_RETRIES, 'true')
-        }
-        if (attemptToFixFailed) {
-          span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'false')
-        }
-        if (duration) {
-          span.finish(span._startTime + duration - MILLISECONDS_TO_SUBTRACT_FROM_FAILED_TEST_DURATION) // milliseconds
-        } else {
-          span.finish() // `duration` is empty for retries, so we'll use clock time
-        }
-        finishAllTraceSpans(span)
+      if (error) {
+        span.setTag('error', error)
+      }
+      if (hasFailedAllRetries) {
+        span.setTag(TEST_HAS_FAILED_ALL_RETRIES, 'true')
+      }
+      if (attemptToFixFailed) {
+        span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'false')
+      }
+      if (duration) {
+        span.finish(span._startTime + duration - MILLISECONDS_TO_SUBTRACT_FROM_FAILED_TEST_DURATION) // milliseconds
+      } else {
+        span.finish() // `duration` is empty for retries, so we'll use clock time
       }
+      finishAllTraceSpans(span)
     })
 
     this.addSub('ci:vitest:test:skip', ({ testName, testSuiteAbsolutePath, isNew, isDisabled }) => {
@@ -267,8 +282,9 @@ class VitestPlugin extends CiPlugin {
         'x-datadog-parent-id': process.env.DD_CIVISIBILITY_TEST_MODULE_ID
       })
 
+      const trimmedCommand = DD_MAJOR < 6 ? this.command : 'vitest run'
       // test suites run in a different process, so they also need to init the metadata dictionary
-      const testSessionName = getTestSessionName(this.config, this.command, this.testEnvironmentMetadata)
+      const testSessionName = getTestSessionName(this.config, trimmedCommand, this.testEnvironmentMetadata)
       const metadataTags = {}
       for (const testLevel of TEST_LEVEL_EVENT_TYPES) {
         metadataTags[testLevel] = {

package/packages/datadog-shimmer/src/shimmer.js

@@ -100,7 +100,7 @@ function wrapFunction (original, wrapper) {
  */
 function wrap (target, name, wrapper, options) {
   if (typeof wrapper !== 'function') {
-    throw new Error(wrapper ? 'Target is not a function' : 'No function provided')
+    throw new TypeError(wrapper ? 'Target is not a function' : 'No function provided')
   }
 
   // No descriptor means original was on the prototype. This is not totally
@@ -141,11 +141,7 @@ function wrap (target, name, wrapper, options) {
   } else {
     if (descriptor.get) {
       // `replaceGetter` may only be used when the getter has no side effect.
-      if (options?.replaceGetter) {
-        descriptor.get = () => wrapped
-      } else {
-        descriptor.get = wrapped
-      }
+      descriptor.get = options?.replaceGetter ? () => wrapped : wrapped
     } else {
       descriptor.value = wrapped
     }
@@ -252,7 +248,7 @@ function assertMethod (target, name, method) {
       }
     }
 
-    throw new Error(message)
+    throw new TypeError(message)
   }
 }
 
@@ -264,7 +260,7 @@ function assertMethod (target, name, method) {
  */
 function assertNotClass (target) {
   if (Function.prototype.toString.call(target).startsWith('class')) {
-    throw new Error('Target is a native class constructor and cannot be wrapped.')
+    throw new TypeError('Target is a native class constructor and cannot be wrapped.')
   }
 }
 

package/packages/dd-trace/src/appsec/api_security_sampler.js

@@ -18,8 +18,8 @@ let asmStandaloneEnabled
 let sampledRequests
 
 class NoopTTLCache {
-  clear () { }
-  set (_key, _value) { return undefined }
+  clear () {}
+  set (_key, _value) {}
   has (_key) { return false }
 }
 

package/packages/dd-trace/src/appsec/blocked_templates.js

@@ -1,4 +1,4 @@
-/* eslint-disable @stylistic/js/max-len */
+/* eslint-disable @stylistic/max-len */
 'use strict'
 
 const html = '<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>You\'ve been blocked</title><style>a,body,div,html,span{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}body{background:-webkit-radial-gradient(26% 19%,circle,#fff,#f4f7f9);background:radial-gradient(circle at 26% 19%,#fff,#f4f7f9);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:center;align-content:center;width:100%;min-height:100vh;line-height:1;flex-direction:column}p{display:block}main{text-align:center;flex:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:center;align-content:center;flex-direction:column}p{font-size:18px;line-height:normal;color:#646464;font-family:sans-serif;font-weight:400}a{color:#4842b7}footer{width:100%;text-align:center}footer p{font-size:16px}</style></head><body><main><p>Sorry, you cannot access this page. Please contact the customer service team.</p></main><footer><p>Security provided by <a href="https://www.datadoghq.com/product/security-platform/application-security-monitoring/" target="_blank">Datadog</a></p></footer></body></html>'