dd-trace 5.18.0 → 5.20.0

package/LICENSE-3rdparty.csv

@@ -46,7 +46,6 @@ dev,eslint-plugin-import,MIT,Copyright 2015 Ben Mosher
 dev,eslint-plugin-mocha,MIT,Copyright 2014 Mathias Schreck
 dev,eslint-plugin-n,MIT,Copyright 2015 Toru Nagashima
 dev,eslint-plugin-promise,ISC,jden and other contributors
-dev,eslint-plugin-standard,MIT,Copyright 2015 Jamund Ferguson
 dev,express,MIT,Copyright 2009-2014 TJ Holowaychuk 2013-2014 Roman Shtylman 2014-2015 Douglas Christopher Wilson
 dev,get-port,MIT,Copyright Sindre Sorhus
 dev,glob,ISC,Copyright Isaac Z. Schlueter and Contributors
@@ -63,7 +62,6 @@ dev,rimraf,ISC,Copyright Isaac Z. Schlueter and Contributors
 dev,sinon,BSD-3-Clause,Copyright 2010-2017 Christian Johansen
 dev,sinon-chai,WTFPL and BSD-2-Clause,Copyright 2004 Sam Hocevar 2012–2017 Domenic Denicola
 dev,tap,ISC,Copyright 2011-2022 Isaac Z. Schlueter and Contributors
-dev,tape,MIT,Copyright James Halliday
 dev,tiktoken,MIT,Copyright (c) 2022 OpenAI, Shantanu Jain
 file,aws-lambda-nodejs-runtime-interface-client,Apache 2.0,Copyright 2019 Amazon.com Inc. or its affiliates. All Rights Reserved.
 file,profile.proto,Apache license 2.0,Copyright 2016 Google Inc.

package/ext/formats.d.ts

@@ -5,6 +5,7 @@ declare const formats: {
   HTTP_HEADERS: typeof opentracing.FORMAT_HTTP_HEADERS
   BINARY: typeof opentracing.FORMAT_BINARY
   LOG: 'log'
+  TEXT_MAP_DSM: 'text_map_dsm'
 }
 
 export = formats

package/ext/formats.js

@@ -4,5 +4,6 @@ module.exports = {
   TEXT_MAP: 'text_map',
   HTTP_HEADERS: 'http_headers',
   BINARY: 'binary',
-  LOG: 'log'
+  LOG: 'log',
+  TEXT_MAP_DSM: 'text_map_dsm'
 }

package/index.d.ts

