dd-trace 5.75.0 → 5.77.0

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

@@ -11,7 +11,8 @@ const { MEASURED } = require('../../../ext/tags')
 const {
   convertBuffersToObjects,
   constructCompletionResponseFromStreamedChunks,
-  constructChatCompletionResponseFromStreamedChunks
+  constructChatCompletionResponseFromStreamedChunks,
+  constructResponseResponseFromStreamedChunks
 } = require('./stream-helpers')
 
 const { DD_MAJOR } = require('../../../version')
@@ -59,6 +60,8 @@ class OpenAiTracingPlugin extends TracingPlugin {
         response = constructCompletionResponseFromStreamedChunks(chunks, n)
       } else if (methodName === 'createChatCompletion') {
         response = constructChatCompletionResponseFromStreamedChunks(chunks, n)
+      } else if (methodName === 'createResponse') {
+        response = constructResponseResponseFromStreamedChunks(chunks)
       }
 
       ctx.result = { data: response }
@@ -134,6 +137,10 @@ class OpenAiTracingPlugin extends TracingPlugin {
       case 'createEdit':
         createEditRequestExtraction(tags, payload, openaiStore)
         break
+
+      case 'createResponse':
+        createResponseRequestExtraction(tags, payload, openaiStore)
+        break
     }
 
     span.addTags(tags)
