dd-trace 5.97.0 → 5.99.0

package/LICENSE-3rdparty.csv

@@ -68,7 +68,6 @@
 "esquery","https://github.com/estools/esquery","['BSD-3-Clause']","['Joel Feenstra']"
 "estraverse","https://github.com/estools/estraverse","['BSD-2-Clause']","['estools']"
 "fast-fifo","https://github.com/mafintosh/fast-fifo","['MIT']","['Mathias Buus']"
-"ignore","https://github.com/kaelzhang/node-ignore","['MIT']","['kael']"
 "import-in-the-middle","https://github.com/nodejs/import-in-the-middle","['Apache-2.0']","['Bryan English']"
 "istanbul-lib-coverage","https://github.com/istanbuljs/istanbuljs","['BSD-3-Clause']","['Krishnan Anantheswaran']"
 "jest-docblock","https://github.com/jestjs/jest","['MIT']","['jestjs']"

package/ext/tags.js

@@ -25,6 +25,7 @@ const tags = {
   HTTP_RESPONSE_HEADERS: 'http.response.headers',
   HTTP_USERAGENT: 'http.useragent',
   HTTP_CLIENT_IP: 'http.client_ip',
+  NETWORK_CLIENT_IP: 'network.client.ip',
 
   // Messaging
 

package/index.d.ts

@@ -272,6 +272,7 @@ interface Plugins {
   "memcached": tracer.plugins.memcached;
   "microgateway-core": tracer.plugins.microgateway_core;
   "mocha": tracer.plugins.mocha;
+  "modelcontextprotocol-sdk": tracer.plugins.modelcontextprotocol_sdk;
   "moleculer": tracer.plugins.moleculer;
   "mongodb-core": tracer.plugins.mongodb_core;
   "mongoose": tracer.plugins.mongoose;
@@ -665,7 +666,15 @@ declare namespace tracer {
        * @env DD_RUNTIME_METRICS_EVENT_LOOP_ENABLED
        * Programmatic configuration takes precedence over the environment variables listed above.
        */
-      eventLoop?: boolean
+      eventLoop?: boolean,
+
+       /**
+       * Whether to use native metrics. When set to false, forces the JS implementation
+       * @default true
+       * @env DD_RUNTIME_METRICS_NATIVE
+       * Programmatic configuration takes precedence over the environment variables listed above.
+       */
+      native?: boolean
     }
 
     /**
@@ -795,7 +804,7 @@ declare namespace tracer {
          * Whether to request blocking mode when evaluating prompts via auto-instrumentation.
          * When `true`, AI Guard will block requests that violate security policies.
          * When `false`, AI Guard evaluates but never blocks (monitor-only mode).
-         * @default false
+         * @default true
          * @env DD_AI_GUARD_BLOCK
          * Programmatic configuration takes precedence over the environment variables listed above.
          */
@@ -1847,6 +1856,10 @@ declare namespace tracer {
        * List of tags associated with the evaluation (e.g. indirect-prompt-injection)
        */
       tags: string[];
+      /**
+       * Dictionary of tag probabilities (e.g. { indirect-prompt-injection: 0.2, jailbreak-attempt: 0.8 })
+       */
+      tagProbabilities: { [key: string]: number }
       /**
        * Sensitive Data Scanner findings from the evaluation.
        */
@@ -1866,6 +1879,10 @@ declare namespace tracer {
        * List of tags associated with the evaluation (e.g. indirect-prompt-injection)
        */
       tags: string[];
+      /**
+       * Dictionary of tag probabilities (e.g. { indirect-prompt-injection: 0.2, jailbreak-attempt: 0.8 })
+       */
+      tagProbabilities: { [key: string]: number }
       /**
        * Sensitive Data Scanner findings from the evaluation.
        */
@@ -2832,11 +2849,18 @@ declare namespace tracer {
      * [mocha](https://mochajs.org/) module.
      */
     interface mocha extends Integration {}
-
+    
+    /**
+     * This plugin automatically instruments the
+     * [modelcontextprotocol-sdk](https://github.com/npmjs/package/@modelcontextprotocol/sdk) library.
+     */
+    interface modelcontextprotocol_sdk extends Instrumentation {}
+    
     /**
      * This plugin automatically instruments the
      * [moleculer](https://moleculer.services/) module.
      */
+
     interface moleculer extends Moleculer {
       /**
        * Configuration for Moleculer clients. Set to false to disable client
@@ -3048,6 +3072,14 @@ declare namespace tracer {
        * @returns true to instrument the command, false to skip it
        */
       filter?: (command: string) => boolean;
+
+      /**
+       * Whether to use a different service name for each Redis instance based
+       * on the configured connection name of the client.
+       *
+       * @default false
+       */
+      splitByInstance?: boolean;
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.97.0",
+  "version": "5.99.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -13,6 +13,8 @@
     "dependencies:dedupe": "yarn-deduplicate yarn.lock",
     "generate:config:types": "node scripts/generate-config-types.js",
     "verify:config:types": "node scripts/generate-config-types.js --check",
+    "generate:supported-integrations": "node scripts/generate-supported-integrations.js",
+    "verify:supported-integrations": "node scripts/generate-supported-integrations.js --check",
     "type:check": "tsc --noEmit -p tsconfig.dev.json",
     "type:doc:build": "cd docs && yarn && yarn build",
     "type:doc:test": "cd docs && yarn && yarn test",
@@ -24,58 +26,58 @@
     "release:proposal": "node scripts/release/proposal",
     "services": "node ./scripts/install_plugin_modules && node packages/dd-trace/test/setup/services",
     "test": "echo '\nError: The root \"npm test\" command is intentionally disabled.\n\nInstead, run specific test suites:\n  - npm run test:trace:core\n  - npm run test:appsec\n  - etc.\n\nOr run individual test files:\n  npx mocha path/to/test.spec.js\n\nSee CONTRIBUTING.md (Testing section) for more details.\n' && exit 1",
-    "test:aiguard": "mocha packages/dd-trace/test/aiguard/**/*.spec.js",
-    "test:aiguard:ci": "nyc -- npm run test:aiguard",
+    "test:aiguard": "mocha \"packages/dd-trace/test/aiguard/**/*.spec.js\"",
+    "test:aiguard:ci": "nyc --silent node init && nyc -- npm run test:aiguard",
     "test:appsec": "mocha --exclude \"packages/dd-trace/test/appsec/**/*.plugin.spec.js\" \"packages/dd-trace/test/appsec/**/*.spec.js\"",
-    "test:appsec:ci": "nyc -- npm run test:appsec",
+    "test:appsec:ci": "nyc --silent node init && nyc -- npm run test:appsec",
     "test:appsec:plugins": "mocha \"packages/dd-trace/test/appsec/**/*.@(${PLUGINS}).plugin.spec.js\"",
-    "test:appsec:plugins:ci": "yarn services && nyc -- npm run test:appsec:plugins",
-    "test:debugger": "mocha packages/dd-trace/test/debugger/**/*.spec.js",
-    "test:debugger:ci": "nyc -- npm run test:debugger",
+    "test:appsec:plugins:ci": "yarn services && nyc --silent node init && nyc -- npm run test:appsec:plugins",
+    "test:debugger": "mocha \"packages/dd-trace/test/debugger/**/*.spec.js\"",
+    "test:debugger:ci": "nyc --silent node init && nyc -- npm run test:debugger",
     "test:eslint-rules": "node eslint-rules/*.test.mjs",
     "test:trace:core": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- \"packages/dd-trace/test/*.spec.js\" \"packages/dd-trace/test/{agent,ci-visibility,config,crashtracking,datastreams,encode,exporters,msgpack,opentelemetry,opentracing,payload-tagging,plugins,remote_config,service-naming,standalone,telemetry,external-logger}/**/*.spec.js\"",
-    "test:trace:core:ci": "nyc -- npm run test:trace:core",
-    "test:trace:guardrails": "mocha packages/dd-trace/test/guardrails/**/*.spec.js",
-    "test:trace:guardrails:ci": "nyc -- npm run test:trace:guardrails",
-    "test:esbuild": "mocha packages/datadog-esbuild/test/**/*.spec.js",
-    "test:esbuild:ci": "nyc -- npm run test:esbuild",
-    "test:webpack": "mocha packages/datadog-webpack/test/**/*.spec.js",
-    "test:webpack:ci": "nyc -- npm run test:webpack",
+    "test:trace:core:ci": "nyc --silent node init && nyc -- npm run test:trace:core",
+    "test:trace:guardrails": "mocha \"packages/dd-trace/test/guardrails/**/*.spec.js\"",
+    "test:trace:guardrails:ci": "nyc --silent node init && nyc -- npm run test:trace:guardrails",
+    "test:esbuild": "mocha \"packages/datadog-esbuild/test/**/*.spec.js\"",
+    "test:esbuild:ci": "nyc --silent node init && nyc -- npm run test:esbuild",
+    "test:webpack": "mocha \"packages/datadog-webpack/test/**/*.spec.js\"",
+    "test:webpack:ci": "nyc --silent node init && nyc -- npm run test:webpack",
     "test:instrumentations": "mocha \"packages/datadog-instrumentations/test/@(${PLUGINS}).spec.js\"",
-    "test:instrumentations:ci": "yarn services && nyc -- npm run test:instrumentations",
-    "test:instrumentations:misc": "mocha packages/datadog-instrumentations/test/*/**/*.spec.js",
-    "test:instrumentations:misc:ci": "nyc -- npm run test:instrumentations:misc",
-    "test:core": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- packages/datadog-core/test/**/*.spec.js",
-    "test:core:ci": "nyc -- npm run test:core",
-    "test:code-origin": "mocha packages/datadog-code-origin/test/**/*.spec.js",
-    "test:code-origin:ci": "nyc -- npm run test:code-origin",
-    "test:lambda": "mocha packages/dd-trace/test/lambda/**/*.spec.js",
-    "test:lambda:ci": "nyc -- npm run test:lambda",
+    "test:instrumentations:ci": "yarn services && nyc --silent node init && nyc -- npm run test:instrumentations",
+    "test:instrumentations:misc": "mocha \"packages/datadog-instrumentations/test/*/**/*.spec.js\"",
+    "test:instrumentations:misc:ci": "nyc --silent node init && nyc -- npm run test:instrumentations:misc",
+    "test:core": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- \"packages/datadog-core/test/**/*.spec.js\"",
+    "test:core:ci": "nyc --silent node init && nyc -- npm run test:core",
+    "test:code-origin": "mocha \"packages/datadog-code-origin/test/**/*.spec.js\"",
+    "test:code-origin:ci": "nyc --silent node init && nyc -- npm run test:code-origin",
+    "test:lambda": "mocha \"packages/dd-trace/test/lambda/**/*.spec.js\"",
+    "test:lambda:ci": "nyc --silent node init && nyc -- npm run test:lambda",
     "test:llmobs:sdk": "mocha --exclude \"packages/dd-trace/test/llmobs/plugins/**/*.spec.js\" \"packages/dd-trace/test/llmobs/**/*.spec.js\"",
-    "test:llmobs:sdk:ci": "nyc -- npm run test:llmobs:sdk",
+    "test:llmobs:sdk:ci": "nyc --silent node init && nyc -- npm run test:llmobs:sdk",
     "test:llmobs:plugins": "mocha \"packages/dd-trace/test/llmobs/plugins/@(${PLUGINS})/*.spec.js\"",
-    "test:llmobs:plugins:ci": "yarn services && nyc -- npm run test:llmobs:plugins",
-    "test:openfeature": "mocha packages/dd-trace/test/openfeature/**/*.spec.js",
-    "test:openfeature:ci": "nyc -- npm run test:openfeature",
+    "test:llmobs:plugins:ci": "yarn services && nyc --silent node init && nyc -- npm run test:llmobs:plugins",
+    "test:openfeature": "mocha \"packages/dd-trace/test/openfeature/**/*.spec.js\"",
+    "test:openfeature:ci": "nyc --silent node init && nyc -- npm run test:openfeature",
     "test:plugins": "node --expose-gc ./node_modules/mocha/bin/mocha.js \"packages/datadog-plugin-@(${PLUGINS})/test/**/${SPEC:-*}*.spec.js\"",
-    "test:plugins:ci": "yarn services && nyc -- npm run test:plugins",
-    "test:plugins:ci:flaky": "yarn services && nyc -- npm run test:plugins -- --bail --retries 2",
+    "test:plugins:ci": "yarn services && nyc --silent node init && nyc -- npm run test:plugins",
+    "test:plugins:ci:flaky": "yarn services && nyc --silent node init && nyc -- npm run test:plugins -- --bail --retries 2",
     "test:plugins:upstream": "node ./packages/dd-trace/test/plugins/suite.js",
-    "test:profiler": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- packages/dd-trace/test/profiling/**/*.spec.js",
-    "test:profiler:ci": "nyc -- npm run test:profiler",
+    "test:profiler": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- \"packages/dd-trace/test/profiling/**/*.spec.js\"",
+    "test:profiler:ci": "nyc --silent node init && nyc -- npm run test:profiler",
     "test:integration": "mocha --timeout 60000 \"integration-tests/*.spec.js\"",
     "test:integration:aiguard": "mocha --timeout 60000 \"integration-tests/aiguard/*.spec.js\"",
     "test:integration:appsec": "mocha --timeout 60000 \"integration-tests/appsec/*.spec.js\"",
     "test:integration:bun": "mocha --timeout 60000 \"integration-tests/bun/*.spec.js\"",
     "test:integration:cucumber": "mocha --timeout 60000 \"integration-tests/cucumber/*.spec.js\"",
-    "test:integration:cypress": "mocha --timeout 60000 \"integration-tests/cypress/*.spec.js\"",
+    "test:integration:cypress": "mocha --timeout 60000 \"integration-tests/cypress/${SPEC:-cypress-*}.spec.js\"",
     "test:integration:debugger": "mocha --timeout 60000 \"integration-tests/debugger/*.spec.js\"",
     "test:integration:esbuild": "mocha --timeout 60000 \"integration-tests/esbuild/*.spec.js\"",
     "test:integration:webpack": "mocha --timeout 60000 \"integration-tests/webpack/*.spec.js\"",
     "test:integration:openfeature": "mocha --timeout 60000 \"integration-tests/openfeature/*.spec.js\"",
     "test:integration:jest": "mocha --timeout 60000 \"integration-tests/jest/*.spec.js\"",
     "test:integration:mocha": "mocha --timeout 60000 \"integration-tests/mocha/*.spec.js\"",
-    "test:integration:playwright": "mocha --timeout 60000 \"integration-tests/playwright/*.spec.js\"",
+    "test:integration:playwright": "mocha --timeout 60000 \"integration-tests/playwright/${SPEC:-playwright-*}.spec.js\"",
     "test:integration:selenium": "mocha --timeout 60000 \"integration-tests/selenium/*.spec.js\"",
     "test:integration:vitest": "mocha --timeout 60000 \"integration-tests/vitest/*.spec.js\"",
     "test:integration:testopt": "mocha --timeout 120000 \"integration-tests/ci-visibility/*.spec.js\"",
@@ -83,7 +85,7 @@
     "test:integration:plugins": "mocha \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/*.spec.js\"",
     "test:unit:plugins": "mocha \"packages/datadog-instrumentations/test/@(${PLUGINS}).spec.js\" \"packages/datadog-plugin-@(${PLUGINS})/test/**/*.spec.js\" --exclude \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/*.spec.js\"",
     "test:shimmer": "mocha \"packages/datadog-shimmer/test/**/*.spec.js\"",
-    "test:shimmer:ci": "nyc -- npm run test:shimmer",
+    "test:shimmer:ci": "nyc --silent node init && nyc -- npm run test:shimmer",
     "verify:workflow-job-names": "node scripts/verify-workflow-job-names.js",
     "verify-exercised-tests": "node scripts/verify-exercised-tests.js"
   },
@@ -153,28 +155,28 @@
     "@datadog/wasm-js-rewriter": "5.0.1",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
     "@opentelemetry/api-logs": "<1.0.0",
-    "oxc-parser": "^0.121.0"
+    "oxc-parser": "^0.127.0"
   },
   "devDependencies": {
-    "@actions/core": "^3.0.0",
-    "@actions/github": "^9.0.0",
+    "@actions/core": "^3.0.1",
+    "@actions/github": "^9.1.1",
     "@babel/helpers": "^7.29.2",
     "@eslint/eslintrc": "^3.3.5",
     "@eslint/js": "^9.39.2",
     "@msgpack/msgpack": "^3.1.3",
-    "@openfeature/core": "^1.8.1",
-    "@openfeature/server-sdk": "~1.20.0",
+    "@openfeature/core": "^1.10.0",
+    "@openfeature/server-sdk": "~1.21.0",
     "@stylistic/eslint-plugin": "^5.10.0",
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.106",
-    "@types/sinon": "^21.0.0",
-    "axios": "^1.15.0",
+    "@types/sinon": "^21.0.1",
+    "axios": "^1.15.2",
     "benchmark": "^2.1.4",
     "body-parser": "^2.2.2",
-    "bun": "1.3.11",
+    "bun": "1.3.13",
     "codeowners-audit": "^2.9.0",
     "eslint": "^9.39.2",
-    "eslint-plugin-cypress": "^6.2.2",
+    "eslint-plugin-cypress": "^6.3.1",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jsdoc": "^62.9.0",
     "eslint-plugin-mocha": "^11.2.0",
@@ -200,10 +202,10 @@
     "retry": "^0.13.1",
     "semifies": "^1.0.0",
     "semver": "^7.7.2",
-    "sinon": "^21.0.3",
+    "sinon": "^21.1.2",
     "tiktoken": "^1.0.21",
-    "typescript": "^6.0.2",
-    "workerpool": "^10.0.0",
+    "typescript": "^6.0.3",
+    "workerpool": "^10.0.2",
     "yaml": "^2.8.3",
     "yarn-deduplicate": "^6.0.2"
   }

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

@@ -5,6 +5,7 @@ const {
   channel,
   addHook,
 } = require('./helpers/instrument')
+const { createCallbackInstrumentor } = require('./helpers/callback-instrumentor')
 
 const cryptoHashCh = channel('datadog:crypto:hashing:start')
 const cryptoCipherCh = channel('datadog:crypto:cipher:start')
@@ -12,9 +13,35 @@ const cryptoCipherCh = channel('datadog:crypto:cipher:start')
 const hashMethods = ['createHash', 'createHmac', 'createSign', 'createVerify', 'sign', 'verify']
 const cipherMethods = ['createCipheriv', 'createDecipheriv']
 
+// Async crypto APIs that offload work to the libuv worker thread pool. The mapped sparse array
+// names each callback-preceding argument position whose value should be captured on the context
+// (string or number only). Unused positions are elided so iteration can skip them. Consumers of
+// the context (e.g. the events profiler) read these fields as sample labels.
+const asyncParamsByMethod = {
+  checkPrime: [],
+  generateKey: ['type'],
+  generateKeyPair: ['type'],
+  generatePrime: ['size'],
+  hkdf: ['digest', , , , 'keylen'], // eslint-disable-line no-sparse-arrays
+  pbkdf2: [, , 'iterations', 'keylen', 'digest'], // eslint-disable-line no-sparse-arrays
+  randomBytes: ['size'],
+  randomFill: [, 'offset', 'size'], // eslint-disable-line no-sparse-arrays
+  randomInt: [],
+  scrypt: [, , 'keylen'], // eslint-disable-line no-sparse-arrays
+  sign: ['algorithm'],
+  verify: ['algorithm'],
+}
+
 addHook({ name: 'crypto' }, crypto => {
   shimmer.massWrap(crypto, hashMethods, wrapCryptoMethod(cryptoHashCh))
   shimmer.massWrap(crypto, cipherMethods, wrapCryptoMethod(cryptoCipherCh))
+
+  const instrument = createCallbackInstrumentor('apm:crypto:operation')
+  for (const [method, paramNames] of Object.entries(asyncParamsByMethod)) {
+    if (typeof crypto[method] === 'function') {
+      shimmer.wrap(crypto, method, instrument(buildAsyncContext(method, paramNames)))
+    }
+  }
   return crypto
 })
 
@@ -30,3 +57,21 @@ function wrapCryptoMethod (channel) {
   }
   return wrapMethod
 }
+
+function buildAsyncContext (operation, paramNames) {
+  return function (_, args) {
+    const ctx = { operation }
+    const lastIndex = args.length - 1
+    // paramNames is a sparse array; for-in yields only populated slot indices, in ascending
+    // numeric order, so we can break once we pass the callback position.
+    for (const i in paramNames) {
+      if (i >= lastIndex) break
+      const name = paramNames[i]
+      const value = args[i]
+      if (typeof value === 'string' || typeof value === 'number') {
+        ctx[name] = value
+      }
+    }
+    return ctx
+  }
+}

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

@@ -235,6 +235,40 @@ function getPickleByFile (runtimeOrCoodinator) {
   }, {})
 }
 
+function getFinalStatus ({
+  status,
+  hasFailedAllRetries,
+  isLastAtrRetry,
+  isLastEfdRetry,
+  isLastAttemptToFix,
+  hasPassedAllRetries,
+  isQuarantined,
+  isDisabled,
+}) {
+  // Note that intermediate executions DO NOT report a final status tag
+
+  // If the test is quarantined or disabled, regardless of its actual execution result or active retry features,
+  // the final status of its last execution should be reported as 'skip'.
+  if (isQuarantined || isDisabled || status === 'skip') {
+    return 'skip'
+  }
+
+  // When no retry feature is active, every execution is final
+  if (!isLastAtrRetry && !isLastEfdRetry && !isLastAttemptToFix) {
+    return status
+  }
+
+  // ATR and EFD: pass unless every attempt failed
+  if (isLastAtrRetry || isLastEfdRetry) {
+    return hasFailedAllRetries ? 'fail' : 'pass'
+  }
+
+  // Branch for ATF (We need to check hasPassedAllRetries)
+  if (isLastAttemptToFix) {
+    return hasPassedAllRetries ? 'pass' : 'fail'
+  }
+}
+
 function wrapRun (pl, isLatestVersion, version) {
   if (patched.has(pl)) return
 
@@ -262,7 +296,7 @@ function wrapRun (pl, isLatestVersion, version) {
     testStartCh.runStores(ctx, () => {})
     const promises = {}
     try {
-      this.eventBroadcaster.on('envelope', async (testCase) => {
+      const onEnvelope = async (testCase) => {
         // Only supported from >=8.0.0
         if (testCase?.testCaseFinished) {
           const { testCaseFinished: { willBeRetried } } = testCase
@@ -280,7 +314,7 @@ function wrapRun (pl, isLatestVersion, version) {
             const isAtrRetry = !isFirstAttempt && isFlakyTestRetriesEnabled
 
             // ATR: record this attempt as failed so when run().finally runs (after retry) we have all statuses
-            if (isFlakyTestRetriesEnabled && isAtrRetry === false) {
+            if (isFlakyTestRetriesEnabled) {
               const nameForKey = this.pickle.name.replace(/\s*\(attempt \d+(?:, retried)?\)\s*$/, '')
               const atrKey = `${this.pickle.uri}:${nameForKey}`
               if (atrStatusesByScenarioKey.has(atrKey)) {
@@ -303,13 +337,15 @@ function wrapRun (pl, isLatestVersion, version) {
             testStartCh.runStores(newCtx, () => {})
           }
         }
-      })
+      }
+      this.eventBroadcaster.on('envelope', onEnvelope)
       let promise
 
       testFnCh.runStores(ctx, () => {
         promise = run.apply(this, arguments)
       })
       promise.finally(async () => {
+        this.eventBroadcaster.removeListener('envelope', onEnvelope)
         const result = this.getWorstStepResult()
         const { status, skipReason } = isLatestVersion
           ? getStatusFromResultLatest(result)
@@ -408,6 +444,31 @@ function wrapRun (pl, isLatestVersion, version) {
         if (promises.hitBreakpointPromise) {
           await promises.hitBreakpointPromise
         }
+
+        // Notice that ATR is handled using cucumber native retries features.
+        // Therefore, if we reach this point, we are certain that it's the last ATR execution
+        const isLastAtrRetry = isFlakyTestRetriesEnabled && !isAttemptToFix && !isEfdRetry && numTestRetries > 0
+
+        const statuses = lastStatusByPickleId.get(this.pickle.id)
+        const isLastEfdRetry = isEfdRetry && statuses?.length === earlyFlakeDetectionNumRetries + 1
+        const isLastAttemptToFixRetry = isAttemptToFix && statuses?.length === testManagementAttemptToFixRetries + 1
+
+        // Intermediate (non-last EFD or ATF retries) executions do not report a final status
+        const isIntermediateExecution = (isEfdRetry && !isLastEfdRetry) || (isAttemptToFix && !isLastAttemptToFixRetry)
+
+        const finalStatus = isIntermediateExecution
+          ? undefined
+          : getFinalStatus({
+            status,
+            hasFailedAllRetries,
+            isLastAtrRetry,
+            isLastEfdRetry,
+            isLastAttemptToFix: isLastAttemptToFixRetry,
+            hasPassedAllRetries,
+            isQuarantined,
+            isDisabled,
+          })
+
         testFinishCh.publish({
           status,
           skipReason,
@@ -424,6 +485,7 @@ function wrapRun (pl, isLatestVersion, version) {
           isQuarantined,
           isModified,
           ...attemptCtx.currentStore,
+          finalStatus,
         })
       })
       return promise