dd-trace 3.9.3 → 3.11.0

package/LICENSE-3rdparty.csv

@@ -20,6 +20,7 @@ require,lodash.uniq,MIT,Copyright JS Foundation and other contributors
 require,lru-cache,ISC,Copyright (c) 2010-2022 Isaac Z. Schlueter and Contributors
 require,methods,MIT,Copyright 2013-2014 TJ Holowaychuk
 require,module-details-from-path,MIT,Copyright 2016 Thomas Watson Steen
+require,node-abort-controller,MIT,Copyright (c) 2019 Steve Faulkner
 require,opentracing,MIT,Copyright 2016 Resonance Labs Inc
 require,path-to-regexp,MIT,Copyright 2014 Blake Embrey
 require,protobufjs,BSD-3-Clause,Copyright 2016 Daniel Wirtz
@@ -38,6 +39,7 @@ dev,dotenv,BSD-2-Clause,Copyright 2015 Scott Motte
 dev,eslint,MIT,Copyright JS Foundation and other contributors https://js.foundation
 dev,eslint-config-standard,MIT,Copyright Feross Aboukhadijeh
 dev,eslint-plugin-import,MIT,Copyright 2015 Ben Mosher
+dev,eslint-plugin-mocha,MIT,Copyright 2014 Mathias Schreck
 dev,eslint-plugin-node,MIT,Copyright 2015 Toru Nagashima
 dev,eslint-plugin-promise,ISC,jden and other contributors
 dev,eslint-plugin-standard,MIT,Copyright 2015 Jamund Ferguson

package/README.md

@@ -1,76 +1,139 @@
-# dd-trace-js
+# `dd-trace`: Node.js APM Tracer Library
 
