dd-trace 5.46.0 → 5.48.0

package/LICENSE-3rdparty.csv

@@ -2,10 +2,10 @@ Component,Origin,License,Copyright
 require,@datadog/libdatadog,Apache license 2.0,Copyright 2024 Datadog Inc.
 require,@datadog/native-appsec,Apache license 2.0,Copyright 2018 Datadog Inc.
 require,@datadog/native-metrics,Apache license 2.0,Copyright 2018 Datadog Inc.
-require,@datadog/wasm-js-rewriter,Apache license 2.0,Copyright 2018 Datadog Inc.
 require,@datadog/native-iast-taint-tracking,Apache license 2.0,Copyright 2018 Datadog Inc.
 require,@datadog/pprof,Apache license 2.0,Copyright 2019 Google Inc.
 require,@datadog/sketches-js,Apache license 2.0,Copyright 2020 Datadog Inc.
+require,@datadog/wasm-js-rewriter,Apache license 2.0,Copyright 2018 Datadog Inc.
 require,@opentelemetry/api,Apache license 2.0,Copyright OpenTelemetry Authors
 require,@opentelemetry/core,Apache license 2.0,Copyright OpenTelemetry Authors
 require,@isaacs/ttlcache,ISC,Copyright (c) 2022-2023 - Isaac Z. Schlueter and Contributors
@@ -38,7 +38,6 @@ dev,@eslint/eslintrc,MIT,Copyright OpenJS Foundation and other contributors, <ww
 dev,@eslint/js,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
 dev,@msgpack/msgpack,ISC,Copyright 2019 The MessagePack Community
 dev,@stylistic/eslint-plugin-js,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
-dev,application-config-path,MIT,Copyright (c) 2015, 2023 Linus Unnebäck
 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

package/index.d.ts

@@ -869,6 +869,39 @@ declare namespace tracer {
     flush(): void
   }
 
