dd-trace 5.97.0 → 5.99.0

package/packages/dd-trace/src/encode/span-stats.js

@@ -31,7 +31,7 @@ class SpanStatsEncoder extends AgentEncoder {
   }
 
   _encodeStat (bytes, stat) {
-    this._encodeMapPrefix(bytes, 14)
+    this._encodeMapPrefix(bytes, 15)
 
     this._encodeString(bytes, 'Service')
     const service = stat.Service || DEFAULT_SERVICE_NAME
@@ -76,6 +76,9 @@ class SpanStatsEncoder extends AgentEncoder {
 
     this._encodeString(bytes, 'HTTPEndpoint')
     this._encodeString(bytes, stat.HTTPEndpoint)
+
+    this._encodeString(bytes, 'srv_src')
+    this._encodeString(bytes, stat.srv_src || '')
   }
 
   _encodeBucket (bytes, bucket) {

package/packages/dd-trace/src/exporters/agent/index.js

@@ -24,7 +24,6 @@ class AgentExporter {
       lookup,
       protocolVersion,
       headers,
-      config,
     })
 
     globalThis[Symbol.for('dd-trace')].beforeExitHandlers.add(this.flush.bind(this))

package/packages/dd-trace/src/exporters/agent/writer.js

@@ -20,14 +20,13 @@ class AgentWriter extends BaseWriter {
       ...args[0],
       beforeFirstFlush: () => firstFlushChannel.publish(),
     })
-    const { prioritySampler, lookup, protocolVersion, headers, config = {} } = args[0]
+    const { prioritySampler, lookup, protocolVersion, headers } = args[0]
     const AgentEncoder = getEncoder(protocolVersion)
 
     this._prioritySampler = prioritySampler
     this._lookup = lookup
     this._protocolVersion = protocolVersion
     this._headers = headers
-    this._config = config
     this._encoder = new AgentEncoder(this)
   }
 

package/packages/dd-trace/src/exporters/agentless/writer.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { getValueFromEnvSources } = require('../../config/helper')
+const getConfig = require('../../config')
 const log = require('../../log')
 const request = require('../common/request')
 const tracerVersion = require('../../../../../package.json').version
@@ -39,7 +39,7 @@ class AgentlessWriter extends BaseWriter {
       }
     }
 
