dd-trace 5.71.0 → 5.73.0

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

@@ -29,6 +29,7 @@ const testSessionConfigurationCh = channel('ci:jest:session:configuration')
 
 const testSuiteStartCh = channel('ci:jest:test-suite:start')
 const testSuiteFinishCh = channel('ci:jest:test-suite:finish')
+const testSuiteErrorCh = channel('ci:jest:test-suite:error')
 
 const workerReportTraceCh = channel('ci:jest:worker-report:trace')
 const workerReportCoverageCh = channel('ci:jest:worker-report:coverage')
@@ -46,7 +47,7 @@ const skippableSuitesCh = channel('ci:jest:test-suite:skippable')
 const libraryConfigurationCh = channel('ci:jest:library-configuration')
 const knownTestsCh = channel('ci:jest:known-tests')
 const testManagementTestsCh = channel('ci:jest:test-management-tests')
-const impactedTestsCh = channel('ci:jest:modified-tests')
+const modifiedFilesCh = channel('ci:jest:modified-files')
 
 const itrSkippedSuitesCh = channel('ci:jest:itr:skipped-suites')
 
@@ -78,7 +79,7 @@ let isTestManagementTestsEnabled = false
 let testManagementTests = {}
 let testManagementAttemptToFixRetries = 0
 let isImpactedTestsEnabled = false
-let modifiedTests = {}
+let modifiedFiles = {}
 
 const testContexts = new WeakMap()
 const originalTestFns = new WeakMap()
@@ -89,6 +90,7 @@ const attemptToFixRetriedTestsStatuses = new Map()
 const wrappedWorkers = new WeakSet()
 const testSuiteMockedFiles = new Map()
 const testsToBeRetried = new Set()
+const testSuiteAbsolutePathsWithFastCheck = new Set()
 
 const BREAKPOINT_HIT_GRACE_PERIOD_MS = 200
 
@@ -197,10 +199,8 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
 
       if (this.isImpactedTestsEnabled) {
         try {
-          const hasImpactedTests = Object.keys(modifiedTests).length > 0
-          this.modifiedTestsForThisSuite = hasImpactedTests
-            ? this.getModifiedTestForThisSuite(modifiedTests)
-            : this.getModifiedTestForThisSuite(this.testEnvironmentOptions._ddModifiedTests)
+          const hasImpactedTests = Object.keys(modifiedFiles).length > 0
+          this.modifiedFiles = hasImpactedTests ? modifiedFiles : this.testEnvironmentOptions._ddModifiedFiles
         } catch (e) {
           log.error('Error parsing impacted tests', e)
           this.isImpactedTestsEnabled = false
@@ -290,19 +290,6 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
       return result
     }
 
-    getModifiedTestForThisSuite (modifiedTests) {
-      if (this.modifiedTestsForThisSuite) {
-        return this.modifiedTestsForThisSuite
-      }
-      let modifiedTestsForThisSuite = modifiedTests
-      // If jest is using workers, modified tests are serialized to json.
-      // If jest runs in band, they are not.
-      if (typeof modifiedTestsForThisSuite === 'string') {
-        modifiedTestsForThisSuite = JSON.parse(modifiedTestsForThisSuite)
-      }
-      return modifiedTestsForThisSuite
-    }
-
     // Generic function to handle test retries
     retryTest ({
       jestEvent,
@@ -319,9 +306,13 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
       }
     }
 
+    getShouldStripSeedFromTestName () {
+      return testSuiteAbsolutePathsWithFastCheck.has(this.testSuiteAbsolutePath)
+    }
+
     // At the `add_test` event we don't have the test object yet, so we can't use it
     getTestNameFromAddTestEvent (event, state) {
-      const describeSuffix = getJestTestName(state.currentDescribeBlock)
+      const describeSuffix = getJestTestName(state.currentDescribeBlock, this.getShouldStripSeedFromTestName())
       return describeSuffix ? `${describeSuffix} ${event.testName}` : event.testName
     }
 
@@ -344,7 +335,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         })
       }
       if (event.name === 'test_start') {
-        const testName = getJestTestName(event.test)
+        const testName = getJestTestName(event.test, this.getShouldStripSeedFromTestName())
         if (testsToBeRetried.has(testName)) {
           // This is needed because we're trying tests with the same name
           this.resetSnapshotState()
@@ -378,7 +369,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             this.testSourceFile,
             testStartLine,
             testEndLine,
-            this.modifiedTestsForThisSuite,
+            this.modifiedFiles,
             'jest'
           )
         }
