dd-trace 5.89.0 → 5.91.0

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

@@ -140,7 +140,6 @@ function runnableWrapper (RunnablePackage, libraryConfig) {
     if (!testFinishCh.hasSubscribers) {
       return run.apply(this, arguments)
     }
-    // Flaky test retries does not work in parallel mode
     if (libraryConfig?.isFlakyTestRetriesEnabled) {
       this.retries(libraryConfig?.flakyTestRetriesCount)
     }
@@ -289,6 +288,12 @@ function getOnTestEndHandler (config) {
       hasFailedAllRetries = true
     }
 
+    // ATR: set hasFailedAllRetries when all auto test retries were exhausted and every attempt failed
+    if (config.isFlakyTestRetriesEnabled && !test._ddIsAttemptToFix && !test._ddIsEfdRetry &&
+      getIsLastRetry(test) && testStatuses.every(status => status === 'fail')) {
+      hasFailedAllRetries = true
+    }
+
     const isAttemptToFixRetry = test._ddIsAttemptToFix && testStatuses.length > 1
     const isAtrRetry = config.isFlakyTestRetriesEnabled &&
       !test._ddIsAttemptToFix &&

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

@@ -10,6 +10,7 @@ const {
   getOnHookEndHandler,
   getOnFailHandler,
   getOnPendingHandler,
+  getOnTestRetryHandler,
   getRunTestsWrapper,
 } = require('./utils')
 require('./common')
@@ -42,12 +43,18 @@ addHook({
     }
     if (this.options._ddIsTestManagementTestsEnabled) {
       config.isTestManagementTestsEnabled = true
-      // TODO: attempt to fix does not work in parallel mode yet
-      // config.testManagementAttemptToFixRetries = this.options._ddTestManagementAttemptToFixRetries
+      config.testManagementAttemptToFixRetries = this.options._ddTestManagementAttemptToFixRetries
       config.testManagementTests = this.options._ddTestManagementTests
       delete this.options._ddIsTestManagementTestsEnabled
+      delete this.options._ddTestManagementAttemptToFixRetries
       delete this.options._ddTestManagementTests
     }
+    if (this.options._ddIsFlakyTestRetriesEnabled) {
+      config.isFlakyTestRetriesEnabled = true
+      config.flakyTestRetriesCount = this.options._ddFlakyTestRetriesCount
+      delete this.options._ddIsFlakyTestRetriesEnabled
+      delete this.options._ddFlakyTestRetriesCount
+    }
     return run.apply(this, arguments)
   })
 
@@ -74,6 +81,8 @@ addHook({
 
     this.on('test end', getOnTestEndHandler(config))
 
+    this.on('retry', getOnTestRetryHandler(config))
+
     // If the hook passes, 'hook end' will be emitted. Otherwise, 'fail' will be emitted
     this.on('hook end', getOnHookEndHandler())
 
@@ -92,5 +101,4 @@ addHook({
   name: 'mocha',
   versions: ['>=5.2.0'],
   file: 'lib/runnable.js',
-}, runnableWrapper)
-// TODO: parallel mode does not support flaky test retries, so no library config is passed.
+}, (runnablePackage) => runnableWrapper(runnablePackage, config))

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