@@ -518,45 +518,7 @@ declare namespace tracer {
       /**
        * Configuration of the IAST. Can be a boolean as an alias to `iast.enabled`.
        */
-      iast?: boolean | {
-        /**
-         * Whether to enable IAST.
-         * @default false
-         */
-        enabled?: boolean,
-        /**
-         * Controls the percentage of requests that iast will analyze
-         * @default 30
-         */
-        requestSampling?: number,
-        /**
-         * Controls how many request can be analyzing code vulnerabilities at the same time
-         * @default 2
-         */
-        maxConcurrentRequests?: number,
-        /**
-         * Controls how many code vulnerabilities can be detected in the same request
-         * @default 2
-         */
-        maxContextOperations?: number,
-        /**
-         * Whether to enable vulnerability deduplication
-         */
-        deduplicationEnabled?: boolean,
-        /**
-         * Whether to enable vulnerability redaction
-         * @default true
-         */
-        redactionEnabled?: boolean,
-        /**
-         * Specifies a regex that will redact sensitive source names in vulnerability reports.
-         */
-        redactionNamePattern?: string,
-        /**
-         * Specifies a regex that will redact sensitive source values in vulnerability reports.
-         */
-        redactionValuePattern?: string
-      }
+      iast?: boolean | IastOptions
 
       appsec?: {
         /**
@@ -736,6 +698,11 @@ declare namespace tracer {
       }
     };
 
+    /**
+     * Configuration of the IAST. Can be a boolean as an alias to `iast.enabled`.
+     */
+    iast?: boolean | IastOptions
+
     /**
      * Configuration of ASM Remote Configuration
      */
@@ -2137,6 +2104,61 @@ declare namespace tracer {
     export type TimeInput = otel.TimeInput;
     export type TraceState = otel.TraceState;
   }
+
+  /**
+   * Iast configuration used in `tracer` and `tracer.experimental` options
+   */
+  interface IastOptions {
+    /**
+     * Whether to enable IAST.
+     * @default false
+     */
+    enabled?: boolean,
+
+    /**
+     * Controls the percentage of requests that iast will analyze
+     * @default 30
+     */
+    requestSampling?: number,
+
+    /**
+     * Controls how many request can be analyzing code vulnerabilities at the same time
+     * @default 2
+     */
+    maxConcurrentRequests?: number,
+
+    /**
+     * Controls how many code vulnerabilities can be detected in the same request
+     * @default 2
+     */
+    maxContextOperations?: number,
+
+    /**
+     * Whether to enable vulnerability deduplication
+     */
+    deduplicationEnabled?: boolean,
+
+    /**
+     * Whether to enable vulnerability redaction
+     * @default true
+     */
+    redactionEnabled?: boolean,
+
+    /**
+     * Specifies a regex that will redact sensitive source names in vulnerability reports.
+     */
+    redactionNamePattern?: string,
+
+    /**
+     * Specifies a regex that will redact sensitive source values in vulnerability reports.
+     */
+    redactionValuePattern?: string,
+
+    /**
+     * Specifies the verbosity of the sent telemetry. Default 'INFORMATION'
+     */
+    telemetryVerbosity?: string
+  }
 }
 
 /**

package/init.js

@@ -2,22 +2,10 @@
 
 const path = require('path')
 const Module = require('module')
-const telemetry = require('./packages/dd-trace/src/telemetry/init-telemetry')
 const semver = require('semver')
-
-function isTrue (envVar) {
-  return ['1', 'true', 'True'].includes(envVar)
-}
-
-// eslint-disable-next-line no-console
-let log = { info: isTrue(process.env.DD_TRACE_DEBUG) ? console.log : () => {} }
-if (semver.satisfies(process.versions.node, '>=16')) {
-  const Config = require('./packages/dd-trace/src/config')
-  log = require('./packages/dd-trace/src/log')
-
-  // eslint-disable-next-line no-new
-  new Config() // we need this to initialize the logger
-}
+const log = require('./packages/dd-trace/src/log')
+const { isTrue } = require('./packages/dd-trace/src/util')
+const telemetry = require('./packages/dd-trace/src/telemetry/init-telemetry')
 
 let initBailout = false
 let clobberBailout = false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.18.0",
+  "version": "5.20.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -33,6 +33,7 @@
     "test:profiler": "tap \"packages/dd-trace/test/profiling/**/*.spec.js\"",
     "test:profiler:ci": "npm run test:profiler -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/profiling/**/*.js\"",
     "test:integration": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/*.spec.js\"",
+    "test:integration:appsec": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/appsec/*.spec.js\"",
     "test:integration:cucumber": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/cucumber/*.spec.js\"",
     "test:integration:cypress": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/cypress/*.spec.js\"",
     "test:integration:jest": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/jest/*.spec.js\"",
@@ -45,9 +46,7 @@
     "test:integration:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/integration-test/**/*.spec.js\"",
     "test:unit:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-instrumentations/test/@($(echo $PLUGINS)).spec.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/**/*.spec.js\" --exclude \"packages/datadog-plugin-@($(echo $PLUGINS))/test/integration-test/**/*.spec.js\"",
     "test:shimmer": "mocha 'packages/datadog-shimmer/test/**/*.spec.js'",
-    "test:shimmer:ci": "nyc --no-clean --include 'packages/datadog-shimmer/src/**/*.js' -- npm run test:shimmer",
-    "leak:core": "node ./scripts/install_plugin_modules && (cd packages/memwatch && yarn) && NODE_PATH=./packages/memwatch/node_modules node --no-warnings ./node_modules/.bin/tape 'packages/dd-trace/test/leak/**/*.js'",
-    "leak:plugins": "yarn services && (cd packages/memwatch && yarn) && NODE_PATH=./packages/memwatch/node_modules node --no-warnings ./node_modules/.bin/tape \"packages/datadog-plugin-@($(echo $PLUGINS))/test/leak.js\""
+    "test:shimmer:ci": "nyc --no-clean --include 'packages/datadog-shimmer/src/**/*.js' -- npm run test:shimmer"
   },
   "repository": {
     "type": "git",
@@ -74,7 +73,7 @@
   },
   "dependencies": {
     "@datadog/native-appsec": "8.0.1",
-    "@datadog/native-iast-rewriter": "2.3.1",
+    "@datadog/native-iast-rewriter": "2.4.0",
     "@datadog/native-iast-taint-tracking": "3.0.0",
     "@datadog/native-metrics": "^2.0.0",
     "@datadog/pprof": "5.3.0",
@@ -116,13 +115,12 @@
     "cli-table3": "^0.6.3",
     "dotenv": "16.3.1",
     "esbuild": "0.16.12",
-    "eslint": "^8.23.0",
+    "eslint": "^8.57.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-mocha": "^10.1.0",
-    "eslint-plugin-n": "^15.7.0",
-    "eslint-plugin-promise": "^3.6.0",
-    "eslint-plugin-standard": "^3.0.1",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-mocha": "^10.4.3",
+    "eslint-plugin-n": "^16.6.2",
+    "eslint-plugin-promise": "^6.4.0",
     "express": "^4.18.2",
     "get-port": "^3.2.0",
     "glob": "^7.1.6",
@@ -139,7 +137,6 @@
     "sinon": "^15.2.0",
     "sinon-chai": "^3.7.0",
     "tap": "^16.3.7",
-    "tape": "^5.6.5",
     "tiktoken": "^1.0.15"
   }
 }