-    if (!getValueFromEnvSources('DD_API_KEY')) {
+    if (!getConfig().apiKey) {
       this.#apiKeyMissing = true
       log.error('DD_API_KEY is required for agentless trace intake. Set DD_API_KEY. Traces will not be sent.')
     }
@@ -108,7 +108,7 @@ class AgentlessWriter extends BaseWriter {
       return
     }
 
-    const apiKey = getValueFromEnvSources('DD_API_KEY')
+    const apiKey = getConfig().apiKey
     if (!apiKey) {
       if (!this.#apiKeyMissing) {
         this.#apiKeyMissing = true

package/packages/dd-trace/src/exporters/common/util.js

@@ -1,12 +1,12 @@
 'use strict'
 
-const { getValueFromEnvSources } = require('../../config/helper')
+const getConfig = require('../../config')
 
 function safeJSONStringify (value) {
   return JSON.stringify(
     value,
     (key, value) => key === 'dd-api-key' ? undefined : value,
-    getValueFromEnvSources('DD_TRACE_BEAUTIFUL_LOGS') ? 2 : undefined
+    getConfig().DD_TRACE_BEAUTIFUL_LOGS ? 2 : undefined
   )
 }
 

package/packages/dd-trace/src/id.js

@@ -245,3 +245,5 @@ function writeUInt32BE (buffer, value, offset) {
 module.exports = function createIdentifier (value, radix) {
   return new Identifier(value ?? '', radix)
 }
+
+module.exports.Identifier = Identifier

package/packages/dd-trace/src/index.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { getValueFromEnvSources } = require('./config/helper')
-const { isFalse, isTrue } = require('./util')
+const { isFalse } = require('./util')
 
 // Global `jest` is only present in Jest workers.
 const inJestWorker = typeof jest !== 'undefined'
@@ -9,10 +9,7 @@ const inJestWorker = typeof jest !== 'undefined'
 const ddTraceDisabled = getValueFromEnvSources('DD_TRACE_ENABLED')
   ? isFalse(getValueFromEnvSources('DD_TRACE_ENABLED'))
   : String(getValueFromEnvSources('OTEL_TRACES_EXPORTER')).toLowerCase() === 'none'
-const shouldUseProxyWhenTracingDisabled =
-  isTrue(getValueFromEnvSources('DD_DYNAMIC_INSTRUMENTATION_ENABLED')) ||
-  isTrue(getValueFromEnvSources('DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED'))
 
-module.exports = (ddTraceDisabled && !shouldUseProxyWhenTracingDisabled) || inJestWorker
+module.exports = ddTraceDisabled || inJestWorker
   ? require('./noop/proxy')
   : require('./proxy')

package/packages/dd-trace/src/lambda/handler.js

@@ -3,7 +3,6 @@
 const log = require('../log')
 const { channel } = require('../../../datadog-instrumentations/src/helpers/instrument')
 const { ERROR_MESSAGE, ERROR_TYPE } = require('../constants')
-const { getValueFromEnvSources } = require('../config/helper')
 const { ImpendingTimeout } = require('./runtime/errors')
 const { extractContext } = require('./context')
 
@@ -27,8 +26,7 @@ let __lambdaTimeout
 function checkTimeout (context) {
   const remainingTimeInMillis = context.getRemainingTimeInMillis()
 
-  let apmFlushDeadline = Number.parseInt(getValueFromEnvSources('DD_APM_FLUSH_DEADLINE_MILLISECONDS')) || 100
-  apmFlushDeadline = apmFlushDeadline < 0 ? 100 : apmFlushDeadline
+  const apmFlushDeadline = tracer._config.DD_APM_FLUSH_DEADLINE_MILLISECONDS
 
   __lambdaTimeout = setTimeout(() => {
     timeoutChannel.publish()

package/packages/dd-trace/src/llmobs/plugins/{anthropic.js → anthropic/index.js}

@@ -1,7 +1,8 @@
 'use strict'
 
-const { UNKNOWN_MODEL_PROVIDER } = require('../constants/tags')
-const LLMObsPlugin = require('./base')
+const { UNKNOWN_MODEL_PROVIDER } = require('../../constants/tags')
+const LLMObsPlugin = require('../base')
+const { appendMessage } = require('./util')
 
 const ALLOWED_METADATA_KEYS = new Set([
   'max_tokens',
@@ -144,51 +145,11 @@ class AnthropicLLMObsPlugin extends LLMObsPlugin {
     const inputMessages = []
 
     if (system) {
-      messages.unshift({ content: system, role: 'system' })
+      appendMessage(inputMessages, { role: 'system', content: system })
     }
 
     for (const message of messages) {
-      const { content, role } = message
-
-      if (typeof content === 'string') {
-        inputMessages.push({ content, role })
-        continue
-      }
-
-      for (const block of content) {
-        if (block.type === 'text') {
-          inputMessages.push({ content: block.text, role })
-        } else if (block.type === 'image') {
-          inputMessages.push({ content: '([IMAGE DETECTED])', role })
-        } else if (block.type === 'tool_use') {
-          const { text, name, id, type } = block
-          let input = block.input
-          if (typeof input === 'string') {
-            input = JSON.parse(input)
-          }
-
-          const toolCall = {
-            name,
-            arguments: input,
-            toolId: id,
-            type,
-          }
-
-          inputMessages.push({ content: text ?? '', role, toolCalls: [toolCall] })
-        } else if (block.type === 'tool_result') {
-          const { content } = block
-          const formattedContent = this.#formatAnthropicToolResultContent(content)
-          const toolResult = {
-            result: formattedContent,
-            toolId: block.tool_use_id,
-            type: 'tool_result',
-          }
-
-          inputMessages.push({ content: '', role, toolResults: [toolResult] })
-        } else {
-          inputMessages.push({ content: JSON.stringify(block), role })
-        }
-      }
+      appendMessage(inputMessages, message)
     }
 
     this._tagger.tagLLMIO(span, inputMessages)
@@ -273,25 +234,6 @@ class AnthropicLLMObsPlugin extends LLMObsPlugin {
 
     this._tagger.tagMetrics(span, metrics)
   }
-
-  // maybe can make into a util file
-  #formatAnthropicToolResultContent (content) {
-    if (typeof content === 'string') {
-      return content
-    } else if (Array.isArray(content)) {
-      const formattedContent = []
-      for (const toolResultBlock of content) {
-        if (toolResultBlock.text) {
-          formattedContent.push(toolResultBlock.text)
-        } else if (toolResultBlock.type === 'image') {
-          formattedContent.push('([IMAGE DETECTED])')
-        }
-      }
-
-      return formattedContent.join(',')
-    }
-    return JSON.stringify(content)
-  }
 }
 
 module.exports = AnthropicLLMObsPlugin

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

@@ -0,0 +1,106 @@
+'use strict'
+
+/**
+ * @typedef {{type: 'text', text: string}} TextBlock
+ * @typedef {{type: 'image'}} ImageBlock
+ * @typedef {{
+ *  type: 'tool_use', text: string, name: string, id: string, input: string | Record<string, unknown>
+ * }} ToolUseBlock
+ * @typedef {{
+ *  type: 'tool_result',
+ *  tool_use_id: string,
+ *  content: string | Array<{type: string, text?: string}>
+ * }} ToolResultBlock
+ *
+ * @typedef {{
+ *   content: string,
+ *   role: string,
+ *   toolCalls?: Array<{
+ *     name: string,
+ *     arguments: string | Record<string, unknown>,
+ *     toolId: string,
+ *     type: string
+ *   }>,
+ *   toolResults?: Array<{
+ *     result: string,
+ *     toolId: string,
+ *     type: 'tool_result'
+ *   }>
+ * }} AnthropicLlmObsMessage
+ */
+
+/**
+ * Formats tool result into LLM Observability compatible contents
+ * @param {ToolResultBlock['content']} content
+ */
+function formatAnthropicToolResultContent (content) {
+  if (typeof content === 'string') {
+    return content
+  } else if (Array.isArray(content)) {
+    const formattedContent = []
+    for (const toolResultBlock of content) {
+      if (toolResultBlock.text) {
+        formattedContent.push(toolResultBlock.text)
+      } else if (toolResultBlock.type === 'image') {
+        formattedContent.push('([IMAGE DETECTED])')
+      }
+    }
+
+    return formattedContent.join(',')
+  }
+  return JSON.stringify(content)
+}
+
+/**
+ * Normalizes and formats a message into LLM Observability compatible contents.
+ * Can be spread into a list of other messages.
+ *
+ * @param {AnthropicLlmObsMessage[]} messages
+ * @param {{ role: string, content: string | Array<TextBlock | ImageBlock | ToolUseBlock | ToolResultBlock> }} message
+ * @returns {void}
+ */
+function appendMessage (messages, { role, content }) {
+  if (typeof content === 'string') {
+    messages.push({ content, role })
+    return
+  }
+
+  for (const block of content) {
+    if (block.type === 'text') {
+      messages.push({ content: block.text, role })
+    } else if (block.type === 'image') {
+      messages.push({ content: '([IMAGE DETECTED])', role })
+    } else if (block.type === 'tool_use') {
+      const { text, name, id, type } = block
+      let input = block.input
+      if (typeof input === 'string') {
+        input = JSON.parse(input)
+      }
+
+      const toolCall = {
+        name,
+        arguments: input,
+        toolId: id,
+        type,
+      }
+
+      messages.push({ content: text ?? '', role, toolCalls: [toolCall] })
+    } else if (block.type === 'tool_result') {
+      const { content } = block
+      const formattedContent = formatAnthropicToolResultContent(content)
+      const toolResult = {
+        result: formattedContent,
+        toolId: block.tool_use_id,
+        type: 'tool_result',
+      }
+
+      messages.push({ content: '', role, toolResults: [toolResult] })
+    } else {
+      messages.push({ content: JSON.stringify(block), role })
+    }
+  }
+}
+
+module.exports = {
+  appendMessage,
+}

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

@@ -1,16 +1,17 @@
 'use strict'
 
 const { spanHasError } = require('../../../util')
+const { formatIO } = require('../messages')
 const LangChainLLMObsHandler = require('.')
 
 class LangChainLLMObsChainHandler extends LangChainLLMObsHandler {
   setMetaTags ({ span, inputs, results }) {
     let input
     if (inputs) {
-      input = this.formatIO(inputs)
+      input = formatIO(inputs)
     }
 
-    const output = !results || spanHasError(span) ? '' : this.formatIO(results)
+    const output = !results || spanHasError(span) ? '' : formatIO(results)
 
     // chain spans will always be workflows
     this._tagger.tagTextIO(span, input, output)

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

@@ -2,6 +2,7 @@
 
 const LLMObsTagger = require('../../../tagger')
 const { spanHasError } = require('../../../util')
+const { getRole } = require('../messages')
 const LangChainLLMObsHandler = require('.')
 
 const LLM = 'llm'
@@ -22,7 +23,7 @@ class LangChainLLMObsChatModelHandler extends LangChainLLMObsHandler {
     for (const messageSet of inputs) {
       for (const message of messageSet) {
         const content = message.content || ''
-        const role = this.getRole(message)
+        const role = getRole(message)
         inputMessages.push({ content, role })
       }
     }
@@ -54,7 +55,7 @@ class LangChainLLMObsChatModelHandler extends LangChainLLMObsHandler {
     for (const messageSet of results.generations) {
       for (const chatCompletion of messageSet) {
         const chatCompletionMessage = chatCompletion.message
-        const role = this.getRole(chatCompletionMessage)
+        const role = getRole(chatCompletionMessage)
         const content = chatCompletionMessage.text || ''
         const toolCalls = this.extractToolCalls(chatCompletionMessage)
         outputMessages.push({ content, role, toolCalls })

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

@@ -2,6 +2,7 @@
 
 const LLMObsTagger = require('../../../tagger')
 const { spanHasError } = require('../../../util')
+const { formatIO } = require('../messages')
 const LangChainLLMObsHandler = require('.')
 
 class LangChainLLMObsEmbeddingHandler extends LangChainLLMObsHandler {
@@ -10,7 +11,7 @@ class LangChainLLMObsEmbeddingHandler extends LangChainLLMObsHandler {
     let embeddingInput, embeddingOutput
 
     if (isWorkflow) {
-      embeddingInput = this.formatIO(inputs)
+      embeddingInput = formatIO(inputs)
     } else {
       const input = Array.isArray(inputs) ? inputs : [inputs]
       embeddingInput = input.map(doc => ({ text: doc }))

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

@@ -1,11 +1,5 @@
 'use strict'
 
-const ROLE_MAPPINGS = {
-  human: 'user',
-  ai: 'assistant',
-  system: 'system',
-}
-
 class LangChainLLMObsHandler {
   constructor (tagger) {
     /** @type {import('../../../tagger')} */
@@ -18,38 +12,6 @@ class LangChainLLMObsHandler {
 
   setMetaTags () {}
 
-  formatIO (messages) {
-    if (messages.constructor.name === 'Object') { // plain JSON
-      const formatted = {}
-      for (const [key, value] of Object.entries(messages)) {
-        formatted[key] = this.formatIO(value)
-      }
-
-      return formatted
-    } else if (Array.isArray(messages)) {
-      return messages.map(message => this.formatIO(message))
-    } // either a BaseMesage type or a string
-    return this.getContentFromMessage(messages)
-  }
-
-  getContentFromMessage (message) {
-    if (typeof message === 'string') {
-      return message
-    }
-    try {
-      const messageContent = {
-        content: message.content || '',
-      }
-
-      const role = this.getRole(message)
-      if (role) messageContent.role = role
-
-      return messageContent
-    } catch {
-      return JSON.stringify(message)
-    }
-  }
-
   checkTokenUsageChatOrLLMResult (results) {
     const llmOutput = results.llmOutput
     const tokens = {
@@ -90,17 +52,6 @@ class LangChainLLMObsHandler {
       runId: runIdBase,
     }
   }
-
-  getRole (message) {
-    if (message.role) return ROLE_MAPPINGS[message.role] || message.role
-
-    const type = (
-      (typeof message.getType === 'function' && message.getType()) ||
-      (typeof message._getType === 'function' && message._getType())
-    )
-
-    return ROLE_MAPPINGS[type] || type
-  }
 }
 
 module.exports = LangChainLLMObsHandler

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

@@ -1,11 +1,12 @@
 'use strict'
 
 const { spanHasError } = require('../../../util')
+const { formatIO } = require('../messages')
 const LangChainLLMObsHandler = require('.')
 
 class LangChainLLMObsVectorStoreHandler extends LangChainLLMObsHandler {
   setMetaTags ({ span, inputs, results }) {
-    const input = this.formatIO(inputs)
+    const input = formatIO(inputs)
     if (spanHasError(span)) {
       this._tagger.tagRetrievalIO(span, input)
       return

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

@@ -0,0 +1,76 @@
+'use strict'
+
+const ROLE_MAPPINGS = {
+  human: 'user',
+  ai: 'assistant',
+  system: 'system',
+}
+
+function getRole (message) {
+  if (message.role) return ROLE_MAPPINGS[message.role] || message.role
+
+  const type = (
+    (typeof message.getType === 'function' && message.getType()) ||
+    (typeof message._getType === 'function' && message._getType())
+  )
+
+  return ROLE_MAPPINGS[type] || type
+}
+
+function getContentFromMessage (message) {
+  if (typeof message === 'string') {
+    return message
+  }
+  try {
+    const messageContent = {
+      content: message.content || '',
+    }
+
+    const role = getRole(message)
+    if (role) messageContent.role = role
+
+    return messageContent
+  } catch {
+    return JSON.stringify(message)
+  }
+}
+
+function isBaseMessage (data) {
+  return typeof data._getType === 'function' || typeof data.getType === 'function'
+}
+
+function formatIO (data) {
+  if (data == null) return ''
+
+  if (typeof data === 'string' || typeof data === 'number' || typeof data === 'boolean') {
+    return data
+  }
+
+  if (data.constructor?.name === 'Object') {
+    const formatted = {}
+    for (const [key, value] of Object.entries(data)) {
+      formatted[key] = formatIO(value)
+    }
+    return formatted
+  }
+
+  if (Array.isArray(data)) {
+    return data.map(item => formatIO(item))
+  }
+
+  // Only duck-typed BaseMessage instances collapse to { content, role }.
+  // Other class instances (e.g. LangChain Document) preserve their shape via JSON.stringify,
+  // otherwise they'd reduce to { content: '' } and lose data.
+  if (isBaseMessage(data)) return getContentFromMessage(data)
+
+  try {
+    return JSON.stringify(data)
+  } catch {
+    return String(data)
+  }
+}
+
+module.exports = {
+  getRole,
+  formatIO,
+}

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

@@ -1,36 +1,11 @@
 'use strict'
 
 const LLMObsPlugin = require('../base')
+const { formatIO } = require('../langchain/messages')
 const { spanHasError } = require('../../util')
 
 const streamDataMap = new WeakMap()
 
-function formatIO (data) {
-  if (data == null) return ''
-
-  if (typeof data === 'string' || typeof data === 'number' || typeof data === 'boolean') {
-    return data
-  }
-
-  if (data.constructor?.name === 'Object') {
-    const formatted = {}
-    for (const [key, value] of Object.entries(data)) {
-      formatted[key] = formatIO(value)
-    }
-    return formatted
-  }
-
-  if (Array.isArray(data)) {
-    return data.map(item => formatIO(item))
-  }
-
-  try {
-    return JSON.stringify(data)
-  } catch {
-    return String(data)
-  }
-}
-
 class PregelStreamLLMObsPlugin extends LLMObsPlugin {
   static id = 'llmobs_langgraph_pregel_stream'
   static integration = 'langgraph'

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

@@ -0,0 +1,68 @@
+'use strict'
+
+const LLMObsPlugin = require('../base')
+const { formatInput, formatOutput } = require('./utils')
+
+class McpToolCallLLMObsPlugin extends LLMObsPlugin {
+  static id = 'llmobs_mcp_tool_call'
+  static integration = 'modelcontextprotocol-sdk'
+  static prefix = 'tracing:orchestrion:@modelcontextprotocol/sdk:Client_callTool'
+
+  getLLMObsSpanRegisterOptions (ctx) {
+    const params = ctx.arguments?.[0]
+    const toolName = params?.name || 'unknown_tool'
+
+    return {
+      kind: 'tool',
+      name: `MCP Client Tool Call: ${toolName}`,
+    }
+  }
+
+  setLLMObsTags (ctx) {
+    const span = ctx.currentStore?.span
+    if (!span) return
+
+    const params = ctx.arguments?.[0]
+    const toolName = params?.name
+    const toolArguments = params?.arguments
+
+    const spanTags = { mcp_tool_kind: 'client' }
+
+    const serverVersion = ctx.self?.getServerVersion?.()
+    if (serverVersion) {
+      if (serverVersion.name) spanTags.mcp_server_name = serverVersion.name
+      if (serverVersion.version) spanTags.mcp_server_version = serverVersion.version
+      if (serverVersion.title) spanTags.mcp_server_title = serverVersion.title
+    }
+
+    this._tagger.tagSpanTags(span, spanTags)
+
+    const hasError = ctx.error || ctx.result?.isError
+    const input = formatInput(toolName, toolArguments)
+    const output = hasError ? undefined : formatOutput(ctx.result)
+
+    this._tagger.tagTextIO(span, input, output)
+  }
+}
+
+class McpListToolsLLMObsPlugin extends LLMObsPlugin {
+  static id = 'llmobs_mcp_list_tools'
+  static integration = 'modelcontextprotocol-sdk'
+  static prefix = 'tracing:orchestrion:@modelcontextprotocol/sdk:Client_listTools'
+
+  getLLMObsSpanRegisterOptions () {
+    return {
+      kind: 'task',
+      name: 'MCP Client List Tools',
+    }
+  }
+
+  setLLMObsTags (ctx) {
+    const span = ctx.currentStore?.span
+    if (!span || ctx.error) return
+
+    this._tagger.tagTextIO(span, null, JSON.stringify(ctx.result))
+  }
+}
+
+module.exports = [McpToolCallLLMObsPlugin, McpListToolsLLMObsPlugin]