dd-trace 6.12.0 → 6.14.0

package/packages/dd-trace/src/llmobs/plugins/ai/ddTelemetry.js

@@ -4,7 +4,6 @@ const { channel } = require('dc-polyfill')
 const BaseLLMObsPlugin = require('../base')
 const { getModelProvider } = require('../../../../../datadog-plugin-ai/src/utils')
 
-const toolCreationCh = channel('tracing:orchestrion:ai:tool:start')
 const setAttributesCh = channel('dd-trace:vercel-ai:span:setAttributes')
 
 const { MODEL_NAME, MODEL_PROVIDER, NAME } = require('../../constants/tags')
@@ -21,16 +20,10 @@ const {
   getTelemetryMetadata,
 } = require('./util')
 
-/**
- * @typedef {Record<string, unknown> & { description?: string, id?: string }} AvailableToolArgs
- */
-
 /**
  * @typedef {string | number | boolean | null | undefined | string[] | number[] | boolean[]} TagValue
  * @typedef {Record<string, TagValue>} SpanTags
  *
- * @typedef {{ name?: string, description?: string }} ToolForModel
- *
  * @typedef {{ type: 'text' | 'reasoning' | 'redacted-reasoning', text?: string, data?: string }} TextPart
  * @typedef {{ type: 'tool-call', toolName: string, toolCallId: string, args?: unknown, input?: unknown }} ToolCallPart
  * @typedef {(
@@ -76,58 +69,14 @@ class DdTelemetryPlugin extends BaseLLMObsPlugin {
   static integration = 'ai'
   static prefix = 'tracing:dd-trace:vercel-ai'
 
-  /**
-   * The available tools within the runtime scope of this integration.
-   * This essentially acts as a global registry for all tools made through the Vercel AI SDK.
-   * @type {Set<AvailableToolArgs>}
-   */
-  #availableTools
-
-  /**
-   * A mapping of tool call IDs to tool names.
-   * This is used to map the tool call ID to the tool name for the output message.
-   * @type {Record<string, string>}
-   */
-  #toolCallIdsToName
-
   constructor (...args) {
     super(...args)
 
-    this.#toolCallIdsToName = {}
-    this.#availableTools = new Set()
-    toolCreationCh.subscribe(ctx => {
-      const toolArgs = ctx.arguments
-      const tool = toolArgs[0] ?? {}
-      this.#availableTools.add(tool)
-    })
-
     setAttributesCh.subscribe(({ ctx, attributes }) => {
       Object.assign(ctx.attributes, attributes)
     })
   }
 
-  /**
-   * Does a best-effort attempt to find the right tool name for the given tool description.
-   * This is because the Vercel AI SDK does not tag tools by name properly, but
-   * rather by the index they were passed in. Tool names appear nowhere in the span tags.
-   *
-   * We use the tool description as the next best identifier for a tool.
-   *
-   * @param {string} toolName
-   * @param {string | undefined} toolDescription
-   * @returns {string | undefined}
-   */
-  findToolName (toolName, toolDescription) {
-    if (Number.isNaN(Number.parseInt(toolName, 10))) return toolName
-
-    for (const availableTool of this.#availableTools) {
-      const description = availableTool.description
-      if (description === toolDescription && availableTool.id) {
-        return availableTool.id
-      }
-    }
-  }
-
   /**
    * @override
    */
