dd-trace 5.67.0 → 5.68.0

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

@@ -0,0 +1,186 @@
+'use strict'
+
+const pkg = require('./pkg')
+const { GRPC_CLIENT_ERROR_STATUSES, GRPC_SERVER_ERROR_STATUSES } = require('./constants')
+const { getEnvironmentVariables } = require('./config-helper')
+
+// eslint-disable-next-line @stylistic/max-len
+const qsRegex = String.raw`(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?|public_?|access_?|secret_?)key(?:_?id)?|token|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:(?:\s|%20)*(?:=|%3D)[^&]+|(?:"|%22)(?:\s|%20)*(?::|%3A)(?:\s|%20)*(?:"|%22)(?:%2[^2]|%[^2]|[^"%])+(?:"|%22))|bearer(?:\s|%20)+[a-z0-9\._\-]+|token(?::|%3A)[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L](?:[\w=-]|%3D)+\.ey[I-L](?:[\w=-]|%3D)+(?:\.(?:[\w.+\/=-]|%3D|%2F|%2B)+)?|[\-]{5}BEGIN(?:[a-z\s]|%20)+PRIVATE(?:\s|%20)KEY[\-]{5}[^\-]+[\-]{5}END(?:[a-z\s]|%20)+PRIVATE(?:\s|%20)KEY|ssh-rsa(?:\s|%20)*(?:[a-z0-9\/\.+]|%2F|%5C|%2B){100,}`
+// eslint-disable-next-line @stylistic/max-len
+const defaultWafObfuscatorKeyRegex = String.raw`(?i)pass|pw(?:or)?d|secret|(?:api|private|public|access)[_-]?key|token|consumer[_-]?(?:id|key|secret)|sign(?:ed|ature)|bearer|authorization|jsessionid|phpsessid|asp\.net[_-]sessionid|sid|jwt`
+// eslint-disable-next-line @stylistic/max-len
+const defaultWafObfuscatorValueRegex = String.raw`(?i)(?:p(?:ass)?w(?:or)?d|pass(?:[_-]?phrase)?|secret(?:[_-]?key)?|(?:(?:api|private|public|access)[_-]?)key(?:[_-]?id)?|(?:(?:auth|access|id|refresh)[_-]?)?token|consumer[_-]?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?|jsessionid|phpsessid|asp\.net(?:[_-]|-)sessionid|sid|jwt)(?:\s*=([^;&]+)|"\s*:\s*("[^"]+"|\d+))|bearer\s+([a-z0-9\._\-]+)|token\s*:\s*([a-z0-9]{13})|gh[opsu]_([0-9a-zA-Z]{36})|ey[I-L][\w=-]+\.(ey[I-L][\w=-]+(?:\.[\w.+\/=-]+)?)|[\-]{5}BEGIN[a-z\s]+PRIVATE\sKEY[\-]{5}([^\-]+)[\-]{5}END[a-z\s]+PRIVATE\sKEY|ssh-rsa\s*([a-z0-9\/\.+]{100,})`
+
+const {
+  AWS_LAMBDA_FUNCTION_NAME,
+  FUNCTION_NAME,
+  K_SERVICE,
+  WEBSITE_SITE_NAME
+} = getEnvironmentVariables()
+
+const service = AWS_LAMBDA_FUNCTION_NAME ||
+  FUNCTION_NAME || // Google Cloud Function Name set by deprecated runtimes
+  K_SERVICE || // Google Cloud Function Name set by newer runtimes
+  WEBSITE_SITE_NAME || // set by Azure Functions
+  pkg.name ||
+  'node'
+
+module.exports = {
+  apmTracingEnabled: true,
+  'appsec.apiSecurity.enabled': true,
+  'appsec.apiSecurity.sampleDelay': 30,
+  'appsec.apiSecurity.endpointCollectionEnabled': true,
+  'appsec.apiSecurity.endpointCollectionMessageLimit': 300,
+  'appsec.blockedTemplateGraphql': undefined,
+  'appsec.blockedTemplateHtml': undefined,
+  'appsec.blockedTemplateJson': undefined,
+  'appsec.enabled': undefined,
+  'appsec.eventTracking.mode': 'identification',
+  'appsec.extendedHeadersCollection.enabled': false,
+  'appsec.extendedHeadersCollection.redaction': true,
+  'appsec.extendedHeadersCollection.maxHeaders': 50,
+  'appsec.obfuscatorKeyRegex': defaultWafObfuscatorKeyRegex,
+  'appsec.obfuscatorValueRegex': defaultWafObfuscatorValueRegex,
+  'appsec.rasp.enabled': true,
+  'appsec.rasp.bodyCollection': false,
+  'appsec.rateLimit': 100,
+  'appsec.rules': undefined,
+  'appsec.sca.enabled': null,
+  'appsec.stackTrace.enabled': true,
+  'appsec.stackTrace.maxDepth': 32,
+  'appsec.stackTrace.maxStackTraces': 2,
+  'appsec.wafTimeout': 5e3, // µs
+  baggageMaxBytes: 8192,
+  baggageMaxItems: 64,
+  baggageTagKeys: 'user.id,session.id,account.id',
+  clientIpEnabled: false,
+  clientIpHeader: null,
+  'crashtracking.enabled': true,
+  'codeOriginForSpans.enabled': true,
+  'codeOriginForSpans.experimental.exit_spans.enabled': false,
+  dbmPropagationMode: 'disabled',
+  'dogstatsd.hostname': '127.0.0.1',
+  'dogstatsd.port': '8125',
+  dsmEnabled: false,
+  'dynamicInstrumentation.enabled': false,
+  'dynamicInstrumentation.probeFile': undefined,
+  'dynamicInstrumentation.redactedIdentifiers': [],
+  'dynamicInstrumentation.redactionExcludedIdentifiers': [],
+  'dynamicInstrumentation.uploadIntervalSeconds': 1,
+  env: undefined,
+  'experimental.enableGetRumData': false,
+  'experimental.exporter': undefined,
+  flushInterval: 2000,
+  flushMinSpans: 1000,
+  gitMetadataEnabled: true,
+  graphqlErrorExtensions: [],
+  'grpc.client.error.statuses': GRPC_CLIENT_ERROR_STATUSES,
+  'grpc.server.error.statuses': GRPC_SERVER_ERROR_STATUSES,
+  headerTags: [],
+  'heapSnapshot.count': 0,
+  'heapSnapshot.destination': '',
+  'heapSnapshot.interval': 3600,
+  hostname: '127.0.0.1',
+  'iast.dbRowsToTaint': 1,
+  'iast.deduplicationEnabled': true,
+  'iast.enabled': false,
+  'iast.maxConcurrentRequests': 2,
+  'iast.maxContextOperations': 2,
+  'iast.redactionEnabled': true,
+  'iast.redactionNamePattern': null,
+  'iast.redactionValuePattern': null,
+  'iast.requestSampling': 30,
+  'iast.securityControlsConfiguration': null,
+  'iast.telemetryVerbosity': 'INFORMATION',
+  'iast.stackTrace.enabled': true,
+  injectionEnabled: [],
+  instrumentationSource: 'manual',
+  injectForce: null,
+  isAzureFunction: false,
+  isCiVisibility: false,
+  isEarlyFlakeDetectionEnabled: false,
+  isFlakyTestRetriesEnabled: false,
+  flakyTestRetriesCount: 5,
+  isGCPFunction: false,
+  isGitUploadEnabled: false,
+  isIntelligentTestRunnerEnabled: false,
+  isManualApiEnabled: false,
+  'langchain.spanCharLimit': 128,
+  'langchain.spanPromptCompletionSampleRate': 1,
+  'llmobs.agentlessEnabled': undefined,
+  'llmobs.enabled': false,
+  'llmobs.mlApp': undefined,
+  ciVisibilityTestSessionName: '',
+  ciVisAgentlessLogSubmissionEnabled: false,
+  legacyBaggageEnabled: true,
+  isTestDynamicInstrumentationEnabled: false,
+  isServiceUserProvided: false,
+  testManagementAttemptToFixRetries: 20,
+  isTestManagementEnabled: false,
+  isImpactedTestsEnabled: false,
+  logInjection: true,
+  lookup: undefined,
+  inferredProxyServicesEnabled: false,
+  memcachedCommandEnabled: false,
+  middlewareTracingEnabled: true,
+  openAiLogsEnabled: false,
+  'openai.spanCharLimit': 128,
+  peerServiceMapping: {},
+  plugins: true,
+  port: '8126',
+  'profiling.enabled': undefined,
+  'profiling.exporters': 'agent',
+  'profiling.sourceMap': true,
+  'profiling.longLivedThreshold': undefined,
+  protocolVersion: '0.4',
+  queryStringObfuscation: qsRegex,
+  'remoteConfig.enabled': true,
+  'remoteConfig.pollInterval': 5, // seconds
+  reportHostname: false,
+  'runtimeMetrics.enabled': false,
+  'runtimeMetrics.eventLoop': true,
+  'runtimeMetrics.gc': true,
+  runtimeMetricsRuntimeId: false,
+  sampleRate: undefined,
+  'sampler.rateLimit': 100,
+  'sampler.rules': [],
+  'sampler.spanSamplingRules': [],
+  scope: undefined,
+  service,
+  serviceMapping: {},
+  site: 'datadoghq.com',
+  spanAttributeSchema: 'v0',
+  spanComputePeerService: false,
+  spanLeakDebug: 0,
+  spanRemoveIntegrationFromService: false,
+  startupLogs: false,
+  'stats.enabled': false,
+  tags: {},
+  tagsHeaderMaxLength: 512,
+  'telemetry.debug': false,
+  'telemetry.dependencyCollection': true,
+  'telemetry.enabled': true,
+  'telemetry.heartbeatInterval': 60_000,
+  'telemetry.logCollection': true,
+  'telemetry.metrics': true,
+  traceEnabled: true,
+  traceId128BitGenerationEnabled: true,
+  traceId128BitLoggingEnabled: true,
+  tracePropagationExtractFirst: false,
+  tracePropagationBehaviorExtract: 'continue',
+  'tracePropagationStyle.inject': ['datadog', 'tracecontext', 'baggage'],
+  'tracePropagationStyle.extract': ['datadog', 'tracecontext', 'baggage'],
+  'tracePropagationStyle.otelPropagators': false,
+  traceWebsocketMessagesEnabled: false,
+  traceWebsocketMessagesInheritSampling: true,
+  traceWebsocketMessagesSeparateTraces: true,
+  tracing: true,
+  url: undefined,
+  version: pkg.version,
+  instrumentation_config_id: undefined,
+  'vertexai.spanCharLimit': 128,
+  'vertexai.spanPromptCompletionSampleRate': 1,
+  'trace.aws.addSpanPointers': true,
+  'trace.dynamoDb.tablePrimaryKeys': undefined,
+  'trace.nativeSpanEvents': false
+}

