dd-trace 5.79.0 → 5.81.0

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

@@ -4,7 +4,7 @@ const { errorMonitor } = require('node:events')
 
 const { channel, addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
-const satisfies = require('semifies')
+const satisfies = require('../../../vendor/dist/semifies')
 
 function wrapConnection (Connection, version) {
   const startCh = channel('apm:mysql2:query:start')

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const satisfies = require('semifies')
+const satisfies = require('../../../vendor/dist/semifies')
 
 const { addHook, channel } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
@@ -11,6 +11,9 @@ const {
   getIsFaultyEarlyFlakeDetection
 } = require('../../dd-trace/src/plugins/util/test')
 const log = require('../../dd-trace/src/log')
+const {
+  getEnvironmentVariable
+} = require('../../dd-trace/src/config-helper')
 const { DD_MAJOR } = require('../../../version')
 
 const testStartCh = channel('ci:playwright:test:start')
@@ -38,7 +41,7 @@ const testSuiteToTestStatuses = new Map()
 const testSuiteToErrors = new Map()
 const testsToTestStatuses = new Map()
 
-const RUM_FLUSH_WAIT_TIME = 1000
+const RUM_FLUSH_WAIT_TIME = Number(getEnvironmentVariable('DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS')) || 1000
 
 let applyRepeatEachIndex = null
 
@@ -481,6 +484,15 @@ function dispatcherRunWrapper (run) {
 
 function dispatcherRunWrapperNew (run) {
   return function (testGroups) {
+    // Filter out disabled tests from testGroups before they get scheduled
+    if (isTestManagementTestsEnabled) {
+      testGroups.forEach(group => {
+        group.tests = group.tests.filter(test => !test._ddIsDisabled)
+      })
+      // Remove empty groups
+      testGroups = testGroups.filter(group => group.tests.length > 0)
+    }
+
     if (!this._allTests) {
       // Removed in https://github.com/microsoft/playwright/commit/1e52c37b254a441cccf332520f60225a5acc14c7
       // Not available from >=1.44.0
@@ -678,10 +690,11 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
 
     const projects = getProjectsFromRunner(this, config)
 
-    const shouldSetRetries = isFlakyTestRetriesEnabled &&
-      flakyTestRetriesCount > 0 &&
-      !isTestManagementTestsEnabled
-    if (shouldSetRetries) {
+    // ATR and `--retries` are now compatible with Test Management.
+    // Test Management tests have their retries set to 0 at the test level,
+    // preventing them from being retried by ATR or `--retries`.
+    const shouldSetATRRetries = isFlakyTestRetriesEnabled && flakyTestRetriesCount > 0
+    if (shouldSetATRRetries) {
       projects.forEach(project => {
         if (project.retries === 0) { // Only if it hasn't been set by the user
           project.retries = flakyTestRetriesCount
@@ -713,6 +726,8 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
       })
     })
 
+    let preventedToFail = false
+
     const sessionStatus = runAllTestsReturn.status || runAllTestsReturn
 
     if (isTestManagementTestsEnabled && sessionStatus === 'failed') {
@@ -721,23 +736,30 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
       let totalPureQuarantinedFailedTestCount = 0
 
       for (const [fqn, testStatuses] of testsToTestStatuses.entries()) {
-        const failedCount = testStatuses.filter(status => status === 'fail').length
-        totalFailedTestCount += failedCount
-        if (quarantinedButNotAttemptToFixFqns.has(fqn)) {
-          totalPureQuarantinedFailedTestCount += failedCount
+        // Only count as failed if the final status (after retries) is 'fail'
+        const lastStatus = testStatuses[testStatuses.length - 1]
+        if (lastStatus === 'fail') {
+          totalFailedTestCount += 1
+          if (quarantinedButNotAttemptToFixFqns.has(fqn)) {
+            totalPureQuarantinedFailedTestCount += 1
+          }
         }
       }
 
       for (const test of quarantinedOrDisabledTestsAttemptToFix) {
         const testFqn = getTestFullyQualifiedName(test)
         const testStatuses = testsToTestStatuses.get(testFqn)
-        totalAttemptToFixFailedTestCount += testStatuses.filter(status => status === 'fail').length
+        // Only count as failed if the final status (after retries) is 'fail'
+        if (testStatuses && testStatuses[testStatuses.length - 1] === 'fail') {
+          totalAttemptToFixFailedTestCount += 1
+        }
       }
 
       const totalIgnorableFailures = totalAttemptToFixFailedTestCount + totalPureQuarantinedFailedTestCount
 
       if (totalFailedTestCount > 0 && totalFailedTestCount === totalIgnorableFailures) {
         runAllTestsReturn = 'passed'
+        preventedToFail = true
       }
     }
 
@@ -745,7 +767,7 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
       onDone = resolve
     })
     testSessionFinishCh.publish({
-      status: STATUS_TO_TEST_STATUS[sessionStatus],
+      status: preventedToFail ? 'pass' : STATUS_TO_TEST_STATUS[sessionStatus],
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
@@ -893,6 +915,9 @@ addHook({
         if (testProperties.disabled) {
           test._ddIsDisabled = true
           test.expectedStatus = 'skipped'
+          // setting test.expectedStatus to 'skipped' does not work for every case,
+          // so we need to filter out disabled tests in dispatcherRunWrapperNew,
+          // so they don't get to the workers
           continue
         }
         if (testProperties.quarantined) {
@@ -905,6 +930,8 @@ addHook({
         }
         if (testProperties.attemptToFix) {
           test._ddIsAttemptToFix = true
+          // Prevent ATR or `--retries` from retrying attemptToFix tests
+          test.retries = 0
           const fileSuite = getSuiteType(test, 'file')
 
           if (!fileSuitesWithManagedTestsToProjects.has(fileSuite)) {
@@ -979,6 +1006,8 @@ addHook({
         newTests.forEach(newTest => {
           newTest._ddIsNew = true
           if (isEarlyFlakeDetectionEnabled && newTest.expectedStatus !== 'skipped' && !newTest._ddIsModified) {
+            // Prevent ATR or `--retries` from retrying new tests if EFD is enabled
+            newTest.retries = 0
             const fileSuite = getSuiteType(newTest, 'file')
             if (!fileSuitesWithNewTestsToProjects.has(fileSuite)) {
               fileSuitesWithNewTestsToProjects.set(fileSuite, getSuiteType(newTest, 'project'))
@@ -1052,9 +1081,19 @@ addHook({
 
     try {
       if (page) {
-        const isRumActive = await page.evaluate(() => {
-          return window.DD_RUM && window.DD_RUM.getInternalContext ? !!window.DD_RUM.getInternalContext() : false
+        const { isRumInstrumented, isRumActive, rumSamplingRate } = await page.evaluate(() => {
+          const isRumInstrumented = !!window.DD_RUM
+          const isRumActive = window.DD_RUM && window.DD_RUM.getInternalContext
+            ? !!window.DD_RUM.getInternalContext()
+            : false
+          const rumSamplingRate = window.DD_RUM && window.DD_RUM.getInitConfiguration
+            ? window.DD_RUM.getInitConfiguration().sessionSampleRate
+            : null
+          return { isRumInstrumented, isRumActive, rumSamplingRate }
         })
+        if (isRumInstrumented && rumSamplingRate < 100 && !isRumActive) {
+          log.debug("RUM was detected on the page, but it isn't active because the sampling rate is below 100%")
+        }
 
         if (isRumActive) {
           testPageGotoCh.publish({
@@ -1063,8 +1102,9 @@ addHook({
           })
         }
       }
-    } catch {
+    } catch (e) {
       // ignore errors such as redirects, context destroyed, etc
+      log.error('goto hook error', e)
     }
 
     return response
@@ -1156,8 +1196,9 @@ addHook({
                   }
                 }
               }
-            } catch {
+            } catch (e) {
               // ignore errors
+              log.error('afterEach hook error', e)
             }
           },
           title: 'afterEach hook',
@@ -1270,6 +1311,10 @@ function generateSummaryWrapper (generateSummary) {
         const {
           _requireFile: testSuiteAbsolutePath,
           location: { line: testSourceLine },
+          _ddIsNew: isNew,
+          _ddIsDisabled: isDisabled,
+          _ddIsModified: isModified,
+          _ddIsQuarantined: isQuarantined
         } = test
         const browserName = getBrowserNameFromProjects(sessionProjects, test)
 
@@ -1278,6 +1323,10 @@ function generateSummaryWrapper (generateSummary) {
           testSuiteAbsolutePath,
           testSourceLine,
           browserName,
+          isNew,
+          isDisabled,
+          isModified,
+          isQuarantined
         })
       }
     }

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

@@ -1,7 +1,7 @@
 'use strict'
 
 const METHODS = [...require('http').METHODS.map(v => v.toLowerCase()), 'all']
-const pathToRegExp = require('path-to-regexp')
+const pathToRegExp = require('../../../vendor/dist/path-to-regexp')
 const shimmer = require('../../datadog-shimmer')
 const { addHook, channel } = require('./helpers/instrument')
 

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

@@ -2,6 +2,7 @@
 
 const { addHook, channel } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 const ciSeleniumDriverGetStartCh = channel('ci:selenium:driver:get')
 
@@ -15,7 +16,8 @@ if (window.DD_RUM && window.DD_RUM.stopSession) {
 `
 const IS_RUM_ACTIVE_SCRIPT = 'return !!window.DD_RUM'
 
-const DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS = 500
+const DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS =
+Number(getEnvironmentVariable('DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS')) || 500
 const DD_CIVISIBILITY_TEST_EXECUTION_ID_COOKIE_NAME = 'datadog-ci-visibility-test-execution-id'
 
 // TODO: can we increase the supported version range?

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

@@ -12,6 +12,9 @@ const producerCh = tracingChannel('ws:send')
 const receiverCh = tracingChannel('ws:receive')
 const closeCh = tracingChannel('ws:close')
 const emitCh = channel('tracing:ws:server:connect:emit')
+// TODO: Add a error channel / handle error events properly.
+
+const eventHandlerMap = new WeakMap()
 
 function wrapHandleUpgrade (handleUpgrade) {
   return function () {
@@ -67,24 +70,37 @@ function createWrapEmit (emit) {
 }
 
 function createWrappedHandler (handler) {
-  return function wrappedMessageHandler (data, binary) {
+  return shimmer.wrapFunction(handler, originalHandler => function (data, binary) {
     const byteLength = dataLength(data)
 
     const ctx = { data, binary, socket: this._sender?._socket, byteLength }
 
-    return receiverCh.traceSync(handler, ctx, this, data, binary)
-  }
+    return receiverCh.traceSync(originalHandler, ctx, this, data, binary)
+  })
 }
 
 function wrapListener (originalOn) {
   return function (eventName, handler) {
     if (eventName === 'message') {
-      return originalOn.call(this, eventName, createWrappedHandler(handler))
+      // Prevent multiple wrapping of the same handler in case the user adds the listener multiple times
+      const wrappedHandler = eventHandlerMap.get(handler) ?? createWrappedHandler(handler)
+      eventHandlerMap.set(handler, wrappedHandler)
+      return originalOn.call(this, eventName, wrappedHandler)
     }
     return originalOn.apply(this, arguments)
   }
 }
 
+function removeListener (originalOff) {
+  return function (eventName, handler) {
+    if (eventName === 'message') {
+      const wrappedHandler = eventHandlerMap.get(handler)
+      return originalOff.call(this, eventName, wrappedHandler)
+    }
+    return originalOff.apply(this, arguments)
+  }
+}
+
 function wrapClose (close) {
   return function (code, data) {
     // _closeFrameReceived is set to true when receiver receives a close frame from a peer
@@ -115,22 +131,24 @@ addHook({
   versions: ['>=8.0.0']
 }, ws => {
   shimmer.wrap(ws.prototype, 'send', wrapSend)
-  shimmer.wrap(ws.prototype, 'on', wrapListener)
   shimmer.wrap(ws.prototype, 'close', wrapClose)
+
+  // TODO: Do not wrap these methods. Instead, add a listener to the websocket instance when one is created.
+  // That way it avoids producing too many spans for the same websocket instance and less user code is impacted.
+  shimmer.wrap(ws.prototype, 'on', wrapListener)
+  shimmer.wrap(ws.prototype, 'addListener', wrapListener)
+  shimmer.wrap(ws.prototype, 'off', removeListener)
+  shimmer.wrap(ws.prototype, 'removeListener', removeListener)
+
   return ws
 })
 
-function detectType (data) {
-  if (typeof Blob !== 'undefined' && data instanceof Blob) return 'Blob'
-  if (typeof Buffer !== 'undefined' && Buffer.isBuffer(data)) return 'Buffer'
-  if (typeof data === 'string') return 'string'
-  return 'Unknown'
-}
-
 function dataLength (data) {
-  const type = detectType(data)
-  if (type === 'Blob') return data.size
-  if (type === 'Buffer') return data.length
-  if (type === 'string') return Buffer.byteLength(data)
-  return 0
+  if (typeof data === 'string') {
+    return Buffer.byteLength(data)
+  }
+  if (data instanceof Blob) {
+    return data.size
+  }
+  return data?.length ?? 0
 }

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

@@ -27,8 +27,9 @@ const PROVIDER = {
  * Coerce the chunks into a single response body.
  *
  * @param {Array<{ chunk: { bytes: Buffer } }>} chunks
- * @param {string} provider
- * @returns {Object}
+ * @param {string} modelProvider
+ * @param {string} modelName
+ * @returns {Generation | Record<never, never>}
  */
 function extractTextAndResponseReasonFromStream (chunks, modelProvider, modelName) {
   const modelProviderUpper = modelProvider.toUpperCase()

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

@@ -2,6 +2,7 @@
 
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
+const spanContexts = new WeakMap()
 
 class AzureServiceBusProducerPlugin extends ProducerPlugin {
   static get id () { return 'azure-service-bus' }
@@ -36,7 +37,12 @@ class AzureServiceBusProducerPlugin 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.msg)
       }
     }
@@ -47,9 +53,12 @@ class AzureServiceBusProducerPlugin extends ProducerPlugin {
       if (isBatch) {
         span.setTag('messaging.batch.message_count', messages.count)
         if (batchLinksAreEnabled()) {
-          messages._spanContexts.forEach(spanContext => {
-            span.addLink(spanContext)
-          })
+          const contexts = spanContexts.get(messages)
+          if (contexts) {
+            for (const spanContext of contexts) {
+              span.addLink(spanContext)
+            }
+          }
         }
       } else if (Array.isArray(messages)) {
         span.setTag('messaging.batch.message_count', messages.length)
@@ -64,7 +73,7 @@ class AzureServiceBusProducerPlugin extends ProducerPlugin {
   }
 
   asyncEnd (ctx) {
-    super.finish()
+    super.finish(ctx)
   }
 }
 

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-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

@@ -2,7 +2,7 @@
 
 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 noopTask = {

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
     }
   })
 })

package/packages/datadog-plugin-google-genai/src/index.js

@@ -0,0 +1,17 @@
+'use strict'
+
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+const GenAiTracingPlugin = require('./tracing')
+const GenAiLLMObsPlugin = require('../../dd-trace/src/llmobs/plugins/genai')
+
+class GenAiPlugin extends CompositePlugin {
+  static id = 'google-genai'
+  static get plugins () {
+    return {
+      llmobs: GenAiLLMObsPlugin,
+      tracing: GenAiTracingPlugin
+    }
+  }
+}
+
+module.exports = GenAiPlugin