dd-trace 4.15.0 → 4.17.0

package/LICENSE-3rdparty.csv

@@ -14,6 +14,7 @@ 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.kebabcase,MIT,Copyright JS Foundation and other contributors
@@ -32,6 +33,7 @@ require,retry,MIT,Copyright 2011 Tim Koschützki Felix Geisendörfer
 require,semver,ISC,Copyright Isaac Z. Schlueter and Contributors
 dev,@types/node,MIT,Copyright Authors
 dev,autocannon,MIT,Copyright 2016 Matteo Collina
+dev,aws-sdk,Apache 2.0,Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 dev,axios,MIT,Copyright 2014-present Matt Zabriskie
 dev,benchmark,MIT,Copyright 2010-2016 Mathias Bynens Robert Kieffer John-David Dalton
 dev,body-parser,MIT,Copyright 2014 Jonathan Ong 2014-2015 Douglas Christopher Wilson

package/ext/tags.d.ts

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

package/ext/tags.js

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

package/index.d.ts

@@ -829,6 +829,7 @@ interface Plugins {
   "mysql2": plugins.mysql2;
   "net": plugins.net;
   "next": plugins.next;
+  "openai": plugins.openai;
   "opensearch": plugins.opensearch;
   "oracledb": plugins.oracledb;
   "paperplane": plugins.paperplane;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "4.15.0",
+  "version": "4.17.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -37,7 +37,8 @@
     "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:serverless": "mocha --colors --timeout 30000 \"integration-tests/serverless/*.spec.js\"",
-    "test:integration:plugins": "mocha --colors --timeout 30000 \"packages/datadog-plugin-*/test/integration-test/*.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'",
     "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'",
@@ -58,7 +59,7 @@
     "apm"
   ],
   "author": "Datadog Inc. <info@datadoghq.com>",
-  "license": "BSD-3-Clause",
+  "license": "(Apache-2.0 OR BSD-3-Clause)",
   "bugs": {
     "url": "https://github.com/DataDog/dd-trace-js/issues"
   },
@@ -67,11 +68,11 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@datadog/native-appsec": "^3.2.0",
+    "@datadog/native-appsec": "^4.0.0",
     "@datadog/native-iast-rewriter": "2.1.3",
-    "@datadog/native-iast-taint-tracking": "1.5.0",
+    "@datadog/native-iast-taint-tracking": "1.6.1",
     "@datadog/native-metrics": "^2.0.0",
-    "@datadog/pprof": "3.2.0",
+    "@datadog/pprof": "4.0.0",
     "@datadog/sketches-js": "^2.1.0",
     "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/core": "^1.14.0",
@@ -82,6 +83,7 @@
     "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.4",
     "lodash.kebabcase": "^4.1.1",
@@ -102,6 +104,7 @@
   "devDependencies": {
     "@types/node": ">=16",
     "autocannon": "^4.5.2",
+    "aws-sdk": "^2.1446.0",
     "axios": "^0.21.2",
     "benchmark": "^2.1.4",
     "body-parser": "^1.20.2",

package/packages/datadog-esbuild/index.js

@@ -23,11 +23,12 @@ for (const instrumentation of Object.values(instrumentations)) {
   }
 }
 
-const NAMESPACE = 'datadog'
 const NM = 'node_modules/'
 const INSTRUMENTED = Object.keys(instrumentations)
 const RAW_BUILTINS = require('module').builtinModules
 const CHANNEL = 'dd-trace:bundler:load'
+const path = require('path')
+const fs = require('fs')
 
 const builtins = new Set()
 
@@ -109,55 +110,59 @@ module.exports.setup = function (build) {
       // https://esbuild.github.io/plugins/#on-resolve-arguments
       return {
         path: fullPathToModule,
-        namespace: NAMESPACE,
         pluginData: {
           version: packageJson.version,
           pkg: extracted.pkg,
           path: extracted.path,
           full: fullPathToModule,
           raw: args.path,
+          pkgOfInterest: true,
           internal
         }
       }
-    } else if (args.namespace === NAMESPACE) {
-      // The datadog namespace is used when requiring files that are injected during the onLoad stage
-
-      if (builtins.has(args.path)) return
-
-      return {
-        path: require.resolve(args.path, { paths: [ args.resolveDir ] }),
-        namespace: 'file'
-      }
     }
   })
 
