dd-trace 5.83.0 → 5.85.0

package/packages/dd-trace/src/llmobs/plugins/bedrockruntime.js

@@ -6,7 +6,7 @@ const {
   extractRequestParams,
   extractTextAndResponseReason,
   parseModelId,
-  extractTextAndResponseReasonFromStream
+  extractTextAndResponseReasonFromStream,
 } = require('../../../../datadog-plugin-aws-sdk/src/services/bedrockruntime/utils')
 const BaseLLMObsPlugin = require('./base')
 
@@ -49,7 +49,7 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
         inputTokensFromHeaders: inputTokenCount && Number.parseInt(inputTokenCount),
         outputTokensFromHeaders: outputTokenCount && Number.parseInt(outputTokenCount),
         cacheReadTokensFromHeaders: cacheReadTokenCount && Number.parseInt(cacheReadTokenCount),
-        cacheWriteTokensFromHeaders: cacheWriteTokenCount && Number.parseInt(cacheWriteTokenCount)
+        cacheWriteTokensFromHeaders: cacheWriteTokenCount && Number.parseInt(cacheWriteTokenCount),
       }
     })
 
@@ -71,7 +71,7 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
       modelProvider: modelProvider.toLowerCase(),
       kind: 'llm',
       name: 'bedrock-runtime.command',
-      integration: 'bedrock'
+      integration: 'bedrock',
     })
 
     const requestParams = extractRequestParams(request.params, modelProvider)
@@ -83,7 +83,7 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
     // add metadata tags
     this._tagger.tagMetadata(span, {
       temperature: Number.parseFloat(requestParams.temperature) || 0,
-      max_tokens: Number.parseInt(requestParams.maxTokens) || 0
+      max_tokens: Number.parseInt(requestParams.maxTokens) || 0,
     })
 
     // add I/O tags
@@ -96,14 +96,14 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
     // add token metrics
     const { inputTokens, outputTokens, totalTokens, cacheReadTokens, cacheWriteTokens } = extractTokens({
       requestId: response.$metadata.requestId,
-      usage: textAndResponseReason.usage
+      usage: textAndResponseReason.usage,
     })
     this._tagger.tagMetrics(span, {
       inputTokens,
       outputTokens,
       totalTokens,
       cacheReadTokens,
-      cacheWriteTokens
+      cacheWriteTokens,
     })
   }
 }
@@ -113,7 +113,7 @@ function extractTokens ({ requestId, usage }) {
     inputTokensFromHeaders,
     outputTokensFromHeaders,
     cacheReadTokensFromHeaders,
-    cacheWriteTokensFromHeaders
+    cacheWriteTokensFromHeaders,
   } = requestIdsToTokens[requestId] || {}
   delete requestIdsToTokens[requestId]
 
@@ -130,7 +130,7 @@ function extractTokens ({ requestId, usage }) {
     outputTokens,
     totalTokens: normalizedInputTokens + outputTokens,
     cacheReadTokens,
-    cacheWriteTokens
+    cacheWriteTokens,
   }
 }
 

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

@@ -9,7 +9,7 @@ const {
   formatInputMessages,
   formatEmbeddingInput,
   formatOutputMessages,
-  formatEmbeddingOutput
+  formatEmbeddingOutput,
 } = require('./util')
 
 class GenAiLLMObsPlugin extends LLMObsPlugin {
@@ -44,7 +44,7 @@ class GenAiLLMObsPlugin extends LLMObsPlugin {
       modelProvider: 'google',
       modelName: inputs.model,
       kind: operation,
-      name: 'google_genai.request'
+      name: 'google_genai.request',
     }
   }
 

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

