dd-trace 6.21.0 → 6.22.0

package/packages/datadog-instrumentations/src/openai-realtime/index.js

@@ -10,6 +10,11 @@ const RealtimeSession = require('./session')
 /**
  * @typedef {import('./session').TurnDescriptor} TurnDescriptor
  * @typedef {import('./turns').ResponseTurn} ResponseTurn
+ * @typedef {{
+ *   session: RealtimeSession,
+ *   socket: object | undefined,
+ *   finalize: (failed?: boolean) => void,
+ * }} Connection
  */
 
 // One span per phase of a turn. `user speech` and `agent speech` share a channel: they differ only
@@ -36,7 +41,7 @@ const audioChannel = dc.channel('dd-trace:openai:realtime:audio')
 const USER_SPEECH = { operation: 'createRealtimeUserSpeech', llmobsName: 'user speech' }
 const AGENT_SPEECH = { operation: 'createRealtimeAgentSpeech', llmobsName: 'agent speech' }
 
-/** @type {WeakMap<object, { session: RealtimeSession, finalize: () => void }>} */
+/** @type {WeakMap<object, Connection>} */
 const connections = new WeakMap()
 
 /**
@@ -92,7 +97,7 @@ function captureContext (turn) {
  * Start tracking a connection, reading the model and base path off the URL the SDK already built.
  *
  * @param {object} emitter
- * @returns {{ session: RealtimeSession, finalize: () => void }}
+ * @returns {Connection}
  */
 function createConnection (emitter) {
   let model
@@ -135,7 +140,7 @@ function createConnection (emitter) {
     session.finishSession(Date.now(), failed)
   }
 
-  const connection = { session, finalize }
+  const connection = { session, socket: emitter.socket, finalize }
   attachSocketClose(emitter, finalize)
   return connection
 }