-  build.onLoad({ filter: /.*/, namespace: NAMESPACE }, args => {
+  build.onLoad({ filter: /.*/ }, args => {
+    if (!args.pluginData?.pkgOfInterest) {
+      return
+    }
+
     const data = args.pluginData
 
     if (DEBUG) console.log(`LOAD: ${data.pkg}@${data.version}, pkg "${data.path}"`)
 
-    const path = data.raw !== data.pkg
+    const pkgPath = data.raw !== data.pkg
       ? `${data.pkg}/${data.path}`
       : data.pkg
 
+    // Read the content of the module file of interest
+    const fileCode = fs.readFileSync(args.path, 'utf8')
+
     const contents = `
-      const dc = require('diagnostics_channel');
-      const ch = dc.channel('${CHANNEL}');
-      const mod = require('${args.path}');
-      const payload = {
-        module: mod,
-        version: '${data.version}',
-        package: '${data.pkg}',
-        path: '${path}'
-      };
-      ch.publish(payload);
-      module.exports = payload.module;
+      (function() {
+        ${fileCode}
+      })(...arguments);
+      {
+        const dc = require('diagnostics_channel');
+        const ch = dc.channel('${CHANNEL}');
+        const mod = module.exports
+        const payload = {
+          module: mod,
+          version: '${data.version}',
+          package: '${data.pkg}',
+          path: '${pkgPath}'
+        };
+        ch.publish(payload);
+        module.exports = payload.module;
+    }
     `
 
     // https://esbuild.github.io/plugins/#on-load-results
     return {
       contents,
-      loader: 'js'
+      loader: 'js',
+      resolveDir: path.dirname(args.path)
     }
   })
 }

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

@@ -10,13 +10,14 @@ function publishRequestBodyAndNext (req, res, next) {
   return function () {
     if (bodyParserReadCh.hasSubscribers && req) {
       const abortController = new AbortController()
+      const body = req.body
 
-      bodyParserReadCh.publish({ req, res, abortController })
+      bodyParserReadCh.publish({ req, res, body, abortController })
 
       if (abortController.signal.aborted) return
     }
 
-    next.apply(this, arguments)
+    return next.apply(this, arguments)
   }
 }
 
@@ -27,6 +28,6 @@ addHook({
 }, read => {
   return shimmer.wrap(read, function (req, res, next) {
     arguments[2] = publishRequestBodyAndNext(req, res, next)
-    read.apply(this, arguments)
+    return read.apply(this, arguments)
   })
 })

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

@@ -0,0 +1,37 @@
+'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')
+
+const cookieParserReadCh = channel('datadog:cookie-parser:read:finish')
+
+function publishRequestCookieAndNext (req, res, next) {
+  return function cookieParserWrapper () {
+    if (cookieParserReadCh.hasSubscribers && req) {
+      const abortController = new AbortController()
+
+      const mergedCookies = Object.assign({}, req.cookies, req.signedCookies)
+
+      cookieParserReadCh.publish({ req, res, abortController, cookies: mergedCookies })
+
+      if (abortController.signal.aborted) return
+    }
+
+    return next.apply(this, arguments)
+  }
+}
+
+addHook({
+  name: 'cookie-parser',
+  versions: ['>=1.0.0']
+}, cookieParser => {
+  return shimmer.wrap(cookieParser, function () {
+    const cookieMiddleware = cookieParser.apply(this, arguments)
+
+    return shimmer.wrap(cookieMiddleware, function (req, res, next) {
+      arguments[2] = publishRequestCookieAndNext(req, res, next)
+      return cookieMiddleware.apply(this, arguments)
+    })
+  })
+})

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

@@ -31,6 +31,10 @@ const {
   getTestSuitePath
 } = require('../../dd-trace/src/plugins/util/test')
 