@@ -232,7 +181,13 @@ class DdTelemetryPlugin extends BaseLLMObsPlugin {
     const lastUserPrompt =
       promptInfo.prompt ??
       promptInfo.messages.reverse().find(message => message.role === 'user')?.content
-    const prompt = Array.isArray(lastUserPrompt) ? lastUserPrompt.map(part => part.text ?? '').join('') : lastUserPrompt
+    let prompt = lastUserPrompt
+    if (Array.isArray(lastUserPrompt)) {
+      prompt = ''
+      for (const part of lastUserPrompt) {
+        if (typeof part.text === 'string') prompt += part.text
+      }
+    }
 
     const output = tags['ai.response.object']
 
@@ -248,7 +203,13 @@ class DdTelemetryPlugin extends BaseLLMObsPlugin {
     const lastUserPrompt =
       promptInfo.prompt ??
       promptInfo.messages.reverse().find(message => message.role === 'user')?.content
-    const prompt = Array.isArray(lastUserPrompt) ? lastUserPrompt.map(part => part.text ?? '').join('') : lastUserPrompt
+    let prompt = lastUserPrompt
+    if (Array.isArray(lastUserPrompt)) {
+      prompt = ''
+      for (const part of lastUserPrompt) {
+        if (typeof part.text === 'string') prompt += part.text
+      }
+    }
 
     const output = tags['ai.response.text']
 
@@ -263,16 +224,14 @@ class DdTelemetryPlugin extends BaseLLMObsPlugin {
    * @param {SpanTags} tags
    */
   setLLMOperationTags (span, tags) {
-    const toolsForModel = tags['ai.prompt.tools']?.map(getJsonStringValue)
-
     const inputMessages = getJsonStringValue(tags['ai.prompt.messages'], [])
     const parsedInputMessages = []
     for (const message of inputMessages) {
-      const formattedMessages = this.formatMessage(message, toolsForModel)
+      const formattedMessages = this.formatMessage(message)
       parsedInputMessages.push(...formattedMessages)
     }
 
-    const outputMessage = this.formatOutputMessage(tags, toolsForModel)
+    const outputMessage = this.formatOutputMessage(tags)
 
     this._tagger.tagLLMIO(span, parsedInputMessages, outputMessage)
 
@@ -284,8 +243,8 @@ class DdTelemetryPlugin extends BaseLLMObsPlugin {
   }
 
   setToolTags (span, tags) {
-    const toolCallId = tags['ai.toolCall.id']
-    const name = getToolNameFromTags(tags) ?? this.#toolCallIdsToName[toolCallId]
+    const name = getToolNameFromTags(tags)
+
     if (name) this._tagger._setTag(span, NAME, name)
 
     const input = tags['ai.toolCall.args']
@@ -294,7 +253,7 @@ class DdTelemetryPlugin extends BaseLLMObsPlugin {
     this._tagger.tagTextIO(span, input, output)
   }
 
-  formatOutputMessage (tags, toolsForModel) {
+  formatOutputMessage (tags) {
     const outputMessageText = tags['ai.response.text'] ?? tags['ai.response.object']
     const outputMessageToolCalls = getJsonStringValue(tags['ai.response.toolCalls'], [])
 
@@ -302,13 +261,9 @@ class DdTelemetryPlugin extends BaseLLMObsPlugin {
     for (const toolCall of outputMessageToolCalls) {
       const toolArgs = toolCall.args ?? toolCall.input
       const toolCallArgs = typeof toolArgs === 'string' ? getJsonStringValue(toolArgs, {}) : toolArgs
-      const toolDescription = toolsForModel?.find(tool => toolCall.toolName === tool.name)?.description
-      const name = this.findToolName(toolCall.toolName, toolDescription)
-      this.#toolCallIdsToName[toolCall.toolCallId] = name
-
       formattedToolCalls.push({
         arguments: toolCallArgs,
-        name,
+        name: toolCall.toolName,
         toolId: toolCall.toolCallId,
         type: toolCall.toolCallType ?? 'function',
       })
@@ -328,11 +283,10 @@ class DdTelemetryPlugin extends BaseLLMObsPlugin {
    * need to split into multiple messages.
    *
    * @param {AiSdkMessage} message
-   * @param {ToolForModel[] | null | undefined} toolsForModel
    * @returns {Array<{role: string, content: string, toolId?: string,
    *   toolCalls?: Array<{arguments: string, name: string, toolId: string, type: string}>}>}
    */
-  formatMessage (message, toolsForModel) {
+  formatMessage (message) {
     const { role, content } = message
 
     if (role === 'system') {
@@ -357,12 +311,9 @@ class DdTelemetryPlugin extends BaseLLMObsPlugin {
         if (['text', 'reasoning', 'redacted-reasoning'].includes(type)) {
           finalContent += part.text ?? part.data
         } else if (type === 'tool-call') {
-          const toolDescription = toolsForModel?.find(tool => part.toolName === tool.name)?.description
-          const name = this.findToolName(part.toolName, toolDescription)
-
           toolCalls.push({
             arguments: part.args ?? part.input,
-            name,
+            name: part.toolName,
             toolId: part.toolCallId,
             type: 'function',
           })

package/packages/dd-trace/src/llmobs/plugins/ai/vercelTelemetry.js

@@ -38,11 +38,15 @@ function formatLanguageModelInputMessages (instructions, messages) {
   const inputMessages = []
 
   if (instructions) {
-    const systemPrompt = typeof instructions === 'string'
-      ? instructions
-      : Array.isArray(instructions)
-        ? instructions.map(instruction => instruction.content).join('')
-        : instructions.content
+    let systemPrompt = instructions
+    if (typeof instructions !== 'string') {
+      if (Array.isArray(instructions)) {
+        systemPrompt = ''
+        for (const instruction of instructions) systemPrompt += instruction.content
+      } else {
+        systemPrompt = instructions.content
+      }
+    }
 
     inputMessages.push({ role: 'system', content: systemPrompt })
   }
@@ -53,13 +57,13 @@ function formatLanguageModelInputMessages (instructions, messages) {
     if (role === 'system') {
       inputMessages.push({ role, content })
     } else if (role === 'user') {
-      const userMessageContent =
-      typeof content === 'string'
-        ? content
-        : content
-          .filter(part => part.type === 'text')
-          .map(part => part.text)
-          .join('')
+      let userMessageContent = content
+      if (typeof content !== 'string') {
+        userMessageContent = ''
+        for (const part of content) {
+          if (part.type === 'text') userMessageContent += part.text
+        }
+      }
 
       inputMessages.push({ role, content: userMessageContent })
     } else if (role === 'assistant') {
@@ -292,7 +296,13 @@ class VercelAiTelemetryPlugin extends BaseLLMObsPlugin {
     const { event, result } = ctx
 
     const lastUserPrompt = event.messages.findLast(message => message.role === 'user')?.content
-    const input = Array.isArray(lastUserPrompt) ? lastUserPrompt.map(part => part.text ?? '').join('') : lastUserPrompt
+    let input = lastUserPrompt
+    if (Array.isArray(lastUserPrompt)) {
+      input = ''
+      for (const part of lastUserPrompt) {
+        if (part.type === 'text') input += part.text
+      }
+    }
 
     const output =
       ctx.isStream

package/packages/dd-trace/src/llmobs/plugins/anthropic/util.js

@@ -38,16 +38,20 @@ function formatAnthropicToolResultContent (content) {
   if (typeof content === 'string') {
     return content
   } else if (Array.isArray(content)) {
-    const formattedContent = []
+    let formattedContent = ''
     for (const toolResultBlock of content) {
+      let part
       if (toolResultBlock.text) {
-        formattedContent.push(toolResultBlock.text)
+        part = toolResultBlock.text
       } else if (toolResultBlock.type === 'image') {
-        formattedContent.push('([IMAGE DETECTED])')
+        part = '([IMAGE DETECTED])'
       }
+      if (part === undefined) continue
+      if (formattedContent) formattedContent += ','
+      formattedContent += part
     }
 
-    return formattedContent.join(',')
+    return formattedContent
   }
   return JSON.stringify(content)
 }

package/packages/dd-trace/src/llmobs/plugins/claude-agent-sdk/index.js

@@ -18,12 +18,15 @@ function getToolOutputText (raw) {
   if (raw == null) return
 
   if (Array.isArray(raw)) {
-    const output = []
+    let output = ''
+    let separator = ''
     for (const block of raw) {
       const text = getToolOutputText(block)
-      if (text) output.push(text)
+      if (!text) continue
+      output += separator + text
+      separator = '\n'
     }
-    return output.join('\n') || undefined
+    return output
   }
 
   if (raw.type === 'tool_result') return getToolOutputText(raw.content)

package/packages/dd-trace/src/llmobs/plugins/langchain/index.js

@@ -46,6 +46,13 @@ class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
     }
   }
 
+  error (ctx) {
+    // NodeInterrupt or GraphInterrupt "errors" for control flow, do not mark as real errors
+    if (ctx.error?.is_bubble_up) return
+
+    super.error(ctx)
+  }
+
   getLLMObsSpanRegisterOptions (ctx) {
     const span = ctx.currentStore?.span
     const spanContext = span?.context()

package/packages/dd-trace/src/llmobs/plugins/openai/utils.js

@@ -134,15 +134,17 @@ function hasMultimodalInputs (variables) {
  * @returns {{ content: string, audioParts: Array<{ mimeType: string, content: string }> }}
  */
 function extractContentParts (parts) {
-  const extracted = []
+  let content = ''
+  let hasContent = false
   const audioParts = []
 
   for (const part of parts) {
     const partType = part?.type ?? ''
+    let extracted
     if (partType === 'text') {
-      extracted.push(part.text ?? '')
+      extracted = part.text ?? ''
     } else if (partType === 'image_url') {
-      extracted.push(IMAGE_FALLBACK)
+      extracted = IMAGE_FALLBACK
     } else if (partType === 'input_audio') {
       const inputAudio = part.input_audio ?? {}
       const data = inputAudio.data
@@ -151,14 +153,19 @@ function extractContentParts (parts) {
         // is needed. Only fall back to "[audio]" when there's no audio to capture.
         audioParts.push(formatAudioPart(data, audioMimeTypeFromFormat(inputAudio.format, AUDIO_MIME_TYPES)))
       } else {
-        extracted.push(AUDIO_FALLBACK)
+        extracted = AUDIO_FALLBACK
       }
     } else {
-      extracted.push(`[${partType}]`)
+      extracted = `[${partType}]`
     }
+
+    if (extracted === undefined) continue
+    if (hasContent) content += '\n'
+    content += extracted
+    hasContent = true
   }
 
-  return { content: extracted.join('\n'), audioParts }
+  return { content, audioParts }
 }
 
 /**

package/packages/dd-trace/src/llmobs/plugins/openai-agents/utils.js

@@ -11,23 +11,23 @@ const { safeJsonParse } = require('../../util')
  * @returns {{ content: string, audioParts: Array<{ mimeType: string, content: string }> }}
  */
 function extractMessageContent (parts) {
-  const contentParts = []
+  let content = ''
   const audioParts = []
 
   for (const part of parts) {
     if (!part) continue
     const text = extractTextFromContentItem(part)
     if (text) {
-      contentParts.push(text)
+      content += text
       continue
     }
 
     const extracted = extractContentParts([part])
-    if (extracted.content) contentParts.push(extracted.content)
+    if (extracted.content) content += extracted.content
     if (extracted.audioParts.length > 0) audioParts.push(...extracted.audioParts)
   }
 
-  return { content: contentParts.join(''), audioParts }
+  return { content, audioParts }
 }
 
 /**
@@ -167,13 +167,11 @@ function extractOutputMessages (result) {
       if (item.type === 'message') {
         let content = ''
         if (Array.isArray(item.content)) {
-          const textParts = []
           for (const contentItem of item.content) {
             if (contentItem?.type === 'output_text' && contentItem.text) {
-              textParts.push(contentItem.text)
+              content += contentItem.text
             }
           }
-          content = textParts.join('')
         } else if (typeof item.content === 'string') {
           content = item.content
         }

package/packages/dd-trace/src/llmobs/util.js

@@ -337,37 +337,6 @@ function resolveAgentAttribution (tags, span) {
   return { name: tags[PARENT_AGENT_NAME], spanId: tags[PARENT_AGENT_SPAN_ID] }
 }
 
-/**
- * Removes all `key=value` entries for the given key from a comma-separated tagset string.
- *
- * @param {string} tags - Existing tagset string (may be empty).
- * @param {string} key
- * @returns {string}
- */
-function stripTagsetEntry (tags, key) {
-  if (!tags.includes(key)) return tags
-  return tags.split(',').filter(entry => !entry.startsWith(`${key}=`)).join(',')
-}
-
-/**
- * Appends `key=value` to the tagset string with a comma separator, but only when `value` is
- * truthy, passes the optional `safeguard` predicate, and fits within `maxTagSetLength`. Returns
- * the original `tags` unchanged when the value is absent, unsafe, or would overflow the budget.
- *
- * @param {string} tags - Existing tagset string (may be empty).
- * @param {string} key
- * @param {string | undefined} value
- * @param {((v: string) => boolean) | null} [safeguard]
- * @param {number} [maxTagSetLength]
- * @returns {string}
- */
-function appendOptionalPropagatedTag (tags, key, value, safeguard, maxTagSetLength) {
-  if (!value || (safeguard && !safeguard(value))) return tags
-  const entry = `${tags ? ',' : ''}${key}=${value}`
-  if (maxTagSetLength != null && tags.length + entry.length > maxTagSetLength) return tags
-  return `${tags}${entry}`
-}
-
 function spanHasError (span) {
   const spanContext = span.context()
   return !!(spanContext.getTag('error') || spanContext.getTag('error.type'))
@@ -518,7 +487,6 @@ function formatAudioPart (data, mimeType) {
 
 module.exports = {
   agentNameWireSafe,
-  appendOptionalPropagatedTag,
   audioMimeTypeFromFormat,
   encodeUnicode,
   findGenAIAncestorSpanId,
@@ -527,7 +495,6 @@ module.exports = {
   normalizeLlmObsTraceId,
   formatAudioPart,
   resolveAgentAttribution,
-  stripTagsetEntry,
   validateCostTags,
   validateKind,
   getFunctionArguments,