@@ -302,6 +302,7 @@ function testBeginHandler (test, browserName, shouldCreateTestSpan) {
   const {
     _requireFile: testSuiteAbsolutePath,
     location: {
+      file: testSourceFileAbsolutePath,
       line: testSourceLine,
     },
     _type,
@@ -319,7 +320,7 @@ function testBeginHandler (test, browserName, shouldCreateTestSpan) {
 
   if (isNewTestSuite) {
     startedSuites.push(testSuiteAbsolutePath)
-    const testSuiteCtx = { testSuiteAbsolutePath }
+    const testSuiteCtx = { testSuiteAbsolutePath, testSourceFileAbsolutePath }
     testSuiteToCtx.set(testSuiteAbsolutePath, testSuiteCtx)
     testSuiteStartCh.runStores(testSuiteCtx, () => {})
   }
@@ -335,6 +336,7 @@ function testBeginHandler (test, browserName, shouldCreateTestSpan) {
     const testCtx = {
       testName,
       testSuiteAbsolutePath,
+      testSourceFileAbsolutePath,
       testSourceLine,
       browserName,
       isDisabled: test._ddIsDisabled,
@@ -404,6 +406,15 @@ function testEndHandler ({
     test._ddHasFailedAllRetries = true
   }
 
+  // ATR: set _ddHasFailedAllRetries when all auto test retries were exhausted and every attempt failed
+  if (isFlakyTestRetriesEnabled && !testProperties.attemptToFix && !test._ddIsEfdRetry &&
+    !(test._ddIsNew || test._ddIsModified) &&
+    flakyTestRetriesCount != null && flakyTestRetriesCount > 0 &&
+    testStatuses.length === flakyTestRetriesCount + 1 &&
+    testStatuses.every(status => status === 'fail')) {
+    test._ddHasFailedAllRetries = true
+  }
+
   // this handles tests that do not go through the worker process (because they're skipped)
   if (shouldCreateTestSpan) {
     const testResult = results.at(-1)
@@ -459,6 +470,7 @@ function testEndHandler ({
       testSkipCh.publish({
         testName: getTestFullname(test),
         testSuiteAbsolutePath,
+        testSourceFileAbsolutePath: test.location.file,
         testSourceLine: test.location.line,
         browserName,
         isNew: test._ddIsNew,
@@ -1144,6 +1156,7 @@ addHook({
     const {
       _requireFile: testSuiteAbsolutePath,
       location: {
+        file: testSourceFileAbsolutePath,
         line: testSourceLine,
       },
     } = test
@@ -1159,6 +1172,7 @@ addHook({
     const testCtx = {
       testName,
       testSuiteAbsolutePath,
+      testSourceFileAbsolutePath,
       testSourceLine,
       browserName,
     }
@@ -1322,7 +1336,10 @@ function generateSummaryWrapper (generateSummary) {
       if (didNotRun) {
         const {
           _requireFile: testSuiteAbsolutePath,
-          location: { line: testSourceLine },
+          location: {
+            file: testSourceFileAbsolutePath,
+            line: testSourceLine,
+          },
           _ddIsNew: isNew,
           _ddIsDisabled: isDisabled,
           _ddIsModified: isModified,
@@ -1333,6 +1350,7 @@ function generateSummaryWrapper (generateSummary) {
         testSkipCh.publish({
           testName: getTestFullname(test),
           testSuiteAbsolutePath,
+          testSourceFileAbsolutePath,
           testSourceLine,
           browserName,
           isNew,

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

@@ -172,8 +172,10 @@ const prismaHook = (runtime, versions, name, isIitm) => {
         prismaHelperInit.publish(prismaHelperCtx)
 
         const helper = prismaHelperCtx.helper
-        this._tracingHelper = helper
-        this._engine.tracingHelper = helper
+        if (helper) {
+          this._tracingHelper = helper
+          this._engine.tracingHelper = helper
+        }
       }
     }
   }

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

@@ -95,6 +95,7 @@ function getProvidedContext () {
       _ddTestManagementAttemptToFixRetries: testManagementAttemptToFixRetries,
       _ddTestManagementTests: testManagementTests,
       _ddIsFlakyTestRetriesEnabled: isFlakyTestRetriesEnabled,
+      _ddFlakyTestRetriesCount: flakyTestRetriesCount,
       _ddIsImpactedTestsEnabled: isImpactedTestsEnabled,
       _ddModifiedFiles: modifiedFiles,
     } = globalThis.__vitest_worker__.providedContext
@@ -109,6 +110,7 @@ function getProvidedContext () {
       testManagementAttemptToFixRetries,
       testManagementTests,
       isFlakyTestRetriesEnabled,
+      flakyTestRetriesCount: flakyTestRetriesCount ?? 0,
       isImpactedTestsEnabled,
       modifiedFiles,
     }
@@ -124,6 +126,7 @@ function getProvidedContext () {
       testManagementAttemptToFixRetries: 0,
       testManagementTests: {},
       isFlakyTestRetriesEnabled: false,
+      flakyTestRetriesCount: 0,
       isImpactedTestsEnabled: false,
       modifiedFiles: {},
     }
@@ -143,8 +146,23 @@ function isReporterPackageNewest (vitestPackage) {
   return vitestPackage.h?.name === 'BaseSequencer'
 }
 
-function isBaseSequencer (vitestPackage) {
-  return vitestPackage.b?.name === 'BaseSequencer'
+/**
+ * Finds an export by its `.name` property in a minified vitest chunk.
+ * Minified export keys change across versions, so we search by function/class name.
+ * @param {object} pkg - The module exports object
+ * @param {string} name - The `.name` value to look for
+ * @returns {{ key: string, value: Function } | undefined}
+ */
+function findExportByName (pkg, name) {
+  for (const [key, value] of Object.entries(pkg)) {
+    if (value?.name === name) {
+      return { key, value }
+    }
+  }
+}
+
+function getBaseSequencerExport (vitestPackage) {
+  return findExportByName(vitestPackage, 'BaseSequencer')
 }
 
 function getChannelPromise (channelToPublishTo, frameworkVersion) {
@@ -154,19 +172,19 @@ function getChannelPromise (channelToPublishTo, frameworkVersion) {
 }
 
 function isCliApiPackage (vitestPackage) {
-  return vitestPackage.s?.name === 'startVitest'
+  return !!findExportByName(vitestPackage, 'startVitest')
 }
 
-function isTestPackage (testPackage) {
-  return testPackage.V?.name === 'VitestTestRunner'
+function getTestRunnerExport (testPackage) {
+  return findExportByName(testPackage, 'VitestTestRunner') || findExportByName(testPackage, 'TestRunner')
 }
 
-function hasForksPoolWorker (vitestPackage) {
-  return vitestPackage.f?.name === 'ForksPoolWorker'
+function getForksPoolWorkerExport (vitestPackage) {
+  return findExportByName(vitestPackage, 'ForksPoolWorker')
 }
 
-function hasThreadsPoolWorker (vitestPackage) {
-  return vitestPackage.T?.name === 'ThreadsPoolWorker'
+function getThreadsPoolWorkerExport (vitestPackage) {
+  return findExportByName(vitestPackage, 'ThreadsPoolWorker')
 }
 
 function getSessionStatus (state) {
@@ -260,6 +278,7 @@ function getSortWrapper (sort, frameworkVersion) {
           ? this.ctx.getCoreWorkspaceProject()
           : this.ctx.getRootProject()
         workspaceProject._provided._ddIsFlakyTestRetriesEnabled = isFlakyTestRetriesEnabled
+        workspaceProject._provided._ddFlakyTestRetriesCount = flakyTestRetriesCount
       } catch {
         log.warn('Could not send library configuration to workers.')
       }
@@ -443,7 +462,11 @@ function getCliOrStartVitestWrapper (frameworkVersion) {
 }
 
 function getCreateCliWrapper (vitestPackage, frameworkVersion) {
-  shimmer.wrap(vitestPackage, 'c', getCliOrStartVitestWrapper(frameworkVersion))
+  const createCliExport = findExportByName(vitestPackage, 'createCLI')
+  if (!createCliExport) {
+    return vitestPackage
+  }
+  shimmer.wrap(vitestPackage, createCliExport.key, getCliOrStartVitestWrapper(frameworkVersion))
 
   return vitestPackage
 }
@@ -530,27 +553,30 @@ function getStartVitestWrapper (cliApiPackage, frameworkVersion) {
   if (!isCliApiPackage(cliApiPackage)) {
     return cliApiPackage
   }
-  shimmer.wrap(cliApiPackage, 's', getCliOrStartVitestWrapper(frameworkVersion))
+  const startVitestExport = findExportByName(cliApiPackage, 'startVitest')
+  shimmer.wrap(cliApiPackage, startVitestExport.key, getCliOrStartVitestWrapper(frameworkVersion))
 
-  if (hasForksPoolWorker(cliApiPackage)) {
+  const forksPoolWorker = getForksPoolWorkerExport(cliApiPackage)
+  if (forksPoolWorker) {
     // function is async
-    shimmer.wrap(cliApiPackage.f.prototype, 'start', start => function () {
+    shimmer.wrap(forksPoolWorker.value.prototype, 'start', start => function () {
       vitestPool = 'child_process'
       this.env.DD_VITEST_WORKER = '1'
 
       return start.apply(this, arguments)
     })
-    shimmer.wrap(cliApiPackage.f.prototype, 'on', getWrappedOn)
+    shimmer.wrap(forksPoolWorker.value.prototype, 'on', getWrappedOn)
   }
 
-  if (hasThreadsPoolWorker(cliApiPackage)) {
+  const threadsPoolWorker = getThreadsPoolWorkerExport(cliApiPackage)
+  if (threadsPoolWorker) {
     // function is async
-    shimmer.wrap(cliApiPackage.T.prototype, 'start', start => function () {
+    shimmer.wrap(threadsPoolWorker.value.prototype, 'start', start => function () {
       vitestPool = 'worker_threads'
       this.env.DD_VITEST_WORKER = '1'
       return start.apply(this, arguments)
     })
-    shimmer.wrap(cliApiPackage.T.prototype, 'on', getWrappedOn)
+    shimmer.wrap(threadsPoolWorker.value.prototype, 'on', getWrappedOn)
   }
   return cliApiPackage
 }
@@ -657,6 +683,9 @@ function wrapVitestTestRunner (VitestTestRunner) {
         }
         task.result.state = 'pass'
       } else if (isQuarantined) {
+        if (task.result.state === 'fail') {
+          switchedStatuses.add(task)
+        }
         task.result.state = 'pass'
       }
     }
@@ -740,7 +769,10 @@ function wrapVitestTestRunner (VitestTestRunner) {
     }
 
     const lastExecutionStatus = task.result.state
-    const shouldFlipStatus = isEarlyFlakeDetectionEnabled || attemptToFixTasks.has(task)
+    const isAtf = attemptToFixTasks.has(task)
+    const isQuarantinedOrDisabledAtf = isAtf && (quarantinedTasks.has(task) || disabledTasks.has(task))
+    const shouldTrackStatuses = isEarlyFlakeDetectionEnabled || isAtf
+    const shouldFlipStatus = isEarlyFlakeDetectionEnabled || isQuarantinedOrDisabledAtf
     const statuses = taskToStatuses.get(task)
 
     // These clauses handle task.repeats, whether EFD is enabled or not
@@ -758,8 +790,10 @@ function wrapVitestTestRunner (VitestTestRunner) {
         } else {
           testPassCh.publish({ task, ...ctx.currentStore })
         }
-        if (shouldFlipStatus) {
+        if (shouldTrackStatuses) {
           statuses.push(lastExecutionStatus)
+        }
+        if (shouldFlipStatus) {
           // If we don't "reset" the result.state to "pass", once a repetition fails,
           // vitest will always consider the test as failed, so we can't read the actual status
           // This means that we change vitest's behavior:
@@ -769,7 +803,7 @@ function wrapVitestTestRunner (VitestTestRunner) {
         }
       }
     } else if (numRepetition === task.repeats) {
-      if (shouldFlipStatus) {
+      if (shouldTrackStatuses) {
         statuses.push(lastExecutionStatus)
       }
 
@@ -857,11 +891,12 @@ addHook({
   versions: ['>=4.0.0'],
   filePattern: 'dist/chunks/test.*',
 }, (testPackage) => {
-  if (!isTestPackage(testPackage)) {
+  const testRunner = getTestRunnerExport(testPackage)
+  if (!testRunner) {
     return testPackage
   }
 
-  wrapVitestTestRunner(testPackage.V)
+  wrapVitestTestRunner(testRunner.value)
 
   return testPackage
 })
@@ -930,8 +965,9 @@ addHook({
   versions: ['>=3.0.9'],
   filePattern: 'dist/chunks/coverage.*',
 }, (coveragePackage) => {
-  if (isBaseSequencer(coveragePackage)) {
-    shimmer.wrap(coveragePackage.b.prototype, 'sort', getSortWrapper)
+  const baseSequencer = getBaseSequencerExport(coveragePackage)
+  if (baseSequencer) {
+    shimmer.wrap(baseSequencer.value.prototype, 'sort', getSortWrapper)
   }
   return coveragePackage
 })
@@ -1047,6 +1083,15 @@ addHook({
             }
           }
 
+          // ATR: set hasFailedAllRetries when all auto test retries were exhausted and every attempt failed
+          if (providedContext.isFlakyTestRetriesEnabled && !attemptToFixTasks.has(task) &&
+            !newTasks.has(task) && !modifiedTasks.has(task)) {
+            const maxRetries = providedContext.flakyTestRetriesCount ?? 0
+            if (maxRetries > 0 && task.result?.retryCount === maxRetries) {
+              hasFailedAllRetries = true
+            }
+          }
+
           if (testCtx) {
             const isRetry = task.result?.retryCount > 0
             // `duration` is the duration of all the retries, so it can't be used if there are retries

package/packages/datadog-plugin-apollo/src/gateway/execute.js

@@ -5,6 +5,14 @@ const ApolloBasePlugin = require('../../../dd-trace/src/plugins/apollo')
 class ApolloGatewayExecutePlugin extends ApolloBasePlugin {
   static operation = 'execute'
   static prefix = 'tracing:apm:apollo:gateway:execute'
+
+  onAsyncStart (ctx) {
+    const span = ctx?.currentStore?.span
+
+    if (!span) return
+
+    this.config.hooks.execute(span, ctx)
+  }
 }
 
 module.exports = ApolloGatewayExecutePlugin

package/packages/datadog-plugin-apollo/src/gateway/fetch.js

@@ -29,6 +29,11 @@ class ApolloGatewayFetchPlugin extends ApolloBasePlugin {
 
     return ctx.currentStore
   }
+
+  onAsyncStart (ctx) {
+    const span = ctx?.currentStore?.span
+    this.config.hooks.fetch(span, ctx)
+  }
 }
 
 module.exports = ApolloGatewayFetchPlugin

package/packages/datadog-plugin-apollo/src/gateway/plan.js

@@ -5,6 +5,14 @@ const ApolloBasePlugin = require('../../../dd-trace/src/plugins/apollo')
 class ApolloGatewayPlanPlugin extends ApolloBasePlugin {
   static operation = 'plan'
   static prefix = 'tracing:apm:apollo:gateway:plan'
+
+  onEnd (ctx) {
+    const span = ctx?.currentStore?.span
+
+    if (!span) return
+
+    this.config.hooks.plan(span, ctx)
+  }
 }
 
 module.exports = ApolloGatewayPlanPlugin

package/packages/datadog-plugin-apollo/src/gateway/postprocessing.js

@@ -5,6 +5,11 @@ const ApolloBasePlugin = require('../../../dd-trace/src/plugins/apollo')
 class ApolloGatewayPostProcessingPlugin extends ApolloBasePlugin {
   static operation = 'postprocessing'
   static prefix = 'tracing:apm:apollo:gateway:postprocessing'
+
+  onAsyncStart (ctx) {
+    const span = ctx?.currentStore?.span
+    this.config.hooks.postprocessing(span, ctx)
+  }
 }
 
 module.exports = ApolloGatewayPostProcessingPlugin

package/packages/datadog-plugin-apollo/src/gateway/request.js

@@ -52,15 +52,16 @@ class ApolloGatewayRequestPlugin extends ApolloBasePlugin {
     return ctx.currentStore
   }
 
-  asyncStart (ctx) {
+  onAsyncStart (ctx) {
     const errors = ctx?.result?.errors
     // apollo gateway catches certain errors and returns them in the result object
     // we want to capture these errors as spans
     if (Array.isArray(errors) && errors.at(-1)?.stack && errors.at(-1).message) {
       ctx.currentStore.span.setTag('error', errors.at(-1))
     }
-    ctx.currentStore.span.finish()
-    return ctx.parentStore
+
+    const span = ctx?.currentStore?.span
+    this.config.hooks.request(span, ctx)
   }
 }
 

package/packages/datadog-plugin-apollo/src/gateway/validate.js

@@ -6,16 +6,17 @@ class ApolloGatewayValidatePlugin extends ApolloBasePlugin {
   static operation = 'validate'
   static prefix = 'tracing:apm:apollo:gateway:validate'
 
-  end (ctx) {
+  onEnd (ctx) {
     const result = ctx.result
-    const span = ctx.currentStore?.span
+    const span = ctx?.currentStore?.span
 
     if (!span) return
 
     if (Array.isArray(result) && result.at(-1)?.stack && result.at(-1).message) {
       span.setTag('error', result.at(-1))
     }
-    span.finish()
+
+    this.config.hooks.validate(span, ctx)
   }
 }
 

package/packages/datadog-plugin-apollo/src/index.js

@@ -10,6 +10,34 @@ class ApolloPlugin extends CompositePlugin {
       gateway: ApolloGatewayPlugin,
     }
   }
+
+  /**
+   * @override
+   */
+  configure (config) {
+    return super.configure(validateConfig(config))
+  }
+}
+
+const noop = () => {}
+
+function validateConfig (config) {
+  return {
+    ...config,
+    hooks: getHooks(config),
+  }
+}
+
+function getHooks (config) {
+  const hooks = config?.hooks
+  const request = hooks?.request ?? noop
+  const validate = hooks?.validate ?? noop
+  const plan = hooks?.plan ?? noop
+  const execute = hooks?.execute ?? noop
+  const fetch = hooks?.fetch ?? noop
+  const postprocessing = hooks?.postprocessing ?? noop
+
+  return { request, validate, plan, execute, fetch, postprocessing }
 }
 
 module.exports = ApolloPlugin

package/packages/datadog-plugin-azure-durable-functions/src/index.js

@@ -0,0 +1,49 @@
+'use strict'
+
+const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
+
+class AzureDurableFunctionsPlugin extends TracingPlugin {
+  static get id () { return 'azure-durable-functions' }
+  static get operation () { return 'invoke' }
+  static get prefix () { return 'tracing:datadog:azure:durable-functions:invoke' }
+  static get type () { return 'serverless' }
+  static get kind () { return 'server' }
+
+  bindStart (ctx) {
+    const span = this.startSpan(this.operationName(), {
+      kind: 'internal',
+      type: 'serverless',
+
+      meta: {
+        component: 'azure-functions',
+        'aas.function.name': ctx.functionName,
+        'aas.function.trigger': ctx.trigger,
+        'resource.name': `${ctx.trigger} ${ctx.functionName}`,
+      },
+    }, ctx)
+
+    // in the case of entity functions, operationName should be available
+    if (ctx.operationName) {
+      span.setTag('aas.function.operation', ctx.operationName)
+      span.setTag('resource.name', `${ctx.trigger} ${ctx.functionName} ${ctx.operationName}`
+      )
+    }
+
+    ctx.span = span
+    return ctx.currentStore
+  }
+
+  end (ctx) {
+    // We only want to run finish here if this is a synchronous operation
+    // Only synchronous operations would have `result` or `error` on `end`
+    // So we skip operations that dont
+    if (!ctx.hasOwnProperty('result') && !ctx.hasOwnProperty('error')) return
+    super.finish(ctx)
+  }
+
+  asyncStart (ctx) {
+    super.finish(ctx)
+  }
+}
+
+module.exports = AzureDurableFunctionsPlugin

package/packages/datadog-plugin-cypress/src/cypress-plugin.js

@@ -247,6 +247,7 @@ class CypressPlugin {
   isSuitesSkippingEnabled = false
   isCodeCoverageEnabled = false
   isFlakyTestRetriesEnabled = false
+  flakyTestRetriesCount = 0
   isEarlyFlakeDetectionEnabled = false
   isKnownTestsEnabled = false
   earlyFlakeDetectionNumRetries = 0
@@ -354,7 +355,10 @@ class CypressPlugin {
           this.isKnownTestsEnabled = isKnownTestsEnabled
           if (isFlakyTestRetriesEnabled && this.isTestIsolationEnabled) {
             this.isFlakyTestRetriesEnabled = true
-            this.cypressConfig.retries.runMode = flakyTestRetriesCount
+            this.flakyTestRetriesCount = flakyTestRetriesCount ?? 0
+            this.cypressConfig.retries.runMode = this.flakyTestRetriesCount
+          } else {
+            this.flakyTestRetriesCount = 0
           }
           this.isTestManagementTestsEnabled = isTestManagementEnabled
           this.testManagementAttemptToFixRetries = testManagementAttemptToFixRetries
@@ -603,7 +607,7 @@ class CypressPlugin {
           [TEST_SESSION_NAME]: testSessionName,
         }
       }
-      const libraryCapabilitiesTags = getLibraryCapabilitiesTags(this.constructor.id, false, this.frameworkVersion)
+      const libraryCapabilitiesTags = getLibraryCapabilitiesTags(this.constructor.id, this.frameworkVersion)
       metadataTags.test = {
         ...metadataTags.test,
         ...libraryCapabilitiesTags,
@@ -1019,6 +1023,12 @@ class CypressPlugin {
             }
           }
         }
+        // ATR: set TEST_HAS_FAILED_ALL_RETRIES when all auto test retries were exhausted and every attempt failed
+        if (this.isFlakyTestRetriesEnabled && !isAttemptToFix && !isEfdRetry &&
+          this.flakyTestRetriesCount > 0 && testStatuses.length === this.flakyTestRetriesCount + 1 &&
+          testStatuses.every(status => status === 'fail')) {
+          this.activeTestSpan.setTag(TEST_HAS_FAILED_ALL_RETRIES, 'true')
+        }
 
         // Ensure quarantined tests reported from support.js are tagged
         // (This catches cases where the test ran but failed, but Cypress saw it as passed)

package/packages/datadog-plugin-cypress/src/support.js

@@ -61,18 +61,16 @@ Cypress.on('fail', (err, runnable) => {
   }
 
   const testName = runnable.fullTitle()
-  const { isQuarantined, isAttemptToFix } = getTestProperties(testName)
+  const { isQuarantined, isDisabled } = getTestProperties(testName)
 
-  // For pure quarantined tests (not attemptToFix), suppress the failure
-  // This makes the test "pass" from Cypress's perspective while we still track the error
-  if (isQuarantined && !isAttemptToFix) {
-    // Store the error so we can report it to Datadog in afterEach
+  // Suppress failures for quarantined or disabled tests so they don't affect the exit code.
+  // This applies regardless of attempt-to-fix status: per spec, quarantined/disabled test
+  // results are always ignored.
+  if (isQuarantined || isDisabled) {
     quarantinedTestErrors.set(testName, err)
-    // Don't re-throw - this prevents Cypress from marking the test as failed
     return
   }
 
-  // For all other tests (including attemptToFix), let the error propagate normally
   throw err
 })
 

package/packages/datadog-plugin-jest/src/index.js

@@ -386,6 +386,12 @@ class JestPlugin extends CiPlugin {
       return ctx.currentStore
     })
 
+    this.addBind('ci:jest:test-suite:hook:fn', (ctx) => {
+      const testSuiteSpan = this.testSuiteSpanPerTestSuiteAbsolutePath.get(ctx.testSuiteAbsolutePath)
+      const store = storage('legacy').getStore()
+      return { ...store, span: testSuiteSpan }
+    })
+
     this.addSub('ci:jest:test:finish', ({
       span,
       status,

package/packages/datadog-plugin-langgraph/src/index.js

@@ -0,0 +1,24 @@
+'use strict'
+
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+const langgraphLLMObsPlugins = require('../../dd-trace/src/llmobs/plugins/langgraph')
+const streamPlugin = require('./stream')
+
+const plugins = {}
+
+// CRITICAL: LLMObs plugins MUST come first
+for (const Plugin of langgraphLLMObsPlugins) {
+  plugins[Plugin.id] = Plugin
+}
+
+// Tracing plugins second
+for (const Plugin of streamPlugin) {
+  plugins[Plugin.id] = Plugin
+}
+
+class LanggraphPlugin extends CompositePlugin {
+  static id = 'langgraph'
+  static plugins = plugins
+}
+
+module.exports = LanggraphPlugin