package/packages/datadog-instrumentations/src/child_process.js

@@ -39,10 +39,10 @@ function normalizeArgs (args, shell) {
 
   if (Array.isArray(args[1])) {
     childProcessInfo.command = childProcessInfo.command + ' ' + args[1].join(' ')
-    if (args[2] != null && typeof args[2] === 'object') {
+    if (args[2] !== null && typeof args[2] === 'object') {
       childProcessInfo.options = args[2]
     }
-  } else if (args[1] != null && typeof args[1] === 'object') {
+  } else if (args[1] !== null && typeof args[1] === 'object') {
     childProcessInfo.options = args[1]
   }
   childProcessInfo.shell = shell ||

package/packages/datadog-instrumentations/src/fs.js

@@ -272,7 +272,7 @@ function createWrapFunction (prefix = '', override = '') {
         const outerResource = new AsyncResource('bound-anonymous-fn')
 
         arguments[lastIndex] = innerResource.bind(function (e) {
-          if (typeof e === 'object') { // fs.exists receives a boolean
+          if (e !== null && typeof e === 'object') { // fs.exists receives a boolean
             errorChannel.publish(e)
           }
 

package/packages/datadog-instrumentations/src/hapi.js

@@ -38,7 +38,7 @@ function wrapStart (start) {
 
 function wrapExt (ext) {
   return function (events, method, options) {
-    if (typeof events === 'object') {
+    if (events !== null && typeof events === 'object') {
       arguments[0] = wrapEvents(events)
     } else {
       arguments[1] = wrapExtension(method)

package/packages/datadog-instrumentations/src/helpers/register.js

@@ -29,6 +29,10 @@ if (!disabledInstrumentations.has('fetch')) {
   require('../fetch')
 }
 
+if (!disabledInstrumentations.has('process')) {
+  require('../process')
+}
+
 const HOOK_SYMBOL = Symbol('hookExportsMap')
 
 if (DD_TRACE_DEBUG && DD_TRACE_DEBUG.toLowerCase() !== 'false') {
@@ -88,16 +92,13 @@ for (const packageName of names) {
       if (matchesFile) {
         const version = moduleVersion || getVersion(moduleBaseDir)
         if (!Object.hasOwnProperty(namesAndSuccesses, name)) {
-          namesAndSuccesses[name] = {
-            success: false,
-            version
-          }
+          namesAndSuccesses[`${name}@${version}`] = false
         }
 
         if (matchVersion(version, versions)) {
           // Check if the hook already has a set moduleExport
           if (hook[HOOK_SYMBOL].has(moduleExports)) {
-            namesAndSuccesses[name].success = true
+            namesAndSuccesses[`${name}@${version}`] = true
             return moduleExports
           }
 
@@ -117,19 +118,20 @@ for (const packageName of names) {
               `integration_version:${version}`
             ])
           }
-          namesAndSuccesses[name].success = true
+          namesAndSuccesses[`${name}@${version}`] = true
         }
       }
     }
-    for (const name of Object.keys(namesAndSuccesses)) {
-      const { success, version } = namesAndSuccesses[name]
-      if (!success && !seenCombo.has(`${name}@${version}`)) {
+    for (const nameVersion of Object.keys(namesAndSuccesses)) {
+      const [name, version] = nameVersion.split('@')
+      const success = namesAndSuccesses[nameVersion]
+      if (!success && !seenCombo.has(nameVersion)) {
         telemetry('abort.integration', [
           `integration:${name}`,
           `integration_version:${version}`
         ])
-        log.info(`Found incompatible integration version: ${name}@${version}`)
-        seenCombo.add(`${name}@${version}`)
+        log.info(`Found incompatible integration version: ${nameVersion}`)
+        seenCombo.add(nameVersion)
       }
     }
 

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

@@ -43,7 +43,9 @@ function patch (http, methodName) {
         return request.apply(this, arguments)
       }
 
-      const ctx = { args, http }
+      const abortController = new AbortController()
+
+      const ctx = { args, http, abortController }
 
       return startChannel.runStores(ctx, () => {
         let finished = false
@@ -107,6 +109,10 @@ function patch (http, methodName) {
             return emit.apply(this, arguments)
           }
 
+          if (abortController.signal.aborted) {
+            req.destroy(abortController.signal.reason || new Error('Aborted'))
+          }
+
           return req
         } catch (e) {
           ctx.error = e
@@ -132,7 +138,7 @@ function patch (http, methodName) {
   }
 
   function combineOptions (inputURL, inputOptions) {
-    if (typeof inputOptions === 'object') {
+    if (inputOptions !== null && typeof inputOptions === 'object') {
       return Object.assign(inputURL || {}, inputOptions)
     } else {
       return inputURL

package/packages/datadog-instrumentations/src/http/server.js

@@ -12,6 +12,7 @@ const errorServerCh = channel('apm:http:server:request:error')
 const finishServerCh = channel('apm:http:server:request:finish')
 const startWriteHeadCh = channel('apm:http:server:response:writeHead:start')
 const finishSetHeaderCh = channel('datadog:http:server:response:set-header:finish')
+const startSetHeaderCh = channel('datadog:http:server:response:set-header:start')
 
 const requestFinishedSet = new WeakSet()
 
@@ -24,6 +25,12 @@ addHook({ name: httpNames }, http => {
   shimmer.wrap(http.ServerResponse.prototype, 'writeHead', wrapWriteHead)
   shimmer.wrap(http.ServerResponse.prototype, 'write', wrapWrite)
   shimmer.wrap(http.ServerResponse.prototype, 'end', wrapEnd)
+  shimmer.wrap(http.ServerResponse.prototype, 'setHeader', wrapSetHeader)
+  shimmer.wrap(http.ServerResponse.prototype, 'removeHeader', wrapAppendOrRemoveHeader)
+  // Added in node v16.17.0
+  if (http.ServerResponse.prototype.appendHeader) {
+    shimmer.wrap(http.ServerResponse.prototype, 'appendHeader', wrapAppendOrRemoveHeader)
+  }
   return http
 })
 
@@ -65,9 +72,7 @@ function wrapEmit (emit) {
           // TODO: should this always return true ?
           return this.listenerCount(eventName) > 0
         }
-        if (finishSetHeaderCh.hasSubscribers) {
-          wrapSetHeader(res)
-        }
+
         return emit.apply(this, arguments)
       } catch (err) {
         errorServerCh.publish(err)
@@ -81,16 +86,6 @@ function wrapEmit (emit) {
   }
 }
 
-function wrapSetHeader (res) {
-  shimmer.wrap(res, 'setHeader', setHeader => {
-    return function (name, value) {
-      const setHeaderResult = setHeader.apply(this, arguments)
-      finishSetHeaderCh.publish({ name, value, res })
-      return setHeaderResult
-    }
-  })
-}
-
 function wrapWriteHead (writeHead) {
   return function wrappedWriteHead (statusCode, reason, obj) {
     if (!startWriteHeadCh.hasSubscribers) {
@@ -159,6 +154,48 @@ function wrapWrite (write) {
   }
 }
 
+function wrapSetHeader (setHeader) {
+  return function wrappedSetHeader (name, value) {
+    if (!startSetHeaderCh.hasSubscribers && !finishSetHeaderCh.hasSubscribers) {
+      return setHeader.apply(this, arguments)
+    }
+
+    if (startSetHeaderCh.hasSubscribers) {
+      const abortController = new AbortController()
+      startSetHeaderCh.publish({ res: this, abortController })
+
+      if (abortController.signal.aborted) {
+        return
+      }
+    }
+
+    const setHeaderResult = setHeader.apply(this, arguments)
+
+    if (finishSetHeaderCh.hasSubscribers) {
+      finishSetHeaderCh.publish({ name, value, res: this })
+    }
+
+    return setHeaderResult
+  }
+}
+
+function wrapAppendOrRemoveHeader (originalMethod) {
+  return function wrappedAppendOrRemoveHeader () {
+    if (!startSetHeaderCh.hasSubscribers) {
+      return originalMethod.apply(this, arguments)
+    }
+
+    const abortController = new AbortController()
+    startSetHeaderCh.publish({ res: this, abortController })
+
+    if (abortController.signal.aborted) {
+      return this
+    }
+
+    return originalMethod.apply(this, arguments)
+  }
+}
+
 function wrapEnd (end) {
   return function wrappedEnd () {
     if (!startWriteHeadCh.hasSubscribers) {

package/packages/datadog-instrumentations/src/jest.js

@@ -12,7 +12,8 @@ const {
   getTestParametersString,
   addEfdStringToTestName,
   removeEfdStringFromTestName,
-  getIsFaultyEarlyFlakeDetection
+  getIsFaultyEarlyFlakeDetection,
+  NUM_FAILED_TEST_RETRIES
 } = require('../../dd-trace/src/plugins/util/test')
 const {
   getFormattedJestTestParameters,
@@ -49,6 +50,9 @@ const itrSkippedSuitesCh = channel('ci:jest:itr:skipped-suites')
 const CHILD_MESSAGE_CALL = 1
 // Maximum time we'll wait for the tracer to flush
 const FLUSH_TIMEOUT = 10000
+// eslint-disable-next-line
+// https://github.com/jestjs/jest/blob/41f842a46bb2691f828c3a5f27fc1d6290495b82/packages/jest-circus/src/types.ts#L9C8-L9C54
+const RETRY_TIMES = Symbol.for('RETRY_TIMES')
 
 let skippableSuites = []
 let knownTests = {}
@@ -127,6 +131,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
       }
 
       this.isEarlyFlakeDetectionEnabled = this.testEnvironmentOptions._ddIsEarlyFlakeDetectionEnabled
+      this.isFlakyTestRetriesEnabled = this.testEnvironmentOptions._ddIsFlakyTestRetriesEnabled
 
       if (this.isEarlyFlakeDetectionEnabled) {
         const hasKnownTests = !!knownTests.jest
@@ -140,6 +145,13 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
           this.isEarlyFlakeDetectionEnabled = false
         }
       }
+
+      if (this.isFlakyTestRetriesEnabled) {
+        const currentNumRetries = this.global[RETRY_TIMES]
+        if (!currentNumRetries) {
+          this.global[RETRY_TIMES] = NUM_FAILED_TEST_RETRIES
+        }
+      }
     }
 
     getHasSnapshotTests () {
@@ -218,6 +230,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             retriedTestsToNumAttempts.set(originalTestName, numEfdRetry + 1)
           }
         }
+        const isJestRetry = event.test?.invocations > 1
         asyncResource.runInAsyncScope(() => {
           testStartCh.publish({
             name: removeEfdStringFromTestName(testName),
@@ -228,7 +241,8 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             testParameters,
             frameworkVersion: jestVersion,
             isNew: isNewTest,
-            isEfdRetry: numEfdRetry > 0
+            isEfdRetry: numEfdRetry > 0,
+            isJestRetry
           })
           originalTestFns.set(event.test, event.test.fn)
           event.test.fn = asyncResource.bind(event.test.fn)
@@ -758,6 +772,7 @@ addHook({
       _ddIsEarlyFlakeDetectionEnabled,
       _ddEarlyFlakeDetectionNumRetries,
       _ddRepositoryRoot,
+      _ddIsFlakyTestRetriesEnabled,
       ...restOfTestEnvironmentOptions
     } = testEnvironmentOptions
 

package/packages/datadog-instrumentations/src/kafkajs.js

@@ -59,7 +59,7 @@ addHook({ name: 'kafkajs', file: 'src/index.js', versions: ['>=1.4'] }, (BaseKaf
         try {
           const { topic, messages = [] } = arguments[0]
           for (const message of messages) {
-            if (typeof message === 'object') {
+            if (message !== null && typeof message === 'object') {
               message.headers = message.headers || {}
             }
           }

package/packages/datadog-instrumentations/src/ldapjs.js

@@ -61,7 +61,7 @@ addHook({ name: 'ldapjs', versions: ['>=2'] }, ldapjs => {
       let filter
       if (isString(options)) {
         filter = options
-      } else if (typeof options === 'object' && options.filter) {
+      } else if (options !== null && typeof options === 'object' && options.filter) {
         if (isString(options.filter)) {
           filter = options.filter
         }
@@ -78,7 +78,7 @@ addHook({ name: 'ldapjs', versions: ['>=2'] }, ldapjs => {
       const callback = arguments[callbackIndex]
       // eslint-disable-next-line n/handle-callback-err
       arguments[callbackIndex] = shimmer.wrap(callback, function (err, corkedEmitter) {
-        if (typeof corkedEmitter === 'object' && typeof corkedEmitter.on === 'function') {
+        if (corkedEmitter !== null && typeof corkedEmitter === 'object' && typeof corkedEmitter.on === 'function') {
           wrapEmitter(corkedEmitter)
         }
         callback.apply(this, arguments)

package/packages/datadog-instrumentations/src/mocha/main.js

@@ -395,9 +395,13 @@ addHook({
       }
 
       const asyncResource = testFileToSuiteAr.get(suite.file)
-      asyncResource.runInAsyncScope(() => {
-        testSuiteFinishCh.publish(status)
-      })
+      if (asyncResource) {
+        asyncResource.runInAsyncScope(() => {
+          testSuiteFinishCh.publish(status)
+        })
+      } else {
+        log.warn(() => `No AsyncResource found for suite ${suite.file}`)
+      }
     })
 
     return run.apply(this, arguments)
@@ -424,23 +428,29 @@ addHook({
   versions: ['>=6.0.0'],
   file: 'src/WorkerHandler.js'
 }, (workerHandlerPackage) => {
-  shimmer.wrap(workerHandlerPackage.prototype, 'exec', exec => function (message, [testSuiteAbsolutePath]) {
+  shimmer.wrap(workerHandlerPackage.prototype, 'exec', exec => function (_, path) {
     if (!testStartCh.hasSubscribers) {
       return exec.apply(this, arguments)
     }
+    if (!path?.length) {
+      return exec.apply(this, arguments)
+    }
+    const [testSuiteAbsolutePath] = path
+    const testSuiteAsyncResource = new AsyncResource('bound-anonymous-fn')
 
-    this.worker.on('message', function (message) {
+    function onMessage (message) {
       if (Array.isArray(message)) {
         const [messageCode, payload] = message
         if (messageCode === MOCHA_WORKER_TRACE_PAYLOAD_CODE) {
-          testSessionAsyncResource.runInAsyncScope(() => {
+          testSuiteAsyncResource.runInAsyncScope(() => {
             workerReportTraceCh.publish(payload)
           })
         }
       }
-    })
+    }
+
+    this.worker.on('message', onMessage)
 
-    const testSuiteAsyncResource = new AsyncResource('bound-anonymous-fn')
     testSuiteAsyncResource.runInAsyncScope(() => {
       testSuiteStartCh.publish({
         testSuiteAbsolutePath
@@ -455,12 +465,14 @@ addHook({
           testSuiteAsyncResource.runInAsyncScope(() => {
             testSuiteFinishCh.publish(status)
           })
+          this.worker.off('message', onMessage)
         },
         (err) => {
           testSuiteAsyncResource.runInAsyncScope(() => {
             testSuiteErrorCh.publish(err)
             testSuiteFinishCh.publish('fail')
           })
+          this.worker.off('message', onMessage)
         }
       )
       return promise
@@ -469,6 +481,7 @@ addHook({
         testSuiteErrorCh.publish(err)
         testSuiteFinishCh.publish('fail')
       })
+      this.worker.off('message', onMessage)
       throw err
     }
   })

package/packages/datadog-instrumentations/src/mquery.js

@@ -25,9 +25,9 @@ const methodsOptionalArgs = ['findOneAndUpdate']
 function getFilters (args, methodName) {
   const [arg0, arg1] = args
 
-  const filters = arg0 && typeof arg0 === 'object' ? [arg0] : []
+  const filters = arg0 !== null && typeof arg0 === 'object' ? [arg0] : []
 
-  if (arg1 && typeof arg1 === 'object' && methodsOptionalArgs.includes(methodName)) {
+  if (arg1 !== null && typeof arg1 === 'object' && methodsOptionalArgs.includes(methodName)) {
     filters.push(arg1)
   }
 

package/packages/datadog-instrumentations/src/next.js

@@ -46,7 +46,7 @@ function wrapHandleApiRequest (handleApiRequest) {
 function wrapHandleApiRequestWithMatch (handleApiRequest) {
   return function (req, res, query, match) {
     return instrument(req, res, () => {
-      const page = (typeof match === 'object' && typeof match.definition === 'object')
+      const page = (match !== null && typeof match === 'object' && typeof match.definition === 'object')
         ? match.definition.pathname
         : undefined