dd-trace 5.58.0 → 5.60.0

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

@@ -2,14 +2,10 @@
 
 const { workerData: { config: parentConfig, parentThreadId, configPort } } = require('node:worker_threads')
 const { format } = require('node:url')
-const log = require('../../log')
+const log = require('./log')
 
 const config = module.exports = {
-  dynamicInstrumentation: parentConfig.dynamicInstrumentation,
-  runtimeId: parentConfig.tags['runtime-id'],
-  service: parentConfig.service,
-  commitSHA: parentConfig.commitSHA,
-  repositoryUrl: parentConfig.repositoryUrl,
+  ...parentConfig,
   parentThreadId,
   maxTotalPayloadSize: 5 * 1024 * 1024 // 5MB
 }

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

@@ -9,7 +9,7 @@ const { getStackFromCallFrames } = require('./state')
 const { ackEmitting } = require('./status')
 const { parentThreadId } = require('./config')
 const { MAX_SNAPSHOTS_PER_SECOND_GLOBALLY } = require('./defaults')
-const log = require('../../log')
+const log = require('./log')
 const { version } = require('../../../../../package.json')
 const { NODE_MAJOR } = require('../../../../../version')
 
@@ -40,11 +40,19 @@ const SUPPORT_ARRAY_BUFFER_RESIZE = NODE_MAJOR >= 20
 const oneSecondNs = 1_000_000_000n
 let globalSnapshotSamplingRateWindowStart = 0n
 let snapshotsSampledWithinTheLastSecond = 0
-// TODO: Is a limit of 256 snapshots ever going to be a problem?
-const snapshotProbeIndexBuffer = new ArrayBuffer(1, { maxByteLength: 256 })
-// TODO: Is a limit of 256 probes ever going to be a problem?
+
 // TODO: Change to const once we drop support for Node.js 18
