dd-trace 5.31.0 → 5.33.0

package/LICENSE-3rdparty.csv

@@ -30,6 +30,7 @@ require,rfdc,MIT,Copyright 2019 David Mark Clements
 require,semver,ISC,Copyright Isaac Z. Schlueter and Contributors
 require,shell-quote,mit,Copyright (c) 2013 James Halliday
 require,source-map,BSD-3-Clause,Copyright (c) 2009-2011, Mozilla Foundation and contributors
+require,ttl-set,MIT,Copyright (c) 2024 Thomas Watson
 dev,@apollo/server,MIT,Copyright (c) 2016-2020 Apollo Graph, Inc. (Formerly Meteor Development Group, Inc.)
 dev,@types/node,MIT,Copyright Authors
 dev,@eslint/eslintrc,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>

package/README.md

@@ -1,7 +1,6 @@
 # `dd-trace`: Node.js APM Tracer Library
 
 [![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)
 [![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"/>
@@ -23,16 +22,18 @@ Most of the documentation for `dd-trace` is available on these webpages:
 
 ## Version Release Lines and Maintenance
 
-| Release Line                                             | Latest Version                                                                                         | Node.js  | 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)     | `>= 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` | **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     |
+| Release Line                                             | Latest Version                                                                                         | Node.js  | [SSI](https://docs.datadoghq.com/tracing/trace_collection/automatic_instrumentation/single-step-apm/?tab=linuxhostorvm) | [K8s Injection](https://docs.datadoghq.com/tracing/trace_collection/library_injection_local/?tab=kubernetes) |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)     | `>= v12` | NO | NO | **EOL** | 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` | NO | NO | **EOL** | 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` | NO | YES | **EOL** | 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` | YES | YES | **EOL**     | 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` | YES | YES | **Current**     | 2024-01-11     | Unknown     |
 
-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`.
+* EOL = End-of-life
+* SSI = Single-Step Install
+
+We currently maintain one release line, namely `v5`.
 
 For any new projects it is recommended to use the `v5` release line:
 
@@ -41,20 +42,22 @@ $ npm install dd-trace
 $ yarn add dd-trace
 ```
 
-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.
+Existing projects that need to use EOL versions of Node.js may continue to use these older release lines.
 This is done by specifying the version when installing the package.
 
 ```sh
-$ npm install dd-trace@4
-$ yarn add dd-trace@4
+$ npm install dd-trace@4 # or whatever version you need
+$ yarn add dd-trace@4 # or whatever version you need
 ```
 
+Note, however, that the end-of-life release lines are no longer maintained and will not receive updates.
+
 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).
+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.
 

package/index.d.ts

@@ -2233,7 +2233,17 @@ declare namespace tracer {
     /**
      * Specifies the verbosity of the sent telemetry. Default 'INFORMATION'
      */
-    telemetryVerbosity?: string
+    telemetryVerbosity?: string,
+
+    /**
+     * Configuration for stack trace reporting
+     */
+    stackTrace?: {
+      /** Whether to enable stack trace reporting.
+       * @default true
+       */
+      enabled?: boolean,
+    }
   }
 
   export namespace llmobs {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.31.0",
+  "version": "5.33.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -33,7 +33,7 @@
     "test:lambda:ci": "nyc --no-clean --include \"packages/dd-trace/src/lambda/**/*.js\" -- npm run test:lambda",
     "test:llmobs:sdk": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" --exclude \"packages/dd-trace/test/llmobs/plugins/**/*.spec.js\" \"packages/dd-trace/test/llmobs/**/*.spec.js\" ",
     "test:llmobs:sdk:ci": "nyc --no-clean --include \"packages/dd-trace/src/llmobs/**/*.js\" -- npm run test:llmobs:sdk",
-    "test:llmobs:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/llmobs/plugins/**/*.spec.js\"",
+    "test:llmobs:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/llmobs/plugins/@($(echo $PLUGINS))/*.spec.js\"",
     "test:llmobs:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/src/llmobs/**/*.js\" -- npm run test:llmobs:plugins",
     "test: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\"",
     "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",
@@ -81,12 +81,12 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@datadog/libdatadog": "^0.3.0",
+    "@datadog/libdatadog": "^0.4.0",
     "@datadog/native-appsec": "8.4.0",
     "@datadog/native-iast-rewriter": "2.6.1",
     "@datadog/native-iast-taint-tracking": "3.2.0",
     "@datadog/native-metrics": "^3.1.0",
-    "@datadog/pprof": "5.4.1",
+    "@datadog/pprof": "5.5.0",
     "@datadog/sketches-js": "^2.1.0",
     "@isaacs/ttlcache": "^1.4.1",
     "@opentelemetry/api": ">=1.0.0 <1.9.0",
@@ -111,7 +111,8 @@
     "semver": "^7.5.4",
     "shell-quote": "^1.8.1",
     "source-map": "^0.7.4",
-    "tlhunter-sorted-set": "^0.1.0"
+    "tlhunter-sorted-set": "^0.1.0",
+    "ttl-set": "^1.0.0"
   },
   "devDependencies": {
     "@apollo/server": "^4.11.0",

package/packages/datadog-instrumentations/src/aws-sdk.js

@@ -155,6 +155,8 @@ function getMessage (request, error, result) {
 }
 
 function getChannelSuffix (name) {
+  // some resource identifiers have spaces between ex: bedrock runtime
+  name = name.replaceAll(' ', '')
   return [
     'cloudwatchlogs',
     'dynamodb',
@@ -167,7 +169,8 @@ function getChannelSuffix (name) {
     'sns',
     'sqs',
     'states',
-    'stepfunctions'
+    'stepfunctions',
+    'bedrockruntime'
   ].includes(name)
     ? name
     : 'default'

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

@@ -70,6 +70,7 @@ let earlyFlakeDetectionNumRetries = 0
 let earlyFlakeDetectionFaultyThreshold = 0
 let isEarlyFlakeDetectionFaulty = false
 let isFlakyTestRetriesEnabled = false
+let isKnownTestsEnabled = false
 let numTestRetries = 0
 let knownTests = []
 let skippedSuites = []
@@ -238,8 +239,9 @@ function wrapRun (pl, isLatestVersion) {
     asyncResource.runInAsyncScope(() => {
       testStartCh.publish(testStartPayload)
     })
+    const promises = {}
     try {
-      this.eventBroadcaster.on('envelope', shimmer.wrapFunction(null, () => (testCase) => {
+      this.eventBroadcaster.on('envelope', shimmer.wrapFunction(null, () => async (testCase) => {
         // Only supported from >=8.0.0
         if (testCase?.testCaseFinished) {
           const { testCaseFinished: { willBeRetried } } = testCase
@@ -253,17 +255,22 @@ function wrapRun (pl, isLatestVersion) {
             }
 
             const failedAttemptAsyncResource = numAttemptToAsyncResource.get(numAttempt)
-            const isRetry = numAttempt++ > 0
+            const isFirstAttempt = numAttempt++ === 0
+
+            if (promises.hitBreakpointPromise) {
+              await promises.hitBreakpointPromise
+            }
+
             failedAttemptAsyncResource.runInAsyncScope(() => {
               // the current span will be finished and a new one will be created
-              testRetryCh.publish({ isRetry, error })
+              testRetryCh.publish({ isFirstAttempt, error })
             })
 
             const newAsyncResource = new AsyncResource('bound-anonymous-fn')
             numAttemptToAsyncResource.set(numAttempt, newAsyncResource)
 
             newAsyncResource.runInAsyncScope(() => {
-              testStartCh.publish(testStartPayload) // a new span will be created
+              testStartCh.publish({ ...testStartPayload, promises }) // a new span will be created
             })
           }
         }
@@ -273,7 +280,7 @@ function wrapRun (pl, isLatestVersion) {
       asyncResource.runInAsyncScope(() => {
         promise = run.apply(this, arguments)
       })
-      promise.finally(() => {
+      promise.finally(async () => {
         const result = this.getWorstStepResult()
         const { status, skipReason } = isLatestVersion
           ? getStatusFromResultLatest(result)
@@ -286,7 +293,7 @@ function wrapRun (pl, isLatestVersion) {
         }
         let isNew = false
         let isEfdRetry = false
-        if (isEarlyFlakeDetectionEnabled && status !== 'skip') {
+        if (isKnownTestsEnabled && status !== 'skip') {
           const numRetries = numRetriesByPickleId.get(this.pickle.id)
 
           isNew = numRetries !== undefined
@@ -296,6 +303,9 @@ function wrapRun (pl, isLatestVersion) {
 
         const error = getErrorFromCucumberResult(result)
 
+        if (promises.hitBreakpointPromise) {
+          await promises.hitBreakpointPromise
+        }
         attemptAsyncResource.runInAsyncScope(() => {
           testFinishCh.publish({ status, skipReason, error, isNew, isEfdRetry, isFlakyRetry: numAttempt > 0 })
         })
@@ -385,13 +395,15 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
     isSuitesSkippingEnabled = configurationResponse.libraryConfig?.isSuitesSkippingEnabled
     isFlakyTestRetriesEnabled = configurationResponse.libraryConfig?.isFlakyTestRetriesEnabled
     numTestRetries = configurationResponse.libraryConfig?.flakyTestRetriesCount
+    isKnownTestsEnabled = configurationResponse.libraryConfig?.isKnownTestsEnabled
 
-    if (isEarlyFlakeDetectionEnabled) {
+    if (isKnownTestsEnabled) {
       const knownTestsResponse = await getChannelPromise(knownTestsCh)
       if (!knownTestsResponse.err) {
         knownTests = knownTestsResponse.knownTests
       } else {
         isEarlyFlakeDetectionEnabled = false
+        isKnownTestsEnabled = false
       }
     }
 
@@ -428,7 +440,7 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
 
     pickleByFile = isCoordinator ? getPickleByFileNew(this) : getPickleByFile(this)
 
-    if (isEarlyFlakeDetectionEnabled) {
+    if (isKnownTestsEnabled) {
       const isFaulty = getIsFaultyEarlyFlakeDetection(
         Object.keys(pickleByFile),
         knownTests.cucumber || {},
@@ -436,6 +448,7 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
       )
       if (isFaulty) {
         isEarlyFlakeDetectionEnabled = false
+        isKnownTestsEnabled = false
         isEarlyFlakeDetectionFaulty = true
       }
     }
@@ -524,7 +537,7 @@ function getWrappedRunTestCase (runTestCaseFunction, isNewerCucumberVersion = fa
 
     let isNew = false
 
-    if (isEarlyFlakeDetectionEnabled) {
+    if (isKnownTestsEnabled) {
       isNew = isNewTest(testSuitePath, pickle.name)
       if (isNew) {
         numRetriesByPickleId.set(pickle.id, 0)
@@ -669,14 +682,14 @@ function getWrappedParseWorkerMessage (parseWorkerMessageFunction, isNewVersion)
       const { status } = getStatusFromResultLatest(worstTestStepResult)
       let isNew = false
 
-      if (isEarlyFlakeDetectionEnabled) {
+      if (isKnownTestsEnabled) {
         isNew = isNewTest(pickle.uri, pickle.name)
       }
 
       const testFileAbsolutePath = pickle.uri
       const finished = pickleResultByFile[testFileAbsolutePath]
 
-      if (isNew) {
+      if (isEarlyFlakeDetectionEnabled && isNew) {
         const testFullname = `${pickle.uri}:${pickle.name}`
         let testStatuses = newTestsByTestFullname.get(testFullname)
         if (!testStatuses) {
@@ -830,7 +843,8 @@ addHook({
   )
   // EFD in parallel mode only supported in >=11.0.0
   shimmer.wrap(adapterPackage.ChildProcessAdapter.prototype, 'startWorker', startWorker => function () {
-    if (isEarlyFlakeDetectionEnabled) {
+    if (isKnownTestsEnabled) {
+      this.options.worldParameters._ddIsEarlyFlakeDetectionEnabled = isEarlyFlakeDetectionEnabled
       this.options.worldParameters._ddKnownTests = knownTests
       this.options.worldParameters._ddEarlyFlakeDetectionNumRetries = earlyFlakeDetectionNumRetries
     }
@@ -853,9 +867,12 @@ addHook({
     'initialize',
     initialize => async function () {
       await initialize.apply(this, arguments)
-      isEarlyFlakeDetectionEnabled = !!this.options.worldParameters._ddKnownTests
-      if (isEarlyFlakeDetectionEnabled) {
+      isKnownTestsEnabled = !!this.options.worldParameters._ddKnownTests
+      if (isKnownTestsEnabled) {
         knownTests = this.options.worldParameters._ddKnownTests
+      }
+      isEarlyFlakeDetectionEnabled = !!this.options.worldParameters._ddIsEarlyFlakeDetectionEnabled
+      if (isEarlyFlakeDetectionEnabled) {
         earlyFlakeDetectionNumRetries = this.options.worldParameters._ddEarlyFlakeDetectionNumRetries
       }
     }

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

@@ -88,6 +88,7 @@ module.exports = {
   mysql2: () => require('../mysql2'),
   net: () => require('../net'),
   next: () => require('../next'),
+  'node-serialize': () => require('../node-serialize'),
   'node:child_process': () => require('../child_process'),
   'node:crypto': () => require('../crypto'),
   'node:dns': () => require('../dns'),
@@ -96,6 +97,7 @@ module.exports = {
   'node:https': () => require('../http'),
   'node:net': () => require('../net'),
   'node:url': () => require('../url'),
+  'node:vm': () => require('../vm'),
   nyc: () => require('../nyc'),
   oracledb: () => require('../oracledb'),
   openai: () => require('../openai'),
@@ -122,6 +124,7 @@ module.exports = {
   undici: () => require('../undici'),
   url: () => require('../url'),
   vitest: { esmFirst: true, fn: () => require('../vitest') },
+  vm: () => require('../vm'),
   when: () => require('../when'),
   winston: () => require('../winston'),
   workerpool: () => require('../mocha')

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

@@ -12,7 +12,8 @@ const {
   getTestParametersString,
   addEfdStringToTestName,
   removeEfdStringFromTestName,
-  getIsFaultyEarlyFlakeDetection
+  getIsFaultyEarlyFlakeDetection,
+  JEST_WORKER_LOGS_PAYLOAD_CODE
 } = require('../../dd-trace/src/plugins/util/test')
 const {
   getFormattedJestTestParameters,
@@ -30,12 +31,13 @@ const testSuiteFinishCh = channel('ci:jest:test-suite:finish')
 
 const workerReportTraceCh = channel('ci:jest:worker-report:trace')
 const workerReportCoverageCh = channel('ci:jest:worker-report:coverage')
+const workerReportLogsCh = channel('ci:jest:worker-report:logs')
 
 const testSuiteCodeCoverageCh = channel('ci:jest:test-suite:code-coverage')
 
 const testStartCh = channel('ci:jest:test:start')
 const testSkippedCh = channel('ci:jest:test:skip')
-const testRunFinishCh = channel('ci:jest:test:finish')
+const testFinishCh = channel('ci:jest:test:finish')
 const testErrCh = channel('ci:jest:test:err')
 
 const skippableSuitesCh = channel('ci:jest:test-suite:skippable')
@@ -67,6 +69,7 @@ let earlyFlakeDetectionNumRetries = 0
 let earlyFlakeDetectionFaultyThreshold = 30
 let isEarlyFlakeDetectionFaulty = false
 let hasFilteredSkippableSuites = false
+let isKnownTestsEnabled = false
 
 const sessionAsyncResource = new AsyncResource('bound-anonymous-fn')
 
@@ -75,6 +78,8 @@ const originalTestFns = new WeakMap()
 const retriedTestsToNumAttempts = new Map()
 const newTestsTestStatuses = new Map()
 
+const BREAKPOINT_HIT_GRACE_PERIOD_MS = 200
+
 // based on https://github.com/facebook/jest/blob/main/packages/jest-circus/src/formatNodeAssertErrors.ts#L41
 function formatJestError (errors) {
   let error
@@ -134,17 +139,19 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
       this.isFlakyTestRetriesEnabled = this.testEnvironmentOptions._ddIsFlakyTestRetriesEnabled
       this.flakyTestRetriesCount = this.testEnvironmentOptions._ddFlakyTestRetriesCount
       this.isDiEnabled = this.testEnvironmentOptions._ddIsDiEnabled
+      this.isKnownTestsEnabled = this.testEnvironmentOptions._ddIsKnownTestsEnabled
 
-      if (this.isEarlyFlakeDetectionEnabled) {
-        const hasKnownTests = !!knownTests.jest
-        earlyFlakeDetectionNumRetries = this.testEnvironmentOptions._ddEarlyFlakeDetectionNumRetries
+      if (this.isKnownTestsEnabled) {
         try {
+          const hasKnownTests = !!knownTests.jest
+          earlyFlakeDetectionNumRetries = this.testEnvironmentOptions._ddEarlyFlakeDetectionNumRetries
           this.knownTestsForThisSuite = hasKnownTests
             ? (knownTests.jest[this.testSuite] || [])
             : this.getKnownTestsForSuite(this.testEnvironmentOptions._ddKnownTests)
         } catch (e) {
           // If there has been an error parsing the tests, we'll disable Early Flake Deteciton
           this.isEarlyFlakeDetectionEnabled = false
+          this.isKnownTestsEnabled = false
         }
       }
 
@@ -224,7 +231,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         asyncResources.set(event.test, asyncResource)
         const testName = getJestTestName(event.test)
 
-        if (this.isEarlyFlakeDetectionEnabled) {
+        if (this.isKnownTestsEnabled) {
           const originalTestName = removeEfdStringFromTestName(testName)
           isNewTest = retriedTestsToNumAttempts.has(originalTestName)
           if (isNewTest) {
@@ -250,70 +257,96 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         })
       }
       if (event.name === 'add_test') {
-        if (this.isEarlyFlakeDetectionEnabled) {
+        if (this.isKnownTestsEnabled) {
           const testName = this.getTestNameFromAddTestEvent(event, state)
           const isNew = !this.knownTestsForThisSuite?.includes(testName)
           const isSkipped = event.mode === 'todo' || event.mode === 'skip'
           if (isNew && !isSkipped && !retriedTestsToNumAttempts.has(testName)) {
             retriedTestsToNumAttempts.set(testName, 0)
-            // Retrying snapshots has proven to be problematic, so we'll skip them for now
-            // We'll still detect new tests, but we won't retry them.
-            // TODO: do not bail out of EFD with the whole test suite
-            if (this.getHasSnapshotTests()) {
-              log.warn('Early flake detection is disabled for suites with snapshots')
-              return
-            }
-            for (let retryIndex = 0; retryIndex < earlyFlakeDetectionNumRetries; retryIndex++) {
-              if (this.global.test) {
-                this.global.test(addEfdStringToTestName(event.testName, retryIndex), event.fn, event.timeout)
-              } else {
-                log.error('Early flake detection could not retry test because global.test is undefined')
+            if (this.isEarlyFlakeDetectionEnabled) {
+              // Retrying snapshots has proven to be problematic, so we'll skip them for now
+              // We'll still detect new tests, but we won't retry them.
+              // TODO: do not bail out of EFD with the whole test suite
+              if (this.getHasSnapshotTests()) {
+                log.warn('Early flake detection is disabled for suites with snapshots')
+                return
+              }
+              for (let retryIndex = 0; retryIndex < earlyFlakeDetectionNumRetries; retryIndex++) {
+                if (this.global.test) {
+                  this.global.test(addEfdStringToTestName(event.testName, retryIndex), event.fn, event.timeout)
+                } else {
+                  log.error('Early flake detection could not retry test because global.test is undefined')
+                }
               }
             }
           }
         }
       }
       if (event.name === 'test_done') {
-        const probe = {}
+        let status = 'pass'
+        if (event.test.errors && event.test.errors.length) {
+          status = 'fail'
+        }
+        // restore in case it is retried
+        event.test.fn = originalTestFns.get(event.test)
+
+        // We'll store the test statuses of the retries
+        if (this.isKnownTestsEnabled) {
+          const testName = getJestTestName(event.test)
+          const originalTestName = removeEfdStringFromTestName(testName)
+          const isNewTest = retriedTestsToNumAttempts.has(originalTestName)
+          if (isNewTest) {
+            if (newTestsTestStatuses.has(originalTestName)) {
+              newTestsTestStatuses.get(originalTestName).push(status)
+            } else {
+              newTestsTestStatuses.set(originalTestName, [status])
+            }
+          }
+        }
+
+        const promises = {}
+        const numRetries = this.global[RETRY_TIMES]
+        const numTestExecutions = event.test?.invocations
+        const willBeRetried = numRetries > 0 && numTestExecutions - 1 < numRetries
+        const mightHitBreakpoint = this.isDiEnabled && numTestExecutions >= 2
+
         const asyncResource = asyncResources.get(event.test)
-        asyncResource.runInAsyncScope(() => {
-          let status = 'pass'
-          if (event.test.errors && event.test.errors.length) {
-            status = 'fail'
-            const numRetries = this.global[RETRY_TIMES]
-            const numTestExecutions = event.test?.invocations
-            const willBeRetried = numRetries > 0 && numTestExecutions - 1 < numRetries
-
-            const error = formatJestError(event.test.errors[0])
+
+        if (status === 'fail') {
+          asyncResource.runInAsyncScope(() => {
             testErrCh.publish({
-              error,
-              willBeRetried,
-              probe,
-              isDiEnabled: this.isDiEnabled
+              error: formatJestError(event.test.errors[0]),
+              shouldSetProbe: this.isDiEnabled && willBeRetried && numTestExecutions === 1,
+              promises
             })
-          }
-          testRunFinishCh.publish({
+          })
+        }
+
+        // After finishing it might take a bit for the snapshot to be handled.
+        // This means that tests retried with DI are BREAKPOINT_HIT_GRACE_PERIOD_MS slower at least.
+        if (status === 'fail' && mightHitBreakpoint) {
+          await new Promise(resolve => {
+            setTimeout(() => {
+              resolve()
+            }, BREAKPOINT_HIT_GRACE_PERIOD_MS)
+          })
+        }
+
+        asyncResource.runInAsyncScope(() => {
+          testFinishCh.publish({
             status,
-            testStartLine: getTestLineStart(event.test.asyncError, this.testSuite)
+            testStartLine: getTestLineStart(event.test.asyncError, this.testSuite),
+            promises,
+            shouldRemoveProbe: this.isDiEnabled && !willBeRetried
           })
-          // restore in case it is retried
-          event.test.fn = originalTestFns.get(event.test)
-          // We'll store the test statuses of the retries
-          if (this.isEarlyFlakeDetectionEnabled) {
-            const testName = getJestTestName(event.test)
-            const originalTestName = removeEfdStringFromTestName(testName)
-            const isNewTest = retriedTestsToNumAttempts.has(originalTestName)
-            if (isNewTest) {
-              if (newTestsTestStatuses.has(originalTestName)) {
-                newTestsTestStatuses.get(originalTestName).push(status)
-              } else {
-                newTestsTestStatuses.set(originalTestName, [status])
-              }
-            }
-          }
         })
-        if (probe.setProbePromise) {
-          await probe.setProbePromise
+
+        if (promises.isProbeReady) {
+          await promises.isProbeReady
+        }
+
+        if (promises.isProbeRemoved) {
+          await promises.isProbeRemoved
         }
       }
       if (event.name === 'test_skip' || event.name === 'test_todo') {
@@ -455,12 +488,13 @@ function cliWrapper (cli, jestVersion) {
         isEarlyFlakeDetectionEnabled = libraryConfig.isEarlyFlakeDetectionEnabled
         earlyFlakeDetectionNumRetries = libraryConfig.earlyFlakeDetectionNumRetries
         earlyFlakeDetectionFaultyThreshold = libraryConfig.earlyFlakeDetectionFaultyThreshold
+        isKnownTestsEnabled = libraryConfig.isKnownTestsEnabled
       }
     } catch (err) {
       log.error('Jest library configuration error', err)
     }
 
-    if (isEarlyFlakeDetectionEnabled) {
+    if (isKnownTestsEnabled) {
       const knownTestsPromise = new Promise((resolve) => {
         onDone = resolve
       })
@@ -476,6 +510,7 @@ function cliWrapper (cli, jestVersion) {
         } else {
           // We disable EFD if there has been an error in the known tests request
           isEarlyFlakeDetectionEnabled = false
+          isKnownTestsEnabled = false
         }
       } catch (err) {
         log.error('Jest known tests error', err)
@@ -793,6 +828,7 @@ addHook({
       _ddIsFlakyTestRetriesEnabled,
       _ddFlakyTestRetriesCount,
       _ddIsDiEnabled,
+      _ddIsKnownTestsEnabled,
       ...restOfTestEnvironmentOptions
     } = testEnvironmentOptions
 
@@ -820,17 +856,19 @@ addHook({
     const testPaths = await getTestPaths.apply(this, arguments)
     const [{ rootDir, shard }] = arguments
 
-    if (isEarlyFlakeDetectionEnabled) {
+    if (isKnownTestsEnabled) {
       const projectSuites = testPaths.tests.map(test => getTestSuitePath(test.path, test.context.config.rootDir))
       const isFaulty =
         getIsFaultyEarlyFlakeDetection(projectSuites, knownTests.jest || {}, earlyFlakeDetectionFaultyThreshold)
       if (isFaulty) {
         log.error('Early flake detection is disabled because the number of new suites is too high.')
         isEarlyFlakeDetectionEnabled = false
+        isKnownTestsEnabled = false
         const testEnvironmentOptions = testPaths.tests[0]?.context?.config?.testEnvironmentOptions
         // Project config is shared among all tests, so we can modify it here
         if (testEnvironmentOptions) {
           testEnvironmentOptions._ddIsEarlyFlakeDetectionEnabled = false
+          testEnvironmentOptions._ddIsKnownTestsEnabled = false
         }
         isEarlyFlakeDetectionFaulty = true
       }
@@ -901,6 +939,11 @@ addHook({
   return runtimePackage
 })
 
+/*
+* This hook does two things:
+* - Pass known tests to the workers.
+* - Receive trace, coverage and logs payloads from the workers.
+*/
 addHook({
   name: 'jest-worker',
   versions: ['>=24.9.0'],
@@ -908,7 +951,7 @@ addHook({
 }, (childProcessWorker) => {
   const ChildProcessWorker = childProcessWorker.default
   shimmer.wrap(ChildProcessWorker.prototype, 'send', send => function (request) {
-    if (!isEarlyFlakeDetectionEnabled) {
+    if (!isKnownTestsEnabled) {
       return send.apply(this, arguments)
     }
     const [type] = request
@@ -953,6 +996,12 @@ addHook({
       })
       return
     }
+    if (code === JEST_WORKER_LOGS_PAYLOAD_CODE) { // datadog logs payload
+      sessionAsyncResource.runInAsyncScope(() => {
+        workerReportLogsCh.publish(data)
+      })
+      return
+    }
     return _onMessage.apply(this, arguments)
   })
   return childProcessWorker