@@ -5,7 +5,7 @@ const ROLES = {
   MODEL: 'model',
   ASSISTANT: 'assistant',
   USER: 'user',
-  REASONING: 'reasoning'
+  REASONING: 'reasoning',
 }
 
 /**
@@ -36,7 +36,7 @@ function extractTextParts (parts) {
 function groupPartsByRole (parts) {
   const grouped = {
     reasoning: '',
-    assistant: ''
+    assistant: '',
   }
 
   for (const part of parts) {
@@ -144,7 +144,7 @@ function extractMetadata (config) {
     seed: 'seed',
     response_mime_type: 'responseMimeType',
     safety_settings: 'safetySettings',
-    automatic_function_calling: 'automaticFunctionCalling'
+    automatic_function_calling: 'automaticFunctionCalling',
   }
 
   const metadata = {}
@@ -167,7 +167,7 @@ function formatFunctionCallMessage (parts, functionCalls, role) {
     name: part.functionCall.name,
     arguments: part.functionCall.args,
     toolId: part.functionCall.id || '',
-    type: 'function_call'
+    type: 'function_call',
   }))
 
   const textParts = extractTextParts(parts)
@@ -190,12 +190,12 @@ function formatFunctionResponseMessage (functionResponses, role) {
     name: part.functionResponse.name,
     result: JSON.stringify(part.functionResponse.response),
     toolId: part.functionResponse.id,
-    type: 'function_response'
+    type: 'function_response',
   }))
 
   return {
     role,
-    toolResults
+    toolResults,
   }
 }
 
@@ -233,7 +233,7 @@ function formatContentObject (content) {
   if (hasThoughtParts(parts)) {
     return {
       role: ROLES.REASONING,
-      content: extractTextParts(parts).join('\n')
+      content: extractTextParts(parts).join('\n'),
     }
   }
 
@@ -252,7 +252,7 @@ function formatContentObject (content) {
   // Regular text content
   return {
     role,
-    content: extractTextParts(parts).join('\n')
+    content: extractTextParts(parts).join('\n'),
   }
 }
 
@@ -340,8 +340,8 @@ function formatNonStreamingCandidate (candidate) {
       role: ROLES.ASSISTANT,
       content: JSON.stringify({
         language: executableCode.executableCode.language,
-        code: executableCode.executableCode.code
-      })
+        code: executableCode.executableCode.code,
+      }),
     })
     return messages
   }
@@ -353,8 +353,8 @@ function formatNonStreamingCandidate (candidate) {
       role: ROLES.ASSISTANT,
       content: JSON.stringify({
         outcome: codeExecutionResult.codeExecutionResult.outcome,
-        output: codeExecutionResult.codeExecutionResult.output
-      })
+        output: codeExecutionResult.codeExecutionResult.output,
+      }),
     })
     return messages
   }
@@ -365,14 +365,14 @@ function formatNonStreamingCandidate (candidate) {
   if (partsByRole.reasoning) {
     messages.push({
       role: ROLES.REASONING,
-      content: partsByRole.reasoning
+      content: partsByRole.reasoning,
     })
   }
 
   if (partsByRole.assistant) {
     messages.push({
       role: ROLES.ASSISTANT,
-      content: partsByRole.assistant
+      content: partsByRole.assistant,
     })
   }
 
@@ -482,5 +482,5 @@ module.exports = {
   formatInputMessages,
   formatEmbeddingInput,
   formatOutputMessages,
-  formatEmbeddingOutput
+  formatEmbeddingOutput,
 }

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

@@ -85,7 +85,7 @@ class LangChainLLMObsChatModelHandler extends LangChainLLMObsHandler {
       this._tagger.tagMetrics(span, {
         inputTokens,
         outputTokens,
-        totalTokens
+        totalTokens,
       })
     }
   }
@@ -100,7 +100,7 @@ class LangChainLLMObsChatModelHandler extends LangChainLLMObsHandler {
       toolCallsInfo.push({
         name: toolCall.name || '',
         arguments: toolCall.args || {},
-        tool_id: toolCall.id || ''
+        tool_id: toolCall.id || '',
       })
     }
 

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

@@ -3,7 +3,7 @@
 const ROLE_MAPPINGS = {
   human: 'user',
   ai: 'assistant',
-  system: 'system'
+  system: 'system',
 }
 
 class LangChainLLMObsHandler {
@@ -38,7 +38,7 @@ class LangChainLLMObsHandler {
     }
     try {
       const messageContent = {
-        content: message.content || ''
+        content: message.content || '',
       }
 
       const role = this.getRole(message)
@@ -55,7 +55,7 @@ class LangChainLLMObsHandler {
     const tokens = {
       inputTokens: 0,
       outputTokens: 0,
-      totalTokens: 0
+      totalTokens: 0,
     }
     if (!llmOutput) return tokens
     const tokenUsage = llmOutput.tokenUsage || llmOutput.usageMetadata || llmOutput.usage || {}
@@ -85,9 +85,9 @@ class LangChainLLMObsHandler {
       tokens: {
         inputTokens,
         outputTokens,
-        totalTokens
+        totalTokens,
       },
-      runId: runIdBase
+      runId: runIdBase,
     }
   }
 

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

@@ -25,7 +25,7 @@ class LangChainLLMObsVectorStoreHandler extends LangChainLLMObsHandler {
         text: document.pageContent,
         id: document.id,
         name: document.metadata?.source,
-        score
+        score,
       })
     }
 

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

@@ -38,7 +38,7 @@ class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
       llm: new LlmHandler(this._tagger),
       embedding: new EmbeddingHandler(this._tagger),
       tool: new ToolHandler(this._tagger),
-      similarity_search: new VectorStoreHandler(this._tagger)
+      similarity_search: new VectorStoreHandler(this._tagger),
     }
   }
 
@@ -58,7 +58,7 @@ class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
       modelProvider,
       modelName,
       kind,
-      name
+      name,
     }
   }
 
@@ -210,5 +210,5 @@ module.exports = [
   EmbeddingsEmbedDocumentsPlugin,
   ToolInvokePlugin,
   VectorStoreSimilaritySearchPlugin,
-  VectorStoreSimilaritySearchWithScorePlugin
+  VectorStoreSimilaritySearchWithScorePlugin,
 ]

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

@@ -12,5 +12,5 @@ module.exports = {
   INPUT_TYPE_FILE,
   INPUT_TYPE_TEXT,
   IMAGE_FALLBACK,
-  FILE_FALLBACK
+  FILE_FALLBACK,
 }

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

@@ -4,20 +4,20 @@ const LLMObsPlugin = require('../base')
 const {
   PROMPT_TRACKING_INSTRUMENTATION_METHOD,
   PROMPT_MULTIMODAL,
-  INSTRUMENTATION_METHOD_AUTO
+  INSTRUMENTATION_METHOD_AUTO,
 } = require('../../constants/tags')
 const {
   extractChatTemplateFromInstructions,
   normalizePromptVariables,
   extractTextFromContentItem,
-  hasMultimodalInputs
+  hasMultimodalInputs,
 } = require('./utils')
 
 const allowedParamKeys = new Set([
   'max_output_tokens',
   'temperature',
   'stream',
-  'reasoning'
+  'reasoning',
 ])
 
 function isIterable (obj) {
@@ -49,7 +49,7 @@ class OpenAiLLMObsPlugin extends LLMObsPlugin {
       modelProvider,
       modelName: inputs.model,
       kind,
-      name
+      name,
     }
   }
 
@@ -139,7 +139,7 @@ class OpenAiLLMObsPlugin extends LLMObsPlugin {
     const { model, ...parameters } = inputs
 
     const metadata = {
-      encoding_format: parameters.encoding_format || 'float'
+      encoding_format: parameters.encoding_format || 'float',
     }
     if (inputs.dimensions) metadata.dimensions = inputs.dimensions
     this._tagger.tagMetadata(span, metadata)
@@ -210,7 +210,7 @@ class OpenAiLLMObsPlugin extends LLMObsPlugin {
       if (message.function_call) {
         const functionCallInfo = {
           name: message.function_call.name,
-          arguments: JSON.parse(message.function_call.arguments)
+          arguments: JSON.parse(message.function_call.arguments),
         }
         outputMessages.push({ content, role, toolCalls: [functionCallInfo] })
       } else if (message.tool_calls) {
@@ -220,7 +220,7 @@ class OpenAiLLMObsPlugin extends LLMObsPlugin {
             arguments: JSON.parse(toolCall.function.arguments),
             name: toolCall.function.name,
             toolId: toolCall.id,
-            type: toolCall.type
+            type: toolCall.type,
           }
           toolCallsInfo.push(toolCallInfo)
         }
@@ -290,8 +290,8 @@ class OpenAiLLMObsPlugin extends LLMObsPlugin {
               toolId: item.call_id,
               name: item.name,
               arguments: parsedArgs,
-              type: item.type
-            }]
+              type: item.type,
+            }],
           })
         } else if (item.type === 'function_call_output') {
           // Function output: convert to user message with tool_results
@@ -301,8 +301,8 @@ class OpenAiLLMObsPlugin extends LLMObsPlugin {
               toolId: item.call_id,
               result: item.output,
               name: item.name || '',
-              type: item.type
-            }]
+              type: item.type,
+            }],
           })
         } else if (item.role && item.content) {
           // Regular message
@@ -346,8 +346,8 @@ class OpenAiLLMObsPlugin extends LLMObsPlugin {
             content: JSON.stringify({
               summary: item.summary ?? [],
               encrypted_content: item.encrypted_content ?? null,
-              id: item.id ?? ''
-            })
+              id: item.id ?? '',
+            }),
           })
         } else if (item.type === 'function_call') {
           // Handle function_call type (responses API tool calls)
@@ -366,8 +366,8 @@ class OpenAiLLMObsPlugin extends LLMObsPlugin {
               toolId: item.call_id,
               name: item.name,
               arguments: args,
-              type: item.type
-            }]
+              type: item.type,
+            }],
           })
         } else {
           // Handle regular message objects
@@ -401,7 +401,7 @@ class OpenAiLLMObsPlugin extends LLMObsPlugin {
                 toolId: tc.id,
                 name: tc.function?.name || tc.name,
                 arguments: args,
-                type: tc.type || 'function_call'
+                type: tc.type || 'function_call',
               }
             })
           }
@@ -429,7 +429,7 @@ class OpenAiLLMObsPlugin extends LLMObsPlugin {
           id,
           version,
           variables: normalizedVariables,
-          template: chatTemplate
+          template: chatTemplate,
         }, true)
         const tags = { [PROMPT_TRACKING_INSTRUMENTATION_METHOD]: INSTRUMENTATION_METHOD_AUTO }
         if (hasMultimodalInputs(inputs.prompt.variables)) {

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

@@ -4,7 +4,7 @@ const {
   INPUT_TYPE_IMAGE,
   INPUT_TYPE_FILE,
   IMAGE_FALLBACK,
-  FILE_FALLBACK
+  FILE_FALLBACK,
 } = require('./constants')
 
 const REGEX_SPECIAL_CHARS = /[.*+?^${}()|[\]\\]/g
@@ -106,7 +106,7 @@ function normalizePromptVariables (variables) {
   return Object.fromEntries(
     Object.entries(variables).map(([key, value]) => [
       key,
-      extractTextFromContentItem(value) ?? String(value ?? '')
+      extractTextFromContentItem(value) ?? String(value ?? ''),
     ])
   )
 }
@@ -122,5 +122,5 @@ module.exports = {
   extractChatTemplateFromInstructions,
   normalizePromptVariables,
   extractTextFromContentItem,
-  hasMultimodalInputs
+  hasMultimodalInputs,
 }

package/packages/dd-trace/src/llmobs/plugins/vertexai.js

@@ -2,7 +2,7 @@
 
 const {
   extractModel,
-  extractSystemInstructions
+  extractSystemInstructions,
 } = require('../../../../datadog-plugin-google-cloud-vertexai/src/utils')
 const LLMObsPlugin = require('./base')
 
@@ -19,7 +19,7 @@ class VertexAILLMObsPlugin extends LLMObsPlugin {
       kind: 'llm',
       modelName: extractModel(ctx.instance),
       modelProvider: 'google',
-      name: ctx.resource
+      name: ctx.resource,
     }
   }
 
@@ -53,7 +53,7 @@ function getMetadata (instance) {
     ['maxOutputTokens', 'max_output_tokens'],
     ['candidateCount', 'candidate_count'],
     ['topP', 'top_p'],
-    ['topK', 'top_k']
+    ['topK', 'top_k'],
   ]) {
     if (modelConfig[parameter]) {
       metadata[parameterKey] = modelConfig[parameter]
@@ -90,7 +90,7 @@ function extractInputMessages (request, history, systemInstructions) {
   if (!Array.isArray(contents)) {
     messages.push({
       content: '[Non-array content object: ' +
-      `${(typeof contents.toString === 'function' ? contents.toString() : String(contents))}]`
+      `${(typeof contents.toString === 'function' ? contents.toString() : String(contents))}]`,
     })
     return messages
   }
@@ -136,7 +136,7 @@ function extractMessagesFromContent (content) {
   if (parts == null || parts.length === 0 || !Array.isArray(parts)) {
     const message = {
       content:
-      `[Non-text content object: ${(typeof content.toString === 'function' ? content.toString() : String(content))}]`
+      `[Non-text content object: ${(typeof content.toString === 'function' ? content.toString() : String(content))}]`,
     }
     if (role) message.role = role
     messages.push(message)
@@ -161,7 +161,7 @@ function extractMessageFromPart (part, role) {
   if (functionCall) {
     message.toolCalls = [{
       name: functionCall.name,
-      arguments: functionCall.args
+      arguments: functionCall.args,
     }]
   }
   if (functionResponse) {

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

@@ -10,7 +10,7 @@ const Span = require('../opentracing/span')
 const { SPAN_KIND, OUTPUT_VALUE, INPUT_VALUE } = require('./constants/tags')
 const {
   getFunctionArguments,
-  validateKind
+  validateKind,
 } = require('./util')
 const { storage } = require('./storage')
 const telemetry = require('./telemetry')
@@ -58,7 +58,7 @@ class LLMObs extends NoopLLMObs {
 
     const llmobs = {
       mlApp: options.mlApp,
-      agentlessEnabled: options.agentlessEnabled
+      agentlessEnabled: options.agentlessEnabled,
     }
     // TODO: This will update config telemetry with the origin 'code', which is not ideal when `enable()` is called
     // based on `APM_TRACING` RC product updates.
@@ -302,7 +302,7 @@ class LLMObs extends NoopLLMObs {
     try {
       return {
         traceId: span.context().toTraceId(true),
-        spanId: span.context().toSpanId()
+        spanId: span.context().toSpanId(),
       }
     } catch {
       err = 'invalid_span'
@@ -384,7 +384,7 @@ class LLMObs extends NoopLLMObs {
 
       const evaluationTags = {
         'ddtrace.version': tracerVersion,
-        ml_app: mlApp
+        ml_app: mlApp,
       }
 
       if (tags) {
@@ -419,7 +419,7 @@ class LLMObs extends NoopLLMObs {
         ml_app: mlApp,
         [`${metricType}_value`]: value,
         timestamp_ms: timestampMs,
-        tags: Object.entries(evaluationTags).map(([key, value]) => `${key}:${value}`)
+        tags: Object.entries(evaluationTags).map(([key, value]) => `${key}:${value}`),
       }
       const currentStore = storage.getStore()
       const routing = currentStore?.routingContext
@@ -438,8 +438,8 @@ class LLMObs extends NoopLLMObs {
       ...currentStore,
       annotationContext: {
         ...currentStore?.annotationContext,
-        ...options
-      }
+        ...options,
+      },
     }
 
     return storage.run(store, fn)
@@ -461,8 +461,8 @@ class LLMObs extends NoopLLMObs {
       ...currentStore,
       routingContext: {
         apiKey: options.ddApiKey,
-        site: options.ddSite
-      }
+        site: options.ddSite,
+      },
     }
     return storage.run(store, fn)
   }
@@ -498,7 +498,7 @@ class LLMObs extends NoopLLMObs {
     if (options) {
       this._tagger.registerLLMObsSpan(span, {
         ...options,
-        parent: parentStore?.span
+        parent: parentStore?.span,
       })
     }
 
@@ -541,7 +541,7 @@ class LLMObs extends NoopLLMObs {
       modelProvider,
       sessionId,
       _decorator,
-      spanOptions
+      spanOptions,
     }
   }
 }

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

@@ -7,7 +7,7 @@ const logger = require('../log')
 const {
   ERROR_MESSAGE,
   ERROR_TYPE,
-  ERROR_STACK
+  ERROR_STACK,
 } = require('../constants')
 const {
   SPAN_KIND,
@@ -29,7 +29,7 @@ const {
   NAME,
   INPUT_PROMPT,
   ROUTING_API_KEY,
-  ROUTING_SITE
+  ROUTING_SITE,
 } = require('./constants/tags')
 const { UNSERIALIZABLE_VALUE_TEXT } = require('./constants/text')
 const telemetry = require('./telemetry')
@@ -84,7 +84,7 @@ class LLMObsSpanProcessor {
       const mlObsTags = LLMObsTagger.tagMap.get(span)
       const routing = {
         apiKey: mlObsTags[ROUTING_API_KEY],
-        site: mlObsTags[ROUTING_SITE]
+        site: mlObsTags[ROUTING_SITE],
       }
 
       this.#writer.append(formattedEvent, routing)
@@ -200,8 +200,8 @@ class LLMObsSpanProcessor {
       metrics,
       _dd: {
         span_id: span.context().toSpanId(),
-        trace_id: span.context().toTraceId(true)
-      }
+        trace_id: span.context().toTraceId(true),
+      },
     }
 
     if (sessionId) llmObsSpanEvent.session_id = sessionId
@@ -256,7 +256,7 @@ class LLMObsSpanProcessor {
       ml_app: mlApp,
       'ddtrace.version': tracerVersion,
       error: Number(!!error) || 0,
-      language: 'javascript'
+      language: 'javascript',
     }
 
     const errType = span.context()._tags[ERROR_TYPE] || error?.name

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

@@ -36,7 +36,7 @@ const {
   ROUTING_API_KEY,
   ROUTING_SITE,
   PROMPT_TRACKING_INSTRUMENTATION_METHOD,
-  INSTRUMENTATION_METHOD_ANNOTATED
+  INSTRUMENTATION_METHOD_ANNOTATED,
 } = require('./constants/tags')
 const { storage } = require('./storage')
 
@@ -68,7 +68,7 @@ class LLMObsTagger {
     kind,
     name,
     integration,
-    _decorator
+    _decorator,
   } = {}) {
     if (!this._config.llmobs.enabled) return
     if (!kind) return // do not register it in the map if it doesn't have an llmobs span kind
@@ -519,7 +519,7 @@ class LLMObsTagger {
         content,
         toolCalls,
         toolResults,
-        toolId
+        toolId,
       } = message
       const messageObj = {}
 
@@ -557,7 +557,7 @@ class LLMObsTagger {
         if (role === 'tool') {
           condition = this.#tagConditionalString(toolId, 'Tool ID', messageObj, 'tool_id') && condition
         } else {
-          log.warn(`Tool ID for tool message not associated with a "tool" role, instead got "${role}"`)
+          log.warn('Tool ID for tool message not associated with a "tool" role, instead got "%s"', role)
         }
       }