@@ -407,7 +398,8 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
           isJestRetry,
           isDisabled,
           isQuarantined,
-          isModified
+          isModified,
+          testSuiteAbsolutePath: this.testSuiteAbsolutePath
         }
         testContexts.set(event.test, ctx)
 
@@ -465,7 +457,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             this.testSourceFile,
             testStartLine,
             testEndLine,
-            this.modifiedTestsForThisSuite,
+            this.modifiedFiles,
             'jest'
           )
           if (isModified && !retriedTestsToNumAttempts.has(testFullName) && this.isEarlyFlakeDetectionEnabled) {
@@ -506,7 +498,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         let failedAllTests = false
         let isAttemptToFix = false
         if (this.isTestManagementTestsEnabled) {
-          const testName = getJestTestName(event.test)
+          const testName = getJestTestName(event.test, this.getShouldStripSeedFromTestName())
           isAttemptToFix = this.testManagementTestsForThisSuite?.attemptToFix?.includes(testName)
           if (isAttemptToFix) {
             if (attemptToFixRetriedTestsStatuses.has(testName)) {
@@ -534,7 +526,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)
+          const testName = getJestTestName(event.test, this.getShouldStripSeedFromTestName())
           const isNewTest = retriedTestsToNumAttempts.has(testName)
           if (isNewTest) {
             if (newTestsTestStatuses.has(testName)) {
@@ -594,16 +586,17 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         }
       }
       if (event.name === 'test_skip' || event.name === 'test_todo') {
+        const testName = getJestTestName(event.test, this.getShouldStripSeedFromTestName())
         testSkippedCh.publish({
           test: {
-            name: getJestTestName(event.test),
+            name: testName,
             suite: this.testSuite,
             testSourceFile: this.testSourceFile,
             displayName: this.displayName,
             frameworkVersion: jestVersion,
             testStartLine: getTestLineStart(event.test.asyncError, this.testSuite)
           },
-          isDisabled: this.testManagementTestsForThisSuite?.disabled?.includes(getJestTestName(event.test))
+          isDisabled: this.testManagementTestsForThisSuite?.disabled?.includes(testName)
         })
       }
     }
@@ -818,11 +811,15 @@ function getCliWrapper (isNewJestVersion) {
 
         try {
           const { err, testManagementTests: receivedTestManagementTests } = await testManagementTestsPromise
-          if (!err) {
+          if (err) {
+            isTestManagementTestsEnabled = false
+            testManagementTests = {}
+          } else {
             testManagementTests = receivedTestManagementTests
           }
         } catch (err) {
           log.error('Jest test management tests error', err)
+          isTestManagementTestsEnabled = false
         }
       }
 
@@ -831,12 +828,12 @@ function getCliWrapper (isNewJestVersion) {
           onDone = resolve
         })
 
-        impactedTestsCh.publish({ onDone })
+        modifiedFilesCh.publish({ onDone })
 
         try {
-          const { err, modifiedTests: receivedModifiedTests } = await impactedTestsPromise
+          const { err, modifiedFiles: receivedModifiedFiles } = await impactedTestsPromise
           if (!err) {
-            modifiedTests = receivedModifiedTests
+            modifiedFiles = receivedModifiedFiles
           }
         } catch (err) {
           log.error('Jest impacted tests error', err)
@@ -1101,7 +1098,8 @@ function jestAdapterWrapper (jestAdapter, jestVersion) {
       testEnvironmentOptions: environment.testEnvironmentOptions,
       testSourceFile: environment.testSourceFile,
       displayName: environment.displayName,
-      frameworkVersion: jestVersion
+      frameworkVersion: jestVersion,
+      testSuiteAbsolutePath: environment.testSuiteAbsolutePath
     })
     return adapter.apply(this, arguments).then(suiteResults => {
       const { numFailingTests, skipped, failureMessage: errorMessage } = suiteResults
@@ -1125,12 +1123,17 @@ function jestAdapterWrapper (jestAdapter, jestVersion) {
         const coverageFiles = getFilesWithPath(getCoveredFilenamesFromCoverage(environment.global.__coverage__))
         const mockedFiles = getFilesWithPath(testSuiteMockedFiles.get(environment.testSuiteAbsolutePath) || [])
 
-        testSuiteCodeCoverageCh.publish({ coverageFiles, testSuite: environment.testSourceFile, mockedFiles })
+        testSuiteCodeCoverageCh.publish({
+          coverageFiles,
+          testSuite: environment.testSourceFile,
+          mockedFiles,
+          testSuiteAbsolutePath: environment.testSuiteAbsolutePath
+        })
       }
-      testSuiteFinishCh.publish({ status, errorMessage })
+      testSuiteFinishCh.publish({ status, errorMessage, testSuiteAbsolutePath: environment.testSuiteAbsolutePath })
       return suiteResults
     }).catch(error => {
-      testSuiteFinishCh.publish({ status: 'fail', error })
+      testSuiteFinishCh.publish({ status: 'fail', error, testSuiteAbsolutePath: environment.testSuiteAbsolutePath })
       throw error
     })
   })
