dd-trace 6.20.1 → 6.22.0

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

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

@@ -51,6 +51,8 @@ const {
   TEST_ITR_UNSKIPPABLE,
   TEST_ITR_FORCED_RUN,
   TEST_ITR_SKIPPING_ENABLED,
+  TEST_ITR_SKIPPING_COUNT,
+  TEST_ITR_TESTS_SKIPPED,
   ITR_CORRELATION_ID,
   TEST_SOURCE_FILE,
   TEST_IS_NEW,
@@ -1045,6 +1047,11 @@ class CypressPlugin {
       ...this.getSessionItrSkippingEnabledTags(),
     }
 
+    if (this.isItrEnabled) {
+      testSuiteSpanMetadata[TEST_ITR_SKIPPING_COUNT] = 0
+      testSuiteSpanMetadata[TEST_ITR_TESTS_SKIPPED] = 'false'
+    }
+
     this.ciVisEvent(TELEMETRY_EVENT_CREATED, 'suite')
 
     if (testSuiteAbsolutePath) {
@@ -1519,11 +1526,7 @@ class CypressPlugin {
       : undefined
     const testSpan = this.activeTestSpan || lastFailedTestSpan
 
-    if (!testSpan) {
-      return
-    }
-
-    if (!isFailureScreenshotForUpload(details)) {
+    if (!testSpan || !isFailureScreenshotForUpload(details)) {
       return
     }
 
@@ -2092,6 +2095,16 @@ class CypressPlugin {
           if (!this.skippedTestIds.has(skippedTestId)) {
             this.skippedTestIds.add(skippedTestId)
             this.skippedTests.push(test)
+            const testSuiteSpan = this.#pendingTestSuiteSpans.get(testSuite)
+            if (this.isItrEnabled && testSuiteSpan) {
+              try {
+                const count = testSuiteSpan.context().getTag(TEST_ITR_SKIPPING_COUNT) || 0
+                testSuiteSpan.setTag(TEST_ITR_SKIPPING_COUNT, count + 1)
+                testSuiteSpan.setTag(TEST_ITR_TESTS_SKIPPED, 'true')
+              } catch (error) {
+                log.error('Could not report Test Impact Analysis skips for suite %s: %s', testSuite, error)
+              }
+            }
           }
           this.isTestsSkipped = true
           return { shouldSkip: true }

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)