package/packages/dd-trace/src/crashtracking/crashtracker.js

@@ -5,6 +5,7 @@ const libdatadog = require('@datadog/libdatadog')
 const binding = libdatadog.load('crashtracker')
 
 const log = require('../log')
+const defaults = require('../config_defaults')
 const { URL } = require('url')
 const pkg = require('../../../../package.json')
 
@@ -49,7 +50,7 @@ class Crashtracker {
 
   // TODO: Send only configured values when defaults are fixed.
   #getConfig (config) {
-    const { hostname = '127.0.0.1', port = 8126 } = config
+    const { hostname = defaults.hostname, port = defaults.port } = config
     const url = config.url || new URL(`http://${hostname}:${port}`)
 
     return {

package/packages/dd-trace/src/datastreams/fnv.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const FNV_64_PRIME = BigInt('0x100000001B3')
-const FNV1_64_INIT = BigInt('0xCBF29CE484222325')
+const FNV_64_PRIME = 0x1_00_00_00_01_B3n
+const FNV1_64_INIT = 0xCB_F2_9C_E4_84_22_23_25n
 
 function fnv (data, hvalInit, fnvPrime, fnvSize) {
   let hval = hvalInit

package/packages/dd-trace/src/datastreams/writer.js

@@ -5,6 +5,7 @@ const log = require('../log')
 const request = require('../exporters/common/request')
 const { URL, format } = require('url')
 const { MsgpackEncoder } = require('../msgpack')
+const defaults = require('../config_defaults')
 const zlib = require('zlib')
 
 const msgpack = new MsgpackEncoder()
@@ -31,10 +32,10 @@ function makeRequest (data, url, cb) {
 
 class DataStreamsWriter {
   constructor (config) {
-    const { hostname = '127.0.0.1', port = 8126, url } = config
+    const { hostname = defaults.hostname, port = defaults.port, url } = config
     this._url = url || new URL(format({
       protocol: 'http:',
-      hostname: hostname || 'localhost',
+      hostname,
       port
     }))
   }

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

@@ -3,6 +3,7 @@
 const { workerData: { config: parentConfig, parentThreadId, configPort } } = require('node:worker_threads')
 const { format } = require('node:url')
 const log = require('./log')
+const defaults = require('../../config_defaults')
 
 const config = module.exports = {
   ...parentConfig,
@@ -20,7 +21,7 @@ configPort.on('messageerror', (err) =>
 function updateUrl (updates) {
   config.url = updates.url || format({
     protocol: 'http:',
-    hostname: updates.hostname || 'localhost',
+    hostname: updates.hostname || defaults.hostname,
     port: updates.port
   })
 }

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

@@ -7,6 +7,7 @@ const isIP = require('net').isIP
 const log = require('./log')
 const { URL, format } = require('url')
 const Histogram = require('./histogram')
+const defaults = require('./config_defaults')
 
 const MAX_BUFFER_SIZE = 1024 // limit from the agent
 
@@ -28,9 +29,9 @@ class DogStatsDClient {
       }
     }
 
-    this._host = options.host || 'localhost'
+    this._host = options.host || defaults['dogstatsd.hostname']
     this._family = isIP(this._host)
-    this._port = options.port || 8125
+    this._port = options.port || defaults['dogstatsd.port']
     this._prefix = options.prefix || ''
     this._tags = options.tags || []
     this._queue = []
@@ -182,7 +183,7 @@ class DogStatsDClient {
     } else if (config.port) {
       clientConfig.metricsProxyUrl = new URL(format({
         protocol: 'http:',
-        hostname: config.hostname || 'localhost',
+        hostname: config.hostname || defaults.hostname,
         port: config.port
       }))
     }

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

@@ -4,7 +4,6 @@ const { truncateSpan, normalizeSpan } = require('./tags-processors')
 const { Chunk, MsgpackEncoder } = require('../msgpack')
 const log = require('../log')
 const { isTrue } = require('../util')
-const coalesce = require('koalas')
 const { memoize } = require('../log/utils')
 const { getEnvironmentVariable } = require('../config-helper')
 
@@ -32,10 +31,7 @@ class AgentEncoder {
     this._stringBytes = new Chunk()
     this._writer = writer
     this._reset()
-    this._debugEncoding = isTrue(coalesce(
-      getEnvironmentVariable('DD_TRACE_ENCODING_DEBUG'),
-      false
-    ))
+    this._debugEncoding = isTrue(getEnvironmentVariable('DD_TRACE_ENCODING_DEBUG'))
     this._config = this._writer?._config
   }
 

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

@@ -19,6 +19,7 @@ module.exports = function getExporter (name) {
     case exporters.CUCUMBER_WORKER:
     case exporters.MOCHA_WORKER:
     case exporters.PLAYWRIGHT_WORKER:
+    case exporters.VITEST_WORKER:
       return require('./ci-visibility/exporters/test-worker')
     default: {
       const inAWSLambda = getEnvironmentVariable('AWS_LAMBDA_FUNCTION_NAME') !== undefined

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

@@ -3,16 +3,17 @@
 const { URL, format } = require('url')
 const log = require('../../log')
 const Writer = require('./writer')
+const defaults = require('../../config_defaults')
 
 class AgentExporter {
   #timer
 
   constructor (config, prioritySampler) {
     this._config = config
-    const { url, hostname, port, lookup, protocolVersion, stats = {}, apmTracingEnabled } = config
+    const { url, hostname = defaults.hostname, port, lookup, protocolVersion, stats = {}, apmTracingEnabled } = config
     this._url = url || new URL(format({
       protocol: 'http:',
-      hostname: hostname || 'localhost',
+      hostname,
       port
     }))
 

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

@@ -42,7 +42,7 @@ class Writer extends BaseWriter {
       startupLog({ agentError: err })
 
       if (err) {
-        log.error('Error sending payload to the agent (status code: %s)', err.status, err)
+        log.errorWithoutTelemetry('Error sending payload to the agent (status code: %s)', err.status, err)
         done()
         return
       }

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

@@ -3,6 +3,7 @@
 const { URL, format } = require('url')
 
 const request = require('./request')
+const defaults = require('../../config_defaults')
 const { incrementCountMetric, TELEMETRY_EVENTS_ENQUEUED_FOR_SERIALIZATION } = require('../../ci-visibility/telemetry')
 
 function fetchAgentInfo (url, callback) {
@@ -29,10 +30,10 @@ function fetchAgentInfo (url, callback) {
 class AgentInfoExporter {
   constructor (tracerConfig) {
     this._config = tracerConfig
-    const { url, hostname, port } = this._config
+    const { url, hostname = defaults.hostname, port } = this._config
     this._url = url || new URL(format({
       protocol: 'http:',
-      hostname: hostname || 'localhost',
+      hostname,
       port
     }))
     this._traceBuffer = []

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

@@ -106,11 +106,12 @@ function request (data, options, callback) {
         } catch {
           // ignore error
         }
+
         const responseData = buffer.toString()
         if (responseData) {
           errorMessage += ` Response from the endpoint: "${responseData}"`
         }
-        const error = new Error(errorMessage)
+        const error = new log.NoTransmitError(errorMessage)
         error.status = res.statusCode
 
         callback(error, null, res.statusCode)

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

@@ -3,13 +3,14 @@
 const { URL, format } = require('url')
 
 const { Writer } = require('./writer')
+const defaults = require('../../config_defaults')
 
 class SpanStatsExporter {
   constructor (config) {
-    const { hostname = '127.0.0.1', port = 8126, tags, url } = config
+    const { hostname = defaults.hostname, port = defaults.port, tags, url } = config
     this._url = url || new URL(format({
       protocol: 'http:',
-      hostname: hostname || 'localhost',
+      hostname,
       port
     }))
     this._writer = new Writer({ url: this._url, tags })

package/packages/dd-trace/src/llmobs/constants/tags.js

@@ -32,6 +32,8 @@ module.exports = {
   INPUT_TOKENS_METRIC_KEY: 'input_tokens',
   OUTPUT_TOKENS_METRIC_KEY: 'output_tokens',
   TOTAL_TOKENS_METRIC_KEY: 'total_tokens',
+  CACHE_READ_INPUT_TOKENS_METRIC_KEY: 'cache_read_input_tokens',
+  CACHE_WRITE_INPUT_TOKENS_METRIC_KEY: 'cache_write_input_tokens',
 
   DROPPED_IO_COLLECTION_ERROR: 'dropped_io'
 }

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

@@ -17,7 +17,8 @@ const {
   getModelMetadata,
   getGenerationMetadata,
   getToolNameFromTags,
-  getToolCallResultContent
+  getToolCallResultContent,
+  getLlmObsSpanName
 } = require('./util')
 
 const SPAN_NAME_TO_KIND_MAPPING = {
@@ -84,7 +85,7 @@ class VercelAILLMObsPlugin extends BaseLLMObsPlugin {
   findToolName (toolDescription) {
     for (const availableTool of this.#availableTools) {
       const description = availableTool.description
-      if (description === toolDescription) {
+      if (description === toolDescription && availableTool.id) {
         return availableTool.id
       }
     }
@@ -96,7 +97,7 @@ class VercelAILLMObsPlugin extends BaseLLMObsPlugin {
     const kind = SPAN_NAME_TO_KIND_MAPPING[operation]
     if (!kind) return
 
-    return { kind, name: operation }
+    return { kind, name: getLlmObsSpanName(operation, ctx.attributes['ai.telemetry.functionId']) }
   }
 
   setLLMObsTags (ctx) {

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

@@ -167,6 +167,16 @@ function getToolCallResultContent (content) {
   }
 }
 
+/**
+ * Computes the LLM Observability `ai` span name
+ * @param {string} operation
+ * @param {string} functionId
+ * @returns {string}
+ */
+function getLlmObsSpanName (operation, functionId) {
+  return functionId ? `${functionId}.${operation}` : operation
+}
+
 module.exports = {
   getSpanTags,
   getOperation,
@@ -175,5 +185,6 @@ module.exports = {
   getModelMetadata,
   getGenerationMetadata,
   getToolNameFromTags,
-  getToolCallResultContent
+  getToolCallResultContent,
+  getLlmObsSpanName
 }

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

@@ -8,10 +8,11 @@ const telemetry = require('../telemetry')
 const {
   extractRequestParams,
   extractTextAndResponseReason,
-  parseModelId
+  parseModelId,
+  extractTextAndResponseReasonFromStream
 } = require('../../../../datadog-plugin-aws-sdk/src/services/bedrockruntime/utils')
 
-const ENABLED_OPERATIONS = new Set(['invokeModel'])
+const ENABLED_OPERATIONS = new Set(['invokeModel', 'invokeModelWithResponseStream'])
 
 const requestIdsToTokens = {}
 
@@ -19,7 +20,8 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
   constructor () {
     super(...arguments)
 
-    this.addSub('apm:aws:request:complete:bedrockruntime', ({ response }) => {
+    this.addSub('apm:aws:request:complete:bedrockruntime', (ctx) => {
+      const { response } = ctx
       const request = response.request
       const operation = request.operation
       // avoids instrumenting other non supported runtime operations
@@ -32,23 +34,34 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
       if (modelName.includes('embed')) {
         return
       }
-      const span = storage('legacy').getStore()?.span
-      this.setLLMObsTags({ request, span, response, modelProvider, modelName })
+      const span = ctx.currentStore?.span
+      this.setLLMObsTags({ ctx, request, span, response, modelProvider, modelName })
     })
 
     this.addSub('apm:aws:response:deserialize:bedrockruntime', ({ headers }) => {
       const requestId = headers['x-amzn-requestid']
       const inputTokenCount = headers['x-amzn-bedrock-input-token-count']
       const outputTokenCount = headers['x-amzn-bedrock-output-token-count']
+      const cacheReadTokenCount = headers['x-amzn-bedrock-cache-read-input-token-count']
+      const cacheWriteTokenCount = headers['x-amzn-bedrock-cache-write-input-token-count']
 
       requestIdsToTokens[requestId] = {
         inputTokensFromHeaders: inputTokenCount && Number.parseInt(inputTokenCount),
-        outputTokensFromHeaders: outputTokenCount && Number.parseInt(outputTokenCount)
+        outputTokensFromHeaders: outputTokenCount && Number.parseInt(outputTokenCount),
+        cacheReadTokensFromHeaders: cacheReadTokenCount && Number.parseInt(cacheReadTokenCount),
+        cacheWriteTokensFromHeaders: cacheWriteTokenCount && Number.parseInt(cacheWriteTokenCount)
       }
     })
+
+    this.addSub('apm:aws:response:streamed-chunk:bedrockruntime', ({ ctx, chunk }) => {
+      if (!ctx.chunks) ctx.chunks = []
+
+      if (chunk) ctx.chunks.push(chunk)
+    })
   }
 
-  setLLMObsTags ({ request, span, response, modelProvider, modelName }) {
+  setLLMObsTags ({ ctx, request, span, response, modelProvider, modelName }) {
+    const isStream = request?.operation?.toLowerCase().includes('stream')
     telemetry.incrementLLMObsSpanStartCount({ autoinstrumented: true, integration: 'bedrock' })
 
     const parent = llmobsStore.getStore()?.span
@@ -62,7 +75,10 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
     })
 
     const requestParams = extractRequestParams(request.params, modelProvider)
-    const textAndResponseReason = extractTextAndResponseReason(response, modelProvider, modelName)
+    // for streamed responses, we'll use the coerced response object we formed in the stream handler
+    const textAndResponseReason = isStream
+      ? extractTextAndResponseReasonFromStream(ctx.chunks, modelProvider, modelName)
+      : extractTextAndResponseReason(response, modelProvider, modelName)
 
     // add metadata tags
     this._tagger.tagMetadata(span, {
@@ -78,14 +94,16 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
     )
 
     // add token metrics
-    const { inputTokens, outputTokens, totalTokens } = extractTokens({
+    const { inputTokens, outputTokens, totalTokens, cacheReadTokens, cacheWriteTokens } = extractTokens({
       requestId: response.$metadata.requestId,
       usage: textAndResponseReason.usage
     })
     this._tagger.tagMetrics(span, {
       inputTokens,
       outputTokens,
-      totalTokens
+      totalTokens,
+      cacheReadTokens,
+      cacheWriteTokens
     })
   }
 }
@@ -93,17 +111,26 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
 function extractTokens ({ requestId, usage }) {
   const {
     inputTokensFromHeaders,
-    outputTokensFromHeaders
+    outputTokensFromHeaders,
+    cacheReadTokensFromHeaders,
+    cacheWriteTokensFromHeaders
   } = requestIdsToTokens[requestId] || {}
   delete requestIdsToTokens[requestId]
 
   const inputTokens = usage.inputTokens || inputTokensFromHeaders || 0
   const outputTokens = usage.outputTokens || outputTokensFromHeaders || 0
+  const cacheReadTokens = usage.cacheReadTokens || cacheReadTokensFromHeaders || 0
+  const cacheWriteTokens = usage.cacheWriteTokens || cacheWriteTokensFromHeaders || 0
+
+  // adjust for the fact that bedrock input tokens only count non-cached tokens
+  const normalizedInputTokens = inputTokens + cacheReadTokens + cacheWriteTokens
 
   return {
-    inputTokens,
+    inputTokens: normalizedInputTokens,
     outputTokens,
-    totalTokens: inputTokens + outputTokens
+    totalTokens: normalizedInputTokens + outputTokens,
+    cacheReadTokens,
+    cacheWriteTokens
   }
 }
 

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

@@ -81,8 +81,14 @@ class OpenAiLLMObsPlugin extends LLMObsPlugin {
       const outputTokens = tokenUsage.completion_tokens
       if (outputTokens) metrics.outputTokens = outputTokens
 
-      const totalTokens = tokenUsage.total_toksn || (inputTokens + outputTokens)
+      const totalTokens = tokenUsage.total_tokens || (inputTokens + outputTokens)
       if (totalTokens) metrics.totalTokens = totalTokens
+
+      const promptTokensDetails = tokenUsage.prompt_tokens_details
+      if (promptTokensDetails) {
+        const cacheReadTokens = promptTokensDetails.cached_tokens
+        if (cacheReadTokens) metrics.cacheReadTokens = cacheReadTokens
+      }
     }
 
     return metrics

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

@@ -20,6 +20,8 @@ const {
   NAME,
   PROPAGATED_PARENT_ID_KEY,
   ROOT_PARENT_ID,
+  CACHE_READ_INPUT_TOKENS_METRIC_KEY,
+  CACHE_WRITE_INPUT_TOKENS_METRIC_KEY,
   INPUT_TOKENS_METRIC_KEY,
   OUTPUT_TOKENS_METRIC_KEY,
   TOTAL_TOKENS_METRIC_KEY,
@@ -144,6 +146,12 @@ class LLMObsTagger {
         case 'totalTokens':
           processedKey = TOTAL_TOKENS_METRIC_KEY
           break
+        case 'cacheReadTokens':
+          processedKey = CACHE_READ_INPUT_TOKENS_METRIC_KEY
+          break
+        case 'cacheWriteTokens':
+          processedKey = CACHE_WRITE_INPUT_TOKENS_METRIC_KEY
+          break
       }
 
       if (typeof value === 'number') {

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

@@ -85,7 +85,8 @@ function recordLLMObsEnabled (startTime, config, value = 1) {
     error: 0,
     agentless: Number(config.llmobs.agentlessEnabled),
     site: config.site,
-    auto: Number(autoEnabled)
+    auto: Number(autoEnabled),
+    ml_app: config.llmobs.mlApp
   }
   llmobsMetrics.count('product_enabled', tags).inc(value)
   llmobsMetrics.distribution('init_time', tags).track(initTimeMs)