-[![npm](https://img.shields.io/npm/v/dd-trace.svg?colorB=blue)](https://www.npmjs.com/package/dd-trace)
-[![npm (tag)](https://img.shields.io/npm/v/dd-trace/dev.svg)](https://www.npmjs.com/package/dd-trace/v/dev)
-[![CircleCI](https://circleci.com/gh/DataDog/dd-trace-js.svg?style=shield)](https://circleci.com/gh/DataDog/dd-trace-js)
+[![npm v3](https://img.shields.io/npm/v/dd-trace/latest?color=blue&label=dd-trace%40v3&logo=npm)](https://www.npmjs.com/package/dd-trace)
+[![npm v2](https://img.shields.io/npm/v/dd-trace/latest-node12?color=blue&label=dd-trace%40v2&logo=npm)](https://www.npmjs.com/package/dd-trace/v/latest-node12)
+[![npm dev](https://img.shields.io/npm/v/dd-trace/dev?color=orange&label=dd-trace%40dev&logo=npm)](https://www.npmjs.com/package/dd-trace/v/dev)
 [![codecov](https://codecov.io/gh/DataDog/dd-trace-js/branch/master/graph/badge.svg)](https://codecov.io/gh/DataDog/dd-trace-js)
 
-**Node.js APM Tracer**
+<img align="right" src="https://user-images.githubusercontent.com/551402/208212084-1d0c07e2-4135-4c61-b2da-8f2fddbc66ed.png" alt="Bits the dog  JavaScript" width="200px"/>
 
-Datadog APM tracing client for Node.js.
+`dd-trace` is an npm package that you can install in your Node.js application to capture APM (Application Performance Monitoring) data. In Datadog terminology this library is called a Tracer. This data is then sent off to a process which collects and aggregates the data, called an Agent. Finally the data is sent off to the Datadog servers where it's stored and made available for querying in a myriad of ways, such as displaying in a dashboard or triggering alerts.
 
-## Getting Started
+![Tracer, Agent, Datadog relationship diagram](./docs/relationship.png)
 
-For a basic product overview, check out our [setup documentation](https://docs.datadoghq.com/tracing/languages/nodejs/).
 
-For installation, configuration, and details about using the API, check out our [API documentation](https://datadog.github.io/dd-trace-js).
+## Documentation
+
+Most of the documentation for `dd-trace` is available on these webpages:
+
+- [Tracing Node.js Applications](https://docs.datadoghq.com/tracing/languages/nodejs/) - most project documentation, including setup instructions
+- [Configuring the NodeJS Tracing Library](https://docs.datadoghq.com/tracing/trace_collection/library_config/nodejs) - environment variables and config options
+- [API Documentation](https://datadog.github.io/dd-trace-js) - method signatures, plugin list, and some usage examples
+- [APM Terms and Concepts](https://docs.datadoghq.com/tracing/visualization/) - a glossary of concepts applicable across all languages
+
+
+## Version Release Lines and Maintenance
+
+| Release Line                                             | Latest Version                                                                                         | Status          |Initial Release | End of Life |
+| :--:                                                     | :--:                                                                                                   | :---:           | :---:          | :---:       |
+| [`v1`](https://github.com/DataDog/dd-trace-js/tree/v1.x) | ![npm v1](https://img.shields.io/npm/v/dd-trace/legacy-v1?color=white&label=%20&style=flat-square)     | **End of Life** | 2021-07-13     | 2022-02-25  |
+| [`v2`](https://github.com/DataDog/dd-trace-js/tree/v2.x) | ![npm v2](https://img.shields.io/npm/v/dd-trace/latest-node12?color=white&label=%20&style=flat-square) | **Maintenance** | 2022-01-28     | 2023-08-15  |
+| [`v3`](https://github.com/DataDog/dd-trace-js/tree/v3.x) | ![npm v3](https://img.shields.io/npm/v/dd-trace/latest?color=white&label=%20&style=flat-square)        | **Current**     | 2022-08-15     | Unknown     |
+
+We currently maintain two release lines, namely `v2` and `v3`.
+Features and bug fixes that are merged are released to the `v3` line and, if appropriate, also the `v2` line.
+
+For any new projects it is recommended to use the `v3` release line:
+
+```sh
+$ npm install dd-trace
+$ yarn add dd-trace
+```
+
+However, existing projects that already use the `v2` release line, or projects that need to support Node.js v12, may use the `v2` release line.
+This is done by specifying the version when installing the package.
+Note that we also publish to npm using a `latest-node12` tag that can also be used for install:
+
+```sh
+$ npm install dd-trace@2
+$ yarn add dd-trace@2
+$ npm install dd-trace@latest-node12
+$ yarn add dd-trace@latest-node12
+```
+
+Any backwards-breaking functionality that is introduced into the library will result in an increase of the major version of the library and therefore a new release line.
+Such releases are kept to a minimum to reduce the pain of upgrading the library.
+
+When a new release line is introduced the previous release line then enters maintenance mode where it will receive updates for the next year.
+Once that year is up the release line enters End of Life and will not receive new updates.
+The library also follows the Node.js LTS lifecycle wherein new release lines drop compatibility with Node.js versions that reach end of life (with the maintenance release line still receiving updates for a year).
+
+For more information about library versioning and compatibility, see the [NodeJS Compatibility Requirements](https://docs.datadoghq.com/tracing/trace_collection/compatibility/nodejs/#releases) page.
+
+Changes associated with each individual release are documented on the [GitHub Releases](https://github.com/DataDog/dd-trace-js/releases) screen.
 
-For descriptions of terminology used in APM, take a look at the [official documentation](https://docs.datadoghq.com/tracing/visualization/).
 
 ## Development
 
 Before contributing to this open source project, read our [CONTRIBUTING.md](https://github.com/DataDog/dd-trace-js/blob/master/CONTRIBUTING.md).
 
-## Security Vulnerabilities
 
-If you have found a security issue, please contact the security team directly at [security@datadoghq.com](mailto:security@datadoghq.com).
-
-### Requirements
+## Requirements
 
 Since this project supports multiple Node versions, using a version
 manager such as [nvm](https://github.com/creationix/nvm) is recommended.
 
 We use [yarn](https://yarnpkg.com/) for its workspace functionality, so make sure to install that as well.
 
-To get started once you have Node and yarn installed, run:
+To install dependencies once you have Node and yarn installed, run:
 
 ```sh
 $ yarn
 ```
 
-### Testing
 
-Before running the tests, the data stores need to be running.
+## Testing
+
+Before running _plugin_ tests, the data stores need to be running.
 The easiest way to start all of them is to use the provided
 docker-compose configuration:
 
 ```sh
 $ docker-compose up -d -V --remove-orphans --force-recreate
+$ yarn services
 ```
 
-#### Unit Tests
 
-To run the unit tests, use:
+### Unit Tests
+
+There are several types of unit tests, for various types of components. The
+following commands may be useful:
 
 ```sh
-$ yarn test
+# Tracer core tests (i.e. testing `packages/dd-trace`)
+$ yarn test:trace:core
+# "Core" library tests (i.e. testing `packages/datadog-core`
+$ yarn test:core
+# Instrumentations tests (i.e. testing `packages/datadog-instrumentations`
+$ yarn test:instrumentations
 ```
 
-To run the unit tests continuously in watch mode while developing, use:
+Several other components have test commands as well. See `package.json` for
+details.
+
+To test _plugins_ (i.e. components in `packages/datadog-plugin-XXXX`
+directories, set the `PLUGINS` environment variable to the plugin you're
+interested in, and use `yarn test:plugins`. If you need to test multiple
+plugins you may separate then with a pipe (`|`) delimiter. Here's an
+example testing the `express` and `bluebird` plugins:
 
 ```sh
-$ yarn tdd
+PLUGINS="express|bluebird" yarn test:plugins
 ```
 
-#### Memory Leaks
+
+### Memory Leaks
 
 To run the memory leak tests, use:
 
 ```sh
-$ yarn leak
+$ yarn leak:core
+
+# or
+
+$ yarn leak:plugins
 ```
 
-Please note that memory leak tests only run on Node `>=8`.
 
 ### Linting
 
@@ -83,29 +146,31 @@ To run the linter, use:
 $ yarn lint
 ```
 
-### Continuous Integration
 
-We rely on CircleCI 2.0 for our tests. If you want to test how the CI behaves
-locally, you can use the CircleCI Command Line Interface as described here:
-https://circleci.com/docs/2.0/local-jobs/
+### Benchmarks
 
-After installing the `circleci` CLI, simply run one of the following:
+Our microbenchmarks live in `benchmark/sirun`. Each directory in there
+corresponds to a specific benchmark test and its variants, which are used to
+track regressions and improvements over time.
+
+In addition to those, when two or more approaches must be compared, please write
+a benchmark in the `benchmark/index.js` module so that we can keep track of the
+most efficient algorithm. To run your benchmark, use:
 
 ```sh
-$ circleci build --job lint
-$ circleci build --job node-leaks
-$ circleci build --job node-core-8
-$ circleci build --job node-core-10
-$ circleci build --job node-core-12
-$ circleci build --job node-core-latest
+$ yarn bench
 ```
 
-### Benchmarks
 
-When two or more approaches must be compared, please write a benchmark
-in the `benchmark/index.js` module so that we can keep track of the
-most efficient algorithm. To run your benchmark, just:
+## Serverless / Lambda
 
-```sh
-$ yarn bench
-```
+Note that there is a separate Lambda project, [datadog-lambda-js](https://github.com/DataDog/datadog-lambda-js), that is responsible for enabling metrics and distributed tracing when your application runs on Lambda.
+That project does depend on the `dd-trace` package but also adds a lot of Lambda-related niceties.
+If you find any issues specific to Lambda integrations then the issues may get solved quicker if they're added to that repository.
+That said, even if your application runs on Lambda, any core instrumentation issues not related to Lambda itself may be better served by opening an issue in this repository.
+Regardless of where you open the issue, someone at Datadog will try to help.
+
+
+## Security Vulnerabilities
+
+If you have found a security issue, please contact the security team directly at [security@datadoghq.com](mailto:security@datadoghq.com).

package/ci/init.js

@@ -7,7 +7,8 @@ const options = {
   startupLogs: false,
   tags: {
     [ORIGIN_KEY]: 'ciapp-test'
-  }
+  },
+  isCiVisibility: true
 }
 
 let shouldInit = true
@@ -25,6 +26,10 @@ but neither DD_API_KEY nor DATADOG_API_KEY are set in your environment, \
 so dd-trace will not be initialized.`)
     shouldInit = false
   }
+} else {
+  options.experimental = {
+    exporter: 'agent_proxy'
+  }
 }
 
 if (shouldInit) {

package/ext/exporters.d.ts

@@ -1,7 +1,8 @@
 declare const exporters: {
   LOG: 'log',
   AGENT: 'agent',
-  DATADOG: 'datadog'
+  DATADOG: 'datadog',
+  AGENT_PROXY: 'agent_proxy'
 }
 
 export = exporters

package/ext/exporters.js

@@ -2,5 +2,6 @@
 module.exports = {
   LOG: 'log',
   AGENT: 'agent',
-  DATADOG: 'datadog'
+  DATADOG: 'datadog',
+  AGENT_PROXY: 'agent_proxy'
 }

package/index.d.ts

@@ -509,7 +509,17 @@ export declare interface TracerOptions {
     /**
      * Specifies a regex that will redact sensitive data by its value in attack reports.
      */
-    obfuscatorValueRegex?: string
+    obfuscatorValueRegex?: string,
+
+    /**
+     * Specifies a path to a custom blocking template html file.
+     */
+    blockedTemplateHtml?: string,
+
+    /**
+     * Specifies a path to a custom blocking template json file.
+     */
+    blockedTemplateJson?: string,
   };
 }
 
@@ -1208,6 +1218,12 @@ declare namespace plugins {
    */
   interface kafkajs extends Instrumentation {}
 
+  /**
+   * This plugin automatically instruments the
+   * [ldapjs](https://github.com/ldapjs/node-ldapjs/) module.
+   */
+  interface ldapjs extends Instrumentation {}
+
   /**
    * This plugin automatically instruments the
    * [mariadb](https://github.com/mariadb-corporation/mariadb-connector-nodejs) module.
@@ -1254,7 +1270,12 @@ declare namespace plugins {
    * This plugin automatically instruments the
    * [mongodb-core](https://github.com/mongodb-js/mongodb-core) module.
    */
-  interface mongodb_core extends Instrumentation {}
+  interface mongodb_core extends Instrumentation {
+    /**
+     * Whether to include the query contents in the resource name.
+     */
+    queryInResourceName?: boolean;
+  }
 
   /**
    * This plugin automatically instruments the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "3.9.3",
+  "version": "3.11.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -16,14 +16,14 @@
     "services": "node ./scripts/install_plugin_modules && node packages/dd-trace/test/setup/services",
     "tdd": "node scripts/tdd.js",
     "test": "SERVICES=* yarn services && mocha --colors --exit --expose-gc 'packages/dd-trace/test/setup/node.js' 'packages/*/test/**/*.spec.js'",
-    "test:trace:core": "mocha --colors --exit --expose-gc --file packages/dd-trace/test/setup/core.js --exclude \"packages/dd-trace/test/profiling/**/*.spec.js\" \"packages/dd-trace/test/**/*.spec.js\"",
-    "test:trace:core:ci": "nyc --no-clean --include \"packages/dd-trace/src/**/*.js\" --exclude \"packages/dd-trace/src/profiling/**/*.js\" -- npm run test:trace:core -- --reporter mocha-multi-reporters --reporter-options configFile=mocha-reporter.json",
+    "test:trace:core": "mocha --colors --exit --expose-gc --file packages/dd-trace/test/setup/core.js --exclude \"packages/dd-trace/test/profiling/**/*.spec.js\" --exclude \"packages/dd-trace/test/appsec/iast/**/*.plugin.spec.js\" \"packages/dd-trace/test/**/*.spec.js\"",
+    "test:trace:core:ci": "nyc --no-clean --include \"packages/dd-trace/src/**/*.js\" --exclude \"packages/dd-trace/src/profiling/**/*.js\" --exclude \"packages/dd-trace/test/appsec/iast/**/*.plugin.spec.js\" -- npm run test:trace:core -- --reporter mocha-multi-reporters --reporter-options configFile=mocha-reporter.json",
     "test:instrumentations": "mocha --colors --file 'packages/dd-trace/test/setup/core.js' 'packages/datadog-instrumentations/test/**/*.spec.js'",
     "test:instrumentations:ci": "nyc --no-clean --include 'packages/datadog-instrumentations/src/**/*.js' -- npm run test:instrumentations",
     "test:core": "mocha --colors --file packages/datadog-core/test/setup.js 'packages/datadog-core/test/**/*.spec.js'",
     "test:core:ci": "nyc --no-clean --include 'packages/datadog-core/src/**/*.js' -- npm run test:core",
-    "test:plugins": "mocha --colors --exit --file \"packages/dd-trace/test/setup/core.js\" \"packages/datadog-instrumentations/test/@($(echo $PLUGINS)).spec.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/**/*.spec.js\"",
-    "test:plugins:ci": "yarn services && nyc --no-clean --include \"packages/datadog-instrumentations/src/@($(echo $PLUGINS)).js\" --include \"packages/datadog-instrumentations/src/@($(echo $PLUGINS))/**/*.js\" --include \"packages/datadog-plugin-@($(echo $PLUGINS))/src/**/*.js\" -- npm run test:plugins",
+    "test:plugins": "mocha --colors --exit --file \"packages/dd-trace/test/setup/core.js\" \"packages/datadog-instrumentations/test/@($(echo $PLUGINS)).spec.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/**/*.spec.js\" \"packages/dd-trace/test/appsec/iast/**/*.@($(echo $PLUGINS)).plugin.spec.js\"",
+    "test:plugins:ci": "yarn services && nyc --no-clean --include \"packages/datadog-instrumentations/src/@($(echo $PLUGINS)).js\" --include \"packages/datadog-instrumentations/src/@($(echo $PLUGINS))/**/*.js\" --include \"packages/datadog-plugin-@($(echo $PLUGINS))/src/**/*.js\" --include \"packages/dd-trace/test/appsec/iast/**/*.@($(echo $PLUGINS)).plugin.spec.js\" -- npm run test:plugins",
     "test:plugins:upstream": "node ./packages/dd-trace/test/plugins/suite.js",
     "test:profiler": "mocha --colors --exit --file \"packages/dd-trace/test/setup/core.js\" \"packages/dd-trace/test/profiling/**/*.spec.js\"",
     "test:profiler:ci": "nyc --no-clean --include \"packages/dd-trace/src/profiling/**/*.js\" -- npm run test:profiler",
@@ -59,7 +59,7 @@
   },
   "dependencies": {
     "@datadog/native-appsec": "2.0.0",
-    "@datadog/native-iast-rewriter": "1.0.0",
+    "@datadog/native-iast-rewriter": "1.1.2",
     "@datadog/native-iast-taint-tracking": "1.0.0",
     "@datadog/native-metrics": "^1.5.0",
     "@datadog/pprof": "^1.1.1",
@@ -79,6 +79,7 @@
     "lru-cache": "^7.14.0",
     "methods": "^1.1.2",
     "module-details-from-path": "^1.0.3",
+    "node-abort-controller": "^3.0.1",
     "opentracing": ">=0.12.1",
     "path-to-regexp": "^0.1.2",
     "protobufjs": "^7.1.2",
@@ -99,6 +100,7 @@
     "eslint": "^8.23.0",
     "eslint-config-standard": "^11.0.0-beta.0",
     "eslint-plugin-import": "^2.8.0",
+    "eslint-plugin-mocha": "^10.1.0",
     "eslint-plugin-node": "^5.2.1",
     "eslint-plugin-promise": "^3.6.0",
     "eslint-plugin-standard": "^3.0.1",

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

@@ -46,6 +46,7 @@ module.exports = {
   'koa': () => require('../koa'),
   'koa-router': () => require('../koa'),
   'kafkajs': () => require('../kafkajs'),
+  'ldapjs': () => require('../ldapjs'),
   'limitd-client': () => require('../limitd-client'),
   'mariadb': () => require('../mariadb'),
   'memcached': () => require('../memcached'),

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

@@ -1,5 +1,6 @@
 'use strict'
 
+const { AbortController } = require('node-abort-controller') // AbortController is not available in node <15
 const {
   channel,
   addHook
@@ -11,6 +12,8 @@ const exitServerCh = channel('apm:http:server:request:exit')
 const errorServerCh = channel('apm:http:server:request:error')
 const finishServerCh = channel('apm:http:server:request:finish')
 
+const requestFinishedSet = new WeakSet()
+
 addHook({ name: 'https' }, http => {
   // http.ServerResponse not present on https
   shimmer.wrap(http.Server.prototype, 'emit', wrapEmit)
@@ -29,8 +32,9 @@ function wrapResponseEmit (emit) {
       return emit.apply(this, arguments)
     }
 
-    if (eventName === 'close') {
+    if (['finish', 'close'].includes(eventName) && !requestFinishedSet.has(this)) {
       finishServerCh.publish({ req: this.req })
+      requestFinishedSet.add(this)
     }
 
     return emit.apply(this, arguments)
@@ -45,9 +49,14 @@ function wrapEmit (emit) {
     if (eventName === 'request') {
       res.req = req
 
-      startServerCh.publish({ req, res })
+      const abortController = new AbortController()
+
+      startServerCh.publish({ req, res, abortController })
 
       try {
+        if (abortController.signal.aborted) {
+          return res.end()
+        }
         return emit.apply(this, arguments)
       } catch (err) {
         errorServerCh.publish(err)

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

@@ -19,7 +19,7 @@ const testRunFinishCh = channel('ci:jest:test:finish')
 const testErrCh = channel('ci:jest:test:err')
 
 const skippableSuitesCh = channel('ci:jest:test-suite:skippable')
-const jestConfigurationCh = channel('ci:jest:configuration')
+const jestItrConfigurationCh = channel('ci:jest:itr-configuration')
 
 let skippableSuites = []
 let isCodeCoverageEnabled = false
@@ -176,21 +176,21 @@ function cliWrapper (cli) {
     const configurationPromise = new Promise((resolve) => {
       onDone = resolve
     })
-    if (!jestConfigurationCh.hasSubscribers) {
+    if (!jestItrConfigurationCh.hasSubscribers) {
       return runCLI.apply(this, arguments)
     }
 
     sessionAsyncResource.runInAsyncScope(() => {
-      jestConfigurationCh.publish({ onDone })
+      jestItrConfigurationCh.publish({ onDone })
     })
 
     try {
-      const { err, config } = await configurationPromise
+      const { err, itrConfig } = await configurationPromise
       if (err) {
         log.error(err)
       }
-      isCodeCoverageEnabled = config.isCodeCoverageEnabled
-      isSuitesSkippingEnabled = config.isSuitesSkippingEnabled
+      isCodeCoverageEnabled = itrConfig.isCodeCoverageEnabled
+      isSuitesSkippingEnabled = itrConfig.isSuitesSkippingEnabled
     } catch (e) {
       log.error(e)
     }
@@ -216,7 +216,7 @@ function cliWrapper (cli) {
       }
     }
 
-    const isTestsSkipped = !!skippableSuites.length
+    const isSuitesSkipped = !!skippableSuites.length
 
     const processArgv = process.argv.slice(2).join(' ')
     sessionAsyncResource.runInAsyncScope(() => {
@@ -229,13 +229,20 @@ function cliWrapper (cli) {
 
     let testCodeCoverageLinesTotal
     try {
-      testCodeCoverageLinesTotal = coverageMap.getCoverageSummary().lines.pct
+      const { pct, total } = coverageMap.getCoverageSummary().lines
+      testCodeCoverageLinesTotal = total !== 0 ? pct : 0
     } catch (e) {
       // ignore errors
     }
 
     sessionAsyncResource.runInAsyncScope(() => {
-      testSessionFinishCh.publish({ status: success ? 'pass' : 'fail', isTestsSkipped, testCodeCoverageLinesTotal })
+      testSessionFinishCh.publish({
+        status: success ? 'pass' : 'fail',
+        isSuitesSkipped,
+        isSuitesSkippingEnabled,
+        isCodeCoverageEnabled,
+        testCodeCoverageLinesTotal
+      })
     })
 
     return result
@@ -307,6 +314,11 @@ function jestAdapterWrapper (jestAdapter) {
         const coverageFiles = getCoveredFilenamesFromCoverage(environment.global.__coverage__)
           .map(filename => getTestSuitePath(filename, environment.rootDir))
 
+        /**
+         * Child processes do not each request ITR configuration, so the jest's parent process
+         * needs to pass them the configuration. This is done via _ddTestCodeCoverageEnabled, which
+         * controls whether coverage is reported.
+         */
         if (coverageFiles &&
           environment.testEnvironmentOptions &&
           environment.testEnvironmentOptions._ddTestCodeCoverageEnabled) {
@@ -354,9 +366,11 @@ function configureTestEnvironment (readConfigsResult) {
   if (isSuitesSkippingEnabled) {
     // If suite skipping is enabled, the code coverage results are not going to be relevant,
     // so we do not show them.
+    // Also, we might skip every test, so we need to pass `passWithNoTests`
     const globalConfig = {
       ...readConfigsResult.globalConfig,
-      coverageReporters: ['none']
+      coverageReporters: ['none'],
+      passWithNoTests: true
     }
     readConfigsResult.globalConfig = globalConfig
   }

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

@@ -0,0 +1,91 @@
+'use strict'
+
+const {
+  channel,
+  addHook,
+  AsyncResource
+} = require('./helpers/instrument')
+const shimmer = require('../../datadog-shimmer')
+
+function isString (value) {
+  return typeof value === 'string' || value instanceof String
+}
+
+function getCallbackArgIndex (args) {
+  let callbackIndex = -1
+  for (let i = args.length - 1; i >= 0; i--) {
+    if (typeof args[i] === 'function') {
+      callbackIndex = i
+      break
+    }
+  }
+  return callbackIndex
+}
+
+function wrapEmitter (corkedEmitter) {
+  const callbackMap = new WeakMap()
+
+  const addListener = on => function (name, fn) {
+    if (typeof fn === 'function') {
+      let bindedFn = callbackMap.get(fn)
+      if (!bindedFn) {
+        const callbackResource = new AsyncResource('bound-anonymous-fn')
+        bindedFn = callbackResource.bind(fn)
+        callbackMap.set(fn, bindedFn)
+      }
+      arguments[1] = bindedFn
+    }
+    on.apply(this, arguments)
+  }
+  shimmer.wrap(corkedEmitter, 'on', addListener)
+  shimmer.wrap(corkedEmitter, 'addListener', addListener)
+
+  const removeListener = off => function (name, fn) {
+    if (typeof fn === 'function') {
+      const emitterOn = callbackMap.get(fn)
+      if (emitterOn) {
+        arguments[1] = emitterOn
+      }
+    }
+    off.apply(this, arguments)
+  }
+  shimmer.wrap(corkedEmitter, 'off', removeListener)
+  shimmer.wrap(corkedEmitter, 'removeListener', removeListener)
+}
+
+addHook({ name: 'ldapjs', versions: ['>=2'] }, ldapjs => {
+  const ldapSearchCh = channel('datadog:ldapjs:client:search')
+
+  shimmer.wrap(ldapjs.Client.prototype, 'search', search => function (base, options) {
+    if (ldapSearchCh.hasSubscribers) {
+      let filter
+      if (isString(options)) {
+        filter = options
+      } else if (typeof options === 'object' && options.filter) {
+        if (isString(options.filter)) {
+          filter = options.filter
+        }
+      }
+      ldapSearchCh.publish({ base, filter })
+    }
+
+    return search.apply(this, arguments)
+  })
+
+  shimmer.wrap(ldapjs.Client.prototype, '_send', _send => function () {
+    const callbackIndex = getCallbackArgIndex(arguments)
+    if (callbackIndex > -1) {
+      const callback = arguments[callbackIndex]
+      arguments[callbackIndex] = shimmer.wrap(callback, function (err, corkedEmitter) {
+        if (typeof corkedEmitter === 'object' && typeof corkedEmitter['on'] === 'function') {
+          wrapEmitter(corkedEmitter)
+        }
+        callback.apply(this, arguments)
+      })
+    }
+
+    return _send.apply(this, arguments)
+  })
+
+  return ldapjs
+})

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

@@ -17,7 +17,7 @@ const skipCh = channel('ci:mocha:test:skip')
 const testFinishCh = channel('ci:mocha:test:finish')
 const parameterizedTestCh = channel('ci:mocha:test:parameterize')
 
-const configurationCh = channel('ci:mocha:configuration')
+const itrConfigurationCh = channel('ci:mocha:itr-configuration')
 const skippableSuitesCh = channel('ci:mocha:test-suite:skippable')
 
 const testSessionStartCh = channel('ci:mocha:session:start')
@@ -111,7 +111,10 @@ function mochaHook (Runner) {
         status = 'fail'
       }
       testFileToSuiteAr.clear()
-      testSessionFinishCh.publish(status)
+
+      const isSuitesSkipped = !!suitesToSkip.length
+
+      testSessionFinishCh.publish({ status, isSuitesSkipped })
       // restore the original coverage
       global.__coverage__ = fromCoverageMapToCoverage(originalCoverageMap)
     }))
@@ -317,7 +320,7 @@ addHook({
    * If ITR is disabled, `onDone` is called immediately on the subscriber
    */
   shimmer.wrap(Mocha.prototype, 'run', run => function () {
-    if (!configurationCh.hasSubscribers) {
+    if (!itrConfigurationCh.hasSubscribers) {
       return run.apply(this, arguments)
     }
     const onReceivedSkippableSuites = ({ err, skippableSuites }) => {
@@ -345,7 +348,7 @@ addHook({
     }
 
     mochaRunAsyncResource.runInAsyncScope(() => {
-      configurationCh.publish({
+      itrConfigurationCh.publish({
         onDone: mochaRunAsyncResource.bind(onReceivedConfiguration)
       })
     })

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

@@ -4,7 +4,7 @@ const { addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const { createWrapRequest } = require('./elasticsearch')
 
-addHook({ name: '@opensearch-project/opensearch', file: 'lib/Transport.js', versions: ['1.1.0'] }, Transport => {
+addHook({ name: '@opensearch-project/opensearch', file: 'lib/Transport.js', versions: ['>=1'] }, Transport => {
   shimmer.wrap(Transport.prototype, 'request', createWrapRequest('opensearch'))
   return Transport
 })