+const isMarkedAsUnskippable = (pickle) => {
+  return !!pickle.tags.find(tag => tag.name === '@datadog:unskippable')
+}
+
 // We'll preserve the original coverage here
 const originalCoverageMap = createCoverageMap()
 
@@ -39,6 +43,9 @@ const patched = new WeakSet()
 
 let pickleByFile = {}
 const pickleResultByFile = {}
+let skippableSuites = []
+let isForcedToRun = false
+let isUnskippable = false
 
 function getSuiteStatusFromTestStatuses (testStatuses) {
   if (testStatuses.some(status => status === 'fail')) {
@@ -91,7 +98,11 @@ function wrapRun (pl, isLatestVersion) {
       const testSuiteFullPath = this.pickle.uri
 
       if (!pickleResultByFile[testSuiteFullPath]) { // first test in suite
-        testSuiteStartCh.publish(testSuiteFullPath)
+        isUnskippable = isMarkedAsUnskippable(this.pickle)
+        const testSuitePath = getTestSuitePath(testSuiteFullPath, process.cwd())
+        isForcedToRun = isUnskippable && skippableSuites.includes(testSuitePath)
+
+        testSuiteStartCh.publish({ testSuitePath, isUnskippable, isForcedToRun })
       }
 
       const testSourceLine = this.gherkinDocument &&
@@ -221,8 +232,11 @@ function getFilteredPickles (runtime, suitesToSkip) {
   return runtime.pickleIds.reduce((acc, pickleId) => {
     const test = runtime.eventDataCollector.getPickle(pickleId)
     const testSuitePath = getTestSuitePath(test.uri, process.cwd())
+
+    const isUnskippable = isMarkedAsUnskippable(test)
     const isSkipped = suitesToSkip.includes(testSuitePath)
-    if (isSkipped) {
+
+    if (isSkipped && !isUnskippable) {
       acc.skippedSuites.add(testSuitePath)
     } else {
       acc.picklesToRun.push(pickleId)
@@ -270,7 +284,11 @@ addHook({
       skippableSuitesCh.publish({ onDone })
     })
 
-    const { err, skippableSuites } = await skippableSuitesPromise
+    const skippableResponse = await skippableSuitesPromise
+
+    const err = skippableResponse.err
+    skippableSuites = skippableResponse.skippableSuites
+
     let skippedSuites = []
     let isSuitesSkipped = false
 
@@ -315,7 +333,9 @@ addHook({
         status: success ? 'pass' : 'fail',
         isSuitesSkipped,
         testCodeCoverageLinesTotal,
-        numSkippedSuites: skippedSuites.length
+        numSkippedSuites: skippedSuites.length,
+        hasUnskippableSuites: isUnskippable,
+        hasForcedToRunSuites: isForcedToRun
       })
     })
     return success

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

@@ -0,0 +1,45 @@
+'use strict'
+
+const {
+  channel,
+  addHook
+} = require('./helpers/instrument')
+const shimmer = require('../../datadog-shimmer')
+
+const sanitizeMethodFinished = channel('datadog:express-mongo-sanitize:sanitize:finish')
+const sanitizeMiddlewareFinished = channel('datadog:express-mongo-sanitize:filter:finish')
+
+const propertiesToSanitize = ['body', 'params', 'headers', 'query']
+
+addHook({ name: 'express-mongo-sanitize', versions: ['>=1.0.0'] }, expressMongoSanitize => {
+  shimmer.wrap(expressMongoSanitize, 'sanitize', sanitize => function () {
+    const sanitizedObject = sanitize.apply(this, arguments)
+
+    if (sanitizeMethodFinished.hasSubscribers) {
+      sanitizeMethodFinished.publish({ sanitizedObject })
+    }
+
+    return sanitizedObject
+  })
+
+  return shimmer.wrap(expressMongoSanitize, function () {
+    const middleware = expressMongoSanitize.apply(this, arguments)
+
+    return shimmer.wrap(middleware, function (req, res, next) {
+      if (!sanitizeMiddlewareFinished.hasSubscribers) {
+        return middleware.apply(this, arguments)
+      }
+
+      const wrappedNext = shimmer.wrap(next, function () {
+        sanitizeMiddlewareFinished.publish({
+          sanitizedProperties: propertiesToSanitize,
+          req
+        })
+
+        return next.apply(this, arguments)
+      })
+
+      return middleware.call(this, req, res, wrappedNext)
+    })
+  })
+})

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

@@ -33,13 +33,14 @@ function publishQueryParsedAndNext (req, res, next) {
   return function () {
     if (queryParserReadCh.hasSubscribers && req) {
       const abortController = new AbortController()
+      const query = req.query
 
-      queryParserReadCh.publish({ req, res, abortController })
+      queryParserReadCh.publish({ req, res, query, abortController })
 
       if (abortController.signal.aborted) return
     }
 
-    next.apply(this, arguments)
+    return next.apply(this, arguments)
   }
 }
 

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

@@ -350,6 +350,11 @@ function finishResolvers ({ fields }) {
   })
 }
 
+addHook({ name: '@graphql-tools/executor', file: 'cjs/execution/execute.js', versions: ['>=0.0.14'] }, execute => {
+  shimmer.wrap(execute, 'execute', wrapExecute(execute))
+  return execute
+})
+
 addHook({ name: 'graphql', file: 'execution/execute.js', versions: ['>=0.10'] }, execute => {
   shimmer.wrap(execute, 'execute', wrapExecute(execute))
   return execute

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

@@ -7,6 +7,7 @@ module.exports = {
   '@elastic/elasticsearch': () => require('../elasticsearch'),
   '@elastic/transport': () => require('../elasticsearch'),
   '@google-cloud/pubsub': () => require('../google-cloud-pubsub'),
+  '@graphql-tools/executor': () => require('../graphql'),
   '@grpc/grpc-js': () => require('../grpc'),
   '@hapi/hapi': () => require('../hapi'),
   '@jest/core': () => require('../jest'),
@@ -30,12 +31,14 @@ module.exports = {
   'node:child_process': () => require('../child-process'),
   'connect': () => require('../connect'),
   'cookie': () => require('../cookie'),
+  'cookie-parser': () => require('../cookie-parser'),
   'couchbase': () => require('../couchbase'),
   'crypto': () => require('../crypto'),
   'cypress': () => require('../cypress'),
   'dns': () => require('../dns'),
   'elasticsearch': () => require('../elasticsearch'),
   'express': () => require('../express'),
+  'express-mongo-sanitize': () => require('../express-mongo-sanitize'),
   'fastify': () => require('../fastify'),
   'find-my-way': () => require('../find-my-way'),
   'fs': () => require('../fs'),
@@ -66,7 +69,7 @@ module.exports = {
   'mocha': () => require('../mocha'),
   'mocha-each': () => require('../mocha'),
   'moleculer': () => require('../moleculer'),
-  'mongodb': () => require('../mongodb-core'),
+  'mongodb': () => require('../mongodb'),
   'mongodb-core': () => require('../mongodb-core'),
   'mongoose': () => require('../mongoose'),
   'mysql': () => require('../mysql'),
@@ -81,6 +84,7 @@ module.exports = {
   'pg': () => require('../pg'),
   'pino': () => require('../pino'),
   'pino-pretty': () => require('../pino'),
+  'playwright': () => require('../playwright'),
   'promise-js': () => require('../promise-js'),
   'promise': () => require('../promise'),
   'q': () => require('../q'),

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

@@ -29,7 +29,7 @@ addHook({ name: 'http' }, http => {
 
 function wrapResponseEmit (emit) {
   return function (eventName, event) {
-    if (!startServerCh.hasSubscribers) {
+    if (!finishServerCh.hasSubscribers) {
       return emit.apply(this, arguments)
     }
 

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

@@ -46,6 +46,8 @@ let isCodeCoverageEnabled = false
 let isSuitesSkippingEnabled = false
 let isSuitesSkipped = false
 let numSkippedSuites = 0
+let hasUnskippableSuites = false
+let hasForcedToRunSuites = false
 
 const sessionAsyncResource = new AsyncResource('bound-anonymous-fn')
 
@@ -205,15 +207,17 @@ addHook({
     const [test] = shardedTests
     const rootDir = test && test.context && test.context.config && test.context.config.rootDir
 
-    const { skippedSuites, suitesToRun } = getJestSuitesToRun(skippableSuites, shardedTests, rootDir || process.cwd())
+    const jestSuitesToRun = getJestSuitesToRun(skippableSuites, shardedTests, rootDir || process.cwd())
+    hasUnskippableSuites = jestSuitesToRun.hasUnskippableSuites
+    hasForcedToRunSuites = jestSuitesToRun.hasForcedToRunSuites
 
-    isSuitesSkipped = suitesToRun.length !== shardedTests.length
-    numSkippedSuites = skippedSuites.length
+    isSuitesSkipped = jestSuitesToRun.suitesToRun.length !== shardedTests.length
+    numSkippedSuites = jestSuitesToRun.skippedSuites.length
 
-    itrSkippedSuitesCh.publish({ skippedSuites, frameworkVersion })
+    itrSkippedSuitesCh.publish({ skippedSuites: jestSuitesToRun.skippedSuites, frameworkVersion })
 
     skippableSuites = []
-    return suitesToRun
+    return jestSuitesToRun.suitesToRun
   })
   return sequencerPackage
 })
@@ -285,7 +289,9 @@ function cliWrapper (cli, jestVersion) {
         isSuitesSkippingEnabled,
         isCodeCoverageEnabled,
         testCodeCoverageLinesTotal,
-        numSkippedSuites
+        numSkippedSuites,
+        hasUnskippableSuites,
+        hasForcedToRunSuites
       })
     })
 
@@ -500,16 +506,19 @@ addHook({
     const testPaths = await getTestPaths.apply(this, arguments)
     const { tests } = testPaths
 
-    const { skippedSuites, suitesToRun } = getJestSuitesToRun(skippableSuites, tests, rootDir)
+    const jestSuitesToRun = getJestSuitesToRun(skippableSuites, tests, rootDir)
 
-    isSuitesSkipped = suitesToRun.length !== tests.length
-    numSkippedSuites = skippedSuites.length
+    hasUnskippableSuites = jestSuitesToRun.hasUnskippableSuites
+    hasForcedToRunSuites = jestSuitesToRun.hasForcedToRunSuites
 
-    itrSkippedSuitesCh.publish({ skippedSuites, frameworkVersion })
+    isSuitesSkipped = jestSuitesToRun.suitesToRun.length !== tests.length
+    numSkippedSuites = jestSuitesToRun.skippedSuites.length
+
+    itrSkippedSuitesCh.publish({ skippedSuites: jestSuitesToRun.skippedSuites, frameworkVersion })
 
     skippableSuites = []
 
-    return { ...testPaths, tests: suitesToRun }
+    return { ...testPaths, tests: jestSuitesToRun.suitesToRun }
   })
 
   return searchSourcePackage

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

@@ -1,9 +1,12 @@
 'use strict'
 
-const { addHook } = require('./helpers/instrument')
+const { addHook, channel } = require('./helpers/instrument')
 const { wrapThen } = require('./helpers/promise')
 const shimmer = require('../../datadog-shimmer')
 
+const startRawQueryCh = channel('datadog:knex:raw:start')
+const finishRawQueryCh = channel('datadog:knex:raw:finish')
+
 patch('lib/query/builder.js')
 patch('lib/raw.js')
 patch('lib/schema/builder.js')
@@ -18,3 +21,61 @@ function patch (file) {
     return Builder
   })
 }
+
+addHook({
+  name: 'knex',
+  versions: ['>=2'],
+  file: 'lib/knex-builder/Knex.js'
+}, Knex => {
+  shimmer.wrap(Knex.Client.prototype, 'raw', raw => function () {
+    if (!startRawQueryCh.hasSubscribers) {
+      return raw.apply(this, arguments)
+    }
+
+    const sql = arguments[0]
+
+    // Skip query done by Knex to get the value used for undefined
+    if (sql === 'DEFAULT') {
+      return raw.apply(this, arguments)
+    }
+
+    function finish () {
+      finishRawQueryCh.publish()
+    }
+
+    startRawQueryCh.publish({ sql, dialect: this.dialect })
+
+    const rawResult = raw.apply(this, arguments)
+
+    shimmer.wrap(rawResult, 'then', originalThen => function () {
+      arguments[0] = wrapCallbackWithFinish(arguments[0], finish)
+      arguments[1] = wrapCallbackWithFinish(arguments[1], finish)
+
+      const originalThenResult = originalThen.apply(this, arguments)
+
+      shimmer.wrap(originalThenResult, 'catch', originalCatch => function () {
+        arguments[0] = wrapCallbackWithFinish(arguments[0], finish)
+        return originalCatch.apply(this, arguments)
+      })
+
+      return originalThenResult
+    })
+
+    shimmer.wrap(rawResult, 'asCallback', originalAsCallback => function () {
+      arguments[0] = wrapCallbackWithFinish(arguments[0], finish)
+      return originalAsCallback.apply(this, arguments)
+    })
+
+    return rawResult
+  })
+  return Knex
+})
+
+function wrapCallbackWithFinish (callback, finish) {
+  if (typeof callback !== 'function') return callback
+
+  return function () {
+    finish()
+    callback.apply(this, arguments)
+  }
+}

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

@@ -1,9 +1,10 @@
 const { createCoverageMap } = require('istanbul-lib-coverage')
 
+const { isMarkedAsUnskippable } = require('../../datadog-plugin-jest/src/util')
+
 const { addHook, channel, AsyncResource } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
-
 const {
   getCoveredFilenamesFromCoverage,
   resetCoverage,
@@ -50,6 +51,8 @@ let suitesToSkip = []
 let frameworkVersion
 let isSuitesSkipped = false
 let skippedSuites = []
+const unskippableSuites = []
+let isForcedToRun = false
 
 function getSuitesByTestFile (root) {
   const suitesByTestFile = {}
@@ -104,7 +107,8 @@ function getFilteredSuites (originalSuites) {
   return originalSuites.reduce((acc, suite) => {
     const testPath = getTestSuitePath(suite.file, process.cwd())
     const shouldSkip = suitesToSkip.includes(testPath)
-    if (shouldSkip) {
+    const isUnskippable = unskippableSuites.includes(suite.file)
+    if (shouldSkip && !isUnskippable) {
       acc.skippedSuites.add(testPath)
     } else {
       acc.suitesToRun.push(suite)
@@ -151,7 +155,9 @@ function mochaHook (Runner) {
         status,
         isSuitesSkipped,
         testCodeCoverageLinesTotal,
-        numSkippedSuites: skippedSuites.length
+        numSkippedSuites: skippedSuites.length,
+        hasForcedToRunSuites: isForcedToRun,
+        hasUnskippableSuites: !!unskippableSuites.length
       })
     }))
 
@@ -172,8 +178,10 @@ function mochaHook (Runner) {
       if (!asyncResource) {
         asyncResource = new AsyncResource('bound-anonymous-fn')
         testFileToSuiteAr.set(suite.file, asyncResource)
+        const isUnskippable = unskippableSuites.includes(suite.file)
+        isForcedToRun = isUnskippable && suitesToSkip.includes(getTestSuitePath(suite.file, process.cwd()))
         asyncResource.runInAsyncScope(() => {
-          testSuiteStartCh.publish(suite)
+          testSuiteStartCh.publish({ testSuite: suite.file, isUnskippable, isForcedToRun })
         })
       }
     })
@@ -370,6 +378,13 @@ addHook({
 
     const runner = run.apply(this, arguments)
 
+    this.files.forEach(path => {
+      const isUnskippable = isMarkedAsUnskippable({ path })
+      if (isUnskippable) {
+        unskippableSuites.push(path)
+      }
+    })
+
     const onReceivedSkippableSuites = ({ err, skippableSuites }) => {
       if (err) {
         suitesToSkip = []