-let snapshotProbeIndex = new Uint8Array(snapshotProbeIndexBuffer)
+let snapshotProbeIndexBuffer, snapshotProbeIndex
+
+if (SUPPORT_ARRAY_BUFFER_RESIZE) {
+  // TODO: Is a limit of 256 snapshots ever going to be a problem?
+  // eslint-disable-next-line n/no-unsupported-features/es-syntax
+  snapshotProbeIndexBuffer = new ArrayBuffer(1, { maxByteLength: 256 })
+  // TODO: Is a limit of 256 probes ever going to be a problem?
+  snapshotProbeIndex = new Uint8Array(snapshotProbeIndexBuffer)
+} else {
+  snapshotProbeIndex = new Uint8Array(1)
+}
 
 // WARNING: The code above the line `await session.post('Debugger.resume')` is highly optimized. Please edit with care!
 session.on('Debugger.paused', async ({ params }) => {

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

@@ -1,5 +1,7 @@
 'use strict'
 
+/* eslint n/no-unsupported-features/node-builtins: ['error', { ignores: ['inspector/promises'] }] */
+
 const { builtinModules } = require('node:module')
 
 if (builtinModules.includes('inspector/promises')) {

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

@@ -0,0 +1,19 @@
+'use strict'
+
+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 LEVELS = ['error', 'warn', 'info', 'debug']
+const on = (level, ...args) => {
+  if (typeof args[0] === 'function') {
+    args = [args[0]()]
+  }
+  logPort.postMessage({ level, args })
+}
+const off = () => {}
+
+for (const level of LEVELS) {
+  module.exports[level] = debug && LEVELS.indexOf(logLevel) >= LEVELS.indexOf(level) ? on.bind(null, level) : off
+}

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

@@ -1,9 +1,9 @@
 'use strict'
 
-const { workerData: { rcPort } } = require('node:worker_threads')
+const { workerData: { probePort } } = require('node:worker_threads')
 const { addBreakpoint, removeBreakpoint, modifyBreakpoint } = require('./breakpoints')
 const { ackReceived, ackInstalled, ackError } = require('./status')
-const log = require('../../log')
+const log = require('./log')
 
 // Example log line probe (simplified):
 // {
@@ -32,16 +32,19 @@ const log = require('../../log')
 //   sampling: { snapshotsPerSecond: 5000 },
 //   evaluateAt: 'EXIT' // only used for method probes
 // }
-rcPort.on('message', async ({ action, conf: probe, ackId }) => {
+probePort.on('message', async ({ action, probe, ackId }) => {
   try {
     await processMsg(action, probe)
-    rcPort.postMessage({ ackId })
+    probePort.postMessage({ ackId })
   } catch (err) {
-    rcPort.postMessage({ ackId, error: err })
+    probePort.postMessage({ ackId, error: err })
     ackError(err, probe)
   }
 })
-rcPort.on('messageerror', (err) => log.error('[debugger:devtools_client] received "messageerror" on RC port', err))
+probePort.on(
+  'messageerror',
+  (err) => log.error('[debugger:devtools_client] received "messageerror" on probe port', err)
+)
 
 async function processMsg (action, probe) {
   log.debug(

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

@@ -7,7 +7,7 @@ const config = require('./config')
 const JSONBuffer = require('./json-buffer')
 const request = require('../../exporters/common/request')
 const { GIT_COMMIT_SHA, GIT_REPOSITORY_URL } = require('../../plugins/util/tags')
-const log = require('../../log')
+const log = require('./log')
 const { version } = require('../../../../../package.json')
 const { getEnvironmentVariable } = require('../../config-helper')
 

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

@@ -2,7 +2,7 @@
 
 const { getRuntimeObject } = require('./collector')
 const { processRawState } = require('./processor')
-const log = require('../../../log')
+const log = require('../log')
 
 const DEFAULT_MAX_REFERENCE_DEPTH = 3
 const DEFAULT_MAX_COLLECTION_SIZE = 100

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

@@ -1,4 +1,4 @@
-'use stict'
+'use strict'
 
 module.exports = {
   collectionSizeSym: Symbol('datadog.collectionSize'),

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

@@ -4,7 +4,7 @@ const { join, dirname } = require('path')
 const { normalize } = require('source-map/lib/util')
 const { loadSourceMapSync } = require('./source-maps')
 const session = require('./session')
-const log = require('../../log')
+const log = require('./log')
 
 const WINDOWS_DRIVE_LETTER_REGEX = /[a-zA-Z]/
 

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

@@ -5,7 +5,7 @@ const config = require('./config')
 const JSONBuffer = require('./json-buffer')
 const request = require('../../exporters/common/request')
 const FormData = require('../../exporters/common/form-data')
-const log = require('../../log')
+const log = require('./log')
 
 module.exports = {
   ackReceived,

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

@@ -1,8 +1,10 @@
 'use strict'
 
+const { readFile } = require('fs')
 const { types } = require('util')
 const { join } = require('path')
 const { Worker, MessageChannel, threadId: parentThreadId } = require('worker_threads')
+const getDebuggerConfig = require('./config')
 const log = require('../log')
 
 let worker = null
@@ -23,17 +25,25 @@ function start (config, rc) {
   log.debug('[debugger] Starting Dynamic Instrumentation client...')
 
   const rcAckCallbacks = new Map()
-  const rcChannel = new MessageChannel()
+  const probeChannel = new MessageChannel()
+  const logChannel = new MessageChannel()
   configChannel = new MessageChannel()
 
   process[Symbol.for('datadog:node:util:types')] = types
 
-  rc.setProductHandler('LIVE_DEBUGGING', (action, conf, id, ack) => {
+  readProbeFile(config.dynamicInstrumentation.probeFile, (probes) => {
+    const action = 'apply'
+    for (const probe of probes) {
+      probeChannel.port2.postMessage({ action, probe })
+    }
+  })
+
+  rc.setProductHandler('LIVE_DEBUGGING', (action, probe, id, ack) => {
     rcAckCallbacks.set(++ackId, ack)
-    rcChannel.port2.postMessage({ action, conf, ackId })
+    probeChannel.port2.postMessage({ action, probe, ackId })
   })
 
-  rcChannel.port2.on('message', ({ ackId, error }) => {
+  probeChannel.port2.on('message', ({ ackId, error }) => {
     const ack = rcAckCallbacks.get(ackId)
     if (ack === undefined) {
       // This should never happen, but just in case something changes in the future, we should guard against it
@@ -44,7 +54,12 @@ function start (config, rc) {
     ack(error)
     rcAckCallbacks.delete(ackId)
   })
-  rcChannel.port2.on('messageerror', (err) => log.error('[debugger] received "messageerror" on RC port', err))
+  probeChannel.port2.on('messageerror', (err) => log.error('[debugger] received "messageerror" on probe port', err))
+
+  logChannel.port2.on('message', ({ level, args }) => {
+    log[level](...args)
+  })
+  logChannel.port2.on('messageerror', (err) => log.error('[debugger] received "messageerror" on log port', err))
 
   worker = new Worker(
     join(__dirname, 'devtools_client', 'index.js'),
@@ -52,12 +67,13 @@ function start (config, rc) {
       execArgv: [], // Avoid worker thread inheriting the `-r` command line argument
       env, // Avoid worker thread inheriting the `NODE_OPTIONS` environment variable (in case it contains `-r`)
       workerData: {
-        config: config.serialize(),
+        config: getDebuggerConfig(config),
         parentThreadId,
-        rcPort: rcChannel.port1,
+        probePort: probeChannel.port1,
+        logPort: logChannel.port1,
         configPort: configChannel.port1
       },
-      transferList: [rcChannel.port1, configChannel.port1]
+      transferList: [probeChannel.port1, logChannel.port1, configChannel.port1]
     }
   )
 
@@ -84,13 +100,34 @@ function start (config, rc) {
   })
 
   worker.unref()
-  rcChannel.port1.unref()
-  rcChannel.port2.unref()
+  probeChannel.port1.unref()
+  probeChannel.port2.unref()
+  logChannel.port1.unref()
+  logChannel.port2.unref()
   configChannel.port1.unref()
   configChannel.port2.unref()
 }
 
 function configure (config) {
   if (configChannel === null) return
-  configChannel.port2.postMessage(config.serialize())
+  configChannel.port2.postMessage(getDebuggerConfig(config))
+}
+
+function readProbeFile (path, cb) {
+  if (!path) return
+
+  log.debug('[debugger] Reading probe file: %s', path)
+  readFile(path, 'utf8', (err, data) => {
+    if (err) {
+      log.error('[debugger] Failed to read probe file: %s', path, err)
+      return
+    }
+    try {
+      const parsedData = JSON.parse(data)
+      log.debug('[debugger] Successfully parsed probe file: %s', path)
+      cb(parsedData)
+    } catch (err) {
+      log.error('[debugger] Probe file (%s) is not valid JSON', path, err)
+    }
+  })
 }

package/packages/dd-trace/src/encode/tags-processors.js

@@ -1,3 +1,5 @@
+'use strict'
+
 // From agent truncators: https://github.com/DataDog/datadog-agent/blob/main/pkg/trace/agent/truncator.go
 
 // Values from: https://github.com/DataDog/datadog-agent/blob/main/pkg/trace/traceutil/truncate.go#L22-L27

package/packages/dd-trace/src/exporters/common/agent-info-exporter.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const { URL, format } = require('url')
 
 const request = require('./request')

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const { getEnvironmentVariable } = require('../../config-helper')
 
 function safeJSONStringify (value) {

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const { URL, format } = require('url')
 
 const { Writer } = require('./writer')

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const { SpanStatsEncoder } = require('../../encode/span-stats')
 
 const pkg = require('../../../../../package.json')

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const tracerLogger = require('../../log')// path to require tracer logger
 
 const https = require('https')

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const { SCI_COMMIT_SHA, SCI_REPOSITORY_URL } = require('./constants')
 
 class GitMetadataTagger {

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const commitSHARegex = /git\.commit\.sha=([a-f\d]{40})/
 const repositoryUrlRegex = /git\.repository_url=([\w\d:@/.-]+)/
 

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

@@ -1,7 +1,5 @@
 'use strict'
 
-/* eslint-disable no-var */
-
 var path = require('path')
 var Module = require('module')
 var isTrue = require('./util').isTrue
@@ -26,9 +24,11 @@ function guard (fn) {
     var resolvedInApp
     var entrypoint = process.argv[1]
     try {
+      // eslint-disable-next-line n/no-unsupported-features/node-builtins
       resolvedInApp = Module.createRequire(entrypoint).resolve('dd-trace')
     } catch (e) {
       // Ignore. If we can't resolve the module, we assume it's not in the app.
+      // TODO: There's also the possibility that this version of Node.js doesn't have Module.createRequire (pre v12.2.0)
     }
     if (resolvedInApp) {
       var ourselves = path.normalize(path.join(__dirname, '..', '..', '..', '..', 'index.js'))
@@ -54,8 +54,7 @@ function guard (fn) {
   }
 
   if (!clobberBailout && (!initBailout || forced)) {
-    // Ensure the instrumentation source is set for the current process and potential 
-    // child processes.
+    // Ensure the instrumentation source is set for the current process and potential child processes.
     var result = fn()
     telemetry('complete', ['injection_forced:' + (forced && initBailout ? 'true' : 'false')])
     log.info('Application instrumentation bootstrapping complete')

package/packages/dd-trace/src/guardrails/log.js

@@ -1,6 +1,5 @@
 'use strict'
 
-/* eslint-disable no-var */
 /* eslint-disable no-console */
 
 var isTrue = require('./util').isTrue
@@ -23,7 +22,8 @@ var logLevel = isTrue(DD_TRACE_DEBUG)
   : logLevels.off
 
 var log = {
-  debug: logLevel <= 20 ? console.debug.bind(console) : function () {},
+  /* eslint n/no-unsupported-features/node-builtins: ['error', { ignores: ['console.debug'] }] */
+  debug: logLevel <= 20 ? (console.debug || console.log).bind(console) : function () {},
   info: logLevel <= 30 ? console.info.bind(console) : function () {},
   warn: logLevel <= 40 ? console.warn.bind(console) : function () {},
   error: logLevel <= 50 ? console.error.bind(console) : function () {}

package/packages/dd-trace/src/guardrails/telemetry.js

@@ -1,8 +1,5 @@
 'use strict'
 
-/* eslint-disable no-var */
-/* eslint-disable object-shorthand */
-
 var fs = require('fs')
 var spawn = require('child_process').spawn
 var tracerVersion = require('../../../../package.json').version
@@ -11,12 +8,12 @@ var log = require('./log')
 module.exports = sendTelemetry
 
 if (!process.env.DD_INJECTION_ENABLED) {
-  module.exports = function () {}
+  module.exports = function noop () {}
 }
 
 var telemetryForwarderPath = process.env.DD_TELEMETRY_FORWARDER_PATH
 if (typeof telemetryForwarderPath !== 'string' || !fs.existsSync(telemetryForwarderPath)) {
-  module.exports = function () {}
+  module.exports = function noop () {}
 }
 
 var metadata = {
@@ -28,18 +25,23 @@ var metadata = {
   pid: process.pid
 }
 
-var seen = []
-function hasSeen (point) {
+var seen = {}
+function shouldSend (point) {
   if (point.name === 'abort') {
     // This one can only be sent once, regardless of tags
-    return seen.includes('abort')
-  }
-  if (point.name === 'abort.integration') {
+    if (seen.abort) {
+      return false
+    }
+    seen.abort = true
+  } else if (point.name === 'abort.integration') {
     // For now, this is the only other one we want to dedupe
     var compiledPoint = point.name + point.tags.join('')
-    return seen.includes(compiledPoint)
+    if (seen[compiledPoint]) {
+      return false
+    }
+    seen[compiledPoint] = true
   }
-  return false
+  return true
 }
 
 function sendTelemetry (name, tags) {
@@ -48,9 +50,9 @@ function sendTelemetry (name, tags) {
     points = [{ name: name, tags: tags || [] }]
   }
   if (['1', 'true', 'True'].indexOf(process.env.DD_INJECT_FORCE) !== -1) {
-    points = points.filter(function (p) { return ['error', 'complete'].includes(p.name) })
+    points = points.filter(function (p) { return ['error', 'complete'].indexOf(p.name) !== -1 })
   }
-  points = points.filter(function (p) { return !hasSeen(p) })
+  points = points.filter(function (p) { return shouldSend(p) })
   for (var i = 0; i < points.length; i++) {
     points[i].name = 'library_entrypoint.' + points[i].name
   }

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

@@ -1,7 +1,5 @@
 'use strict'
 
-/* eslint-disable object-shorthand */
-
 function isTrue (str) {
   str = String(str).toLowerCase()
   return str === 'true' || str === '1'

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

@@ -1,3 +1,5 @@
+'use strict'
+
 const BaseLLMObsPlugin = require('./base')
 const { storage } = require('../../../../datadog-core')
 const llmobsStore = storage('llmobs')

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

@@ -8,9 +8,14 @@ const ROLE_MAPPINGS = {
 
 class LangChainLLMObsHandler {
   constructor (tagger) {
+    /** @type {import('../../../tagger')} */
     this._tagger = tagger
   }
 
+  getName ({ span }) {
+    return span?.context()._tags?.['resource.name']
+  }
+
   setMetaTags () {}
 
   formatIO (messages) {

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

@@ -0,0 +1,15 @@
+'use strict'
+
+const LangChainLLMObsHandler = require('.')
+
+class LangChainLLMObsToolHandler extends LangChainLLMObsHandler {
+  getName ({ instance }) {
+    return instance.name
+  }
+
+  setMetaTags ({ span, inputs, results }) {
+    this._tagger.tagTextIO(span, inputs, results)
+  }
+}
+
+module.exports = LangChainLLMObsToolHandler

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

@@ -0,0 +1,36 @@
+'use strict'
+
+const LangChainLLMObsHandler = require('.')
+const { spanHasError } = require('../../../util')
+
+class LangChainLLMObsVectorStoreHandler extends LangChainLLMObsHandler {
+  setMetaTags ({ span, inputs, results }) {
+    const input = this.formatIO(inputs)
+    if (spanHasError(span)) {
+      this._tagger.tagRetrievalIO(span, input)
+      return
+    }
+
+    const documents = []
+    for (const documentResult of results) {
+      let document, score
+      if (Array.isArray(documentResult)) {
+        document = documentResult[0]
+        score = documentResult[1]
+      } else {
+        document = documentResult
+      }
+
+      documents.push({
+        text: document.pageContent,
+        id: document.id,
+        name: document.metadata?.source,
+        score
+      })
+    }
+
+    this._tagger.tagRetrievalIO(span, input, documents)
+  }
+}
+
+module.exports = LangChainLLMObsVectorStoreHandler

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

@@ -14,11 +14,15 @@ const LLM_SPAN_TYPES = new Set(['llm', 'chat_model', 'embedding'])
 const LLM = 'llm'
 const WORKFLOW = 'workflow'
 const EMBEDDING = 'embedding'
+const TOOL = 'tool'
+const RETRIEVAL = 'retrieval'
 
 const ChainHandler = require('./handlers/chain')
 const ChatModelHandler = require('./handlers/chat_model')
 const LlmHandler = require('./handlers/llm')
 const EmbeddingHandler = require('./handlers/embedding')
+const ToolHandler = require('./handlers/tool')
+const VectorStoreHandler = require('./handlers/vectorstore')
 
 class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
   static get integration () { return 'langchain' }
@@ -34,7 +38,9 @@ class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
       chain: new ChainHandler(this._tagger),
       chat_model: new ChatModelHandler(this._tagger),
       llm: new LlmHandler(this._tagger),
-      embedding: new EmbeddingHandler(this._tagger)
+      embedding: new EmbeddingHandler(this._tagger),
+      tool: new ToolHandler(this._tagger),
+      similarity_search: new VectorStoreHandler(this._tagger)
     }
   }
 
@@ -45,7 +51,10 @@ class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
     const modelProvider = tags['langchain.request.provider'] // could be undefined
     const modelName = tags['langchain.request.model'] // could be undefined
     const kind = this.getKind(ctx.type, modelProvider)
-    const name = tags['resource.name']
+
+    const instance = ctx.instance || ctx.self
+    const handler = this._handlers[ctx.type]
+    const name = handler?.getName({ span, instance })
 
     return {
       modelProvider,
@@ -113,7 +122,14 @@ class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
       }
     }
 
-    return WORKFLOW
+    switch (type) {
+      case 'tool':
+        return TOOL
+      case 'similarity_search':
+        return RETRIEVAL
+      default:
+        return WORKFLOW
+    }
   }
 
   getIntegrationName (type, provider = 'custom') {
@@ -181,11 +197,38 @@ class EmbeddingsEmbedDocumentsPlugin extends BaseLangChainLLMObsPlugin {
   }
 }
 
+class ToolInvokePlugin extends BaseLangChainLLMObsPlugin {
+  static get id () { return 'llmobs_langchain_tool_invoke' }
+  static get lcType () { return 'tool' }
+  static get prefix () {
+    return 'tracing:orchestrion:@langchain/core:Tool_invoke'
+  }
+}
+
+class VectorStoreSimilaritySearchPlugin extends BaseLangChainLLMObsPlugin {
+  static get id () { return 'llmobs_langchain_vectorstore_similarity_search' }
+  static get lcType () { return 'similarity_search' }
+  static get prefix () {
+    return 'tracing:orchestrion:@langchain/core:VectorStore_similaritySearch'
+  }
+}
+
+class VectorStoreSimilaritySearchWithScorePlugin extends BaseLangChainLLMObsPlugin {
+  static get id () { return 'llmobs_langchain_vectorstore_similarity_search_with_score' }
+  static get lcType () { return 'similarity_search' }
+  static get prefix () {
+    return 'tracing:orchestrion:@langchain/core:VectorStore_similaritySearchWithScore'
+  }
+}
+
 module.exports = [
   RunnableSequenceInvokePlugin,
   RunnableSequenceBatchPlugin,
   BaseChatModelGeneratePlugin,
   BaseLLMGeneratePlugin,
   EmbeddingsEmbedQueryPlugin,
-  EmbeddingsEmbedDocumentsPlugin
+  EmbeddingsEmbedDocumentsPlugin,
+  ToolInvokePlugin,
+  VectorStoreSimilaritySearchPlugin,
+  VectorStoreSimilaritySearchWithScorePlugin
 ]

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

@@ -281,6 +281,7 @@ class LLMObsTagger {
 
       const { content = '', role } = message
       const toolCalls = message.toolCalls
+      const toolId = message.toolId
       const messageObj = { content }
 
       const valid = typeof content === 'string'
@@ -288,7 +289,7 @@ class LLMObsTagger {
         this.#handleFailure('Message content must be a string.', 'invalid_io_messages')
       }
 
-      const condition = this.#tagConditionalString(role, 'Message role', messageObj, 'role')
+      let condition = this.#tagConditionalString(role, 'Message role', messageObj, 'role')
 
       if (toolCalls) {
         const filteredToolCalls = this.#filterToolCalls(toolCalls)
@@ -298,6 +299,14 @@ class LLMObsTagger {
         }
       }
 
+      if (toolId) {
+        if (role === 'tool') {
+          condition = this.#tagConditionalString(toolId, 'Tool ID', messageObj, 'tool_id')
+        } else {
+          log.warn(`Tool ID for tool message not associated with a "tool" role, instead got "${role}"`)
+        }
+      }
+
       if (valid && condition) {
         messages.push(messageObj)
       }