dd-trace 6.21.0 → 6.22.0

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

@@ -0,0 +1,45 @@
+'use strict'
+
+const { storage } = require('../../../../datadog-core')
+const TracingPlugin = require('../../../../dd-trace/src/plugins/tracing')
+
+const legacyStorage = storage('legacy')
+
+class SonicTracingPlugin extends TracingPlugin {
+  static id = 'bedrockruntime_sonic'
+  static component = 'aws-sdk'
+  static operation = 'sonic'
+  static prefix = 'tracing:apm:aws:bedrockruntime:sonic:span'
+
+  constructor (...args) {
+    super(...args)
+    this.addSub('dd-trace:aws:bedrockruntime:sonic:capture-context', context => {
+      const store = legacyStorage.getStore()
+      const previous = context.runInContext ?? (fn => fn())
+      context.runInContext = fn => previous(() => legacyStorage.run(store, fn))
+    })
+  }
+
+  /** @param {object} ctx */
+  bindStart (ctx) {
+    this.startSpan('aws.bedrockruntime.sonic', {
+      service: this.config.service,
+      resource: ctx.name,
+      type: 'bedrockruntime',
+      kind: 'client',
+      startTime: ctx.startTime,
+      meta: { 'aws.bedrock.request.model': ctx.model },
+    }, ctx)
+    return ctx.currentStore
+  }
+
+  /** @param {object} ctx */
+  end (ctx) {
+    const span = ctx.currentStore?.span
+    if (!span) return
+    if (ctx.descriptor.error) span.setTag('error', ctx.descriptor.error)
+    span.finish(ctx.finishTime)
+  }
+}
+
+module.exports = SonicTracingPlugin

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

