dd-trace 5.14.1 → 5.16.0

package/LICENSE-3rdparty.csv

@@ -12,17 +12,14 @@ require,dc-polyfill,MIT,Copyright 2023 Datadog Inc.
 require,ignore,MIT,Copyright 2013 Kael Zhang and contributors
 require,import-in-the-middle,Apache license 2.0,Copyright 2021 Datadog Inc.
 require,int64-buffer,MIT,Copyright 2015-2016 Yusuke Kawasaki
-require,ipaddr.js,MIT,Copyright 2011-2017 whitequark
 require,istanbul-lib-coverage,BSD-3-Clause,Copyright 2012-2015 Yahoo! Inc.
 require,jest-docblock,MIT,Copyright Meta Platforms, Inc. and affiliates.
 require,koalas,MIT,Copyright 2013-2017 Brian Woodward
 require,limiter,MIT,Copyright 2011 John Hurliman
 require,lodash.sortby,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,msgpack-lite,MIT,Copyright 2015 Yusuke Kawasaki
-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,pprof-format,MIT,Copyright 2022 Stephen Belanger

package/README.md

@@ -2,7 +2,6 @@
 
 [![npm v5](https://img.shields.io/npm/v/dd-trace/latest?color=blue&label=dd-trace%40v5&logo=npm)](https://www.npmjs.com/package/dd-trace)
 [![npm v4](https://img.shields.io/npm/v/dd-trace/latest-node16?color=blue&label=dd-trace%40v4&logo=npm)](https://www.npmjs.com/package/dd-trace/v/latest-node16)
-[![npm v3](https://img.shields.io/npm/v/dd-trace/latest-node14?color=blue&label=dd-trace%40v3&logo=npm)](https://www.npmjs.com/package/dd-trace/v/latest-node14)
 [![codecov](https://codecov.io/gh/DataDog/dd-trace-js/branch/master/graph/badge.svg)](https://codecov.io/gh/DataDog/dd-trace-js)
 
 <img align="right" src="https://user-images.githubusercontent.com/551402/208212084-1d0c07e2-4135-4c61-b2da-8f2fddbc66ed.png" alt="Bits the dog  JavaScript" width="200px"/>
@@ -28,12 +27,12 @@ Most of the documentation for `dd-trace` is available on these webpages:
 | :---:                                                    | :---:                                                                                                  | :---:    | :---:           | :---:          | :---:       |
 | [`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)     | `>= v12` | **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) | `>= v12` | **End of Life** | 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-node14?color=white&label=%20&style=flat-square) | `>= v14` | **Maintenance** | 2022-08-15     | 2024-05-15  |
+| [`v3`](https://github.com/DataDog/dd-trace-js/tree/v3.x) | ![npm v3](https://img.shields.io/npm/v/dd-trace/latest-node14?color=white&label=%20&style=flat-square) | `>= v14` | **End of Life** | 2022-08-15     | 2024-05-15  |
 | [`v4`](https://github.com/DataDog/dd-trace-js/tree/v4.x) | ![npm v4](https://img.shields.io/npm/v/dd-trace/latest-node16?color=white&label=%20&style=flat-square)        | `>= v16` | **Maintenance**     | 2023-05-12     | 2025-01-11     |
 | [`v5`](https://github.com/DataDog/dd-trace-js/tree/v5.x) | ![npm v5](https://img.shields.io/npm/v/dd-trace/latest?color=white&label=%20&style=flat-square)        | `>= v18` | **Current**     | 2024-01-11     | Unknown     |
 
-We currently maintain three release lines, namely `v5`, `v4` and `v3`.
-Features and bug fixes that are merged are released to the `v5` line and, if appropriate, also the `v4` & `v3` line.
+We currently maintain two release lines, namely `v5`, and `v4`.
+Features and bug fixes that are merged are released to the `v5` line and, if appropriate, also `v4`.
 
 For any new projects it is recommended to use the `v5` release line:
 
@@ -42,7 +41,7 @@ $ npm install dd-trace
 $ yarn add dd-trace
 ```
 
-However, existing projects that already use the `v4` & `v3` release line, or projects that need to support EOL versions of Node.js, may continue to use these release lines.
+However, existing projects that already use the `v4` release line, or projects that need to support EOL versions of Node.js, may continue to use these release lines.
 This is done by specifying the version when installing the package.
 
 ```sh
@@ -67,18 +66,9 @@ Changes associated with each individual release are documented on the [GitHub Re
 Please read the [CONTRIBUTING.md](https://github.com/DataDog/dd-trace-js/blob/master/CONTRIBUTING.md) document before contributing to this open source project.
 
 
-## Experimental ESM Support
+## EcmaScript Modules (ESM) Support
 
-> **Warning**
-> 
-> ESM support has been temporarily disabled starting from Node 20 as significant
-> changes are in progress.
-
-ESM support is currently in the experimental stages, while CJS has been supported
-since inception. This means that code loaded using `require()` should work fine
-but code loaded using `import` might not always work.
-
-Use the following command to enable experimental ESM support with your application:
+ESM support requires an additional command-line argument. Use the following to enable experimental ESM support with your application:
 
 Node.js < v20.6
 
@@ -110,9 +100,9 @@ If you would like to trace your bundled application then please read this page o
 
 Please refer to the [SECURITY.md](https://github.com/DataDog/dd-trace-js/blob/master/SECURITY.md) document if you have found a security issue.
 
+
 ## Datadog With OpenTelemetery
 
-Please refer to the [Node.js Custom Instrumentation using OpenTelemetry API](https://docs.datadoghq.com/tracing/trace_collection/custom_instrumentation/nodejs/otel/) document. It includes information on how to use the OpenTelemetry API with dd-trace-js
+Please refer to the [Node.js Custom Instrumentation using OpenTelemetry API](https://docs.datadoghq.com/tracing/trace_collection/custom_instrumentation/nodejs/otel/) document. It includes information on how to use the OpenTelemetry API with dd-trace-js.
 
 Note that our internal implementation of the OpenTelemetry API is currently set within the version range `>=1.0.0 <1.9.0`. This range will be updated at a regular cadence therefore, we recommend updating your tracer to the latest release to ensure up to date support.
-

package/ci/init.js

@@ -4,6 +4,7 @@ const { isTrue } = require('../packages/dd-trace/src/util')
 
 const isJestWorker = !!process.env.JEST_WORKER_ID
 const isCucumberWorker = !!process.env.CUCUMBER_WORKER_ID
+const isMochaWorker = !!process.env.MOCHA_WORKER_ID
 
 const options = {
   startupLogs: false,
@@ -44,6 +45,12 @@ if (isCucumberWorker) {
   }
 }
 
+if (isMochaWorker) {
+  options.experimental = {
+    exporter: 'mocha_worker'
+  }
+}
+
 if (shouldInit) {
   tracer.init(options)
   tracer.use('fs', false)

package/ext/exporters.d.ts

@@ -5,6 +5,7 @@ declare const exporters: {
   AGENT_PROXY: 'agent_proxy',
   JEST_WORKER: 'jest_worker',
   CUCUMBER_WORKER: 'cucumber_worker'
+  MOCHA_WORKER: 'mocha_worker'
 }
 
 export = exporters

package/ext/exporters.js

@@ -5,5 +5,6 @@ module.exports = {
   DATADOG: 'datadog',
   AGENT_PROXY: 'agent_proxy',
   JEST_WORKER: 'jest_worker',
-  CUCUMBER_WORKER: 'cucumber_worker'
+  CUCUMBER_WORKER: 'cucumber_worker',
+  MOCHA_WORKER: 'mocha_worker'
 }

package/ext/tags.d.ts

@@ -10,6 +10,7 @@ declare const tags: {
   MANUAL_DROP: 'manual.drop'
   MEASURED: '_dd.measured'
   BASE_SERVICE: '_dd.base_service'
+  DD_PARENT_ID: '_dd.parent_id'
   HTTP_URL: 'http.url'
   HTTP_METHOD: 'http.method'
   HTTP_STATUS_CODE: 'http.status_code'

package/ext/tags.js

@@ -13,6 +13,7 @@ const tags = {
   MANUAL_DROP: 'manual.drop',
   MEASURED: '_dd.measured',
   BASE_SERVICE: '_dd.base_service',
+  DD_PARENT_ID: '_dd.parent_id',
 
   // HTTP
   HTTP_URL: 'http.url',

package/index.d.ts

@@ -113,9 +113,15 @@ interface Tracer extends opentracing.Tracer {
   wrap<T = (...args: any[]) => any> (name: string, options: (...args: any[]) => tracer.TraceOptions & tracer.SpanOptions, fn: T): T;
 
   /**
-   * Create and return a string that can be included in the <head> of a
-   * document to enable RUM tracing to include it. The resulting string
-   * should not be cached.
+   * Returns an HTML string containing <meta> tags that should be included in
+   * the <head> of a document to enable correlating the current trace with the
+   * RUM view. Otherwise, it is not possible to associate the trace used to
+   * generate the initial HTML document with a given RUM view. The resulting
+   * HTML document should not be cached as the meta tags are time-sensitive
+   * and are associated with a specific user.
+   *
+   * Note that this feature is currently not supported by the backend and
+   * using it will have no effect.
    */
   getRumData (): string;
 
@@ -684,6 +690,15 @@ declare namespace tracer {
          * @default 0.1
          */
         requestSampling?: number
+      },
+      /**
+       * Configuration for RASP
+       */
+      rasp?: {
+        /** Whether to enable RASP.
+         * @default false
+         */
+        enabled?: boolean
       }
     };
 

package/initialize.mjs

@@ -0,0 +1,52 @@
+/**
+  * This file serves one of two purposes, depending on how it's used.
+  *
+  * If used with --import, it will import init.js and register the loader hook.
+  * If used with --loader, it will act as the loader hook, except that it will
+  * also import init.js inside the source code of the entrypoint file.
+  *
+  * The result is that no matter how this file is used, so long as it's with
+  * one of the two flags, the tracer will always be initialized, and the loader
+  * hook will always be active for ESM support.
+  */
+
+import { isMainThread } from 'worker_threads'
+
+import { fileURLToPath } from 'node:url'
+import {
+  load as origLoad,
+  resolve as origResolve,
+  getFormat as origGetFormat,
+  getSource as origGetSource
+} from 'import-in-the-middle/hook.mjs'
+
+let hasInsertedInit = false
+function insertInit (result) {
+  if (!hasInsertedInit) {
+    hasInsertedInit = true
+    result.source = `
+import '${fileURLToPath(new URL('./init.js', import.meta.url))}';
+${result.source}`
+  }
+  return result
+}
+
+export async function load (...args) {
+  return insertInit(await origLoad(...args))
+}
+
+export const resolve = origResolve
+
+export const getFormat = origGetFormat
+
+export async function getSource (...args) {
+  return insertInit(await origGetSource(...args))
+}
+
+if (isMainThread) {
+  await import('./init.js')
+  const { register } = await import('node:module')
+  if (register) {
+    register('./loader-hook.mjs', import.meta.url)
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.14.1",
+  "version": "5.16.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -32,13 +32,13 @@
     "test:plugins:upstream": "node ./packages/dd-trace/test/plugins/suite.js",
     "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 --colors --timeout 30000 \"integration-tests/*.spec.js\"",
-    "test:integration:cucumber": "mocha --colors --timeout 30000 \"integration-tests/cucumber/*.spec.js\"",
-    "test:integration:cypress": "mocha --colors --timeout 30000 \"integration-tests/cypress/*.spec.js\"",
-    "test:integration:playwright": "mocha --colors --timeout 30000 \"integration-tests/playwright/*.spec.js\"",
-    "test:integration:selenium": "mocha --colors --timeout 30000 \"integration-tests/selenium/*.spec.js\"",
-    "test:integration:profiler": "mocha --colors --timeout 90000 \"integration-tests/profiler/*.spec.js\"",
-    "test:integration:serverless": "mocha --colors --timeout 30000 \"integration-tests/serverless/*.spec.js\"",
+    "test:integration": "mocha --colors --timeout 30000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/*.spec.js\"",
+    "test:integration:cucumber": "mocha --colors --timeout 30000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/cucumber/*.spec.js\"",
+    "test:integration:cypress": "mocha --colors --timeout 30000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/cypress/*.spec.js\"",
+    "test:integration:playwright": "mocha --colors --timeout 30000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/playwright/*.spec.js\"",
+    "test:integration:selenium": "mocha --colors --timeout 30000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/selenium/*.spec.js\"",
+    "test:integration:profiler": "mocha --colors --timeout 90000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/profiler/*.spec.js\"",
+    "test:integration:serverless": "mocha --colors --timeout 30000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/serverless/*.spec.js\"",
     "test:integration:plugins": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/integration-test/**/*.spec.js\"",
     "test:unit:plugins": "mocha --colors --exit -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 --colors 'packages/datadog-shimmer/test/**/*.spec.js'",
@@ -70,7 +70,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@datadog/native-appsec": "7.1.1",
+    "@datadog/native-appsec": "8.0.1",
     "@datadog/native-iast-rewriter": "2.3.1",
     "@datadog/native-iast-taint-tracking": "2.1.0",
     "@datadog/native-metrics": "^2.0.0",
@@ -83,17 +83,14 @@
     "ignore": "^5.2.4",
     "import-in-the-middle": "^1.7.4",
     "int64-buffer": "^0.1.9",
-    "ipaddr.js": "^2.1.0",
     "istanbul-lib-coverage": "3.2.0",
     "jest-docblock": "^29.7.0",
     "koalas": "^1.0.2",
     "limiter": "1.1.5",
     "lodash.sortby": "^4.7.0",
     "lru-cache": "^7.14.0",
-    "methods": "^1.1.2",
     "module-details-from-path": "^1.0.3",
     "msgpack-lite": "^0.1.26",
-    "node-abort-controller": "^3.1.1",
     "opentracing": ">=0.12.1",
     "path-to-regexp": "^0.1.2",
     "pprof-format": "^2.1.0",

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

@@ -8,13 +8,16 @@ const {
 const kebabCase = require('../../datadog-core/src/utils/src/kebabcase')
 const shimmer = require('../../datadog-shimmer')
 
+const { NODE_MAJOR, NODE_MINOR } = require('../../../version')
+const MIN_VERSION = ((NODE_MAJOR > 22) || (NODE_MAJOR === 22 && NODE_MINOR >= 2)) ? '>=0.5.3' : '>=0.5.0'
+
 const startCh = channel('apm:amqplib:command:start')
 const finishCh = channel('apm:amqplib:command:finish')
 const errorCh = channel('apm:amqplib:command:error')
 
 let methods = {}
 
-addHook({ name: 'amqplib', file: 'lib/defs.js', versions: ['>=0.5'] }, defs => {
+addHook({ name: 'amqplib', file: 'lib/defs.js', versions: [MIN_VERSION] }, defs => {
   methods = Object.keys(defs)
     .filter(key => Number.isInteger(defs[key]))
     .filter(key => isCamelCase(key))
@@ -22,7 +25,7 @@ addHook({ name: 'amqplib', file: 'lib/defs.js', versions: ['>=0.5'] }, defs => {
   return defs
 })
 
-addHook({ name: 'amqplib', file: 'lib/channel.js', versions: ['>=0.5'] }, channel => {
+addHook({ name: 'amqplib', file: 'lib/channel.js', versions: [MIN_VERSION] }, channel => {
   shimmer.wrap(channel.Channel.prototype, 'sendImmediately', sendImmediately => function (method, fields) {
     return instrument(sendImmediately, this, arguments, methods[method], fields)
   })

package/packages/datadog-instrumentations/src/apollo-server-core.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const { AbortController } = require('node-abort-controller')
 const { addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const dc = require('dc-polyfill')

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

@@ -1,6 +1,5 @@
 'use strict'
 
-const { AbortController } = require('node-abort-controller')
 const dc = require('dc-polyfill')
 
 const { addHook } = require('./helpers/instrument')

package/packages/datadog-instrumentations/src/body-parser.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const { AbortController } = require('node-abort-controller') // AbortController is not available in node <15
 const shimmer = require('../../datadog-shimmer')
 const { channel, addHook } = require('./helpers/instrument')
 

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

@@ -1,6 +1,30 @@
 'use strict'
 
-/* eslint-disable no-console */
+// This code runs before the tracer is configured and before a logger is ready
+// For that reason we queue up the messages now and decide what to do with them later
+const warnings = []
+
+/**
+ * Here we maintain a list of packages that an application
+ * may have installed which could potentially conflict with
+ */
+const potentialConflicts = new Set([
+  '@appsignal/javascript',
+  '@appsignal/nodejs',
+  '@dynatrace/oneagent',
+  '@instana/aws-fargate',
+  '@instana/aws-lambda',
+  '@instana/azure-container-services',
+  '@instana/collector',
+  '@instana/google-cloud-run',
+  '@sentry/node',
+  'appoptics-apm',
+  'atatus-nodejs',
+  'elastic-apm-node',
+  'newrelic',
+  'stackify-node-apm',
+  'sqreen'
+])
 
 const extractPackageAndModulePath = require('./utils/src/extract-package-and-module-path')
 
@@ -13,14 +37,14 @@ const extractPackageAndModulePath = require('./utils/src/extract-package-and-mod
  *
  * Note that this only going to work for modules within npm
  * packages, like `express`, and not internal modules, like
- * `http`.
+ * `http`. It also only works with CJS, not with ESM imports.
  *
  * The output isn't necessarily 100% perfect. For example if the
  * app loads a package we instrument but outside of an
  * unsupported version then a warning would still be displayed.
  * This is OK as the tracer should be loaded earlier anyway.
  */
-module.exports = function () {
+module.exports.checkForRequiredModules = function () {
   const packages = require('../../datadog-instrumentations/src/helpers/hooks')
   const naughties = new Set()
   let didWarn = false
@@ -31,11 +55,49 @@ module.exports = function () {
     if (naughties.has(pkg)) continue
     if (!(pkg in packages)) continue
 
-    console.error(`Warning: Package '${pkg}' was loaded before dd-trace! This may break instrumentation.`)
+    warnings.push(`Warning: Package '${pkg}' was loaded before dd-trace! This may break instrumentation.`)
 
     naughties.add(pkg)
     didWarn = true
   }
 
-  if (didWarn) console.error('Warning: Please ensure dd-trace is loaded before other modules.')
+  if (didWarn) warnings.push('Warning: Please ensure dd-trace is loaded before other modules.')
+}
+
+/**
+ * APM tools, and some other packages in the community, work
+ * by monkey-patching internal modules and possibly some
+ * globals. Usually this is done in a conflict-free way by
+ * wrapping an existing method with a new method that still
+ * calls the original method. Unfortunately it's possible
+ * that some of these packages (dd-trace included) may
+ * wrap methods in a way that make it unsafe for the methods
+ * to be wrapped again by another library.
+ *
+ * When encountered, and when debug mode is on, a warning is
+ * printed if such a package is discovered. This can help
+ * when debugging a faulty installation.
+ */
+module.exports.checkForPotentialConflicts = function () {
+  const naughties = new Set()
+  let didWarn = false
+
+  for (const pathToModule of Object.keys(require.cache)) {
+    const { pkg } = extractPackageAndModulePath(pathToModule)
+    if (naughties.has(pkg)) continue
+    if (!potentialConflicts.has(pkg)) continue
+
+    warnings.push(`Warning: Package '${pkg}' may cause conflicts with dd-trace.`)
+
+    naughties.add(pkg)
+    didWarn = true
+  }
+
+  if (didWarn) warnings.push('Warning: Packages were loaded that may conflict with dd-trace.')
+}
+
+module.exports.flushStartupLogs = function (log) {
+  while (warnings.length) {
+    log.warn(warnings.shift())
+  }
 }

package/packages/datadog-instrumentations/src/cookie-parser.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const { AbortController } = require('node-abort-controller') // AbortController is not available in node <15
 const shimmer = require('../../datadog-shimmer')
 const { channel, addHook } = require('./helpers/instrument')
 

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

@@ -3,7 +3,6 @@
 const { createWrapRouterMethod } = require('./router')
 const shimmer = require('../../datadog-shimmer')
 const { addHook, channel } = require('./helpers/instrument')
-const { AbortController } = require('node-abort-controller')
 
 const handleChannel = channel('apm:express:request:handle')
 

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

@@ -1,7 +1,5 @@
 'use strict'
 
-const { AbortController } = require('node-abort-controller')
-
 const {
   addHook,
   channel,

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

@@ -71,6 +71,7 @@ module.exports = {
   'microgateway-core': () => require('../microgateway-core'),
   mocha: () => require('../mocha'),
   'mocha-each': () => require('../mocha'),
+  workerpool: () => require('../mocha'),
   moleculer: () => require('../moleculer'),
   mongodb: () => require('../mongodb'),
   'mongodb-core': () => require('../mongodb-core'),

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

@@ -29,10 +29,13 @@ if (!disabledInstrumentations.has('fetch')) {
 }
 
 const HOOK_SYMBOL = Symbol('hookExportsMap')
-// TODO: make this more efficient
 
-if (DD_TRACE_DEBUG && DD_TRACE_DEBUG.toLowerCase() !== 'false') checkRequireCache()
+if (DD_TRACE_DEBUG && DD_TRACE_DEBUG.toLowerCase() !== 'false') {
+  checkRequireCache.checkForRequiredModules()
+  setImmediate(checkRequireCache.checkForPotentialConflicts)
+}
 
+// TODO: make this more efficient
 for (const packageName of names) {
   if (disabledInstrumentations.has(packageName)) continue
 

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

@@ -1,6 +1,5 @@
 'use strict'
 
-const { AbortController } = require('node-abort-controller') // AbortController is not available in node <15
 const {
   channel,
   addHook

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

@@ -148,7 +148,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
       }
       let hasSnapshotTests = true
       try {
-        const { _snapshotData } = this.context.expect.getState().snapshotState
+        const { _snapshotData } = this.getVmContext().expect.getState().snapshotState
         hasSnapshotTests = Object.keys(_snapshotData).length > 0
       } catch (e) {
         // if we can't be sure, we'll err on the side of caution and assume it has snapshots
@@ -589,10 +589,13 @@ function coverageReporterWrapper (coverageReporter) {
 
   /**
    * If ITR is active, we're running fewer tests, so of course the total code coverage is reduced.
-   * This calculation adds no value, so we'll skip it.
+   * This calculation adds no value, so we'll skip it, as long as the user has not manually opted in to code coverage,
+   * in which case we'll leave it.
    */
   shimmer.wrap(CoverageReporter.prototype, '_addUntestedFiles', addUntestedFiles => async function () {
-    if (isSuitesSkippingEnabled) {
+    // If the user has added coverage manually, they're willing to pay the price of this execution, so
+    // we will not skip it.
+    if (isSuitesSkippingEnabled && !isUserCodeCoverageEnabled) {
       return Promise.resolve()
     }
     return addUntestedFiles.apply(this, arguments)

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

@@ -0,0 +1,48 @@
+const { addHook, channel } = require('../helpers/instrument')
+const shimmer = require('../../../datadog-shimmer')
+const { getCallSites } = require('../../../dd-trace/src/plugins/util/test')
+const { testToStartLine } = require('./utils')
+
+const parameterizedTestCh = channel('ci:mocha:test:parameterize')
+const patched = new WeakSet()
+
+// mocha-each support
+addHook({
+  name: 'mocha-each',
+  versions: ['>=2.0.1']
+}, mochaEach => {
+  if (patched.has(mochaEach)) return mochaEach
+
+  patched.add(mochaEach)
+
+  return shimmer.wrap(mochaEach, function () {
+    const [params] = arguments
+    const { it, ...rest } = mochaEach.apply(this, arguments)
+    return {
+      it: function (title) {
+        parameterizedTestCh.publish({ title, params })
+        it.apply(this, arguments)
+      },
+      ...rest
+    }
+  })
+})
+
+// support for start line
+addHook({
+  name: 'mocha',
+  versions: ['>=5.2.0'],
+  file: 'lib/suite.js'
+}, (Suite) => {
+  shimmer.wrap(Suite.prototype, 'addTest', addTest => function (test) {
+    const callSites = getCallSites()
+    let startLine
+    const testCallSite = callSites.find(site => site.getFileName() === test.file)
+    if (testCallSite) {
+      startLine = testCallSite.getLineNumber()
+      testToStartLine.set(test, startLine)
+    }
+    return addTest.apply(this, arguments)
+  })
+  return Suite
+})