dd-trace 5.80.0 → 5.82.0

package/packages/datadog-plugin-aws-sdk/src/services/bedrockruntime/index.js

@@ -1,8 +1,8 @@
 'use strict'
 
 const CompositePlugin = require('../../../../dd-trace/src/plugins/composite')
-const BedrockRuntimeTracing = require('./tracing')
 const BedrockRuntimeLLMObsPlugin = require('../../../../dd-trace/src/llmobs/plugins/bedrockruntime')
+const BedrockRuntimeTracing = require('./tracing')
 class BedrockRuntimePlugin extends CompositePlugin {
   static id = 'bedrockruntime'
 

package/packages/datadog-plugin-aws-sdk/src/services/dynamodb.js

@@ -109,7 +109,7 @@ class DynamoDb extends BaseAwsSdkPlugin {
   /**
    * Parses primary key config from the `DD_TRACE_DYNAMODB_TABLE_PRIMARY_KEYS` env var.
    * Only runs when needed, and warns when missing or invalid config.
-   * @returns {Object|undefined} Parsed config from env var or undefined if empty/missing/invalid config.
+   * @returns {object | undefined} Parsed config from env var or undefined if empty/missing/invalid config.
    */
   getPrimaryKeyConfig () {
     if (this.dynamoPrimaryKeyConfig) {
@@ -151,8 +151,8 @@ class DynamoDb extends BaseAwsSdkPlugin {
   /**
    * Calculates a hash for DynamoDB PutItem operations using table's configured primary keys.
    * @param {string} tableName - Name of the DynamoDB table.
-   * @param {Object} item - Complete PutItem item parameter to be put.
-   * @param {Object.<string, Array<string>>} primaryKeyConfig - Mapping of table names to an Array of primary key names
+   * @param {object} item - Complete PutItem item parameter to be put.
+   * @param {Record<string, Array<string>>} primaryKeyConfig - Mapping of table names to an Array of primary key names
    *                                                         loaded from DD_TRACE_DYNAMODB_TABLE_PRIMARY_KEYS.
    * @returns {string|undefined} Hash combining table name and primary key/value pairs, or undefined if unable.
    */
@@ -174,7 +174,7 @@ class DynamoDb extends BaseAwsSdkPlugin {
   /**
    * Calculates a hash for DynamoDB operations that have keys provided (UpdateItem, DeleteItem).
    * @param {string} tableName - Name of the DynamoDB table.
-   * @param {Object} keysObject - Object containing primary key/value attributes in DynamoDB format.
+   * @param {object} keysObject - Object containing primary key/value attributes in DynamoDB format.
    *                       (e.g., { userId: { S: "123" }, sortKey: { N: "456" } })
    * @returns {string|undefined} Hash value combining table name and primary key/value pairs, or undefined if unable.
    *

package/packages/datadog-plugin-aws-sdk/src/services/eventbridge.js

@@ -18,8 +18,8 @@ class EventBridge extends BaseAwsSdkPlugin {
 
   /**
    * requestInject
-   * @param {*} span
-   * @param {*} request
+   * @param {import('../../../..').Span} span
+   * @param {object} request
    *
    * Docs: https://docs.aws.amazon.com/eventbridge/latest/APIReference/API_PutEventsRequestEntry.html
    * We cannot use the traceHeader field as that's reserved for X-Ray.

package/packages/datadog-plugin-aws-sdk/src/util.js

@@ -18,7 +18,7 @@ function generatePointerHash (components) {
 
 /**
  * Encodes a DynamoDB attribute value to Buffer for span pointer hashing.
- * @param {Object} valueObject - DynamoDB value in AWS format ({ S: string } or { N: string } or { B: Buffer })
+ * @param {object} valueObject - DynamoDB value in AWS format ({ S: string } or { N: string } or { B: Buffer })
  * @returns {Buffer|undefined} Encoded value as Buffer, or undefined if invalid input.
  *
  * @example
@@ -55,7 +55,7 @@ function encodeValue (valueObject) {
  * Handles tables with single-key and two-key scenarios.
  *
  * @param {Array<string>} keyNames - Set of primary key names.
- * @param {Object} keyValuePairs - Object containing key/value pairs.
+ * @param {object} keyValuePairs - Object containing key/value pairs.
  * @returns {Array|undefined} [key1Name, key1Value, key2Name, key2Value], or undefined if invalid input.
  *                            key2 entries are empty strings in the single-key case.
  * @example
@@ -90,7 +90,7 @@ const extractPrimaryKeys = (keyNames, keyValuePairs) => {
  * Automatically detects AWS partitions (standard, China, GovCloud) from region.
  *
  * @param {string} queueURL - SQS queue URL in any supported format
- * @returns {Object|null} Object with queueName and arn, or null if URL format is invalid
+ * @returns {object | null} Object with queueName and arn, or null if URL format is invalid
  *
  * @example
  * // Modern AWS SQS URLs

package/packages/datadog-plugin-azure-event-hubs/src/index.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const ProducerPlugin = require('./producer')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+const ProducerPlugin = require('./producer')
 
 class AzureEventHubsPlugin extends CompositePlugin {
   static get id () { return 'azure-event-hubs' }

package/packages/datadog-plugin-azure-event-hubs/src/producer.js

@@ -3,6 +3,8 @@
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 
+const spanContexts = new WeakMap()
+
 class AzureEventHubsProducerPlugin extends ProducerPlugin {
   static get id () { return 'azure-event-hubs' }
   static get operation () { return 'send' }
@@ -36,7 +38,12 @@ class AzureEventHubsProducerPlugin extends ProducerPlugin {
       }
 
       if (batchLinksAreEnabled()) {
-        ctx.batch._spanContexts.push(span.context())
+        const spanContext = spanContexts.get(ctx.batch)
+        if (spanContext) {
+          spanContext.push(span.context())
+        } else {
+          spanContexts.set(ctx.batch, [span.context()])
+        }
         injectTraceContext(this.tracer, span, ctx.eventData)
       }
     }
@@ -53,9 +60,12 @@ class AzureEventHubsProducerPlugin extends ProducerPlugin {
         })
       } else {
         if (batchLinksAreEnabled()) {
-          eventData._spanContexts.forEach(spanContext => {
-            span.addLink(spanContext)
-          })
+          const contexts = spanContexts.get(eventData)
+          if (contexts) {
+            for (const spanContext of contexts) {
+              span.addLink(spanContext)
+            }
+          }
         }
       }
     }
@@ -63,7 +73,11 @@ class AzureEventHubsProducerPlugin extends ProducerPlugin {
   }
 
   asyncEnd (ctx) {
-    super.finish()
+    super.finish(ctx)
+  }
+
+  end (ctx) {
+    super.finish(ctx)
   }
 }
 

package/packages/datadog-plugin-azure-service-bus/src/index.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const ProducerPlugin = require('./producer')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+const ProducerPlugin = require('./producer')
 
 class AzureServiceBusPlugin extends CompositePlugin {
   static get id () { return 'azure-service-bus' }

package/packages/datadog-plugin-azure-service-bus/src/producer.js

@@ -75,6 +75,10 @@ class AzureServiceBusProducerPlugin extends ProducerPlugin {
   asyncEnd (ctx) {
     super.finish(ctx)
   }
+
+  end (ctx) {
+    super.finish(ctx)
+  }
 }
 
 function injectTraceContext (tracer, span, msg) {

package/packages/datadog-plugin-bullmq/src/consumer.js

@@ -0,0 +1,60 @@
+'use strict'
+
+const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
+const { getMessageSize } = require('../../dd-trace/src/datastreams')
+
+class BullmqConsumerPlugin extends ConsumerPlugin {
+  static id = 'bullmq'
+  static prefix = 'tracing:orchestrion:bullmq:Worker_callProcessJob'
+
+  asyncEnd (ctx) {
+    ctx.currentStore?.span?.finish()
+  }
+
+  bindStart (ctx) {
+    const job = ctx.arguments?.[0]
+    const queueName = job?.queueName || job?.queue?.name || 'bullmq'
+
+    let childOf
+    const datadogContext = job?.data?._datadog
+    if (datadogContext) {
+      childOf = this.tracer.extract('text_map', datadogContext)
+    }
+
+    const span = this.startSpan({
+      childOf,
+      resource: queueName,
+      meta: {
+        component: 'bullmq',
+        'span.kind': 'consumer',
+        'messaging.system': 'bullmq',
+        'messaging.destination.name': queueName,
+        'messaging.operation': 'process'
+      }
+    }, ctx)
+
+    if (this.config.dsmEnabled) {
+      this.setConsumerCheckpoint(span, ctx)
+    }
+
+    return ctx.currentStore
+  }
+
+  setConsumerCheckpoint (span, ctx) {
+    const job = ctx.arguments?.[0]
+    if (!job) return
+
+    const queueName = job.queueName || job.queue?.name || 'bullmq'
+    const payloadSize = job.data ? getMessageSize(job.data) : 0
+
+    const datadogContext = job.data?._datadog
+    if (datadogContext) {
+      this.tracer.decodeDataStreamsContext(datadogContext)
+    }
+
+    const edgeTags = ['direction:in', `topic:${queueName}`, 'type:bullmq']
+    this.tracer.setCheckpoint(edgeTags, span, payloadSize)
+  }
+}
+
+module.exports = BullmqConsumerPlugin

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

@@ -0,0 +1,18 @@
+'use strict'
+
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+const BullmqProducerPlugins = require('./producer')
+const BullmqConsumerPlugin = require('./consumer')
+
+class BullmqPlugin extends CompositePlugin {
+  static id = 'bullmq'
+
+  static plugins = {
+    queueAdd: BullmqProducerPlugins[0],
+    queueAddBulk: BullmqProducerPlugins[1],
+    flowProducerAdd: BullmqProducerPlugins[2],
+    consumer: BullmqConsumerPlugin
+  }
+}
+
+module.exports = BullmqPlugin

package/packages/datadog-plugin-bullmq/src/producer.js

@@ -0,0 +1,178 @@
+'use strict'
+
+const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
+const { DsmPathwayCodec, getMessageSize } = require('../../dd-trace/src/datastreams')
+
+class BaseBullmqProducerPlugin extends ProducerPlugin {
+  static id = 'bullmq'
+
+  asyncEnd (ctx) {
+    ctx.currentStore?.span?.finish()
+  }
+
+  bindStart (ctx) {
+    const { resource, meta } = this.getSpanData(ctx)
+    const span = this.startSpan({
+      resource,
+      meta: {
+        component: 'bullmq',
+        'span.kind': 'producer',
+        'messaging.system': 'bullmq',
+        'messaging.operation': 'publish',
+        ...meta
+      }
+    }, ctx)
+
+    this.injectTraceContext(span, ctx)
+
+    if (this.config.dsmEnabled) {
+      this.setProducerCheckpoint(span, ctx)
+    }
+
+    return ctx.currentStore
+  }
+
+  getSpanData (ctx) {
+    throw new Error('getSpanData must be implemented by subclass')
+  }
+
+  injectTraceContext (span, ctx) {
+    throw new Error('injectTraceContext must be implemented by subclass')
+  }
+
+  setProducerCheckpoint (span, ctx) {
+    const { queueName, payloadSize, injectTarget } = this.getDsmData(ctx)
+    const edgeTags = ['direction:out', `topic:${queueName}`, 'type:bullmq']
+    const dataStreamsContext = this.tracer.setCheckpoint(edgeTags, span, payloadSize)
+    if (injectTarget && typeof injectTarget === 'object') {
+      injectTarget._datadog = injectTarget._datadog || {}
+      DsmPathwayCodec.encode(dataStreamsContext, injectTarget._datadog)
+    }
+  }
+
+  getDsmData (ctx) {
+    throw new Error('getDsmData must be implemented by subclass')
+  }
+}
+
+class QueueAddPlugin extends BaseBullmqProducerPlugin {
+  static prefix = 'tracing:orchestrion:bullmq:Queue_add'
+
+  getSpanData (ctx) {
+    const queueName = ctx.self?.name || 'bullmq'
+    return {
+      resource: queueName,
+      meta: {
+        'messaging.destination.name': ctx.self?.name
+      }
+    }
+  }
+
+  injectTraceContext (span, ctx) {
+    const data = ctx.arguments?.[1]
+    if (data?.constructor?.name === 'Object') {
+      data._datadog = data._datadog || {}
+      this.tracer.inject(span, 'text_map', data._datadog)
+    }
+  }
+
+  getDsmData (ctx) {
+    const data = ctx.arguments?.[1]
+    return {
+      queueName: ctx.self?.name || 'bullmq',
+      payloadSize: data ? getMessageSize(data) : 0,
+      injectTarget: data
+    }
+  }
+}
+
+class QueueAddBulkPlugin extends BaseBullmqProducerPlugin {
+  static prefix = 'tracing:orchestrion:bullmq:Queue_addBulk'
+
+  operationName () {
+    return 'bullmq.addBulk'
+  }
+
+  getSpanData (ctx) {
+    const queueName = ctx.self?.name || 'bullmq'
+    const jobs = ctx.arguments?.[0]
+    return {
+      resource: queueName,
+      meta: {
+        'messaging.destination.name': ctx.self?.name,
+        'messaging.batch.message_count': Array.isArray(jobs) ? jobs.length : undefined
+      }
+    }
+  }
+
+  injectTraceContext (span, ctx) {
+    const jobs = ctx.arguments?.[0]
+    if (!Array.isArray(jobs)) return
+    for (const job of jobs) {
+      if (job?.data?.constructor?.name !== 'Object') continue
+      job.data._datadog = job.data._datadog || {}
+      this.tracer.inject(span, 'text_map', job.data._datadog)
+    }
+  }
+
+  getDsmData (ctx) {
+    const jobs = ctx.arguments?.[0] || []
+    const payloadSize = jobs.reduce((total, job) => {
+      return total + (job?.data ? getMessageSize(job.data) : 0)
+    }, 0)
+    return {
+      queueName: ctx.self?.name || 'bullmq',
+      payloadSize,
+      injectTarget: jobs[0]?.data
+    }
+  }
+
+  setProducerCheckpoint (span, ctx) {
+    const jobs = ctx.arguments?.[0] || []
+    const queueName = ctx.self?.name || 'bullmq'
+    const edgeTags = ['direction:out', `topic:${queueName}`, 'type:bullmq']
+
+    for (const job of jobs) {
+      if (job?.data && job.data !== null && job.data.constructor.name === 'Object') {
+        const payloadSize = getMessageSize(job.data)
+        const dataStreamsContext = this.tracer.setCheckpoint(edgeTags, span, payloadSize)
+        job.data._datadog = job.data._datadog || {}
+        DsmPathwayCodec.encode(dataStreamsContext, job.data._datadog)
+      }
+    }
+  }
+}
+
+class FlowProducerAddPlugin extends BaseBullmqProducerPlugin {
+  static prefix = 'tracing:orchestrion:bullmq:FlowProducer_add'
+
+  getSpanData (ctx) {
+    const flow = ctx.arguments?.[0]
+    const queueName = flow?.queueName || 'bullmq'
+    return {
+      resource: queueName,
+      meta: {
+        'messaging.destination.name': flow?.queueName
+      }
+    }
+  }
+
+  injectTraceContext (span, ctx) {
+    const flow = ctx.arguments?.[0]
+    if (flow?.data?.constructor?.name === 'Object') {
+      flow.data._datadog = flow.data._datadog || {}
+      this.tracer.inject(span, 'text_map', flow.data._datadog)
+    }
+  }
+
+  getDsmData (ctx) {
+    const flow = ctx.arguments?.[0]
+    return {
+      queueName: flow?.queueName || 'bullmq',
+      payloadSize: flow?.data ? getMessageSize(flow.data) : 0,
+      injectTarget: flow?.data
+    }
+  }
+}
+
+module.exports = [QueueAddPlugin, QueueAddBulkPlugin, FlowProducerAddPlugin]

package/packages/datadog-plugin-child_process/src/scrub-cmd-params.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const shellParser = require('shell-quote/parse')
+const shellParser = require('../../../vendor/dist/shell-quote').parse
 
 const ALLOWED_ENV_VARIABLES = new Set(['LD_PRELOAD', 'LD_LIBRARY_PATH', 'PATH'])
 const PROCESS_DENYLIST = new Set(['md5'])

package/packages/datadog-plugin-confluentinc-kafka-javascript/src/index.js

@@ -1,9 +1,9 @@
 'use strict'
 
+const KafkajsPlugin = require('../../datadog-plugin-kafkajs/src/index')
 const ProducerPlugin = require('./producer')
 const ConsumerPlugin = require('./consumer')
 const BatchConsumerPlugin = require('./batch-consumer')
-const KafkajsPlugin = require('../../datadog-plugin-kafkajs/src/index')
 
 class ConfluentKafkaJsPlugin extends KafkajsPlugin {
   /**

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

@@ -133,6 +133,14 @@ function getCypressCommand (details) {
   return `${TEST_FRAMEWORK_NAME} ${details.specPattern || ''}`
 }
 
+function getIsTestIsolationEnabled (cypressConfig) {
+  if (!cypressConfig) {
+    // If we can't read testIsolation config parameter, we default to allowing retries
+    return true
+  }
+  return cypressConfig.testIsolation === undefined ? true : cypressConfig.testIsolation
+}
+
 function getLibraryConfiguration (tracer, testConfiguration) {
   return new Promise(resolve => {
     if (!tracer._tracer._exporter?.getLibraryConfiguration) {
@@ -296,6 +304,12 @@ class CypressPlugin {
     this.tracer = tracer
     this.cypressConfig = cypressConfig
 
+    this.isTestIsolationEnabled = getIsTestIsolationEnabled(cypressConfig)
+
+    if (!this.isTestIsolationEnabled) {
+      log.warn('Test isolation is disabled, retries will not be enabled')
+    }
+
     // we have to do it here because the tracer is not initialized in the constructor
     this.testEnvironmentMetadata[DD_TEST_IS_USER_PROVIDED_SERVICE] =
       tracer._tracer._config.isServiceUserProvided ? 'true' : 'false'
@@ -324,7 +338,7 @@ class CypressPlugin {
           this.isEarlyFlakeDetectionEnabled = isEarlyFlakeDetectionEnabled
           this.earlyFlakeDetectionNumRetries = earlyFlakeDetectionNumRetries
           this.isKnownTestsEnabled = isKnownTestsEnabled
-          if (isFlakyTestRetriesEnabled) {
+          if (isFlakyTestRetriesEnabled && this.isTestIsolationEnabled) {
             this.isFlakyTestRetriesEnabled = true
             this.cypressConfig.retries.runMode = flakyTestRetriesCount
           }
@@ -467,6 +481,7 @@ class CypressPlugin {
     // We need to make sure that the plugin is initialized before running the tests
     // This is for the case where the user has not returned the promise from the init function
     await this.libraryConfigurationPromise
+
     this.command = getCypressCommand(details)
     this.frameworkVersion = getCypressVersion(details)
     this.rootDir = getRootDir(details)
@@ -801,7 +816,8 @@ class CypressPlugin {
           testManagementTests: this.getTestSuiteProperties(testSuite),
           isImpactedTestsEnabled: this.isImpactedTestsEnabled,
           isModifiedTest: this.getIsTestModified(testSuiteAbsolutePath),
-          repositoryRoot: this.repositoryRoot
+          repositoryRoot: this.repositoryRoot,
+          isTestIsolationEnabled: this.isTestIsolationEnabled
         }
 
         if (this.testSuiteSpan) {
@@ -962,6 +978,11 @@ class CypressPlugin {
           this.activeTestSpan.addTags(tags)
         }
         return null
+      },
+      'dd:log': (message) => {
+        // eslint-disable-next-line no-console
+        console.log(`[datadog] ${message}`)
+        return null
       }
     }
   }

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

@@ -1,9 +1,9 @@
 'use strict'
 
 const NoopTracer = require('../../dd-trace/src/noop/tracer')
-const cypressPlugin = require('./cypress-plugin')
-const satisfies = require('semifies')
+const satisfies = require('../../../vendor/dist/semifies')
 const { DD_MAJOR } = require('../../../version')
+const cypressPlugin = require('./cypress-plugin')
 
 const noopTask = {
   'dd:testSuiteStart': () => {

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

@@ -9,6 +9,9 @@ let testManagementAttemptToFixRetries = 0
 let testManagementTests = {}
 let isImpactedTestsEnabled = false
 let isModifiedTest = false
+let isTestIsolationEnabled = false
+// Array of test names that have been retried and the reason
+const retryReasonsByTestName = new Map()
 
 // We need to grab the original window as soon as possible,
 // in case the test changes the origin. If the test does change the origin,
@@ -43,17 +46,20 @@ function getTestProperties (testName) {
   return { isAttemptToFix, isDisabled, isQuarantined }
 }
 
-function retryTest (test, suiteTests, numRetries, tags) {
+function getRetriedTests (test, numRetries, tags) {
+  const retriedTests = []
   for (let retryIndex = 0; retryIndex < numRetries; retryIndex++) {
-    const clonedTest = test.clone()
     // TODO: signal in framework logs that this is a retry.
     // TODO: Change it so these tests are allowed to fail.
-    // TODO: figure out if reported duration is skewed.
-    suiteTests.unshift(clonedTest)
+    const clonedTest = test.clone()
     tags.forEach(tag => {
-      clonedTest[tag] = true
+      if (tag) {
+        clonedTest[tag] = true
+      }
     })
+    retriedTests.push(clonedTest)
   }
+  return retriedTests
 }
 
 const oldRunTests = Cypress.mocha.getRunner().runTests
@@ -61,45 +67,80 @@ Cypress.mocha.getRunner().runTests = function (suite, fn) {
   if (!isKnownTestsEnabled && !isTestManagementEnabled && !isImpactedTestsEnabled) {
     return oldRunTests.apply(this, arguments)
   }
-  // We copy the new tests at the beginning of the suite run (runTests), so that they're run
-  // multiple times.
-  suite.tests.forEach(test => {
-    const testName = test.fullTitle()
+  // We copy the tests array and add retries to it, then assign it back to suite.tests
+  // to avoid modifying the array while iterating over it
+  const testsWithRetries = []
 
+  for (let testIndex = 0; testIndex < suite.tests.length; testIndex++) {
+    const test = suite.tests[testIndex]
+    const testName = test.fullTitle()
     const { isAttemptToFix } = getTestProperties(testName)
+    const isSkipped = test.isPending()
 
-    if (isTestManagementEnabled && isAttemptToFix && !test.isPending()) {
-      test._ddIsAttemptToFix = true
-      retryTest(test, suite.tests, testManagementAttemptToFixRetries, ['_ddIsAttemptToFix'])
-    }
-    if (isImpactedTestsEnabled && isModifiedTest) {
+    const isAtemptToFix = isTestManagementEnabled && isAttemptToFix && !isSkipped
+    const isModified = isImpactedTestsEnabled && isModifiedTest
+    const isNew = isKnownTestsEnabled && !isSkipped && isNewTest(test)
+
+    // We want is_modified and is_new regardless of the retry reason
+    if (isModified) {
       test._ddIsModified = true
-      if (isEarlyFlakeDetectionEnabled && !isAttemptToFix) {
-        retryTest(
-          test,
-          suite.tests,
-          earlyFlakeDetectionNumRetries,
-          ['_ddIsModified', '_ddIsEfdRetry', isKnownTestsEnabled && isNewTest(test) && '_ddIsNew']
-        )
-      }
     }
-    if (isKnownTestsEnabled && !test._ddIsNew && !test.isPending() && isNewTest(test)) {
+    if (isNew) {
       test._ddIsNew = true
-      if (isImpactedTestsEnabled && isModifiedTest) {
-        test._ddIsModified = true
-      }
-      if (isEarlyFlakeDetectionEnabled && !isAttemptToFix && !isModifiedTest) {
-        retryTest(test, suite.tests, earlyFlakeDetectionNumRetries, ['_ddIsNew', '_ddIsEfdRetry'])
-      }
     }
-  })
+
+    // Add the original test first
+    testsWithRetries.push(test)
+
+    if (!isTestIsolationEnabled) {
+      continue
+    }
+
+    // Then add retries right after it
+    let retriedTests = []
+    let retryMessage = ''
+    if (isAtemptToFix) {
+      test._ddIsAttemptToFix = true
+      retryMessage = 'because it is an attempt to fix'
+      retriedTests = getRetriedTests(test, testManagementAttemptToFixRetries, ['_ddIsAttemptToFix'])
+    } else if (isModified && isEarlyFlakeDetectionEnabled) {
+      retryMessage = 'to detect flakes because it is modified'
+      retriedTests = getRetriedTests(test, earlyFlakeDetectionNumRetries, [
+        '_ddIsModified',
+        '_ddIsEfdRetry',
+        isKnownTestsEnabled && isNewTest(test) && '_ddIsNew'
+      ])
+    } else if (isNew && isEarlyFlakeDetectionEnabled) {
+      retryMessage = 'to detect flakes because it is new'
+      retriedTests = getRetriedTests(test, earlyFlakeDetectionNumRetries, ['_ddIsNew', '_ddIsEfdRetry'])
+    }
+
+    testsWithRetries.push(...retriedTests)
+
+    if (retryMessage) {
+      retryReasonsByTestName.set(testName, retryMessage)
+    }
+  }
+
+  suite.tests = testsWithRetries
 
   return oldRunTests.apply(this, [suite, fn])
 }
 
 beforeEach(function () {
+  const testName = Cypress.mocha.getRunner().suite.ctx.currentTest.fullTitle()
+
+  const retryMessage = retryReasonsByTestName.get(testName)
+  if (retryMessage) {
+    cy.task(
+      'dd:log',
+      `Retrying "${testName}" ${retryMessage}`
+    )
+    retryReasonsByTestName.delete(testName)
+  }
+
   cy.task('dd:beforeEach', {
-    testName: Cypress.mocha.getRunner().suite.ctx.currentTest.fullTitle(),
+    testName,
     testSuite: Cypress.mocha.getRootSuite().file
   }).then(({ traceId, shouldSkip }) => {
     Cypress.env('traceId', traceId)
@@ -127,6 +168,7 @@ before(function () {
       testManagementTests = suiteConfig.testManagementTests
       isImpactedTestsEnabled = suiteConfig.isImpactedTestsEnabled
       isModifiedTest = suiteConfig.isModifiedTest
+      isTestIsolationEnabled = suiteConfig.isTestIsolationEnabled
     }
   })
 })