@@ -174,9 +174,15 @@ class Kinesis extends BaseAwsSdkPlugin {
 
   responseExtractDSMContext (operation, params, response, span, kwargs = {}) {
     const { streamName } = kwargs
-    if (!this.config.dsmEnabled) return
-    if (operation !== 'getRecords') return
-    if (!response || !response.Records || !response.Records[0]) return
+    if (
+      !this.config.dsmEnabled ||
+      operation !== 'getRecords' ||
+      !response ||
+      !response.Records ||
+      !response.Records[0]
+    ) {
+      return
+    }
 
     // Only attribute payloadSize to the span when there is a single record.
     span = response.Records.length > 1 ? null : span

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

@@ -202,8 +202,7 @@ class Sqs extends BaseAwsSdkPlugin {
    * @returns {Array<Record<string, string> | undefined> | undefined}
    */
   responseExtract (params, operation, response) {
-    if (operation !== 'receiveMessage') return
-    if (!response?.Messages?.length) return
+    if (operation !== 'receiveMessage' || !response?.Messages?.length) return
 
     return response.Messages.map(message => this.parseMessageCarrier(message))
   }
@@ -261,9 +260,7 @@ class Sqs extends BaseAwsSdkPlugin {
    *   carriers are parsed here.
    */
   responseExtractDSMContext (operation, params, response, span, carriers) {
-    if (!this.config.dsmEnabled) return
-    if (operation !== 'receiveMessage') return
-    if (!response?.Messages?.length) return
+    if (!this.config.dsmEnabled || operation !== 'receiveMessage' || !response?.Messages?.length) return
 
     const messages = response.Messages
     // Only attribute payloadSize to the span when there is a single message.

package/packages/datadog-plugin-azure-durable-functions/src/index.js

@@ -2,6 +2,7 @@
 
 const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
 const { AUTO_KEEP } = require('../../../ext/priority')
+const { getIsAzureContainerApp } = require('../../dd-trace/src/serverless')
 const { writeTraceparent, writeTracestate } = require('../../dd-trace/src/carrier')
 
 const ORCHESTRATION_FAILURE_END_CHANNEL =
@@ -39,7 +40,7 @@ class AzureDurableFunctionsPlugin extends TracingPlugin {
       childOf = this.tracer.extract('text_map', carrier) ?? undefined
     }
     const extractedAsDrop = childOf?._sampling.priority < AUTO_KEEP
-
+    const prefix = getIsAzureContainerApp() ? 'aca' : 'aas'
     const span = this.startSpan(this.operationName(), {
       startTime: ctx.startTime,
       childOf,
@@ -48,15 +49,15 @@ class AzureDurableFunctionsPlugin extends TracingPlugin {
 
       meta: {
         component: 'azure-functions',
-        'aas.function.name': ctx.functionName,
-        'aas.function.trigger': ctx.trigger,
+        [`${prefix}.function.name`]: ctx.functionName,
+        [`${prefix}.function.trigger`]: ctx.trigger,
         'resource.name': `${ctx.trigger} ${ctx.functionName}`,
       },
     }, ctx)
 
     // in the case of entity functions, operationName should be available
     if (ctx.operationName) {
-      span.setTag('aas.function.operation', ctx.operationName)
+      span.setTag(`${prefix}.function.operation`, ctx.operationName)
       span.setTag('resource.name', `${ctx.trigger} ${ctx.functionName} ${ctx.operationName}`
       )
     }

package/packages/datadog-plugin-azure-functions/src/index.js

@@ -2,6 +2,7 @@
 
 const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
 const web = require('../../dd-trace/src/plugins/util/web')
+const { getIsAzureContainerApp } = require('../../dd-trace/src/serverless')
 
 const triggerMap = {
   deleteRequest: 'Http',
@@ -52,7 +53,6 @@ class AzureFunctionsPlugin extends TracingPlugin {
         req,
         ctx
       )
-
       span._integrationName = 'azure-functions'
       span.context().setTag('component', 'azure-functions')
       span.addTags(meta)
@@ -102,9 +102,11 @@ class AzureFunctionsPlugin extends TracingPlugin {
 }
 
 function getMetaForTrigger ({ functionName, methodName, invocationContext }) {
+  const prefix = getIsAzureContainerApp() ? 'aca' : 'aas'
+
   let meta = {
-    'aas.function.name': functionName,
-    'aas.function.trigger': mapTriggerTag(methodName),
+    [`${prefix}.function.name`]: functionName,
+    [`${prefix}.function.trigger`]: mapTriggerTag(methodName),
     'span.type': 'serverless',
   }
 

package/packages/datadog-plugin-claude-agent-sdk/src/index.js

@@ -1,7 +1,5 @@
 'use strict'
 
-require('../../datadog-instrumentations/src/claude-agent-sdk')
-
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 const ClaudeAgentSdkLLMObsPlugins = require('../../dd-trace/src/llmobs/plugins/claude-agent-sdk')
 const ClaudeAgentSdkTracingPlugins = require('./tracing')

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

@@ -1526,11 +1526,7 @@ class CypressPlugin {
       : undefined
     const testSpan = this.activeTestSpan || lastFailedTestSpan
 
-    if (!testSpan) {
-      return
-    }
-
-    if (!isFailureScreenshotForUpload(details)) {
+    if (!testSpan || !isFailureScreenshotForUpload(details)) {
       return
     }
 

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

@@ -53,12 +53,12 @@ class CypressPlugin extends Plugin {
       // downstream steps — then run the plugin's afterScreenshot on those
       // details and propagate the value back to Cypress. The user handler runs
       // regardless of whether screenshot upload is enabled.
-      const registerAfterScreenshot = (afterScreenshotHandler) => {
+      const registerAfterScreenshot = () => {
         const filteredUserAfterScreenshotHandlers = userAfterScreenshotHandlers.filter(
-          handler => handler !== afterScreenshotHandler
+          handler => handler !== datadogAfterScreenshotHandler
         )
         if (filteredUserAfterScreenshotHandlers.length === 0) {
-          if (afterScreenshotHandler) on('after:screenshot', afterScreenshotHandler)
+          if (datadogAfterScreenshotHandler) on('after:screenshot', datadogAfterScreenshotHandler)
           return
         }
 
@@ -73,7 +73,7 @@ class CypressPlugin extends Plugin {
             Promise.resolve(details)
           )
           return chain.then((finalDetails) => {
-            if (afterScreenshotHandler) afterScreenshotHandler(finalDetails)
+            if (datadogAfterScreenshotHandler) datadogAfterScreenshotHandler(finalDetails)
             return finalDetails
           })
         })
@@ -90,14 +90,14 @@ class CypressPlugin extends Plugin {
             Promise.resolve()
           ))
         }
-        registerAfterScreenshot(datadogAfterScreenshotHandler)
+        registerAfterScreenshot()
         registerAfterRunWithCleanup()
         payload.registered = true
         return
       }
 
       registerBeforeRun(cypressPlugin.beforeRun.bind(cypressPlugin))
-      registerAfterScreenshot(datadogAfterScreenshotHandler)
+      registerAfterScreenshot()
 
       on('after:spec', (spec, results) => {
         const chain = userAfterSpecHandlers.reduce(

package/packages/datadog-plugin-cypress/src/source-map-utils.js

@@ -26,8 +26,7 @@ function isJavaScriptFile (absoluteFilePath) {
  * @param {number} testSourceLine
  */
 function shouldTrustInvocationDetailsLine (absoluteFilePath, testSourceLine) {
-  if (!Number.isInteger(testSourceLine) || testSourceLine < 1) return false
-  if (!isJavaScriptFile(absoluteFilePath)) return false
+  if (!Number.isInteger(testSourceLine) || testSourceLine < 1 || !isJavaScriptFile(absoluteFilePath)) return false
 
   return getCachedSourceMap(absoluteFilePath) === null
 }

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

@@ -52,10 +52,7 @@ Cypress.on('command:end', (command) => {
   if (name === 'task' && args && typeof args[0] === 'string' && args[0].startsWith('dd:')) {
     return
   }
-  if (INTERNAL_CYPRESS_COMMANDS.has(name)) {
-    return
-  }
-  if (entry == null) {
+  if (INTERNAL_CYPRESS_COMMANDS.has(name) || entry == null) {
     return
   }
   const err = command.get('err')

package/packages/datadog-plugin-express/src/code_origin.js

@@ -26,8 +26,7 @@ class ExpressCodeOriginForSpansPlugin extends Plugin {
 
     // Route added handling: compute and cache tags
     const handleRouteAdded = ({ topOfStackFunc, layer }) => {
-      if (!layer) return
-      if (layerTags.has(layer)) return
+      if (!layer || layerTags.has(layer)) return
       layerTags.set(layer, entryTags(topOfStackFunc))
     }
 

package/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { getMessageSize } = require('../../dd-trace/src/datastreams')
+const { getHeadersSize, getSizeOrZero } = require('../../dd-trace/src/datastreams')
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
 const { storage } = require('../../datadog-core')
 const reconstructPubSubRequestContext = require('./pubsub-request-context')
@@ -82,7 +82,7 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
     const { span } = ctx.currentStore
     const subscription = message._subscriber._subscription
     const topic = subscription?.metadata?.topic || message.attributes?.['pubsub.topic']
-    const payloadSize = getMessageSize(message)
+    const payloadSize = getSizeOrZero(message.data) + getHeadersSize(message.attributes)
     this.tracer.decodeDataStreamsContext(message.attributes)
     this.tracer
       .setCheckpoint(['direction:in', `topic:${topic}`, 'type:google-pubsub'], span, payloadSize)

package/packages/datadog-plugin-google-cloud-pubsub/src/producer.js

@@ -46,8 +46,7 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
   }
 
   start (ctx) {
-    if (!this.config.dsmEnabled) return
-    if (ctx.api !== 'publish' || !ctx.currentStore) return
+    if (!this.config.dsmEnabled || ctx.api !== 'publish' || !ctx.currentStore) return
     const { request } = ctx
     const messages = request.messages || []
     const topic = request.topic

package/packages/datadog-plugin-graphql/src/execute.js

@@ -78,8 +78,8 @@ if (asyncDisposeSymbol === undefined) {
 }
 
 class AbortError extends Error {
-  constructor (message) {
-    super(message)
+  constructor () {
+    super('Aborted')
     this.name = 'AbortError'
   }
 }
@@ -599,7 +599,7 @@ function wrapResolve (resolve, isJit = false) {
     }
 
     if (rootCtx.abortController?.signal.aborted) {
-      throw new AbortError('Aborted')
+      throw new AbortError()
     }
 
     if (!traceResolver) {
@@ -736,7 +736,7 @@ function resolveCompiledJitField (rootCtx, descriptorId, resolve, self, source,
   }
 
   if (rootCtx.abortController?.signal.aborted) {
-    throw new AbortError('Aborted')
+    throw new AbortError()
   }
 
   const depth = config.countListIndices ? descriptor.pathDepth : descriptor.selectionDepth
@@ -930,7 +930,7 @@ function resolveJitDefaultInvocation (rootCtx, descriptorId, source, path, argum
     }
   }
   if (rootCtx.abortController?.signal.aborted) {
-    throw new AbortError('Aborted')
+    throw new AbortError()
   }
 
   const depth = rootCtx.config.countListIndices ? descriptor.pathDepth : descriptor.selectionDepth

package/packages/datadog-plugin-grpc/src/util.js

@@ -71,9 +71,8 @@ module.exports = {
   },
 
   addMetadataTags (span, metadata, filter, type) {
-    if (!metadata || typeof metadata.getMap !== 'function') return
     // Default no-op filter: skip the full metadata clone via `getMap()`.
-    if (filter === getEmptyObject) return
+    if (!metadata || typeof metadata.getMap !== 'function' || filter === getEmptyObject) return
 
     const values = filter(metadata.getMap())
 

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

@@ -63,8 +63,7 @@ class KafkajsProducerPlugin extends ProducerPlugin {
     const commitList = ctx.result
     const clusterId = ctx.clusterId
 
-    if (!this.config.dsmEnabled) return
-    if (!commitList || !Array.isArray(commitList)) return
+    if (!this.config.dsmEnabled || !commitList || !Array.isArray(commitList)) return
     for (const rawCommit of commitList) {
       const commit = this.transformProduceResponse(rawCommit, clusterId)
       this.tracer.setOffset(commit)

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

@@ -651,9 +651,9 @@ class MochaPlugin extends CiPlugin {
         testSuiteMetadata[TEST_ITR_FORCED_RUN] = 'true'
         this.telemetry.count(TELEMETRY_ITR_FORCED_TO_RUN, { testLevel: 'suite' })
       }
-      testSuiteMetadata[TEST_SOURCE_FILE] = this.repositoryRoot !== this.sourceRoot && !!this.repositoryRoot
-        ? getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
-        : testSuite
+      testSuiteMetadata[TEST_SOURCE_FILE] = this.repositoryRoot === this.sourceRoot || !this.repositoryRoot
+        ? testSuite
+        : getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
       if (testSuiteMetadata[TEST_SOURCE_FILE]) {
         testSuiteMetadata[TEST_SOURCE_START] = 1
       }
@@ -1113,10 +1113,7 @@ class MochaPlugin extends CiPlugin {
   #startWebdriverioJasmineTest (result, specs, currentSuite) {
     const state = this._webdriverioJasmineState
     const currentStore = storage('legacy').getStore()
-    if (!state || !result?.id) {
-      return currentStore
-    }
-    if (state.completedTestStatuses.has(result.id)) {
+    if (!state || !result?.id || state.completedTestStatuses.has(result.id)) {
       return currentStore
     }
 
@@ -1962,9 +1959,9 @@ class MochaPlugin extends CiPlugin {
     const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.sourceRoot)
     const testSuiteSpan = this._testSuiteSpansByTestSuite.get(testSuite)
 
-    extraTags[TEST_SOURCE_FILE] = this.repositoryRoot !== this.sourceRoot && !!this.repositoryRoot
-      ? getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
-      : testSuite
+    extraTags[TEST_SOURCE_FILE] = this.repositoryRoot === this.sourceRoot || !this.repositoryRoot
+      ? testSuite
+      : getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
 
     if (isNew) {
       extraTags[TEST_IS_NEW] = 'true'

package/packages/datadog-plugin-mocha/src/webdriverio-video.js

@@ -141,9 +141,13 @@ class WebdriverioVideo {
     captureOwners.set(browser, this)
     this.#onResult = /** @param {{command?: string, endpoint?: string}} event */ (event) => {
       const { command, endpoint } = event
-      if (command === 'takeScreenshot' || endpoint?.endsWith('/screenshot')) return
-      // WDIO looks up the context before BiDi navigation. Capturing in that gap can block navigation.
-      if (command === 'getWindowHandle' || command === 'getWindowHandles') return
+      if (
+        command === 'takeScreenshot' || endpoint?.endsWith('/screenshot') ||
+        // WDIO looks up the context before BiDi navigation. Capturing in that gap can block navigation.
+        command === 'getWindowHandle' || command === 'getWindowHandles'
+      ) {
+        return
+      }
       this.capture()
     }
     browser.on?.('result', this.#onResult)
@@ -252,7 +256,7 @@ class WebdriverioVideo {
     const frames = Array.isArray(screenshots) ? screenshots : [screenshots]
     if (!frames.length) throw new Error('WebdriverIO returned no video frames')
     for (let index = 0; index < frames.length; index++) {
-      if (typeof frames[index] !== 'string') throw new Error('WebdriverIO returned an invalid video frame')
+      if (typeof frames[index] !== 'string') throw new TypeError('WebdriverIO returned an invalid video frame')
       if (Buffer.byteLength(frames[index], 'base64') > MAX_FRAME_BYTES - frameBytes) {
         throw new Error('WebdriverIO video frames exceeded the 200 MiB worker limit')
       }

package/packages/datadog-plugin-mongodb-core/src/query.js

@@ -181,10 +181,9 @@ function canStringifyDirectWalk (value, depth) {
         child._bsontype !== undefined ||
         isRegExp(child) ||
         isMap(child) ||
-        typeof child.toJSON === 'function') {
+        typeof child.toJSON === 'function' || !canStringifyDirectWalk(child, depth + 1)) {
       return false
     }
-    if (!canStringifyDirectWalk(child, depth + 1)) return false
   }
   return true
 }
@@ -322,9 +321,13 @@ function buildRedact (value, ancestors) {
   // `value === original` short-circuit.
   if (typeof value.toJSON === 'function') {
     const json = value.toJSON()
-    if (typeof json !== 'object' || json === null || json === value) return REDACT_LEAF
-    // Re-screen: toJSON can return a TypedArray or Binary BSON wrapper.
-    if (ArrayBuffer.isView(json) || json._bsontype === 'Binary') return REDACT_LEAF
+    if (
+      typeof json !== 'object' || json === null || json === value ||
+      // Re-screen: toJSON can return a TypedArray or Binary BSON wrapper.
+      ArrayBuffer.isView(json) || json._bsontype === 'Binary'
+    ) {
+      return REDACT_LEAF
+    }
     value = json
   } else if (bsontype !== undefined) {
     return REDACT_LEAF

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

@@ -107,8 +107,7 @@ class NextPlugin extends ServerPlugin {
     const { req, res, nextRequest = {} } = ctx
     const store = ctx.currentStore ?? storage('legacy').getStore()
 
-    if (!store) return
-    if (reusedNextRequestStores.has(store)) return
+    if (!store || reusedNextRequestStores.has(store)) return
 
     const span = store.span
     const error = ctx.error ?? span.context().getTag('error')

package/packages/datadog-plugin-openai/src/tracing.js

@@ -295,8 +295,7 @@ class OpenAiTracingPlugin extends TracingPlugin {
   }
 
   sendLog (methodName, span, tags, openaiStore, error) {
-    if (!openaiStore) return
-    if (!this.sampler.isSampled(span)) return
+    if (!openaiStore || !this.sampler.isSampled(span)) return
 
     const log = {
       status: error ? 'error' : 'info',
@@ -334,6 +333,10 @@ function normalizeMethodName (methodName) {
     case 'responses.create':
       return 'createResponse'
 
+    // decisions
+    case 'decisions.create':
+      return 'createDecision'
+
     // files
     case 'files.create':
       return 'createFile'

package/packages/datadog-plugin-openai-agents/src/integration.js

@@ -460,8 +460,12 @@ class OpenAIAgentsIntegration {
    */
   #llmSpanParentAgentName (oaiSpan) {
     const traceInfo = this.#traceInfo.get(oaiSpan.traceId)
-    if (!traceInfo?.currentTopLevelAgentSpanId) return
-    if (!this.#hasUntracedPathToAncestor(oaiSpan.parentId, traceInfo.currentTopLevelAgentSpanId)) return
+    if (
+      !traceInfo?.currentTopLevelAgentSpanId ||
+      !this.#hasUntracedPathToAncestor(oaiSpan.parentId, traceInfo.currentTopLevelAgentSpanId)
+    ) {
+      return
+    }
     return traceInfo.currentTopLevelAgentName
   }
 

package/packages/datadog-plugin-openai-agents/src/processor.js

@@ -64,8 +64,7 @@ class DDOpenAIAgentsProcessor {
 
   onSpanStart (oaiSpan) {
     const integration = this._getIntegration()
-    if (!integration?.enabled) return RESOLVED
-    if (!oaiSpan?.spanData) return RESOLVED // guard NoopSpan
+    if (!integration?.enabled || !oaiSpan?.spanData) return RESOLVED // guard NoopSpan
     const type = oaiSpan.spanData.type
     const kind = SPAN_KIND_BY_TYPE[type]
     try {
@@ -84,8 +83,7 @@ class DDOpenAIAgentsProcessor {
 
   onSpanEnd (oaiSpan) {
     const integration = this._getIntegration()
-    if (!integration?.enabled) return RESOLVED
-    if (!oaiSpan?.spanData) return RESOLVED
+    if (!integration?.enabled || !oaiSpan?.spanData) return RESOLVED
     const type = oaiSpan.spanData.type
     const kind = SPAN_KIND_BY_TYPE[type]
     try {

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

@@ -1,9 +1,12 @@
 'use strict'
 
+const { performance } = require('node:perf_hooks')
+
 const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 
+const ACQUIRE_START_CHANNEL = 'tracing:orchestrion:postgres:query:acquire:start'
 const PREPARE_START_CHANNEL = 'tracing:orchestrion:postgres:query:prepare:start'
 
 /**
@@ -14,6 +17,8 @@ const PREPARE_START_CHANNEL = 'tracing:orchestrion:postgres:query:prepare:start'
  * @property {string} [host]
  * @property {number} [pid]
  * @property {number} [port]
+ * @property {boolean} [poolWaitFinished]
+ * @property {number} [poolWaitStartMs]
  * @property {PostgresQuery} query
  * @property {string} [statement]
  * @property {string} user
@@ -63,12 +68,16 @@ class PostgresPlugin extends DatabasePlugin {
   /** @type {WeakMap<PostgresQuery, import('../../..').Span>} */
   #spans = new WeakMap()
 
+  /** @type {WeakMap<PostgresQuery, PostgresContext>} */
+  #waitContexts = new WeakMap()
+
   /**
    * @param {object} tracer
    * @param {import('../../dd-trace/src/config/config-base')} tracerConfig
    */
   constructor (tracer, tracerConfig) {
     super(tracer, tracerConfig)
+    this.addSub(ACQUIRE_START_CHANNEL, ctx => this.#finishPoolWait(ctx.query))
     this.#preparation = new PostgresPreparationPlugin(this.#prepare.bind(this), tracer, tracerConfig)
   }
 
@@ -112,12 +121,26 @@ class PostgresPlugin extends DatabasePlugin {
     }
 
     this.#spans.set(query, span)
+    this.#waitContexts.set(query, ctx)
     if (this.#dbmEnabled) {
       this.#dbmQueries.set(query, { service: service.name })
     }
     return ctx.currentStore
   }
 
+  /**
+   * @param {PostgresQuery} query
+   */
+  #finishPoolWait (query) {
+    const ctx = this.#waitContexts.get(query)
+    if (ctx === undefined) return
+
+    this.#waitContexts.delete(query)
+    ctx.poolWaitFinished = true
+    const waitTime = ctx.poolWaitStartMs === undefined ? 0 : performance.now() - ctx.poolWaitStartMs
+    ctx.currentStore.span.setTag('db.pool.wait_time_ms', waitTime)
+  }
+
   /**
    * @param {PostgresPreparationContext} ctx
    */
@@ -152,6 +175,7 @@ class PostgresPlugin extends DatabasePlugin {
     this.#dbmQueries.delete(query)
     if (span === undefined) return
 
+    this.#finishPoolWait(query)
     this.#spans.delete(query)
 
     const statement = dbmState?.statement ?? result.statement

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

@@ -144,12 +144,8 @@ class SchemaExtractor {
     span.setTag(SCHEMA_NAME, removeLeadingPeriod(descriptor.fullName))
     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-rhea/src/consumer.js

@@ -52,10 +52,7 @@ class RheaConsumerPlugin extends ConsumerPlugin {
 
 function getResourceNameFromMessage (msgObj) {
   let resourceName = 'amq.topic'
-  let options = {}
-  if (msgObj.receiver && msgObj.receiver.options) {
-    options = msgObj.receiver.options
-  }
+  const options = msgObj.receiver && msgObj.receiver.options ? msgObj.receiver.options : {}
   if (options.source && options.source.address) {
     resourceName = options.source.address
   }

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

@@ -354,6 +354,8 @@ class VitestPlugin extends CiPlugin {
       browserProjectName,
       testExecutionId,
       testStartLine,
+      startTime,
+      duration,
     }) => {
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
       const extraTags = {
@@ -380,10 +382,11 @@ class VitestPlugin extends CiPlugin {
         testSuite,
         testSuiteSpan || this.testSuiteSpan,
         extraTags,
-        testExecutionId
+        testExecutionId,
+        startTime
       )
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', this.getTestTelemetryTags(testSpan))
-      testSpan.finish()
+      testSpan.finish(Number.isFinite(duration) && duration >= 0 ? testSpan._startTime + duration : undefined)
     })
 
     this.addBind('ci:vitest:test-suite:start', (ctx) => {