+  export interface EventTrackingV2 {
+    /**
+     * Links a successful login event to the current trace. Will link the passed user to the current trace with Appsec.setUser() internally.
+     * @param {string} login The login key (username, email...) used by the user to authenticate.
+     * @param {User} user Properties of the authenticated user. Accepts custom fields. Can be null.
+     * @param {any} metadata Custom fields to link to the login success event.
+     */
+    trackUserLoginSuccess(login: string, user?: User | null, metadata?: any): void;
+
+    /**
+     * Links a successful login event to the current trace. Will link the passed user to the current trace with Appsec.setUser() internally.
+     * @param {string} login The login key (username, email...) used by the user to authenticate.
+     * @param {string} userId Identifier of the authenticated user.
+     * @param {any} metadata Custom fields to link to the login success event.
+     */
+    trackUserLoginSuccess(login: string, userId: string, metadata?: any): void;
+
+    /**
+     * Links a failed login event to the current trace.
+     * @param {string} login The login key (username, email...) used by the user to authenticate.
+     * @param {boolean} exists If the user exists.
+     * @param {any} metadata Custom fields to link to the login failure event.
+     */
+    trackUserLoginFailure(login: string, exists: boolean, metadata?: any): void;
+
+    /**
+     * Links a failed login event to the current trace.
+     * @param {string} login The login key (username, email...) used by the user to authenticate.
+     * @param {any} metadata Custom fields to link to the login failure event.
+     */
+    trackUserLoginFailure(login: string, metadata?: any): void;
+  }
+
   export interface Appsec {
     /**
      * Links a successful login event to the current trace. Will link the passed user to the current trace with Appsec.setUser() internally.
@@ -876,6 +909,8 @@ declare namespace tracer {
      * @param {[key: string]: string} metadata Custom fields to link to the login success event.
      *
      * @beta This method is in beta and could change in future versions.
+     *
+     * @deprecated In favor of eventTrackingV2.trackUserLoginSuccess
      */
     trackUserLoginSuccessEvent(user: User, metadata?: { [key: string]: string }): void
 
@@ -886,6 +921,8 @@ declare namespace tracer {
      * @param {[key: string]: string} metadata Custom fields to link to the login failure event.
      *
      * @beta This method is in beta and could change in future versions.
+     *
+     * @deprecated In favor of eventTrackingV2.trackUserLoginFailure
      */
     trackUserLoginFailureEvent(userId: string, exists: boolean, metadata?: { [key: string]: string }): void
 
@@ -926,6 +963,8 @@ declare namespace tracer {
      * @beta This method is in beta and could change in the future
      */
     setUser(user: User): void
+
+    eventTrackingV2: EventTrackingV2
   }
 
   /** @hidden */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.46.0",
+  "version": "5.48.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -84,18 +84,18 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@datadog/libdatadog": "^0.5.0",
-    "@datadog/native-appsec": "8.5.1",
-    "@datadog/wasm-js-rewriter": "3.1.0",
-    "@datadog/native-iast-taint-tracking": "3.3.0",
-    "@datadog/native-metrics": "^3.1.0",
-    "@datadog/pprof": "5.7.0",
+    "@datadog/libdatadog": "^0.5.1",
+    "@datadog/native-appsec": "8.5.2",
+    "@datadog/native-iast-taint-tracking": "3.3.1",
+    "@datadog/native-metrics": "^3.1.1",
+    "@datadog/pprof": "5.7.1",
     "@datadog/sketches-js": "^2.1.0",
+    "@datadog/wasm-js-rewriter": "4.0.0",
     "@isaacs/ttlcache": "^1.4.1",
     "@opentelemetry/api": ">=1.0.0 <1.9.0",
     "@opentelemetry/core": "^1.14.0",
     "crypto-randomuuid": "^1.0.0",
-    "dc-polyfill": "0.1.6",
+    "dc-polyfill": "0.1.8",
     "ignore": "^5.2.4",
     "import-in-the-middle": "1.13.1",
     "istanbul-lib-coverage": "3.2.0",
@@ -125,7 +125,6 @@
     "@msgpack/msgpack": "^3.0.0-beta3",
     "@stylistic/eslint-plugin-js": "^3.0.1",
     "@types/node": "^16.0.0",
-    "application-config-path": "^0.1.1",
     "autocannon": "^4.5.2",
     "aws-sdk": "^2.1446.0",
     "axios": "^1.8.2",

package/packages/datadog-instrumentations/orchestrion.yml

@@ -0,0 +1,52 @@
+version: 1
+dc_module: dc-polyfill
+instrumentations:
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/runnables/base.js
+    function_query:
+      name: invoke
+      type: method
+      kind: async
+      class: RunnableSequence
+    operator: tracePromise
+    channel_name: "RunnableSequence_invoke"
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/runnables/base.js
+    function_query:
+      name: batch
+      type: method
+      kind: async
+      class: RunnableSequence
+    operator: tracePromise
+    channel_name: "RunnableSequence_batch"
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/language_models/chat_models.js
+    function_query:
+      name: generate
+      type: method
+      kind: async
+      class: BaseChatModel
+    operator: tracePromise
+    channel_name: "BaseChatModel_generate"
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/language_models/llms.js
+    function_query:
+      name: generate
+      type: method
+      kind: async
+    operator: tracePromise
+    channel_name: "BaseLLM_generate"
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/embeddings.js
+    function_query:
+      name: constructor
+      type: method
+      kind: sync
+      class: Embeddings
+    operator: traceSync
+    channel_name: "Embeddings_constructor"

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

@@ -267,6 +267,7 @@ function wrapRun (pl, isLatestVersion) {
 
             const failedAttemptAsyncResource = numAttemptToAsyncResource.get(numAttempt)
             const isFirstAttempt = numAttempt++ === 0
+            const isAtrRetry = !isFirstAttempt && isFlakyTestRetriesEnabled
 
             if (promises.hitBreakpointPromise) {
               await promises.hitBreakpointPromise
@@ -274,7 +275,7 @@ function wrapRun (pl, isLatestVersion) {
 
             failedAttemptAsyncResource.runInAsyncScope(() => {
               // the current span will be finished and a new one will be created
-              testRetryCh.publish({ isFirstAttempt, error })
+              testRetryCh.publish({ isFirstAttempt, error, isAtrRetry })
             })
 
             const newAsyncResource = new AsyncResource('bound-anonymous-fn')

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

@@ -399,10 +399,11 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
 
         let attemptToFixPassed = false
         let failedAllTests = false
+        let isAttemptToFix = false
         if (this.isTestManagementTestsEnabled) {
           const testName = getJestTestName(event.test)
           const originalTestName = removeAttemptToFixStringFromTestName(testName)
-          const isAttemptToFix = this.testManagementTestsForThisSuite?.attemptToFix?.includes(originalTestName)
+          isAttemptToFix = this.testManagementTestsForThisSuite?.attemptToFix?.includes(originalTestName)
           if (isAttemptToFix) {
             if (attemptToFixRetriedTestsStatuses.has(originalTestName)) {
               attemptToFixRetriedTestsStatuses.get(originalTestName).push(status)
@@ -423,6 +424,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
           }
         }
 
+        let isEfdRetry = false
         // We'll store the test statuses of the retries
         if (this.isKnownTestsEnabled) {
           const testName = getJestTestName(event.test)
@@ -431,6 +433,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
           if (isNewTest) {
             if (newTestsTestStatuses.has(originalTestName)) {
               newTestsTestStatuses.get(originalTestName).push(status)
+              isEfdRetry = true
             } else {
               newTestsTestStatuses.set(originalTestName, [status])
             }
@@ -466,12 +469,18 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
           })
         }
 
+        let isAtrRetry = false
+        if (this.isFlakyTestRetriesEnabled && event.test?.invocations > 1 && !isAttemptToFix && !isEfdRetry) {
+          isAtrRetry = true
+        }
+
         asyncResource.runInAsyncScope(() => {
           testFinishCh.publish({
             status,
             testStartLine: getTestLineStart(event.test.asyncError, this.testSuite),
             attemptToFixPassed,
-            failedAllTests
+            failedAllTests,
+            isAtrRetry
           })
         })
 

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

@@ -1,31 +1,24 @@
 'use strict'
-
 const { addHook } = require('./helpers/instrument')
+
 const shimmer = require('../../datadog-shimmer')
 
 const tracingChannel = require('dc-polyfill').tracingChannel
 
-const invokeTracingChannel = tracingChannel('apm:langchain:invoke')
-
-function wrapLangChainPromise (fn, type, namespace = []) {
-  return function () {
-    if (!invokeTracingChannel.start.hasSubscribers) {
-      return fn.apply(this, arguments)
-    }
-
-    // Runnable interfaces have an `lc_namespace` property
-    const ns = this.lc_namespace || namespace
-    const resource = [...ns, this.constructor.name].join('.')
-
-    const ctx = {
-      args: arguments,
-      instance: this,
-      type,
-      resource
+function wrap (obj, name, channelName, namespace) {
+  const channel = tracingChannel(channelName)
+  shimmer.wrap(obj, name, function (original) {
+    return function () {
+      if (!channel.start.hasSubscribers) {
+        return original.apply(this, arguments)
+      }
+      const ctx = { self: this, arguments }
+      if (namespace) {
+        ctx.namespace = namespace
+      }
+      return channel.tracePromise(original, ctx, this, ...arguments)
     }
-
-    return invokeTracingChannel.tracePromise(fn, ctx, this, ...arguments)
-  }
+  })
 }
 
 // langchain compiles into ESM and CommonJS, with ESM being the default and landing in the `.js` files
@@ -35,9 +28,10 @@ const extensions = ['js', 'cjs']
 
 for (const extension of extensions) {
   addHook({ name: '@langchain/core', file: `dist/runnables/base.${extension}`, versions: ['>=0.1'] }, exports => {
-    const RunnableSequence = exports.RunnableSequence
-    shimmer.wrap(RunnableSequence.prototype, 'invoke', invoke => wrapLangChainPromise(invoke, 'chain'))
-    shimmer.wrap(RunnableSequence.prototype, 'batch', batch => wrapLangChainPromise(batch, 'chain'))
+    if (extension === 'cjs') {
+      wrap(exports.RunnableSequence.prototype, 'invoke', 'orchestrion:@langchain/core:RunnableSequence_invoke')
+      wrap(exports.RunnableSequence.prototype, 'batch', 'orchestrion:@langchain/core:RunnableSequence_batch')
+    }
     return exports
   })
 
@@ -46,51 +40,53 @@ for (const extension of extensions) {
     file: `dist/language_models/chat_models.${extension}`,
     versions: ['>=0.1']
   }, exports => {
-    const BaseChatModel = exports.BaseChatModel
-    shimmer.wrap(
-      BaseChatModel.prototype,
-      'generate',
-      generate => wrapLangChainPromise(generate, 'chat_model')
-    )
+    if (extension === 'cjs') {
+      wrap(exports.BaseChatModel.prototype, 'generate', 'orchestrion:@langchain/core:BaseChatModel_generate')
+    }
     return exports
   })
 
   addHook({ name: '@langchain/core', file: `dist/language_models/llms.${extension}`, versions: ['>=0.1'] }, exports => {
-    const BaseLLM = exports.BaseLLM
-    shimmer.wrap(BaseLLM.prototype, 'generate', generate => wrapLangChainPromise(generate, 'llm'))
+    if (extension === 'cjs') {
+      wrap(exports.BaseLLM.prototype, 'generate', 'orchestrion:@langchain/core:BaseLLM_generate')
+    }
     return exports
   })
 
   addHook({ name: '@langchain/core', file: `dist/embeddings.${extension}`, versions: ['>=0.1'] }, exports => {
-    // we cannot patch the prototype of the Embeddings class directly
-    // this is because the "abstract class Embeddings" is transpiled from TypeScript to not include abstract functions
-    // thus, we patch the exported class directly instead instead.
+    if (extension === 'cjs') {
+      shimmer.wrap(exports, 'Embeddings', Embeddings => {
+        return class extends Embeddings {
+          constructor (...args) {
+            super(...args)
+
+            const namespace = ['langchain', 'embeddings']
 
-    shimmer.wrap(exports, 'Embeddings', Embeddings => {
-      return class extends Embeddings {
-        constructor (...args) {
-          super(...args)
+            if (this.constructor.name === 'OpenAIEmbeddings') {
+              namespace.push('openai')
+            }
 
+            wrap(this, 'embedQuery', 'apm:@langchain/core:Embeddings_embedQuery', namespace)
+            wrap(this, 'embedDocuments', 'apm:@langchain/core:Embeddings_embedDocuments', namespace)
+          }
+        }
+      })
+    } else {
+      const channel = tracingChannel('orchestrion:@langchain/core:Embeddings_constructor')
+      channel.subscribe({
+        end (ctx) {
+          const { self } = ctx
           const namespace = ['langchain', 'embeddings']
 
-          // when originally implemented, we only wrapped OpenAI embeddings
-          // these embeddings had the resource name of `langchain.embeddings.openai.OpenAIEmbeddings`
-          // we need to make sure `openai` is appended to the resource name until a new tracer major version
-          if (this.constructor.name === 'OpenAIEmbeddings') {
+          if (self.constructor.name === 'OpenAIEmbeddings') {
             namespace.push('openai')
           }
 
-          shimmer.wrap(this, 'embedQuery', embedQuery => wrapLangChainPromise(embedQuery, 'embedding', namespace))
-          shimmer.wrap(this, 'embedDocuments',
-            embedDocuments => wrapLangChainPromise(embedDocuments, 'embedding', namespace))
+          wrap(self, 'embedQuery', 'apm:@langchain/core:Embeddings_embedQuery', namespace)
+          wrap(self, 'embedDocuments', 'apm:@langchain/core:Embeddings_embedDocuments', namespace)
         }
-
-        static [Symbol.hasInstance] (instance) {
-          return instance instanceof Embeddings
-        }
-      }
-    })
-
+      })
+    }
     return exports
   })
 }

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

@@ -417,7 +417,7 @@ addHook({
 
     this.on('test end', getOnTestEndHandler(config))
 
-    this.on('retry', getOnTestRetryHandler())
+    this.on('retry', getOnTestRetryHandler(config))
 
     // If the hook passes, 'hook end' will be emitted. Otherwise, 'fail' will be emitted
     this.on('hook end', getOnHookEndHandler())

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

@@ -286,6 +286,9 @@ function getOnTestEndHandler (config) {
     }
 
     const isAttemptToFixRetry = test._ddIsAttemptToFix && testStatuses.length > 1
+    const isAtrRetry = config.isFlakyTestRetriesEnabled &&
+      !test._ddIsAttemptToFix &&
+      !test._ddIsEfdRetry
 
     // if there are afterEach to be run, we don't finish the test yet
     if (asyncResource && !getAfterEachHooks(test).length) {
@@ -296,7 +299,8 @@ function getOnTestEndHandler (config) {
           isLastRetry: getIsLastRetry(test),
           hasFailedAllRetries,
           attemptToFixPassed,
-          isAttemptToFixRetry
+          isAttemptToFixRetry,
+          isAtrRetry
         })
       })
     }
@@ -364,14 +368,18 @@ function getOnFailHandler (isMain) {
   }
 }
 
-function getOnTestRetryHandler () {
+function getOnTestRetryHandler (config) {
   return function (test, err) {
     const asyncResource = getTestAsyncResource(test)
     if (asyncResource) {
       const isFirstAttempt = test._currentRetry === 0
       const willBeRetried = test._currentRetry < test._retries
+      const isAtrRetry = !isFirstAttempt &&
+        config.isFlakyTestRetriesEnabled &&
+        !test._ddIsAttemptToFix &&
+        !test._ddIsEfdRetry
       asyncResource.runInAsyncScope(() => {
-        testRetryCh.publish({ isFirstAttempt, err, willBeRetried, test })
+        testRetryCh.publish({ isFirstAttempt, err, willBeRetried, test, isAtrRetry })
       })
     }
     const key = getTestToArKey(test)

package/packages/datadog-instrumentations/src/orchestrion-config/index.js

@@ -0,0 +1,5 @@
+const path = require('path')
+const fs = require('fs')
+
+// TODO this needs to be inlined to prevent issues in bundling
+module.exports = fs.readFileSync(path.join(__dirname, '../../orchestrion.yml'), 'utf8')

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

@@ -348,6 +348,10 @@ function testEndHandler (test, annotations, testStatus, error, isTimeout, isMain
   if (isMainProcess) {
     const testResult = results[results.length - 1]
     const testAsyncResource = testToAr.get(test)
+    const isAtrRetry = testResult?.retry > 0 &&
+      isFlakyTestRetriesEnabled &&
+      !test._ddIsAttemptToFix &&
+      !test._ddIsEfdRetry
     testAsyncResource.runInAsyncScope(() => {
       testFinishCh.publish({
         testStatus,
@@ -361,7 +365,8 @@ function testEndHandler (test, annotations, testStatus, error, isTimeout, isMain
         isQuarantined: test._ddIsQuarantined,
         isEfdRetry: test._ddIsEfdRetry,
         hasFailedAllRetries: test._ddHasFailedAllRetries,
-        hasPassedAttemptToFixRetries: test._ddHasPassedAttemptToFixRetries
+        hasPassedAttemptToFixRetries: test._ddHasPassedAttemptToFixRetries,
+        isAtrRetry
       })
     })
   }
@@ -469,6 +474,11 @@ function dispatcherHookNew (dispatcherExport, runWrapper) {
 
       const isTimeout = status === 'timedOut'
       testEndHandler(test, annotations, STATUS_TO_TEST_STATUS[status], errors && errors[0], isTimeout, false)
+      const testResult = test.results[test.results.length - 1]
+      const isAtrRetry = testResult?.retry > 0 &&
+        isFlakyTestRetriesEnabled &&
+        !test._ddIsAttemptToFix &&
+        !test._ddIsEfdRetry
       // We want to send the ddProperties to the worker
       worker.process.send({
         type: 'ddProperties',
@@ -481,7 +491,8 @@ function dispatcherHookNew (dispatcherExport, runWrapper) {
           _ddIsNew: test._ddIsNew,
           _ddIsEfdRetry: test._ddIsEfdRetry,
           _ddHasFailedAllRetries: test._ddHasFailedAllRetries,
-          _ddHasPassedAttemptToFixRetries: test._ddHasPassedAttemptToFixRetries
+          _ddHasPassedAttemptToFixRetries: test._ddHasPassedAttemptToFixRetries,
+          _ddIsAtrRetry: isAtrRetry
         }
       })
     })
@@ -961,6 +972,7 @@ addHook({
         isAttemptToFixRetry: test._ddIsAttemptToFixRetry,
         hasFailedAllRetries: test._ddHasFailedAllRetries,
         hasPassedAttemptToFixRetries: test._ddHasPassedAttemptToFixRetries,
+        isAtrRetry: test._ddIsAtrRetry,
         onDone
       })
     })

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

@@ -82,7 +82,8 @@ function getProvidedContext () {
       isKnownTestsEnabled: false,
       isTestManagementTestsEnabled: false,
       testManagementAttemptToFixRetries: 0,
-      testManagementTests: {}
+      testManagementTests: {},
+      isFlakyTestRetriesEnabled: false
     }
   }
 }
@@ -466,7 +467,8 @@ addHook({
       isEarlyFlakeDetectionEnabled,
       isDiEnabled,
       isTestManagementTestsEnabled,
-      testManagementTests
+      testManagementTests,
+      isFlakyTestRetriesEnabled
     } = getProvidedContext()
 
     if (isKnownTestsEnabled) {
@@ -566,6 +568,11 @@ addHook({
       }
     }
 
+    const isRetryReasonAtr = numAttempt > 0 &&
+      isFlakyTestRetriesEnabled &&
+      !isRetryReasonAttemptToFix &&
+      !isRetryReasonEfd
+
     const asyncResource = new AsyncResource('bound-anonymous-fn')
     taskToAsync.set(task, asyncResource)
 
@@ -580,7 +587,8 @@ addHook({
         mightHitProbe: isDiEnabled && numAttempt > 0,
         isAttemptToFix: attemptToFixTasks.has(task),
         isDisabled: disabledTasks.has(task),
-        isQuarantined
+        isQuarantined,
+        isRetryReasonAtr
       })
     })
     return onBeforeTryTask.apply(this, arguments)

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

@@ -33,7 +33,8 @@ const {
   TEST_MANAGEMENT_IS_DISABLED,
   TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
   TEST_HAS_FAILED_ALL_RETRIES,
-  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED
+  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
+  TEST_RETRY_REASON_TYPES
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT, ERROR_MESSAGE } = require('../../dd-trace/src/constants')
@@ -252,11 +253,16 @@ class CucumberPlugin extends CiPlugin {
       }
     })
 
-    this.addSub('ci:cucumber:test:retry', ({ isFirstAttempt, error }) => {
+    this.addSub('ci:cucumber:test:retry', ({ isFirstAttempt, error, isAtrRetry }) => {
       const store = storage('legacy').getStore()
       const span = store.span
       if (!isFirstAttempt) {
         span.setTag(TEST_IS_RETRY, 'true')
+        if (isAtrRetry) {
+          span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.atr)
+        } else {
+          span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.ext)
+        }
       }
       span.setTag('error', error)
       if (isFirstAttempt && this.di && error && this.libraryConfig?.isDiEnabled) {
@@ -347,7 +353,7 @@ class CucumberPlugin extends CiPlugin {
         span.setTag(TEST_IS_NEW, 'true')
         if (isEfdRetry) {
           span.setTag(TEST_IS_RETRY, 'true')
-          span.setTag(TEST_RETRY_REASON, 'efd')
+          span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.efd)
         }
       }
 
@@ -363,6 +369,7 @@ class CucumberPlugin extends CiPlugin {
 
       if (isFlakyRetry > 0) {
         span.setTag(TEST_IS_RETRY, 'true')
+        span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.atr)
       }
 
       if (hasFailedAllRetries) {
@@ -375,7 +382,7 @@ class CucumberPlugin extends CiPlugin {
 
       if (isAttemptToFixRetry) {
         span.setTag(TEST_IS_RETRY, 'true')
-        span.setTag(TEST_RETRY_REASON, 'attempt_to_fix')
+        span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.atf)
         if (hasPassedAllRetries) {
           span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'true')
         }

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

@@ -40,7 +40,8 @@ const {
   TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
   TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
   TEST_HAS_FAILED_ALL_RETRIES,
-  getLibraryCapabilitiesTags
+  getLibraryCapabilitiesTags,
+  TEST_RETRY_REASON_TYPES
 } = require('../../dd-trace/src/plugins/util/test')
 const { isMarkedAsUnskippable } = require('../../datadog-plugin-jest/src/util')
 const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
@@ -229,6 +230,7 @@ class CypressPlugin {
     this.isTestsSkipped = false
     this.isSuitesSkippingEnabled = false
     this.isCodeCoverageEnabled = false
+    this.isFlakyTestRetriesEnabled = false
     this.isEarlyFlakeDetectionEnabled = false
     this.isKnownTestsEnabled = false
     this.earlyFlakeDetectionNumRetries = 0
@@ -278,6 +280,7 @@ class CypressPlugin {
           this.earlyFlakeDetectionNumRetries = earlyFlakeDetectionNumRetries
           this.isKnownTestsEnabled = isKnownTestsEnabled
           if (isFlakyTestRetriesEnabled) {
+            this.isFlakyTestRetriesEnabled = true
             this.cypressConfig.retries.runMode = flakyTestRetriesCount
           }
           this.isTestManagementTestsEnabled = isTestManagementEnabled
@@ -654,10 +657,18 @@ class CypressPlugin {
         let cypressTestStatus = CYPRESS_STATUS_TO_TEST_STATUS[cypressTest.state]
         if (cypressTest.attempts && cypressTest.attempts[attemptIndex]) {
           cypressTestStatus = CYPRESS_STATUS_TO_TEST_STATUS[cypressTest.attempts[attemptIndex].state]
+          const isAtrRetry = attemptIndex > 0 &&
+            this.isFlakyTestRetriesEnabled &&
+            !finishedTest.isAttemptToFix &&
+            !finishedTest.isEfdRetry
           if (attemptIndex > 0) {
             finishedTest.testSpan.setTag(TEST_IS_RETRY, 'true')
             if (finishedTest.isEfdRetry) {
-              finishedTest.testSpan.setTag(TEST_RETRY_REASON, 'efd')
+              finishedTest.testSpan.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.efd)
+            } else if (isAtrRetry) {
+              finishedTest.testSpan.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.atr)
+            } else {
+              finishedTest.testSpan.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.ext)
             }
           }
         }
@@ -816,14 +827,14 @@ class CypressPlugin {
           this.activeTestSpan.setTag(TEST_IS_NEW, 'true')
           if (isEfdRetry) {
             this.activeTestSpan.setTag(TEST_IS_RETRY, 'true')
-            this.activeTestSpan.setTag(TEST_RETRY_REASON, 'efd')
+            this.activeTestSpan.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.efd)
           }
         }
         if (isAttemptToFix) {
           this.activeTestSpan.setTag(TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX, 'true')
           if (testStatuses.length > 1) {
             this.activeTestSpan.setTag(TEST_IS_RETRY, 'true')
-            this.activeTestSpan.setTag(TEST_RETRY_REASON, 'attempt_to_fix')
+            this.activeTestSpan.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.atf)
           }
           const isLastAttempt = testStatuses.length === this.testManagementAttemptToFixRetries + 1
           if (isLastAttempt) {
@@ -840,7 +851,8 @@ class CypressPlugin {
           testStatus,
           finishTime: this.activeTestSpan._getTime(), // we store the finish time here
           testSpan: this.activeTestSpan,
-          isEfdRetry
+          isEfdRetry,
+          isAttemptToFix
         }
         if (this.finishedTestsByFile[testSuite]) {
           this.finishedTestsByFile[testSuite].push(finishedTest)