@@ -313,6 +320,10 @@ function normalizeMethodName (methodName) {
     case 'embeddings.create':
       return 'createEmbedding'
 
+    // responses
+    case 'responses.create':
+      return 'createResponse'
+
     // files
     case 'files.create':
       return 'createFile'
@@ -376,6 +387,16 @@ function createEditRequestExtraction (tags, payload, openaiStore) {
   openaiStore.instruction = instruction
 }
 
+function createResponseRequestExtraction (tags, payload, openaiStore) {
+  // Extract model information
+  if (payload.model) {
+    tags['openai.request.model'] = payload.model
+  }
+
+  // Store the full payload for response extraction
+  openaiStore.responseData = payload
+}
+
 function retrieveModelRequestExtraction (tags, payload) {
   tags['openai.request.id'] = payload.id
 }
@@ -410,6 +431,10 @@ function responseDataExtractionByMethod (methodName, tags, body, openaiStore) {
       commonCreateResponseExtraction(tags, body, openaiStore, methodName)
       break
 
+    case 'createResponse':
+      createResponseResponseExtraction(tags, body, openaiStore)
+      break
+
     case 'listFiles':
     case 'listFineTunes':
     case 'listFineTuneEvents':
@@ -513,6 +538,26 @@ function commonCreateResponseExtraction (tags, body, openaiStore, methodName) {
   openaiStore.choices = body.choices
 }
 
+function createResponseResponseExtraction (tags, body, openaiStore) {
+  // Extract response ID if available
+  if (body.id) {
+    tags['openai.response.id'] = body.id
+  }
+
+  // Extract status if available
+  if (body.status) {
+    tags['openai.response.status'] = body.status
+  }
+
+  // Extract model from response if available
+  if (body.model) {
+    tags['openai.response.model'] = body.model
+  }
+
+  // Store the full response for potential future use
+  openaiStore.response = body
+}
+
 // The server almost always responds with JSON
 function coerceResponseBody (body, methodName) {
   switch (methodName) {

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

@@ -6,6 +6,7 @@ const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 const {
   TEST_STATUS,
+  VITEST_POOL,
   finishAllTraceSpans,
   getTestSuitePath,
   getTestSuiteCommonTags,
@@ -344,7 +345,6 @@ class VitestPlugin extends CiPlugin {
         finishAllTraceSpans(testSuiteSpan)
       }
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'suite')
-      // TODO: too frequent flush - find for method in worker to decrease frequency
       this.tracer._exporter.flush(onFinish)
       if (this.runningTestProbe) {
         this.removeDiProbe(this.runningTestProbe)
@@ -373,6 +373,7 @@ class VitestPlugin extends CiPlugin {
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
+      vitestPool,
       onFinish
     }) => {
       this.testSessionSpan.setTag(TEST_STATUS, status)
@@ -394,6 +395,9 @@ class VitestPlugin extends CiPlugin {
       if (isTestManagementTestsEnabled) {
         this.testSessionSpan.setTag(TEST_MANAGEMENT_ENABLED, 'true')
       }
+      if (vitestPool) {
+        this.testSessionSpan.setTag(VITEST_POOL, vitestPool)
+      }
       this.testModuleSpan.finish()
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'module')
       this.testSessionSpan.finish()

package/packages/dd-trace/src/appsec/api_security_sampler.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const TTLCache = require('@isaacs/ttlcache')
+const { TTLCache } = require('@isaacs/ttlcache')
 const web = require('../plugins/util/web')
 const log = require('../log')
 const { AUTO_REJECT, USER_REJECT } = require('../../../../ext/priority')

package/packages/dd-trace/src/appsec/channels.js

@@ -12,6 +12,7 @@ module.exports = {
   cookieParser: dc.channel('datadog:cookie-parser:read:finish'),
   expressMiddlewareError: dc.channel('apm:express:middleware:error'),
   expressProcessParams: dc.channel('datadog:express:process_params:start'),
+  expressResponseRenderStart: dc.channel('tracing:datadog:express:response:render:start'),
   expressSession: dc.channel('datadog:express-session:middleware:finish'),
   fastifyBodyParser: dc.channel('datadog:fastify:body-parser:finish'),
   fastifyCookieParser: dc.channel('datadog:fastify-cookie:read:finish'),

package/packages/dd-trace/src/appsec/iast/analyzers/path-traversal-analyzer.js

@@ -68,6 +68,13 @@ class PathTraversalAnalyzer extends InjectionAnalyzer {
       }
       this.analyze(pathArguments)
     })
+
+    this.addSub('tracing:datadog:express:response:render:start', (ctx) => {
+      const store = storage('legacy').getStore()
+      if (!store) return
+
+      this.analyze([ctx.view])
+    })
   }
 
   _isExcluded (location) {

package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/utils.js

@@ -8,8 +8,8 @@ const STRINGIFY_SENSITIVE_KEY = STRINGIFY_RANGE_KEY + 'SENSITIVE'
 const STRINGIFY_SENSITIVE_NOT_STRING_KEY = STRINGIFY_SENSITIVE_KEY + 'NOTSTRING'
 
 // eslint-disable-next-line @stylistic/max-len
-const KEYS_REGEX_WITH_SENSITIVE_RANGES = new RegExp(`(?:"(${STRINGIFY_RANGE_KEY}_\\d+_))|(?:"(${STRINGIFY_SENSITIVE_KEY}_\\d+_(\\d+)_))|("${STRINGIFY_SENSITIVE_NOT_STRING_KEY}_\\d+_([\\s0-9.a-zA-Z]*)")`, 'gm')
-const KEYS_REGEX_WITHOUT_SENSITIVE_RANGES = new RegExp(`"(${STRINGIFY_RANGE_KEY}_\\d+_)`, 'gm')
+const KEYS_REGEX_WITH_SENSITIVE_RANGES = new RegExp(String.raw`(?:"(${STRINGIFY_RANGE_KEY}_\d+_))|(?:"(${STRINGIFY_SENSITIVE_KEY}_\d+_(\d+)_))|("${STRINGIFY_SENSITIVE_NOT_STRING_KEY}_\d+_([\s0-9.a-zA-Z]*)")`, 'gm')
+const KEYS_REGEX_WITHOUT_SENSITIVE_RANGES = new RegExp(String.raw`"(${STRINGIFY_RANGE_KEY}_\d+_)`, 'gm')
 
 const sensitiveValueRegex = new RegExp(DEFAULT_IAST_REDACTION_VALUE_PATTERN, 'gmi')
 

package/packages/dd-trace/src/appsec/iast/vulnerability-reporter.js

@@ -84,9 +84,10 @@ function sendVulnerabilities (vulnerabilities, span) {
     const jsonToSend = vulnerabilitiesFormatter.toJson(validatedVulnerabilities)
 
     if (jsonToSend.vulnerabilities.length > 0) {
-      const tags = {}
-      // TODO: Store this outside of the span and set the tag in the exporter.
-      tags[IAST_JSON_TAG_KEY] = JSON.stringify(jsonToSend)
+      const tags = {
+        // TODO: Store this outside of the span and set the tag in the exporter.
+        [IAST_JSON_TAG_KEY]: JSON.stringify(jsonToSend)
+      }
       span.addTags(tags)
     }
   }

package/packages/dd-trace/src/appsec/rasp/lfi.js

@@ -1,12 +1,13 @@
 'use strict'
 
-const { fsOperationStart, incomingHttpRequestStart } = require('../channels')
+const { isAbsolute } = require('path')
+
+const { fsOperationStart, incomingHttpRequestStart, expressResponseRenderStart } = require('../channels')
 const { storage } = require('../../../../datadog-core')
 const { enable: enableFsPlugin, disable: disableFsPlugin, RASP_MODULE } = require('./fs-plugin')
 const { FS_OPERATION_PATH } = require('../addresses')
 const waf = require('../waf')
 const { RULE_TYPES, handleResult } = require('./utils')
-const { isAbsolute } = require('path')
 
 let config
 let enabled
@@ -25,6 +26,7 @@ function enable (_config) {
 function disable () {
   if (fsOperationStart.hasSubscribers) fsOperationStart.unsubscribe(analyzeLfi)
   if (incomingHttpRequestStart.hasSubscribers) incomingHttpRequestStart.unsubscribe(onFirstReceivedRequest)
+  if (expressResponseRenderStart.hasSubscribers) expressResponseRenderStart.unsubscribe(analyzeLfiInResponseRender)
 
   disableFsPlugin(RASP_MODULE)
 
@@ -42,10 +44,18 @@ function onFirstReceivedRequest () {
 
   if (!analyzeSubscribed) {
     fsOperationStart.subscribe(analyzeLfi)
+    expressResponseRenderStart.subscribe(analyzeLfiInResponseRender)
     analyzeSubscribed = true
   }
 }
 
+function analyzeLfiInResponseRender (ctx) {
+  const store = storage('legacy').getStore()
+  if (!store) return
+
+  analyzeLfiPath(ctx.view, ctx.req, store.res, ctx.abortController)
+}
+
 function analyzeLfi (ctx) {
   const store = storage('legacy').getStore()
   if (!store) return
@@ -54,15 +64,19 @@ function analyzeLfi (ctx) {
   if (!req || !fs) return
 
   getPaths(ctx, fs).forEach(path => {
-    const ephemeral = {
-      [FS_OPERATION_PATH]: path
-    }
+    analyzeLfiPath(path, req, res, ctx.abortController)
+  })
+}
 
-    const raspRule = { type: RULE_TYPES.LFI }
+function analyzeLfiPath (path, req, res, abortController) {
+  const ephemeral = {
+    [FS_OPERATION_PATH]: path
+  }
 
-    const result = waf.run({ ephemeral }, req, raspRule)
-    handleResult(result, req, res, ctx.abortController, config, raspRule)
-  })
+  const raspRule = { type: RULE_TYPES.LFI }
+
+  const result = waf.run({ ephemeral }, req, raspRule)
+  handleResult(result, req, res, abortController, config, raspRule)
 }
 
 function getPaths (ctx, fs) {

package/packages/dd-trace/src/appsec/stack_trace.js

@@ -42,9 +42,9 @@ function filterOutFramesFromLibrary (callSiteList) {
     if (globalThis.__DD_ESBUILD_IAST_WITH_SM) {
       // bundled with SourceMap, get original file and line to discriminate if comes from dd-trace or not
       const callSiteLocation = {
-        path: callSite.getFileName(),
-        line: callSite.getLineNumber(),
-        column: callSite.getColumnNumber()
+        path: callSite.getTranslatedFileName?.() ?? callSite.getFileName(),
+        line: callSite.getTranslatedLineNumber?.() ?? callSite.getLineNumber(),
+        column: callSite.getTranslatedColumnNumber?.() ?? callSite.getColumnNumber()
       }
       const { path } = getOriginalPathAndLineFromSourceMap(callSiteLocation)
       return !path?.startsWith(ddBasePath)
@@ -68,9 +68,9 @@ function getCallsiteFrames (maxDepth = 32, constructorOpt = getCallsiteFrames, c
     const callSite = filteredFrames[index]
     indexedFrames.push({
       id: index,
-      file: callSite.getFileName(),
-      line: callSite.getLineNumber(),
-      column: callSite.getColumnNumber(),
+      file: callSite.getTranslatedFileName?.() ?? callSite.getFileName(),
+      line: callSite.getTranslatedLineNumber?.() ?? callSite.getLineNumber(),
+      column: callSite.getTranslatedColumnNumber?.() ?? callSite.getColumnNumber(),
       function: callSite.getFunctionName(),
       class_name: callSite.getTypeName(),
       isNative: callSite.isNative()

package/packages/dd-trace/src/ci-visibility/exporters/test-worker/index.js

@@ -29,6 +29,9 @@ function getInterprocessTraceCode () {
   if (getEnvironmentVariable('TINYPOOL_WORKER_ID')) {
     return VITEST_WORKER_TRACE_PAYLOAD_CODE
   }
+  if (getEnvironmentVariable('DD_VITEST_WORKER')) {
+    return VITEST_WORKER_TRACE_PAYLOAD_CODE
+  }
   return null
 }
 
@@ -47,6 +50,9 @@ function getInterprocessLogsCode () {
   if (getEnvironmentVariable('TINYPOOL_WORKER_ID')) {
     return VITEST_WORKER_LOGS_PAYLOAD_CODE
   }
+  if (getEnvironmentVariable('DD_VITEST_WORKER')) {
+    return VITEST_WORKER_LOGS_PAYLOAD_CODE
+  }
   return null
 }
 

package/packages/dd-trace/src/ci-visibility/exporters/test-worker/writer.js

@@ -1,6 +1,11 @@
 'use strict'
 const { JSONEncoder } = require('../../encode/json-encoder')
 const { getEnvironmentVariable } = require('../../../config-helper')
+const log = require('../../../log')
+const {
+  VITEST_WORKER_TRACE_PAYLOAD_CODE,
+  VITEST_WORKER_LOGS_PAYLOAD_CODE
+} = require('../../../plugins/util/test')
 
 class Writer {
   constructor (interprocessCode) {
@@ -26,24 +31,42 @@ class Writer {
   _sendPayload (data, onDone = () => {}) {
     // ## Jest
     // Only available when `child_process` is used for the jest worker.
-    // https://github.com/facebook/jest/blob/bb39cb2c617a3334bf18daeca66bd87b7ccab28b/packages/jest-worker/README.md#experimental-worker
     // If worker_threads is used, this will not work
-    // TODO: make it compatible with worker_threads
+    // TODO: make `jest` instrumentation compatible with worker_threads
+    // https://github.com/facebook/jest/blob/bb39cb2c617a3334bf18daeca66bd87b7ccab28b/packages/jest-worker/README.md#experimental-worker
 
     // ## Cucumber
     // This reports to the test's main process the same way test data is reported by Cucumber
     // See cucumber code:
     // https://github.com/cucumber/cucumber-js/blob/5ce371870b677fe3d1a14915dc535688946f734c/src/runtime/parallel/run_worker.ts#L13
-    if (process.send) { // it only works if process.send is available
-      const isVitestWorker = !!getEnvironmentVariable('TINYPOOL_WORKER_ID')
 
-      const payload = isVitestWorker
-        ? { __tinypool_worker_message__: true, interprocessCode: this._interprocessCode, data }
-        : [this._interprocessCode, data]
+    // Old because vitest@>=4 uses `DD_VITEST_WORKER` and reports arrays just like other frameworks
+    // Before vitest@>=4, we need the `__tinypool_worker_message__` property, or tinypool will crash
+    const isVitestWorkerOld = !!getEnvironmentVariable('TINYPOOL_WORKER_ID')
+    const payload = isVitestWorkerOld
+      ? { __tinypool_worker_message__: true, interprocessCode: this._interprocessCode, data }
+      : [this._interprocessCode, data]
 
+    const isVitestTestWorker =
+      this._interprocessCode === VITEST_WORKER_TRACE_PAYLOAD_CODE ||
+      this._interprocessCode === VITEST_WORKER_LOGS_PAYLOAD_CODE
+
+    if (process.send) {
       process.send(payload, () => {
         onDone()
       })
+    } else if (isVitestTestWorker) { // TODO: worker_threads are only supported in vitest right now
+      const { isMainThread, parentPort } = require('worker_threads')
+      if (isMainThread) {
+        return onDone()
+      }
+      try {
+        parentPort.postMessage(payload)
+      } catch (error) {
+        log.error('Error posting message to parent port', error)
+      } finally {
+        onDone()
+      }
     } else {
       onDone()
     }

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

@@ -4,6 +4,7 @@ const fs = require('fs')
 const os = require('os')
 const uuid = require('crypto-randomuuid') // we need to keep the old uuid dep because of cypress
 const { URL } = require('url')
+
 const log = require('./log')
 const tagger = require('./tagger')
 const set = require('../../datadog-core/src/utils/src/set')
@@ -1507,4 +1508,12 @@ function getAgentUrl (url, options) {
   }
 }
 
-module.exports = Config
+let configInstance = null
+function getConfig (options) {
+  if (!configInstance) {
+    configInstance = new Config(options)
+  }
+  return configInstance
+}
+
+module.exports = getConfig

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

@@ -58,6 +58,11 @@ if (SUPPORT_ARRAY_BUFFER_RESIZE) {
 session.on('Debugger.paused', async ({ params }) => {
   const start = process.hrtime.bigint()
 
+  if (params.reason !== 'other') {
+    // This error should not be caught, and should exit the worker thread, effectively stopping the debugging session
+    throw new Error(`Unexpected Debugger.paused reason: ${params.reason}`)
+  }
+
   let maxReferenceDepth, maxCollectionSize, maxFieldCount, maxLength
   let sampled = false
   let numberOfProbesWithSnapshots = 0
@@ -168,7 +173,9 @@ session.on('Debugger.paused', async ({ params }) => {
   await session.post('Debugger.resume')
   const diff = process.hrtime.bigint() - start // TODO: Recored as telemetry (DEBUG-2858)
 
-  log.debug(() => `[debugger:devtools_client] Finished processing breakpoints - main thread paused for: ${
+  // This doesn't measure the overhead of the CDP protocol. The actual pause time is slightly larger.
+  // On my machine I'm seeing around 1.7ms of overhead.
+  log.debug(() => `[debugger:devtools_client] Finished processing breakpoints - main thread paused for: ~${
     Number(diff) / 1_000_000
   } ms`)
 

package/packages/dd-trace/src/debugger/devtools_client/log.js

@@ -1,10 +1,15 @@
 'use strict'
 
+/** @typedef {'error'|'warn'|'info'|'debug'} Level */
+/** @typedef {(...args: unknown[]) => void} LogFn */
+/** @typedef {Record<Level, LogFn>} Logger */
+
 const { workerData } = require('node:worker_threads')
 
 // For testing purposes, we allow `workerData` to be undefined and fallback to a default config
-const { config: { debug, logLevel }, logPort } = workerData ?? { config: { debug: false } }
+const { config: { debug = false, logLevel } = {}, logPort } = workerData ?? {}
 
+/** @type {Level[]} */
 const LEVELS = ['error', 'warn', 'info', 'debug']
 const on = (level, ...args) => {
   if (typeof args[0] === 'function') {
@@ -14,6 +19,12 @@ const on = (level, ...args) => {
 }
 const off = () => {}
 
-for (const level of LEVELS) {
-  module.exports[level] = debug && LEVELS.indexOf(logLevel) >= LEVELS.indexOf(level) ? on.bind(null, level) : off
-}
+const threshold = LEVELS.indexOf(logLevel)
+
+/** @type {Logger} */
+module.exports = Object.fromEntries(
+  LEVELS.map(level => [
+    level,
+    debug && threshold >= LEVELS.indexOf(level) ? on.bind(null, level) : off
+  ])
+)

package/packages/dd-trace/src/debugger/devtools_client/snapshot/index.js

@@ -13,6 +13,10 @@ module.exports = {
   getLocalStateForCallFrame
 }
 
+function returnError () {
+  return new Error('Error getting local state')
+}
+
 async function getLocalStateForCallFrame (
   callFrame,
   {
@@ -37,7 +41,7 @@ async function getLocalStateForCallFrame (
     // TODO: We might be able to get part of the scope chain.
     // Consider if we could set errors just for the part of the scope chain that throws during collection.
     log.error('[debugger:devtools_client] Error getting local state for call frame', err)
-    return () => new Error('Error getting local state')
+    return returnError
   }
 
   // Delay calling `processRawState` so the caller gets a chance to resume the main thread before processing `rawState`

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

@@ -12,7 +12,7 @@ const uuidSource =
 const containerSource = '[0-9a-f]{64}'
 const taskSource = String.raw`[0-9a-f]{32}-\d+`
 const lineReg = /^(\d+):([^:]*):(.+)$/m
-const entityReg = new RegExp(`.*(${uuidSource}|${containerSource}|${taskSource})(?:\\.scope)?$`, 'm')
+const entityReg = new RegExp(String.raw`.*(${uuidSource}|${containerSource}|${taskSource})(?:\.scope)?$`, 'm')
 
 let inode = 0
 let cgroup = ''

package/packages/dd-trace/src/exporters/span-stats/writer.js

@@ -36,13 +36,12 @@ function makeRequest (data, url, cb) {
       'Datadog-Meta-Lang': 'javascript',
       'Datadog-Meta-Tracer-Version': pkg.version,
       'Content-Type': 'application/msgpack'
-    }
+    },
+    protocol: url.protocol,
+    hostname: url.hostname,
+    port: url.port
   }
 
-  options.protocol = url.protocol
-  options.hostname = url.hostname
-  options.port = url.port
-
   log.debug('Request to the intake: %j', options)
 
   request(data, options, (err, res) => {

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

@@ -32,13 +32,13 @@ const map = {
   'resource.name': 'resource'
 }
 
-function format (span) {
+function format (span, isChunkRoot) {
   const formatted = formatSpan(span)
 
   extractSpanLinks(formatted, span)
   extractSpanEvents(formatted, span)
   extractRootTags(formatted, span)
-  extractChunkTags(formatted, span)
+  extractChunkTags(formatted, span, isChunkRoot)
   extractTags(formatted, span)
 
   return formatted
@@ -192,11 +192,10 @@ function extractRootTags (formattedSpan, span) {
   addTag({}, formattedSpan.metrics, TOP_LEVEL_KEY, 1)
 }
 
-function extractChunkTags (formattedSpan, span) {
+function extractChunkTags (formattedSpan, span, isChunkRoot) {
   const context = span.context()
-  const isLocalRoot = span === context._trace.started[0]
 
-  if (!isLocalRoot) return
+  if (!isChunkRoot) return
 
   for (const [key, value] of Object.entries(context._trace.tags)) {
     addTag(formattedSpan.meta, formattedSpan.metrics, key, value)

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

@@ -82,7 +82,9 @@ class VercelAILLMObsPlugin extends BaseLLMObsPlugin {
    * @param {string} toolDescription
    * @returns {string | undefined}
    */
-  findToolName (toolDescription) {
+  findToolName (toolName, toolDescription) {
+    if (Number.isNaN(Number.parseInt(toolName))) return toolName
+
     for (const availableTool of this.#availableTools) {
       const description = availableTool.description
       if (description === toolDescription && availableTool.id) {
@@ -260,16 +262,17 @@ class VercelAILLMObsPlugin extends BaseLLMObsPlugin {
 
     const formattedToolCalls = []
     for (const toolCall of outputMessageToolCalls) {
-      const toolCallArgs = getJsonStringValue(toolCall.args, {})
+      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(toolDescription)
+      const name = this.findToolName(toolCall.toolName, toolDescription)
       this.#toolCallIdsToName[toolCall.toolCallId] = name
 
       formattedToolCalls.push({
         arguments: toolCallArgs,
         name,
         toolId: toolCall.toolCallId,
-        type: 'function'
+        type: toolCall.toolCallType ?? 'function'
       })
     }
 
@@ -317,10 +320,10 @@ class VercelAILLMObsPlugin extends BaseLLMObsPlugin {
           finalContent += part.text ?? part.data
         } else if (type === 'tool-call') {
           const toolDescription = toolsForModel?.find(tool => part.toolName === tool.name)?.description
-          const name = this.findToolName(toolDescription)
+          const name = this.findToolName(part.toolName, toolDescription)
 
           toolCalls.push({
-            arguments: part.args,
+            arguments: part.args ?? part.input,
             name,
             toolId: part.toolCallId,
             type: 'function'

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

@@ -242,12 +242,9 @@ class AnthropicLLMObsPlugin extends LLMObsPlugin {
     const cacheWriteTokens = usage.cache_creation_input_tokens
     const cacheReadTokens = usage.cache_read_input_tokens
 
-    const metrics = {}
-
-    metrics.inputTokens =
-      (inputTokens ?? 0) +
-      (cacheWriteTokens ?? 0) +
-      (cacheReadTokens ?? 0)
+    const metrics = {
+      inputTokens: (inputTokens ?? 0) + (cacheWriteTokens ?? 0) + (cacheReadTokens ?? 0)
+    }
 
     if (outputTokens) metrics.outputTokens = outputTokens
     const totalTokens = metrics.inputTokens + (outputTokens ?? 0)

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

@@ -37,8 +37,9 @@ class LangChainLLMObsHandler {
       return message
     }
     try {
-      const messageContent = {}
-      messageContent.content = message.content || ''
+      const messageContent = {
+        content: message.content || ''
+      }
 
       const role = this.getRole(message)
       if (role) messageContent.role = role