@@ -1237,7 +1240,7 @@ addHook({
       _ddIsTestManagementTestsEnabled,
       _ddTestManagementTests,
       _ddTestManagementAttemptToFixRetries,
-      _ddModifiedTests,
+      _ddModifiedFiles,
       ...restOfTestEnvironmentOptions
     } = testEnvironmentOptions
 
@@ -1310,12 +1313,49 @@ addHook({
   })
 
   shimmer.wrap(Runtime.prototype, 'requireModuleOrMock', requireModuleOrMock => function (from, moduleName) {
-    // TODO: do this for every library that we instrument
-    if (LIBRARIES_BYPASSING_JEST_REQUIRE_ENGINE.has(moduleName)) {
-      // To bypass jest's own require engine
-      return this._requireCoreModule(moduleName)
+    // `requireModuleOrMock` may log errors to the console. If we don't remove ourselves
+    // from the stack trace, the user might see a useless stack trace rather than the error
+    // that `jest` tries to show.
+    const originalPrepareStackTrace = Error.prepareStackTrace
+    Error.prepareStackTrace = function (error, structuredStackTrace) {
+      const filteredStackTrace = structuredStackTrace
+        .filter(callSite => !callSite.getFileName()?.includes('datadog-instrumentations/src/jest.js'))
+
+      return originalPrepareStackTrace(error, filteredStackTrace)
+    }
+    try {
+      // TODO: do this for every library that we instrument
+      if (LIBRARIES_BYPASSING_JEST_REQUIRE_ENGINE.has(moduleName)) {
+        // To bypass jest's own require engine
+        return this._requireCoreModule(moduleName)
+      }
+      // This means that `@fast-check/jest` is used in the test file.
+      if (moduleName === '@fast-check/jest') {
+        testSuiteAbsolutePathsWithFastCheck.add(this._testPath)
+      }
+      const returnedValue = requireModuleOrMock.apply(this, arguments)
+      if (process.exitCode === 1) {
+        if (this.loggedReferenceErrors.size > 0) {
+          const errorMessage = [...this.loggedReferenceErrors][0]
+          testSuiteErrorCh.publish({
+            errorMessage,
+            testSuiteAbsolutePath: this._testPath
+          })
+        } else {
+          testSuiteErrorCh.publish({
+            errorMessage: 'An error occurred while importing a module',
+            testSuiteAbsolutePath: this._testPath
+          })
+        }
+      }
+      return returnedValue
+    } catch (error) {
+      testSuiteErrorCh.publish({ error, testSuiteAbsolutePath: this._testPath })
+      throw error
+    } finally {
+      // Restore original prepareStackTrace
+      Error.prepareStackTrace = originalPrepareStackTrace
     }
-    return requireModuleOrMock.apply(this, arguments)
   })
 
   return runtimePackage
@@ -1365,17 +1405,15 @@ function sendWrapper (send) {
 
       const suiteTestManagementTests = testManagementTests?.jest?.suites?.[testSuite]?.tests || {}
 
-      const suiteModifiedTests = Object.keys(modifiedTests).length > 0
-        ? modifiedTests
-        : {}
-
       args[0].config = {
         ...config,
         testEnvironmentOptions: {
           ...config.testEnvironmentOptions,
           _ddKnownTests: suiteKnownTests,
           _ddTestManagementTests: suiteTestManagementTests,
-          _ddModifiedTests: suiteModifiedTests
+          // TODO: figure out if we can reduce the size of the modified files object
+          // Can we use `testSuite` (it'd have to be relative to repository root though)
+          _ddModifiedFiles: modifiedFiles
         }
       }
     }

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

@@ -68,7 +68,7 @@ const skippableSuitesCh = channel('ci:mocha:test-suite:skippable')
 const mochaGlobalRunCh = channel('ci:mocha:global:run')
 
 const testManagementTestsCh = channel('ci:mocha:test-management-tests')
-const impactedTestsCh = channel('ci:mocha:modified-tests')
+const modifiedFilesCh = channel('ci:mocha:modified-files')
 const workerReportTraceCh = channel('ci:mocha:worker-report:trace')
 const testSessionStartCh = channel('ci:mocha:session:start')
 const testSessionFinishCh = channel('ci:mocha:session:finish')
@@ -233,12 +233,12 @@ function getExecutionConfiguration (runner, isParallel, frameworkVersion, onFini
     })
   }
 
