dd-trace 5.98.0 → 5.99.0

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

@@ -131,7 +131,13 @@ function setAndTrack (config, name, value, rawValue = value, source = 'calculate
     }
     changeTracker[source].add(name)
   } else {
-    const copy = typeof value === 'object' && value !== null ? rfdc(value) : value
+    // Programmatic-only options (e.g. logger, lookup, plugins) have no row in
+    // `configurationsTable` and hold opaque user-supplied references that may
+    // carry cycles or non-plain prototypes — for example a winston Logger
+    // extends a Transform stream. Use a reference for these instead of cloning.
+    const copy = typeof value === 'object' && value !== null && name in configurationsTable
+      ? rfdc(value)
+      : value
     changeTracker.baseValuesByPath[name] = { value: copy, source }
   }
   set(config, name, value)
@@ -358,21 +364,9 @@ class Config extends ConfigBase {
       setAndTrack(this, 'otelMetricsEnabled', false)
     }
 
-    const otelTracesEnabled = trackedConfigOrigins.has('OTEL_TRACES_EXPORTER') &&
-      this.OTEL_TRACES_EXPORTER === 'otlp'
-    if (this.protocolVersion && this.protocolVersion !== '0.4' && otelTracesEnabled) {
+    if (this.OTEL_TRACES_EXPORTER === 'otlp' && this.protocolVersion && this.protocolVersion !== '0.4') {
       log.warn('DD_TRACE_AGENT_PROTOCOL_VERSION is set, disabling OTLP traces export')
-      setAndTrack(this, 'otelTracesEnabled', false)
-    } else {
-      setAndTrack(this, 'otelTracesEnabled', otelTracesEnabled)
-    }
-
-    if (this.otelTracesProtocol && this.otelTracesProtocol !== 'http/json') {
-      log.warn(
-        'OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=%s is not yet supported; only http/json is currently implemented',
-        this.otelTracesProtocol
-      )
-      setAndTrack(this, 'otelTracesProtocol', 'http/json')
+      setAndTrack(this, 'OTEL_TRACES_EXPORTER', 'none')
     }
 
     if (this.telemetry.heartbeatInterval) {
@@ -441,16 +435,13 @@ class Config extends ConfigBase {
       setAndTrack(this, 'runtimeMetrics.enabled', false)
     }
 
-    if (!trackedConfigOrigins.has('sampleRate')) {
-      const effectiveSampler = (trackedConfigOrigins.has('OTEL_TRACES_EXPORTER') &&
-        this.OTEL_TRACES_EXPORTER === 'otlp' &&
-        !trackedConfigOrigins.has('OTEL_TRACES_SAMPLER'))
-        ? 'parentbased_always_on'
-        : this.OTEL_TRACES_SAMPLER
-      if (effectiveSampler && (trackedConfigOrigins.has('OTEL_TRACES_SAMPLER') ||
-          trackedConfigOrigins.has('OTEL_TRACES_EXPORTER'))) {
-        setAndTrack(this, 'sampleRate', getFromOtelSamplerMap(effectiveSampler, this.OTEL_TRACES_SAMPLER_ARG))
-      }
+    // Apply the OTel sampler when the user opted into OTel traces or explicitly set the sampler.
+    // OTEL_TRACES_SAMPLER has `default: parentbased_always_on` (per OTel spec), so opt-in users
+    // that don't set the sampler still get parent-based sampling.
+    if (!trackedConfigOrigins.has('sampleRate') &&
+        (trackedConfigOrigins.has('OTEL_TRACES_SAMPLER') || this.OTEL_TRACES_EXPORTER === 'otlp')) {
+      setAndTrack(this, 'sampleRate',
+        getFromOtelSamplerMap(this.OTEL_TRACES_SAMPLER, this.OTEL_TRACES_SAMPLER_ARG))
     }
 
     if (this.DD_SPAN_SAMPLING_RULES_FILE) {
@@ -605,19 +596,18 @@ class Config extends ConfigBase {
       }
     }
 
-    const DEFAULT_OTLP_PORT = '4318'
+    // TODO: This could likely be moved to the base class and allow easier GRPC handling
+    // Default OTLP endpoints follow the configured agent host so users who point DD at a custom
+    // agent (DD_AGENT_HOST / DD_TRACE_AGENT_URL) also reach OTLP on that host.
+    const defaultOtlpBase = this.OTEL_EXPORTER_OTLP_ENDPOINT?.replace(/\/$/, '') ?? `http://${agentHostname}:4318`
     if (!this.otelLogsUrl) {
-      setAndTrack(this, 'otelLogsUrl', `http://${agentHostname}:${DEFAULT_OTLP_PORT}`)
+      setAndTrack(this, 'otelLogsUrl', `${defaultOtlpBase}/v1/logs`)
     }
     if (!this.otelMetricsUrl) {
-      setAndTrack(this, 'otelMetricsUrl', `http://${agentHostname}:${DEFAULT_OTLP_PORT}/v1/metrics`)
-    }
-    if (!trackedConfigOrigins.has('otelTracesUrl') && this.OTEL_EXPORTER_OTLP_ENDPOINT) {
-      // Generic OTLP endpoint: per spec, append /v1/traces signal-specific subpath
-      setAndTrack(this, 'otelTracesUrl', this.OTEL_EXPORTER_OTLP_ENDPOINT.replace(/\/$/, '') + '/v1/traces')
-    } else if (!this.otelTracesUrl) {
-      const tracesHostname = agentHostname === '127.0.0.1' ? 'localhost' : agentHostname
-      setAndTrack(this, 'otelTracesUrl', `http://${tracesHostname}:${DEFAULT_OTLP_PORT}/v1/traces`)
+      setAndTrack(this, 'otelMetricsUrl', `${defaultOtlpBase}/v1/metrics`)
+    }
+    if (!this.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT) {
+      setAndTrack(this, 'OTEL_EXPORTER_OTLP_TRACES_ENDPOINT', `${defaultOtlpBase}/v1/traces`)
     }
 
     if (process.platform === 'win32') {

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

@@ -13,6 +13,15 @@ const VALID_PROPAGATION_STYLES = new Set([
   'datadog', 'tracecontext', 'b3', 'b3 single header', 'b3multi', 'baggage', 'none',
 ])
 
+const RENAMED_OTEL_TAGS = new Map(
+  [
+    ['deployment.environment.name', 'env'],
+    ['deployment.environment', 'env'],
+    ['service.name', 'service'],
+    ['service.version', 'version'],
+  ]
+)
+
 function toCase (value, methodName) {
   if (Array.isArray(value)) {
     return value.map(item => {
@@ -66,12 +75,12 @@ const transformers = {
     }
     return value
   },
-  parseOtelTags (value, optionName) {
-    return parsers.MAP(value
-      ?.replace(/(^|,)deployment\.environment=/, '$1env:')
-      .replace(/(^|,)service\.name=/, '$1service:')
-      .replace(/(^|,)service\.version=/, '$1version:')
-      .replaceAll('=', ':'), optionName)
+  parseOtelTags (object) {
+    const tags = {}
+    for (const [key, value] of Object.entries(object)) {
+      tags[RENAMED_OTEL_TAGS.get(key) ?? key] = value
+    }
+    return tags
   },
   normalizeProfilingEnabled (configValue) {
     if (configValue == null) {
@@ -225,11 +234,19 @@ const parsers = {
     if (!raw) {
       return entries
     }
-    // DD_TAGS is a special case. It may be a map of key-value pairs separated by spaces.
-    if (optionName === 'DD_TAGS' && !raw.includes(',')) {
+    let valueSeparator = ':'
+    if (optionName.startsWith('OTEL_')) {
+      // OTEL spec uses `key=value,key=value`
+      // (https://opentelemetry.io/docs/specs/otel/protocol/exporter/#specifying-headers-via-environment-variables),
+      // while DD uses `key:value,key:value`. Parse OTEL-prefixed options with `=` so downstream code
+      // receives a proper map and telemetry reports the parsed entries. The char-by-char loop
+      // avoids the allocations that `split(',')` + `indexOf('=')` do per pair.
+      valueSeparator = '='
+    } else if (optionName === 'DD_TAGS' && !raw.includes(',')) {
+      // DD_TAGS is a special case. It may be a map of key-value pairs separated by spaces.
       raw = raw.replaceAll(/\s+/g, ',')
     }
-    tagger.add(entries, raw)
+    tagger.add(entries, raw, valueSeparator)
     return entries
   },
   JSON (raw) {

package/packages/dd-trace/src/config/supported-configurations.json

@@ -179,7 +179,8 @@
       {
         "implementation": "A",
         "type": "int",
-        "default": "100"
+        "default": "100",
+        "allowed": "\\d+"
       }
     ],
     "DD_APM_TRACING_ENABLED": [
@@ -189,7 +190,10 @@
         "configurationNames": [
           "apmTracingEnabled"
         ],
-        "default": "true"
+        "default": "true",
+        "aliases": [
+          "DD_TRACING_ENABLED"
+        ]
       }
     ],
     "DD_APPSEC_AUTO_USER_INSTRUMENTATION_MODE": [
@@ -445,9 +449,9 @@
     ],
     "DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER": [
       {
-        "implementation": "B",
-        "type": "boolean",
-        "default": "false"
+        "implementation": "A",
+        "type": "string",
+        "default": null
       }
     ],
     "DD_CIVISIBILITY_DANGEROUSLY_FORCE_COVERAGE": [
@@ -2509,10 +2513,7 @@
         "implementation": "A",
         "type": "boolean",
         "default": "true",
-        "internalPropertyName": "tracing",
-        "aliases": [
-          "DD_TRACING_ENABLED"
-        ]
+        "internalPropertyName": "tracing"
       }
     ],
     "DD_TRACE_ENCODING_DEBUG": [
@@ -3110,6 +3111,13 @@
         "default": "true"
       }
     ],
+    "DD_TRACE_MODELCONTEXTPROTOCOL_SDK_ENABLED": [
+      {
+        "implementation": "A",
+        "type": "boolean",
+        "default": "true"
+      }
+    ],
     "DD_TRACE_MOLECULER_ENABLED": [
       {
         "implementation": "A",
@@ -3896,18 +3904,16 @@
     ],
     "OTEL_EXPORTER_OTLP_HEADERS": [
       {
-        "implementation": "C",
-        "type": "string",
-        "default": null,
-        "internalPropertyName": "otelHeaders"
+        "implementation": "B",
+        "type": "map",
+        "default": null
       }
     ],
     "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT": [
       {
         "implementation": "A",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "otelTracesUrl"
+        "default": null
       }
     ],
     "OTEL_EXPORTER_OTLP_TRACES_HEADERS": [
@@ -3915,7 +3921,6 @@
         "implementation": "B",
         "type": "map",
         "default": null,
-        "internalPropertyName": "otelTracesHeaders",
         "aliases": [
           "OTEL_EXPORTER_OTLP_HEADERS"
         ]
@@ -3926,7 +3931,7 @@
         "implementation": "B",
         "type": "string",
         "default": "http/json",
-        "internalPropertyName": "otelTracesProtocol",
+        "allowed": "http/json",
         "aliases": [
           "OTEL_EXPORTER_OTLP_PROTOCOL"
         ]
@@ -3936,7 +3941,6 @@
       {
         "implementation": "B",
         "type": "int",
-        "internalPropertyName": "otelTracesTimeout",
         "default": "10000",
         "aliases": [
           "OTEL_EXPORTER_OTLP_TIMEOUT"
@@ -3948,18 +3952,14 @@
         "implementation": "A",
         "type": "string",
         "default": null,
-        "internalPropertyName": "otelLogsUrl",
-        "aliases": [
-          "OTEL_EXPORTER_OTLP_ENDPOINT"
-        ]
+        "internalPropertyName": "otelLogsUrl"
       }
     ],
     "OTEL_EXPORTER_OTLP_LOGS_HEADERS": [
       {
-        "implementation": "A",
-        "type": "string",
+        "implementation": "B",
+        "type": "map",
         "default": null,
-        "internalPropertyName": "otelLogsHeaders",
         "aliases": [
           "OTEL_EXPORTER_OTLP_HEADERS"
         ]
@@ -3993,18 +3993,14 @@
         "implementation": "A",
         "type": "string",
         "default": null,
-        "internalPropertyName": "otelMetricsUrl",
-        "aliases": [
-          "OTEL_EXPORTER_OTLP_ENDPOINT"
-        ]
+        "internalPropertyName": "otelMetricsUrl"
       }
     ],
     "OTEL_EXPORTER_OTLP_METRICS_HEADERS": [
       {
-        "implementation": "B",
-        "type": "string",
+        "implementation": "C",
+        "type": "map",
         "default": null,
-        "internalPropertyName": "otelMetricsHeaders",
         "aliases": [
           "OTEL_EXPORTER_OTLP_HEADERS"
         ]
@@ -4098,8 +4094,8 @@
     ],
     "OTEL_RESOURCE_ATTRIBUTES": [
       {
-        "implementation": "B",
-        "type": "string",
+        "implementation": "A",
+        "type": "map",
         "default": "",
         "transform": "parseOtelTags"
       }
@@ -4113,9 +4109,9 @@
     ],
     "OTEL_TRACES_EXPORTER": [
       {
-        "implementation": "F",
+        "implementation": "H",
         "type": "string",
-        "default": "otlp",
+        "default": null,
         "allowed": "none|otlp",
         "transform": "toLowerCase"
       }

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

@@ -5,6 +5,7 @@ module.exports = function getDebuggerConfig (config, inputPath) {
     commitSHA: config.commitSHA,
     debug: config.debug,
     dynamicInstrumentation: config.dynamicInstrumentation,
+    env: config.env,
     hostname: config.hostname,
     logLevel: config.logLevel,
     port: config.port,
@@ -13,6 +14,7 @@ module.exports = function getDebuggerConfig (config, inputPath) {
     runtimeId: config.tags['runtime-id'],
     service: config.service,
     url: config.url?.toString(),
+    version: config.version,
     inputPath,
   }
 }

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

@@ -6,7 +6,6 @@ const { stringify } = require('querystring')
 const { version } = require('../../../../../package.json')
 const request = require('../../exporters/common/request')
 const { GIT_COMMIT_SHA, GIT_REPOSITORY_URL } = require('../../plugins/util/tags')
-const { getValueFromEnvSources } = require('../../config/helper')
 const { DEBUGGER_DIAGNOSTICS_V1, DEBUGGER_INPUT_V2 } = require('../constants')
 const log = require('./log')
 const JSONBuffer = require('./json-buffer')
@@ -23,14 +22,14 @@ const ddsource = 'dd_debugger'
 const hostname = getHostname()
 const service = config.service
 
-const ddtags = [
-  ['env', getValueFromEnvSources('DD_ENV')],
-  ['version', getValueFromEnvSources('DD_VERSION')],
+const ddtags = buildTags([
+  ['env', config.env],
+  ['version', config.version],
   ['debugger_version', version],
   ['host_name', hostname],
   [GIT_COMMIT_SHA, config.commitSHA],
   [GIT_REPOSITORY_URL, config.repositoryUrl],
-].filter(([, value]) => value !== undefined).map((pair) => pair.join(':')).join(',')
+])
 
 let path
 setInputPath(config.inputPath)
@@ -136,3 +135,24 @@ function setInputPath (newPath) {
   config.inputPath = newPath
   path = `${newPath}?${stringify({ ddtags })}`
 }
+
+/**
+ * @param {Array<[string, unknown]>} tags - The tags to serialize.
+ * @returns {string} The serialized tags.
+ */
+function buildTags (tags) {
+  const serializedTags = []
+
+  for (const [key, rawValue] of tags) {
+    if (rawValue === undefined) continue
+
+    if (String(rawValue).includes(',')) {
+      log.warn('[debugger:devtools_client] Skipping invalid tag value for %s', key)
+      continue
+    }
+
+    serializedTags.push(`${key}:${rawValue}`)
+  }
+
+  return serializedTags.join(',')
+}

package/packages/dd-trace/src/encode/0.4.js

@@ -1,9 +1,8 @@
 'use strict'
 
+const getConfig = require('../config')
 const { MsgpackChunk, MsgpackEncoder } = require('../msgpack')
 const log = require('../log')
-const { isTrue } = require('../util')
-const { getValueFromEnvSources } = require('../config/helper')
 const { truncateSpan, normalizeSpan } = require('./tags-processors')
 
 const SOFT_LIMIT = 8 * 1024 * 1024 // 8MB
@@ -12,7 +11,7 @@ function formatSpan (span, config) {
   span = normalizeSpan(truncateSpan(span, false))
   if (span.span_events) {
     // ensure span events are encoded as tags if agent doesn't support native top level span events
-    if (config?.trace?.nativeSpanEvents) {
+    if (config.trace.nativeSpanEvents) {
       formatSpanEvents(span)
     } else {
       span.meta.events = JSON.stringify(span.span_events)
@@ -30,8 +29,8 @@ class AgentEncoder {
     this._stringBytes = new MsgpackChunk()
     this._writer = writer
     this._reset()
-    this._debugEncoding = isTrue(getValueFromEnvSources('DD_TRACE_ENCODING_DEBUG'))
-    this._config = this._writer?._config
+    this._config = getConfig()
+    this._debugEncoding = this._config.DD_TRACE_ENCODING_DEBUG
   }
 
   count () {

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