@@ -181,14 +186,21 @@ function attachSocketClose (emitter, finalize) {
 
 /**
  * @param {object} emitter
- * @returns {{ session: RealtimeSession, finalize: () => void } | undefined}
+ * @returns {Connection | undefined}
  */
 function getConnection (emitter) {
   const connection = connections.get(emitter)
-  if (connection !== undefined) return connection
+  if (connection !== undefined) {
+    if (connection.socket === emitter.socket) return connection
+
+    // Opt-in SDK recovery keeps the emitter but replaces its socket with a new server session.
+    // Retire the old state before attaching close and exit cleanup to the replacement.
+    connection.finalize(true)
+    connections.delete(emitter)
+  }
 
   // Nothing is listening, so never allocate. Checked only on the miss path, so an established
-  // connection pays one WeakMap lookup per event.
+  // connection reuses its state while the socket is unchanged.
   if (!turnChannel.start.hasSubscribers) return
 
   const created = createConnection(emitter)

package/packages/datadog-instrumentations/src/openai-realtime/session.js

@@ -829,7 +829,7 @@ class RealtimeSession {
       input.audio.totalDecodedBytes, inputFormat.mimeType, inputFormat.sampleRate
     )
     const userEnd = input.speechEndTime ??
-      (userStart !== undefined && inputDurationMs !== undefined ? userStart + inputDurationMs : undefined)
+      (userStart === undefined || inputDurationMs === undefined ? undefined : userStart + inputDurationMs)
 
     const agentStart = turn.audio.startTime
     const playbackMs = segmentDurationMs(

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

@@ -58,6 +58,13 @@ const V4_PACKAGE_SHIMS = [
     versions: ['>=4.87.0'],
     interceptChannel: responsesInterceptChannel,
   },
+  {
+    file: 'resources/decisions',
+    targetClass: 'Decisions',
+    baseResource: 'decisions',
+    methods: ['create'],
+    versions: ['>=7.30.0'],
+  },
   {
     file: 'resources/embeddings',
     targetClass: 'Embeddings',

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

@@ -10,10 +10,9 @@ const logSubmissionCh = channel('ci:log-submission:log')
 
 /**
  * @param {string} symbol
- * @param {(original: Function) => Function} wrapper
  * @param {Function} pino
  */
-function wrapPino (symbol, wrapper, pino) {
+function wrapPino (symbol, pino) {
   /**
    * @param {unknown[]} args
    * @returns {unknown}
@@ -25,7 +24,7 @@ function wrapPino (symbol, wrapper, pino) {
       configurable: true,
       enumerable: true,
       writable: true,
-      value: wrapper(instance[symbol]),
+      value: wrapAsJson(instance[symbol]),
     })
 
     return instance
@@ -83,19 +82,19 @@ function wrapPrettyFactory (prettyFactory) {
 addHook({ name: 'pino', versions: ['2 - 3', '4'], patchDefault: true }, (pino) => {
   const asJsonSym = (pino.symbols && pino.symbols.asJsonSym) || 'asJson'
 
-  return shimmer.wrapFunction(pino, pino => wrapPino(asJsonSym, wrapAsJson, pino))
+  return shimmer.wrapFunction(pino, pino => wrapPino(asJsonSym, pino))
 })
 
 addHook({ name: 'pino', versions: ['>=5 <6.8.0'], patchDefault: true }, (pino) => {
   const asJsonSym = ((pino.default || pino)?.symbols.asJsonSym) || 'asJson'
 
-  return shimmer.wrapFunction(pino, pino => wrapPino(asJsonSym, wrapAsJson, pino.default || pino))
+  return shimmer.wrapFunction(pino, pino => wrapPino(asJsonSym, pino.default || pino))
 })
 
 addHook({ name: 'pino', versions: ['>=6.8.0'], patchDefault: false }, (pino) => {
   const asJsonSym = pino.symbols.asJsonSym
 
-  const wrapped = shimmer.wrapFunction(pino, pino => wrapPino(asJsonSym, wrapAsJson, pino))
+  const wrapped = shimmer.wrapFunction(pino, pino => wrapPino(asJsonSym, pino))
   wrapped.pino = wrapped
   wrapped.default = wrapped
 

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

@@ -25,7 +25,7 @@ function wrapAddCommand (addCommand) {
     return startCh.runStores(ctx, () => {
       const res = addCommand.apply(this, arguments)
 
-      res.then(() => finish(finishCh, errorCh, ctx), err => finish(finishCh, errorCh, ctx, err))
+      res.then(() => finish(ctx), err => finish(ctx, err))
 
       return res
     })
@@ -85,13 +85,11 @@ addHook({ name: '@redis/client', file: 'dist/lib/client/commands-queue.js', vers
 
 addHook({ name: 'redis', versions: ['>=2.6 <4'] }, redis => {
   shimmer.wrap(redis.RedisClient.prototype, 'internal_send_command', internalSendCommand => function (options) {
-    if (!startCh.hasSubscribers) return internalSendCommand.apply(this, arguments)
-
-    if (!options.callback) return internalSendCommand.apply(this, arguments)
+    if (!startCh.hasSubscribers || !options.callback) return internalSendCommand.apply(this, arguments)
 
     const ctx = getStartCtx(this, options.command, options.args)
     return startCh.runStores(ctx, () => {
-      options.callback = wrapCallback(finishCh, errorCh, ctx, options.callback)
+      options.callback = wrapCallback(ctx, options.callback)
 
       try {
         return internalSendCommand.apply(this, arguments)
@@ -114,11 +112,11 @@ addHook({ name: 'redis', versions: ['>=0.12 <2.6'] }, redis => {
     const ctx = getStartCtx(this, command, args)
     return startCh.runStores(ctx, () => {
       if (typeof callback === 'function') {
-        arguments[2] = wrapCallback(finishCh, errorCh, ctx, callback)
+        arguments[2] = wrapCallback(ctx, callback)
       } else if (Array.isArray(args) && typeof args.at(-1) === 'function') {
-        args[args.length - 1] = wrapCallback(finishCh, errorCh, ctx, args.at(-1))
+        args[args.length - 1] = wrapCallback(ctx, args.at(-1))
       } else {
-        arguments[2] = wrapCallback(finishCh, errorCh, ctx)
+        arguments[2] = wrapCallback(ctx)
       }
 
       try {
@@ -155,20 +153,36 @@ function getStartCtx (client, command, args, argsStartIndex) {
   }
 }
 
-function wrapCallback (finishCh, errorCh, ctx, callback) {
+/**
+ * @param {Record<string, unknown> & { error?: Error }} ctx
+ * @param {Function} [callback]
+ */
+function wrapCallback (ctx, callback) {
   if (typeof callback !== 'function') return callback
   return function (err) {
-    return finish(finishCh, errorCh, ctx, err, callback, this, arguments)
+    return finish(ctx, err, callback, this, arguments)
   }
 }
 
-function finish (finishCh, errorCh, ctx, error, callback, thisArg, args) {
+/**
+ * @param {Record<string, unknown> & { error?: Error }} ctx
+ * @param {Error} [error]
+ * @param {Function} [callback]
+ * @param {object} [thisArg]
+ * @param {Iterable<unknown>} [args]
+ */
+function finish (ctx, error, callback, thisArg, args) {
   if (error) {
     ctx.error = error
     errorCh.publish(ctx)
   }
   if (callback) {
-    return finishCh.runStores(ctx, callback, thisArg, ...args)
+    return finishCh.runStores(
+      ctx,
+      /** @type {Parameters<typeof finishCh.runStores>[1]} */ (callback),
+      thisArg,
+      ...(/** @type {Iterable<unknown>} */ (args))
+    )
   }
-  finishCh.publish(ctx)
+  return finishCh.publish(ctx)
 }

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

@@ -91,6 +91,28 @@ function resolveLayerRouteOrForwardError (meta, layer, next) {
   }
 }
 
+// Wrapped `next` -> the host continuation it calls.
+const hostNexts = new WeakMap()
+
+/**
+ * Routers store their continuation on `req.next` once per `handle()`, and host
+ * APIs call it directly (express `res.format`, `res.sendFile` and `res.render`
+ * errors). Point it at the wrapper the current handler receives when that
+ * wrapper wraps the same continuation: `req.next` is the host continuation
+ * itself, or an earlier layer's wrapper of it. Route handlers receive a
+ * route-local continuation from `Route.dispatch`, so `req.next` keeps the
+ * router-level one there. A nested router restores its parent's `req.next`
+ * when it finishes.
+ *
+ * @param {import('node:http').IncomingMessage | undefined} req
+ * @param {Function} hostNext
+ * @param {Function} wrappedNext
+ */
+function adoptRequestNext (req, hostNext, wrappedNext) {
+  hostNexts.set(wrappedNext, hostNext)
+  if (req && (req.next === hostNext || hostNexts.get(req.next) === hostNext)) req.next = wrappedNext
+}
+
 /**
  * Build the request/error dispatch wrappers for one host (`express` / `router`).
  * They wrap the layer's prototype dispatch and read the side-table metadata, so
@@ -171,6 +193,7 @@ function createLayerDispatchWrappers (name) {
       }
 
       const wrappedNext = typeof next === 'function' ? wrapNext(req, meta.name, next) : next
+      if (wrappedNext !== next) adoptRequestNext(req, next, wrappedNext)
       enterChannel.publish({ name: meta.name, req, route, layer: this })
 
       try {
@@ -199,6 +222,7 @@ function createLayerDispatchWrappers (name) {
       }
 
       const wrappedNext = typeof next === 'function' ? wrapNext(req, meta.name, next) : next
+      if (wrappedNext !== next) adoptRequestNext(req, next, wrappedNext)
       enterChannel.publish({ name: meta.name, req, route, layer: this })
 
       try {
@@ -223,6 +247,7 @@ function createLayerDispatchWrappers (name) {
 
       let calls = 0
       if (typeof next === 'function') {
+        const hostNext = next
         next = shimmer.wrapCallback(next, originalNext => function next (error) {
           calls++
           if (calls === 1) {
@@ -238,6 +263,7 @@ function createLayerDispatchWrappers (name) {
 
           originalNext.apply(this, arguments)
         })
+        adoptRequestNext(req, hostNext, next)
       }
 
       const route = needMultiMatch ? resolveLayerRoute(meta, layer) : captureRoute
@@ -273,6 +299,7 @@ function createLayerDispatchWrappers (name) {
 
       let calls = 0
       if (typeof next === 'function') {
+        const hostNext = next
         next = shimmer.wrapCallback(next, originalNext => function next (nextError) {
           calls++
           if (calls === 1) {
@@ -288,6 +315,7 @@ function createLayerDispatchWrappers (name) {
 
           originalNext.apply(this, arguments)
         })
+        adoptRequestNext(req, hostNext, next)
       }
 
       const route = needMultiMatch ? resolveLayerRoute(meta, layer) : captureRoute
@@ -336,6 +364,7 @@ function createLayerDispatchWrappers (name) {
       const nextIndex = isErrorHandler ? 3 : 2
       let calls = 0
       if (typeof args[nextIndex] === 'function') {
+        const hostNext = args[nextIndex]
         args[nextIndex] = shimmer.wrapCallback(args[nextIndex], originalNext => function next (error) {
           calls++
           if (calls === 1) {
@@ -351,6 +380,7 @@ function createLayerDispatchWrappers (name) {
 
           originalNext.apply(this, arguments)
         })
+        adoptRequestNext(req, hostNext, args[nextIndex])
       }
 
       const route = needMultiMatch ? resolveLayerRoute(meta, layer) : captureRoute

package/packages/datadog-instrumentations/src/rum-browser-scripts.js

@@ -5,9 +5,7 @@
 /** @returns {{ isRumInstrumented: boolean, isRumActive: boolean, rumSamplingRate: number | null }} */
 function detectRum () {
   const isRumInstrumented = !!window.DD_RUM
-  const isRumActive = window.DD_RUM && window.DD_RUM.getInternalContext
-    ? !!window.DD_RUM.getInternalContext()
-    : false
+  const isRumActive = !!(window.DD_RUM && window.DD_RUM.getInternalContext && window.DD_RUM.getInternalContext())
   const rumInitConfiguration = window.DD_RUM && window.DD_RUM.getInitConfiguration
     ? window.DD_RUM.getInitConfiguration()
     : undefined
@@ -26,9 +24,7 @@ function stopRumSession () {
 
 function stopRumSessionAndReportActivity () {
   if (window.DD_RUM && window.DD_RUM.stopSession) {
-    const isRumActive = window.DD_RUM.getInternalContext
-      ? !!window.DD_RUM.getInternalContext()
-      : false
+    const isRumActive = !!(window.DD_RUM.getInternalContext && window.DD_RUM.getInternalContext())
     window.DD_RUM.stopSession()
     return isRumActive
   }

package/packages/datadog-instrumentations/src/vitest-main-no-worker-init.js

@@ -659,8 +659,7 @@ function createMainProcessReporter (reporterState) {
     },
 
     onTaskUpdate (packs, events) {
-      if (!isReporterActive()) return
-      if (!events) return
+      if (!isReporterActive() || !events) return
 
       for (const event of events) {
         if (event[1] === 'test-retried') {
@@ -685,8 +684,7 @@ function createMainProcessReporter (reporterState) {
     },
 
     onFinished (files) {
-      if (!isReporterActive()) return
-      if (!files) return
+      if (!isReporterActive() || !files) return
 
       for (const file of files) {
         const testModule = createTestModuleFromFile(file)
@@ -1276,10 +1274,12 @@ function reportFinalTestAttempt (testReport) {
         isQuarantined: testProperties.isQuarantined,
       })
     }
+    const attemptIndex = task.meta?.__ddTestOptCurrentAttemptIndex ?? 0
+    const attemptStartTime = task.meta?.__ddTestOptAttemptStartTimes?.[attemptIndex]
     const {
       isRumActive,
       testExecutionId,
-    } = getRumCorrelation(task)
+    } = getRumCorrelation(task, attemptIndex)
     testSkipCh.publish({
       ...browserEnvironment,
       testName,
@@ -1291,6 +1291,8 @@ function reportFinalTestAttempt (testReport) {
       isRumActive,
       isTestFrameworkWorker: true,
       requestErrorTags: state.requestErrorTags,
+      startTime: Number.isFinite(attemptStartTime) ? attemptStartTime : undefined,
+      duration: task.meta?.__ddTestOptAttemptDurations?.[attemptIndex],
       testStartLine: task.location?.line,
       testExecutionId,
       ...testSuiteStore,

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

@@ -300,8 +300,7 @@ function configureEfdSuiteTracker (testFilepaths, repositoryRoot) {
  * @param {boolean} hasNewTest
  */
 function reserveEarlyFlakeDetectionSuite (testSuite, hasNewTest) {
-  if (!isEfdSuiteAdmissionEnabled || typeof testSuite !== 'string') return false
-  if (isEarlyFlakeDetectionFaulty) return false
+  if (!isEfdSuiteAdmissionEnabled || typeof testSuite !== 'string' || isEarlyFlakeDetectionFaulty) return false
 
   if (hasNewTest) {
     suitesWithNewTests.add(testSuite)
@@ -1201,11 +1200,7 @@ function getSortWrapper (sort, frameworkVersion) {
 
 function getFinishWrapper (exitOrClose) {
   return async function () {
-    if (finishedSessionContexts.has(this)) {
-      return exitOrClose.apply(this, arguments)
-    }
-
-    if (!testSessionFinishCh.hasSubscribers) {
+    if (finishedSessionContexts.has(this) || !testSessionFinishCh.hasSubscribers) {
       return exitOrClose.apply(this, arguments)
     }
     finishedSessionContexts.add(this)
@@ -1230,15 +1225,15 @@ function getFinishWrapper (exitOrClose) {
     const tests = getTypeTasks(this.state.getFiles())
     const hasExecutedTests = tests.some(test =>
       test.mode !== 'skip' && test.mode !== 'todo' &&
-      test.result?.state !== 'skip' && test.result?.state !== 'todo'
+      (test.result?.state === 'pass' || test.result?.state === 'fail')
     )
     const hasErrors = hasRunError || error ||
       this.state.getCountOfFailedTests() > 0 || this.state.getUnhandledErrors().length > 0
-    const testSessionEmptyReason = !hasErrors && !hasExecutedTests
-      ? (isEmptyShard
-          ? 'zero_test_shard'
-          : tests.length > 0 || skippedSuites.length > 0 ? 'all_tests_skipped' : 'zero_tests')
-      : undefined
+    const testSessionEmptyReason = hasErrors || hasExecutedTests
+      ? undefined
+      : isEmptyShard
+        ? 'zero_test_shard'
+        : tests.length > 0 || skippedSuites.length > 0 ? 'all_tests_skipped' : 'zero_tests'
     const status = hasErrors ? 'fail' : (testSessionEmptyReason ? 'skip' : 'pass')
     const flushPromise = getChannelPromise(testSessionFinishCh, {
       status,
@@ -1758,8 +1753,7 @@ async function reportTypecheckFile (file, sessionConfiguration, frameworkVersion
 }
 
 async function reportTypecheckResults (result, frameworkVersion, ctx, typechecker, files = result?.files) {
-  if (!testSuiteFinishCh.hasSubscribers) return
-  if (!Array.isArray(result?.files) || !Array.isArray(files)) return
+  if (!testSuiteFinishCh.hasSubscribers || !Array.isArray(result?.files) || !Array.isArray(files)) return
 
   const setupState = ctx && mainProcessSetupStates.get(ctx)
   if (

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

@@ -33,7 +33,7 @@ const testManagementTestsCh = channel('ci:vitest:test-management-tests')
 const modifiedFilesCh = channel('ci:vitest:modified-files')
 
 const CLOSING_SCRIPT_TAG_RE = /<\/script/i
-const SERIALIZED_CONTEXT_PREFIX = '\u0000dd-vitest-context:'
+const SERIALIZED_CONTEXT_PREFIX = '\0dd-vitest-context:'
 
 const workerReportTraceCh = channel('ci:vitest:worker-report:trace')
 const workerReportCoverageCh = channel('ci:vitest:worker-report:coverage')
@@ -299,7 +299,7 @@ function getVitestTestProperties (providedContext, testSuiteAbsolutePath, testNa
 
   return {
     testSuite: testProperties?.testSuite,
-    isNew: Array.isArray(knownTests) ? !knownTests.includes(testName) : false,
+    isNew: Array.isArray(knownTests) && !knownTests.includes(testName),
     isModified: testProperties?.isModified === true,
     isAttemptToFix: testManagementProperties.isAttemptToFix,
     isDisabled: testManagementProperties.isDisabled,

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

@@ -354,8 +354,7 @@ function hasConcurrentTask (tasks) {
   if (!tasks) return false
 
   for (const task of tasks) {
-    if (task.concurrent === true) return true
-    if (hasConcurrentTask(task.tasks)) return true
+    if (task.concurrent === true || hasConcurrentTask(task.tasks)) return true
   }
 
   return false

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

@@ -3,9 +3,9 @@
 const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const { isTrue } = require('../../dd-trace/src/util')
 
-const VITEST_NO_WORKER_INIT_ACTIVE_ENV = 'DD_TEST_OPT_VITEST_NO_WORKER_INIT_ACTIVE'
-
 if (getEnvironmentVariable('DD_VITEST_WORKER') === '1') {
+  const VITEST_NO_WORKER_INIT_ACTIVE_ENV = 'DD_TEST_OPT_VITEST_NO_WORKER_INIT_ACTIVE'
+
   // In no-worker-init mode the main process reports Vitest events from reporter hooks.
   // Loading worker instrumentation here would reintroduce the worker tracer path.
   // eslint-disable-next-line eslint-rules/eslint-process-env

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

@@ -297,8 +297,7 @@ async function preloadRumNavigation () {
   try {
     const browser = this
     const testExecutionId = getRumTestExecutionId(browser)
-    if (!canCorrelateRumBrowser(browser)) return
-    if (!rumRunnerBrowsers.has(browser)) return
+    if (!canCorrelateRumBrowser(browser) || !rumRunnerBrowsers.has(browser)) return
 
     retainRumBrowser(browser)
     if (!testExecutionId) return
@@ -371,9 +370,7 @@ async function handleRumNavigation (context) {
       log.debug("RUM was detected on the page, but it isn't active because the sampling rate is below 100%")
     }
     const testExecutionId = getRumTestExecutionId(browser, isRumActive)
-    if (sampledOut) return
-
-    if (!testExecutionId) {
+    if (sampledOut || !testExecutionId) {
       return
     }
     if (!isRumActive && browser.isBidi) return
@@ -1736,9 +1733,7 @@ function handleWorkerMessage (state, workerRecord, message) {
         requestId,
       },
     })
-    if (!requestId || !uploadCh.hasSubscribers) {
-      respond(new Error('WebdriverIO media upload is not available'))
-    } else {
+    if (requestId && uploadCh.hasSubscribers) {
       try {
         let signal
         if (isVideo) {
@@ -1754,6 +1749,8 @@ function handleWorkerMessage (state, workerRecord, message) {
         log.error('WebdriverIO media upload error: %s', error?.message || String(error))
         respond(error)
       }
+    } else {
+      respond(new Error('WebdriverIO media upload is not available'))
     }
     return
   }

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

@@ -291,10 +291,7 @@ function dataLength (data) {
   if (data instanceof Blob) {
     return data.size
   }
-  if (ArrayBuffer.isView(data)) {
-    return data.byteLength
-  }
-  if (data instanceof ArrayBuffer) {
+  if (ArrayBuffer.isView(data) || data instanceof ArrayBuffer) {
     return data.byteLength
   }
   let total = 0

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

@@ -13,8 +13,7 @@ class AmqplibClientPlugin extends ClientPlugin {
   bindStart (ctx) {
     const { channel = {}, method, fields } = ctx
 
-    if (method === 'basic.deliver' || method === 'basic.get') return
-    if (method === 'basic.publish') return
+    if (method === 'basic.deliver' || method === 'basic.get' || method === 'basic.publish') return
 
     const stream = (channel.connection && channel.connection.stream) || {}
     const span = this.startSpan(this.operationName(), {

package/packages/datadog-plugin-avsc/src/schema_iterator.js

@@ -154,12 +154,8 @@ class SchemaExtractor {
     span.setTag(SCHEMA_NAME, descriptor.name)
     span.setTag(SCHEMA_OPERATION, operation)
 
-    if (!tracer._dataStreamsProcessor.canSampleSchema(operation)) {
-      return
-    }
-
     // if the span is unsampled, do not sample the schema
-    if (!tracer._prioritySampler.isSampled(span)) {
+    if (!tracer._dataStreamsProcessor.canSampleSchema(operation) || !tracer._prioritySampler.isSampled(span)) {
       return
     }
 

package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/handler.js

@@ -90,8 +90,7 @@ function finishOpenChildSpans (executeSpan) {
   if (!trace?.started) return
 
   for (const span of trace.started) {
-    if (span === executeSpan) continue
-    if (span._integrationName !== AwsDurableExecutionSdkJsHandlerPlugin.id) continue
+    if (span === executeSpan || span._integrationName !== AwsDurableExecutionSdkJsHandlerPlugin.id) continue
     if (span._duration === undefined) {
       span.finish()
     }

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

@@ -125,7 +125,7 @@ class BaseAwsSdkPlugin extends ClientPlugin {
     })
 
     this.addSub(`apm:aws:request:start:${this.serviceIdentifier}`, (ctx) => {
-      if (!IS_SERVERLESS) return
+      if (!IS_SERVERLESS || !ctx.currentStore?.span) return
 
       const { awsRegion, awsService, currentStore, request } = ctx
       const peerServerlessStorage = storage('peerServerless')
@@ -145,10 +145,8 @@ class BaseAwsSdkPlugin extends ClientPlugin {
       }
     })
 
-    this.addSub(`apm:aws:request:region:${this.serviceIdentifier}`, ({ region }) => {
-      const store = storage('legacy').getStore()
-      if (!store) return
-      const { span } = store
+    this.addSub(`apm:aws:request:region:${this.serviceIdentifier}`, ({ region, currentStore }) => {
+      const span = currentStore?.span
       if (!span) return
       span.setTag('aws.region', region)
       span.setTag('region', region)
@@ -160,7 +158,7 @@ class BaseAwsSdkPlugin extends ClientPlugin {
 
       if (!IS_SERVERLESS) return
 
-      const hostname = getHostname(store, region)
+      const hostname = getHostname(currentStore, region)
       if (!hostname) return
 
       span.setTag('peer.service', hostname)
@@ -338,8 +336,7 @@ function getHooks (config) {
 }
 
 function getHostname (store, region) {
-  if (!store) return
-  if (!region) return
+  if (!store || !region) return
   const { awsParams, awsService } = store
   switch (awsService) {
     case 'CloudWatchEvents':

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

@@ -2,15 +2,33 @@
 
 const CompositePlugin = require('../../../../dd-trace/src/plugins/composite')
 const BedrockRuntimeLLMObsPlugin = require('../../../../dd-trace/src/llmobs/plugins/bedrockruntime')
+const SonicLLMObsPlugin = require('../../../../dd-trace/src/llmobs/plugins/nova-sonic')
 const BedrockRuntimeTracing = require('./tracing')
+const SonicTracingPlugin = require('./sonic')
 class BedrockRuntimePlugin extends CompositePlugin {
   static id = 'bedrockruntime'
 
   static get plugins () {
     return {
       llmobs: BedrockRuntimeLLMObsPlugin,
+      sonicLlmobs: SonicLLMObsPlugin,
       tracing: BedrockRuntimeTracing,
+      sonicTracing: SonicTracingPlugin,
     }
   }
+
+  /** @param {import('../../../../../').plugins.aws_sdk | boolean} config */
+  configure (config) {
+    if (typeof config === 'boolean') config = { enabled: config }
+    const bedrock = config.bedrockruntime
+    if (config.enabled === false || bedrock === false || bedrock?.enabled === false ||
+        this._tracerConfig.DD_TRACE_AWS_SDK_BEDROCKRUNTIME_ENABLED === false) {
+      // Disable the whole service before any child can subscribe and enable conversation capture.
+      return super.configure(false)
+    }
+    const normalized = { ...config, ...bedrock }
+    if (config.llmobs === false) normalized.llmobs = false
+    super.configure(normalized)
+  }
 }
 module.exports = BedrockRuntimePlugin