-  const onReceivedImpactedTests = ({ err, modifiedTests: receivedModifiedTests }) => {
+  const onReceivedImpactedTests = ({ err, modifiedFiles: receivedModifiedFiles }) => {
     if (err) {
-      config.modifiedTests = []
+      config.modifiedFiles = []
       config.isImpactedTestsEnabled = false
     } else {
-      config.modifiedTests = receivedModifiedTests
+      config.modifiedFiles = receivedModifiedFiles
     }
     if (config.isSuitesSkippingEnabled) {
       ctx.onDone = onReceivedSkippableSuites
@@ -260,7 +260,7 @@ function getExecutionConfiguration (runner, isParallel, frameworkVersion, onFini
     }
     if (config.isImpactedTestsEnabled) {
       ctx.onDone = onReceivedImpactedTests
-      impactedTestsCh.runStores(ctx, () => {})
+      modifiedFilesCh.runStores(ctx, () => {})
     } else if (config.isSuitesSkippingEnabled) {
       ctx.onDone = onReceivedSkippableSuites
       skippableSuitesCh.runStores(ctx, () => {})
@@ -284,7 +284,7 @@ function getExecutionConfiguration (runner, isParallel, frameworkVersion, onFini
       testManagementTestsCh.runStores(ctx, () => {})
     } if (config.isImpactedTestsEnabled) {
       ctx.onDone = onReceivedImpactedTests
-      impactedTestsCh.runStores(ctx, () => {})
+      modifiedFilesCh.runStores(ctx, () => {})
     } else if (config.isSuitesSkippingEnabled) {
       ctx.onDone = onReceivedSkippableSuites
       skippableSuitesCh.runStores(ctx, () => {})
@@ -321,7 +321,7 @@ function getExecutionConfiguration (runner, isParallel, frameworkVersion, onFini
       testManagementTestsCh.runStores(ctx, () => {})
     } else if (config.isImpactedTestsEnabled) {
       ctx.onDone = onReceivedImpactedTests
-      impactedTestsCh.runStores(ctx, () => {})
+      modifiedFilesCh.runStores(ctx, () => {})
     } else if (config.isSuitesSkippingEnabled) {
       ctx.onDone = onReceivedSkippableSuites
       skippableSuitesCh.runStores(ctx, () => {})
@@ -696,9 +696,8 @@ addHook({
     }
 
     if (config.isImpactedTestsEnabled) {
-      const testSuiteImpactedTests = config.modifiedTests || {}
       newWorkerArgs._ddIsImpactedTestsEnabled = true
-      newWorkerArgs._ddModifiedTests = testSuiteImpactedTests
+      newWorkerArgs._ddModifiedFiles = config.modifiedFiles || {}
     }
 
     // We pass the known tests for the test file to the worker

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

@@ -163,14 +163,13 @@ function runnableWrapper (RunnablePackage, libraryConfig) {
       const ctx = getTestContext(test)
 
       if (ctx) {
-        const originalFn = this.fn
         // we bind the test fn to the correct context
-        const newFn = function () {
+        const newFn = shimmer.wrapFunction(this.fn, originalFn => function () {
           return testFnCh.runStores(ctx, () => originalFn.apply(this, arguments))
-        }
+        })
 
         // we store the original function, not to lose it
-        originalFns.set(newFn, originalFn)
+        originalFns.set(newFn, this.fn)
         this.fn = newFn
 
         wrappedFunctions.add(this.fn)
@@ -446,7 +445,7 @@ function getRunTestsWrapper (runTests, config) {
     if (config.isImpactedTestsEnabled) {
       suite.tests.forEach((test) => {
         isModifiedCh.publish({
-          modifiedTests: config.modifiedTests,
+          modifiedFiles: config.modifiedFiles,
           file: suite.file,
           onDone: (isModified) => {
             if (isModified) {

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

@@ -36,9 +36,9 @@ addHook({
     }
     if (this.options._ddIsImpactedTestsEnabled) {
       config.isImpactedTestsEnabled = true
-      config.modifiedTests = this.options._ddModifiedTests
+      config.modifiedFiles = this.options._ddModifiedFiles
       delete this.options._ddIsImpactedTestsEnabled
-      delete this.options._ddModifiedTests
+      delete this.options._ddModifiedFiles
     }
     if (this.options._ddIsTestManagementTestsEnabled) {
       config.isTestManagementTestsEnabled = true

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

@@ -20,7 +20,7 @@ addHook({ name: 'pg', versions: ['>=8.0.3'], file: 'lib/native/client.js' }, Cli
   return Client
 })
 
-addHook({ name: 'pg', versions: ['>=8.0.3 <8.15.0', '>=8.15.0 <9'], file: 'lib/client.js' }, Client => {
+addHook({ name: 'pg', versions: ['>=8.0.3'], file: 'lib/client.js' }, Client => {
   shimmer.wrap(Client.prototype, 'query', query => wrapQuery(query))
   return Client
 })

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

@@ -21,7 +21,7 @@ const testSessionFinishCh = channel('ci:playwright:session:finish')
 const libraryConfigurationCh = channel('ci:playwright:library-configuration')
 const knownTestsCh = channel('ci:playwright:known-tests')
 const testManagementTestsCh = channel('ci:playwright:test-management-tests')
-const impactedTestsCh = channel('ci:playwright:modified-tests')
+const modifiedFilesCh = channel('ci:playwright:modified-files')
 const isModifiedCh = channel('ci:playwright:test:is-modified')
 
 const testSuiteStartCh = channel('ci:playwright:test-suite:start')
@@ -59,7 +59,7 @@ let isTestManagementTestsEnabled = false
 let testManagementAttemptToFixRetries = 0
 let testManagementTests = {}
 let isImpactedTestsEnabled = false
-let modifiedTests = {}
+let modifiedFiles = {}
 const quarantinedOrDisabledTestsAttemptToFix = []
 let quarantinedButNotAttemptToFixFqns = new Set()
 let rootDir = ''
@@ -593,11 +593,11 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
 
     if (isImpactedTestsEnabled && satisfies(playwrightVersion, MINIMUM_SUPPORTED_VERSION_RANGE_EFD)) {
       try {
-        const { err, modifiedTests: receivedModifiedTests } = await getChannelPromise(impactedTestsCh)
+        const { err, modifiedFiles: receivedModifiedFiles } = await getChannelPromise(modifiedFilesCh)
         if (err) {
           isImpactedTestsEnabled = false
         } else {
-          modifiedTests = receivedModifiedTests
+          modifiedFiles = receivedModifiedFiles
         }
       } catch (err) {
         isImpactedTestsEnabled = false
@@ -819,7 +819,7 @@ addHook({
       await Promise.all(allTests.map(async (test) => {
         const { isModified } = await getChannelPromise(isModifiedCh, {
           filePath: test._requireFile,
-          modifiedTests
+          modifiedFiles
         })
         if (isModified) {
           test._ddIsModified = true

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

@@ -32,7 +32,7 @@ const libraryConfigurationCh = channel('ci:vitest:library-configuration')
 const knownTestsCh = channel('ci:vitest:known-tests')
 const isEarlyFlakeDetectionFaultyCh = channel('ci:vitest:is-early-flake-detection-faulty')
 const testManagementTestsCh = channel('ci:vitest:test-management-tests')
-const impactedTestsCh = channel('ci:vitest:modified-tests')
+const modifiedFilesCh = channel('ci:vitest:modified-files')
 
 const workerReportTraceCh = channel('ci:vitest:worker-report:trace')
 const workerReportLogsCh = channel('ci:vitest:worker-report:logs')
@@ -92,7 +92,7 @@ function getProvidedContext () {
       _ddTestManagementTests: testManagementTests,
       _ddIsFlakyTestRetriesEnabled: isFlakyTestRetriesEnabled,
       _ddIsImpactedTestsEnabled: isImpactedTestsEnabled,
-      _ddModifiedTests: modifiedTests
+      _ddModifiedFiles: modifiedFiles
     } = globalThis.__vitest_worker__.providedContext
 
     return {
@@ -106,7 +106,7 @@ function getProvidedContext () {
       testManagementTests,
       isFlakyTestRetriesEnabled,
       isImpactedTestsEnabled,
-      modifiedTests
+      modifiedFiles
     }
   } catch {
     log.error('Vitest workers could not parse provided context, so some features will not work.')
@@ -121,7 +121,7 @@ function getProvidedContext () {
       testManagementTests: {},
       isFlakyTestRetriesEnabled: false,
       isImpactedTestsEnabled: false,
-      modifiedTests: {}
+      modifiedFiles: {}
     }
   }
 }
@@ -316,14 +316,14 @@ function getSortWrapper (sort, frameworkVersion) {
     }
 
     if (isImpactedTestsEnabled) {
-      const { err, modifiedTests } = await getChannelPromise(impactedTestsCh)
+      const { err, modifiedFiles } = await getChannelPromise(modifiedFilesCh)
       if (err) {
         log.error('Could not get modified tests.')
       } else {
         try {
           const workspaceProject = this.ctx.getCoreWorkspaceProject()
           workspaceProject._provided._ddIsImpactedTestsEnabled = isImpactedTestsEnabled
-          workspaceProject._provided._ddModifiedTests = modifiedTests
+          workspaceProject._provided._ddModifiedFiles = modifiedFiles
         } catch {
           log.warn('Could not send modified tests to workers so Impacted Tests will not work.')
         }
@@ -464,7 +464,7 @@ addHook({
       testManagementAttemptToFixRetries,
       testManagementTests,
       isImpactedTestsEnabled,
-      modifiedTests
+      modifiedFiles
     } = getProvidedContext()
 
     if (isTestManagementTestsEnabled) {
@@ -499,7 +499,7 @@ addHook({
 
     if (isImpactedTestsEnabled) {
       isModifiedCh.publish({
-        modifiedTests,
+        modifiedFiles,
         testSuiteAbsolutePath: task.file.filepath,
         onDone: (isImpacted) => {
           if (isImpacted) {

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

@@ -10,7 +10,7 @@ class AmqplibConsumerPlugin extends ConsumerPlugin {
   static operation = 'consume'
 
   bindStart (ctx) {
-    const { method, fields, message, queue } = ctx
+    const { method, fields = {}, message, queue } = ctx
 
     if (method !== 'basic.deliver' && method !== 'basic.get') return
 

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

@@ -53,10 +53,13 @@ function extractTextAndResponseReasonFromStream (chunks, modelProvider, modelNam
 
     switch (modelProviderUpper) {
       case PROVIDER.AMAZON: {
-        message += body?.outputText
-
-        inputTokens = body?.inputTextTokenCount
-        outputTokens = body?.totalOutputTextTokenCount
+        if (body?.outputText) {
+          message += body?.outputText
+          inputTokens = body?.inputTextTokenCount
+          outputTokens = body?.totalOutputTextTokenCount
+        } else if (body?.contentBlockDelta?.delta?.text) {
+          message += body.contentBlockDelta.delta.text
+        }
 
         break
       }
@@ -155,17 +158,16 @@ class RequestParams {
     stream = '',
     n
   } = {}) {
-    // stringify prompt as it could be a single prompt as well as a list of message objects
-    this.prompt = typeof prompt === 'string' ? prompt : JSON.stringify(prompt) || ''
-    this.temperature = temperature === undefined ? undefined : temperature
-    this.topP = topP === undefined ? undefined : topP
-    this.topK = topK === undefined ? undefined : topK
-    this.maxTokens = maxTokens === undefined ? undefined : maxTokens
+    this.prompt = prompt
+    this.temperature = temperature
+    this.topP = topP
+    this.topK = topK
+    this.maxTokens = maxTokens
     this.stopSequences = stopSequences || []
     this.inputType = inputType || ''
     this.truncate = truncate || ''
     this.stream = stream || ''
-    this.n = n === undefined ? undefined : n
+    this.n = n
   }
 }
 
@@ -234,17 +236,48 @@ function extractRequestParams (params, provider) {
       })
     }
     case PROVIDER.AMAZON: {
+      const prompt = requestBody.inputText
       if (modelId.includes('embed')) {
-        return new RequestParams({ prompt: requestBody.inputText })
+        return new RequestParams({ prompt })
+      } else if (prompt !== undefined) {
+        const textGenerationConfig = requestBody.textGenerationConfig || {}
+        return new RequestParams({
+          prompt,
+          temperature: textGenerationConfig.temperature,
+          topP: textGenerationConfig.topP,
+          maxTokens: textGenerationConfig.maxTokenCount,
+          stopSequences: textGenerationConfig.stopSequences
+        })
+      } else if (Array.isArray(requestBody.messages)) {
+        const inferenceConfig = requestBody.inferenceConfig || {}
+        const messages = []
+        if (Array.isArray(requestBody.system)) {
+          for (const sysMsg of requestBody.system) {
+            messages.push({
+              content: sysMsg.text,
+              role: 'system'
+            })
+          }
+        }
+        for (const message of requestBody.messages) {
+          const textBlocks = message.content?.filter(block => block.text) || []
+          if (textBlocks.length > 0) {
+            messages.push({
+              content: textBlocks.map(block => block.text).join(''),
+              role: message.role
+            })
+          }
+        }
+        return new RequestParams({
+          prompt: messages,
+          temperature: inferenceConfig.temperature,
+          topP: inferenceConfig.topP,
+          maxTokens: inferenceConfig.maxTokens,
+          stopSequences: inferenceConfig.stopSequences
+        })
       }
-      const textGenerationConfig = requestBody.textGenerationConfig || {}
-      return new RequestParams({
-        prompt: requestBody.inputText,
-        temperature: textGenerationConfig.temperature,
-        topP: textGenerationConfig.topP,
-        maxTokens: textGenerationConfig.maxTokenCount,
-        stopSequences: textGenerationConfig.stopSequences
-      })
+
+      return new RequestParams({ prompt })
     }
     case PROVIDER.ANTHROPIC: {
       let prompt = requestBody.prompt
@@ -350,14 +383,27 @@ function extractTextAndResponseReason (response, provider, modelName) {
         if (modelName.includes('embed')) {
           return new Generation({ message: body.embedding })
         }
-        const results = body.results || []
-        if (results.length > 0) {
-          const result = results[0]
+        if (body.results) {
+          const results = body.results || []
+          if (results.length > 0) {
+            const result = results[0]
+            return new Generation({
+              message: result.outputText,
+              finishReason: result.completionReason,
+              inputTokens: body.inputTextTokenCount,
+              outputTokens: result.tokenCount
+            })
+          }
+        } else if (body.output) {
+          const output = body.output || {}
           return new Generation({
-            message: result.outputText,
-            finishReason: result.completionReason,
-            inputTokens: body.inputTextTokenCount,
-            outputTokens: result.tokenCount
+            message: output.message?.content[0]?.text ?? 'Unsupported content type',
+            finishReason: body.stopReason,
+            role: output.message?.role,
+            inputTokens: body.usage?.inputTokens,
+            outputTokens: body.usage?.outputTokens,
+            cacheReadInputTokenCount: body.usage?.cacheReadInputTokenCount,
+            cacheWriteInputTokenCount: body.usage?.cacheWriteInputTokenCount
           })
         }
         break