dd-trace 5.81.0 → 5.82.0

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

@@ -1,8 +1,8 @@
 'use strict'
 
+const session = require('../session')
 const { collectionSizeSym, largeCollectionSkipThresholdSym, fieldCountSym, timeBudgetSym } = require('./symbols')
 const { LARGE_OBJECT_SKIP_THRESHOLD } = require('./constants')
-const session = require('../session')
 
 const LEAF_SUBTYPES = new Set(['date', 'regexp'])
 const ITERABLE_SUBTYPES = new Set(['map', 'set', 'weakmap', 'weakset'])
@@ -13,12 +13,12 @@ module.exports = {
 }
 
 /**
- * @typedef {Object} GetObjectOptions
- * @property {Object} maxReferenceDepth - The maximum depth of the object to traverse
+ * @typedef {object} GetObjectOptions
+ * @property {object} maxReferenceDepth - The maximum depth of the object to traverse
  * @property {number} maxCollectionSize - The maximum size of a collection to include in the snapshot
  * @property {number} maxFieldCount - The maximum number of properties on an object to include in the snapshot
  * @property {bigint} deadlineNs - The deadline in nanoseconds compared to `process.hrtime.bigint()`
- * @property {Object} ctx - A context object to track the state/progress of the snapshot collection.
+ * @property {object} ctx - A context object to track the state/progress of the snapshot collection.
  * @property {boolean} ctx.deadlineReached - Will be set to `true` if the deadline has been reached.
  * @property {Error[]} ctx.captureErrors - An array on which errors can be pushed if an issue is detected while
  *   collecting the snapshot.
@@ -34,7 +34,7 @@ module.exports = {
  *   and should not be set by the caller.
  * @param {boolean} [collection=false] - Whether the object is a collection. Only used internally by this module to
  *   track the current object type and should not be set by the caller.
- * @returns {Promise<Object[]>} The properties of the object
+ * @returns {Promise<object[]>} The properties of the object
  */
 async function collectObjectProperties (objectId, opts, depth = 0, collection = false) {
   const { result, privateProperties } = await session.post('Runtime.getProperties', {

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

@@ -16,7 +16,7 @@ module.exports = {
 }
 
 /**
- * @typedef {Object} GetLocalStateForCallFrameOptions
+ * @typedef {object} GetLocalStateForCallFrameOptions
  * @property {number} [maxReferenceDepth] - The maximum depth of the object to traverse. Defaults to
  *   {@link DEFAULT_MAX_REFERENCE_DEPTH}.
  * @property {number} [maxCollectionSize] - The maximum size of a collection to include in the snapshot. Defaults to
@@ -34,7 +34,7 @@ module.exports = {
  *
  * @param {import('inspector').Debugger.CallFrame} callFrame - The call frame to get the local state for
  * @param {GetLocalStateForCallFrameOptions} [opts] - The options for the snapshot
- * @returns {Promise<Object>} The local state for the call frame
+ * @returns {Promise<object>} The local state for the call frame
  */
 async function getLocalStateForCallFrame (
   callFrame,

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

@@ -24,7 +24,7 @@ module.exports = {
    * Find the script to inspect based on a partial or absolute path. Handles both Windows and POSIX paths.
    *
    * @param {string} path - Partial or absolute path to match against loaded scripts
-   * @returns {Object | null} - Object containing `url`, `scriptId`, `sourceMapURL`, and `source` - or null if no match
+   * @returns {object | null} - Object containing `url`, `scriptId`, `sourceMapURL`, and `source` - or null if no match
    */
   findScriptFromPartialPath (path) {
     if (!path) return null // This shouldn't happen, but better safe than sorry

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

@@ -1,10 +1,10 @@
 'use strict'
 
 const TTLSet = require('../../../../../vendor/dist/ttl-set')
-const config = require('./config')
-const JSONBuffer = require('./json-buffer')
 const request = require('../../exporters/common/request')
 const FormData = require('../../exporters/common/form-data')
+const config = require('./config')
+const JSONBuffer = require('./json-buffer')
 const log = require('./log')
 
 module.exports = {

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

@@ -4,8 +4,8 @@ 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')
+const getDebuggerConfig = require('./config')
 
 let worker = null
 let configChannel = null

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

@@ -1,11 +1,12 @@
 'use strict'
 
 const lookup = require('dns').lookup // cache to avoid instrumentation
-const request = require('./exporters/common/request')
 const dgram = require('dgram')
 const isIP = require('net').isIP
-const log = require('./log')
 const { URL, format } = require('url')
+
+const request = require('./exporters/common/request')
+const log = require('./log')
 const Histogram = require('./histogram')
 const defaults = require('./config_defaults')
 

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

@@ -1,11 +1,11 @@
 'use strict'
 
-const { truncateSpan, normalizeSpan } = require('./tags-processors')
 const { MsgpackChunk, MsgpackEncoder } = require('../msgpack')
 const log = require('../log')
 const { isTrue } = require('../util')
 const { memoize } = require('../log/utils')
 const { getEnvironmentVariable } = require('../config-helper')
+const { truncateSpan, normalizeSpan } = require('./tags-processors')
 
 const SOFT_LIMIT = 8 * 1024 * 1024 // 8MB
 

package/packages/dd-trace/src/encode/agentless-ci-visibility.js

@@ -1,6 +1,4 @@
 'use strict'
-const { truncateSpan, normalizeSpan } = require('./tags-processors')
-const { AgentEncoder } = require('./0.4')
 const { version: ddTraceVersion } = require('../../../../package.json')
 const { ITR_CORRELATION_ID } = require('../../src/plugins/util/test')
 const id = require('../../src/id')
@@ -9,6 +7,8 @@ const {
   TELEMETRY_ENDPOINT_PAYLOAD_SERIALIZATION_MS,
   TELEMETRY_ENDPOINT_PAYLOAD_EVENTS_COUNT
 } = require('../ci-visibility/telemetry')
+const { AgentEncoder } = require('./0.4')
+const { truncateSpan, normalizeSpan } = require('./tags-processors')
 
 const ENCODING_VERSION = 1
 const ALLOWED_CONTENT_TYPES = new Set(['test_session_end', 'test_module_end', 'test_suite_end', 'test'])

package/packages/dd-trace/src/encode/coverage-ci-visibility.js

@@ -1,5 +1,4 @@
 'use strict'
-const { AgentEncoder } = require('./0.4')
 const { MsgpackChunk } = require('../msgpack')
 
 const {
@@ -8,6 +7,7 @@ const {
   TELEMETRY_ENDPOINT_PAYLOAD_EVENTS_COUNT
 } = require('../ci-visibility/telemetry')
 const FormData = require('../exporters/common/form-data')
+const { AgentEncoder } = require('./0.4')
 
 const COVERAGE_PAYLOAD_VERSION = 2
 const COVERAGE_KEYS_LENGTH = 2

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

@@ -95,7 +95,7 @@ class SpanStatsEncoder extends AgentEncoder {
   }
 
   _encode (bytes, stats) {
-    this._encodeMapPrefix(bytes, 8)
+    this._encodeMapPrefix(bytes, stats.ProcessTags ? 9 : 8)
 
     this._encodeString(bytes, 'Hostname')
     this._encodeString(bytes, stats.Hostname)
@@ -123,6 +123,11 @@ class SpanStatsEncoder extends AgentEncoder {
 
     this._encodeString(bytes, 'Sequence')
     this._encodeLong(bytes, stats.Sequence)
+
+    if (stats.ProcessTags) {
+      this._encodeString(bytes, 'ProcessTags')
+      this._encodeString(bytes, stats.ProcessTags)
+    }
   }
 }
 

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

@@ -1,9 +1,9 @@
 'use strict'
 
-const exporters = require('../../../ext/exporters')
 const fs = require('fs')
-const constants = require('./constants')
+const exporters = require('../../../ext/exporters')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const constants = require('./constants')
 
 module.exports = function getExporter (name) {
   switch (name) {

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

@@ -2,8 +2,8 @@
 
 const { URL, format } = require('url')
 const log = require('../../log')
-const Writer = require('./writer')
 const defaults = require('../../config_defaults')
+const Writer = require('./writer')
 
 class AgentExporter {
   #timer

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

@@ -2,9 +2,9 @@
 
 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')
+const request = require('./request')
 
 function fetchAgentInfo (url, callback) {
   request('', {

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

@@ -8,11 +8,11 @@ const http = require('http')
 const https = require('https')
 const zlib = require('zlib')
 
+const { storage } = require('../../../../datadog-core')
+const log = require('../../log')
 const { urlToHttpOptions } = require('./url-to-http-options-polyfill')
 const docker = require('./docker')
 const { httpAgent, httpsAgent } = require('./agents')
-const { storage } = require('../../../../datadog-core')
-const log = require('../../log')
 
 const maxActiveRequests = 8
 

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const request = require('./request')
 const log = require('../../log')
+const request = require('./request')
 const { safeJSONStringify } = require('./util')
 
 class Writer {

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

@@ -2,8 +2,8 @@
 
 const { URL, format } = require('url')
 
-const { Writer } = require('./writer')
 const defaults = require('../../config_defaults')
+const { Writer } = require('./writer')
 
 class SpanStatsExporter {
   constructor (config) {

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

@@ -1,8 +1,7 @@
 'use strict'
 
-const tracerLogger = require('../../log')// path to require tracer logger
-
 const https = require('https')
+const tracerLogger = require('../../log')// path to require tracer logger
 
 class ExternalLogger {
   // Note: these attribute names match the corresponding entry in the JSON payload.

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

@@ -2,10 +2,10 @@
 
 const log = require('../log')
 const startupLog = require('../startup-log')
-const FlareFile = require('./file')
 const { LogChannel } = require('../log/channels')
 const request = require('../exporters/common/request')
 const FormData = require('../exporters/common/form-data')
+const FlareFile = require('./file')
 
 const MAX_LOG_SIZE = 12 * 1024 * 1024 // 12MB soft limit
 const TIMEOUT = 20 * 1000 * 60

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

@@ -2,10 +2,11 @@
 
 var path = require('path')
 var Module = require('module')
+
+var nodeVersion = require('../../../../version')
 var isTrue = require('./util').isTrue
 var log = require('./log')
 var telemetry = require('./telemetry')
-var nodeVersion = require('../../../../version')
 
 var NODE_MAJOR = nodeVersion.NODE_MAJOR
 
@@ -14,7 +15,9 @@ function guard (fn) {
   var clobberBailout = false
   var forced = isTrue(process.env.DD_INJECT_FORCE)
   var engines = require('../../../../package.json').engines
-  var minMajor = parseInt(engines.node.replace(/[^0-9]/g, ''))
+  var versions = engines.node.match(/^>=(\d+) <(\d+)$/)
+  var minMajor = versions[1]
+  var nextMajor = versions[2]
   var version = process.versions.node
 
   if (process.env.DD_INJECTION_ENABLED) {
@@ -40,7 +43,7 @@ function guard (fn) {
 
   // If the runtime doesn't match the engines field in package.json, then we
   // should not initialize the tracer.
-  if (!clobberBailout && NODE_MAJOR < minMajor) {
+  if (!clobberBailout && (NODE_MAJOR < minMajor || NODE_MAJOR >= nextMajor)) {
     initBailout = true
     telemetry([
       { name: 'abort', tags: ['reason:incompatible_runtime'] },

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

@@ -238,7 +238,7 @@ function writeUInt32BE (buffer, value, offset) {
 }
 
 /**
- * @param {string} value
+ * @param {string} [value]
  * @param {number} [radix]
  * @returns {Identifier}
  */

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const { isFalse } = require('./util')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { isFalse } = require('./util')
 
 // Global `jest` is only present in Jest workers.
 const inJestWorker = typeof jest !== 'undefined'

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

@@ -3,8 +3,8 @@
 const log = require('../log')
 const { channel } = require('../../../datadog-instrumentations/src/helpers/instrument')
 const { ERROR_MESSAGE, ERROR_TYPE } = require('../constants')
-const { ImpendingTimeout } = require('./runtime/errors')
 const { getEnvironmentVariable } = require('../config-helper')
+const { ImpendingTimeout } = require('./runtime/errors')
 
 const globalTracer = global._ddtrace
 const tracer = globalTracer._tracer
@@ -21,7 +21,7 @@ let __lambdaTimeout
  * Publishes to the `apm:aws:lambda:timeout` channel when
  * the AWS Lambda run time is about to end.
  *
- * @param {*} context AWS Lambda context object.
+ * @param {object} context AWS Lambda context object.
  */
 function checkTimeout (context) {
   const remainingTimeInMillis = context.getRemainingTimeInMillis()
@@ -63,7 +63,7 @@ function crashFlush () {
 /**
  * Extracts the context from the given Lambda handler arguments.
  *
- * @param {*} args any amount of arguments
+ * @param {unknown[]} args any amount of arguments
  * @returns the context, if extraction was succesful.
  */
 function extractContext (args) {
@@ -80,7 +80,7 @@ function extractContext (args) {
 /**
  * Patches your AWS Lambda handler function to add some tracing support.
  *
- * @param {*} lambdaHandler a Lambda handler function.
+ * @param {Function} lambdaHandler a Lambda handler function.
  */
 exports.datadog = function datadog (lambdaHandler) {
   return (...args) => {

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const { registerLambdaHook } = require('./runtime/ritm')
 const { getEnvironmentVariable } = require('../config-helper')
+const { registerLambdaHook } = require('./runtime/ritm')
 
 /**
  * It is safe to do it this way, since customers will never be expected to disable

package/packages/dd-trace/src/lambda/runtime/patch.js

@@ -2,17 +2,17 @@
 
 const path = require('path')
 
-const { _extractModuleNameAndHandlerPath, _extractModuleRootAndHandler, _getLambdaFilePaths } = require('./ritm')
 const { datadog } = require('../handler')
 const { addHook } = require('../../../../datadog-instrumentations/src/helpers/instrument')
 const shimmer = require('../../../../datadog-shimmer')
 const { getEnvironmentVariable } = require('../../config-helper')
+const { _extractModuleNameAndHandlerPath, _extractModuleRootAndHandler, _getLambdaFilePaths } = require('./ritm')
 
 /**
  * Patches a Datadog Lambda module by calling `patchDatadogLambdaHandler`
  * with the handler name `datadog`.
  *
- * @param {*} datadogLambdaModule node module to be patched.
+ * @param {object} datadogLambdaModule node module to be patched.
  * @returns a Datadog Lambda module with the `datadog` function from
  * `datadog-lambda-js` patched.
  */
@@ -27,7 +27,7 @@ const patchDatadogLambdaModule = (datadogLambdaModule) => {
  * Datadog instrumentation by getting the Lambda handler from its
  * arguments.
  *
- * @param {*} datadogHandler the Datadog Lambda handler to destructure.
+ * @param {Function} datadogHandler the Datadog Lambda handler to destructure.
  * @returns the datadogHandler with its arguments patched.
  */
 function patchDatadogLambdaHandler (datadogHandler) {
@@ -51,7 +51,7 @@ const patchLambdaModule = (handlerPath) => (lambdaModule) => {
 /**
  * Patches a Lambda handler in order to do Datadog instrumentation.
  *
- * @param {*} lambdaHandler the Lambda handler to be patched.
+ * @param {Function} lambdaHandler the Lambda handler to be patched.
  * @returns a function which patches the given Lambda handler.
  */
 function patchLambdaHandler (lambdaHandler) {

package/packages/dd-trace/src/lambda/runtime/ritm.js

@@ -61,7 +61,7 @@ function _extractModuleNameAndHandlerPath (handler) {
 /**
  * Returns all possible paths of the files to be patched when required.
  *
- * @param {*} lambdaStylePath the path comprised of the `LAMBDA_TASK_ROOT`,
+ * @param {string} lambdaStylePath the path comprised of the `LAMBDA_TASK_ROOT`,
  * the root of the module of the Lambda handler, and the module name.
  * @returns the lambdaStylePath with appropiate extensions for the hook.
  */

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

@@ -36,5 +36,11 @@ module.exports = {
   CACHE_WRITE_INPUT_TOKENS_METRIC_KEY: 'cache_write_input_tokens',
   REASONING_OUTPUT_TOKENS_METRIC_KEY: 'reasoning_output_tokens',
 
-  DROPPED_IO_COLLECTION_ERROR: 'dropped_io'
+  DROPPED_IO_COLLECTION_ERROR: 'dropped_io',
+
+  PROMPT_TRACKING_INSTRUMENTATION_METHOD: 'prompt_tracking_instrumentation_method',
+  PROMPT_MULTIMODAL: 'prompt_multimodal',
+  INSTRUMENTATION_METHOD_AUTO: 'auto',
+  INSTRUMENTATION_METHOD_ANNOTATED: 'annotated',
+  INSTRUMENTATION_METHOD_UNKNOWN: 'unknown'
 }

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

@@ -1,5 +1,9 @@
 'use strict'
 
+const util = require('node:util')
+
+const { channel } = require('dc-polyfill')
+
 const log = require('../log')
 const {
   ML_APP,
@@ -7,24 +11,19 @@ const {
   PROPAGATED_PARENT_ID_KEY
 } = require('./constants/tags')
 const { storage } = require('./storage')
-
 const telemetry = require('./telemetry')
 const LLMObsSpanProcessor = require('./span_processor')
+const LLMObsEvalMetricsWriter = require('./writers/evaluations')
+const LLMObsTagger = require('./tagger')
+const LLMObsSpanWriter = require('./writers/spans')
+const { setAgentStrategy } = require('./writers/util')
 
-const { channel } = require('dc-polyfill')
 const spanFinishCh = channel('dd-trace:span:finish')
 const evalMetricAppendCh = channel('llmobs:eval-metric:append')
 const flushCh = channel('llmobs:writers:flush')
 const injectCh = channel('dd-trace:span:inject')
 const registerUserSpanProcessorCh = channel('llmobs:register-processor')
 
-const LLMObsEvalMetricsWriter = require('./writers/evaluations')
-const LLMObsTagger = require('./tagger')
-const LLMObsSpanWriter = require('./writers/spans')
-const { setAgentStrategy } = require('./writers/util')
-
-const util = require('node:util')
-
 /**
  * Setting writers and processor globally when LLMObs is enabled
  * We're setting these in this module instead of on the SDK.

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

@@ -1,10 +1,9 @@
 'use strict'
 
+const { channel } = require('dc-polyfill')
 const BaseLLMObsPlugin = require('../base')
 const { getModelProvider } = require('../../../../../datadog-plugin-ai/src/utils')
 
-const { channel } = require('dc-polyfill')
-
 const toolCreationCh = channel('dd-trace:vercel-ai:tool')
 const setAttributesCh = channel('dd-trace:vercel-ai:span:setAttributes')
 
@@ -21,6 +20,38 @@ const {
   getLlmObsSpanName
 } = require('./util')
 
+/**
+ * @typedef {Record<string, unknown> & { description?: string, id?: string }} AvailableToolArgs
+ */
+
+/**
+ * @typedef {string | number | boolean | null | undefined | string[] | number[] | boolean[]} TagValue
+ * @typedef {Record<string, TagValue>} SpanTags
+ *
+ * @typedef {{ name?: string, description?: string }} ToolForModel
+ *
+ * @typedef {{ type: 'text' | 'reasoning' | 'redacted-reasoning', text?: string, data?: string }} TextPart
+ * @typedef {{ type: 'tool-call', toolName: string, toolCallId: string, args?: unknown, input?: unknown }} ToolCallPart
+ * @typedef {(
+ *   { type: 'tool-result', toolCallId: string, output?: { type: string, value?: unknown }, result?: unknown } &
+ *   Record<string, unknown>
+ * )} ToolResultPart
+ *
+ * @typedef {{
+ *   role: 'system',
+ *   content: string
+ * } | {
+ *   role: 'user',
+ *   content: TextPart[]
+ * } | {
+ *   role: 'assistant',
+ *   content: Array<TextPart | ToolCallPart>
+ * } | {
+ *   role: 'tool',
+ *   content: ToolResultPart[]
+ * }} AiSdkMessage
+ */
+
 const SPAN_NAME_TO_KIND_MAPPING = {
   // embeddings
   embed: 'workflow',
@@ -47,7 +78,7 @@ class VercelAILLMObsPlugin extends BaseLLMObsPlugin {
   /**
    * The available tools within the runtime scope of this integration.
    * This essentially acts as a global registry for all tools made through the Vercel AI SDK.
-   * @type {Set<Record<string, any>>}
+   * @type {Set<AvailableToolArgs>}
    */
   #availableTools
 
@@ -80,7 +111,7 @@ class VercelAILLMObsPlugin extends BaseLLMObsPlugin {
    * We use the tool description as the next best identifier for a tool.
    *
    * @param {string} toolName
-   * @param {string} toolDescription
+   * @param {string | undefined} toolDescription
    * @returns {string | undefined}
    */
   findToolName (toolName, toolDescription) {
@@ -223,7 +254,7 @@ class VercelAILLMObsPlugin extends BaseLLMObsPlugin {
 
   /**
    * @param {import('../../../opentracing/span')} span
-   * @param {Record<string, unknown>} tags
+   * @param {SpanTags} tags
    */
   setLLMOperationTags (span, tags) {
     const toolsForModel = tags['ai.prompt.tools']?.map(getJsonStringValue)
@@ -290,8 +321,8 @@ class VercelAILLMObsPlugin extends BaseLLMObsPlugin {
    * it is possible to have multiple tool call results in a single message that we
    * need to split into multiple messages.
    *
-   * @param {*} message
-   * @param {*} toolsForModel
+   * @param {AiSdkMessage} message
+   * @param {ToolForModel[] | null | undefined} toolsForModel
    * @returns {Array<{role: string, content: string, toolId?: string,
    *   toolCalls?: Array<{arguments: string, name: string, toolId: string, type: string}>}>}
    */

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

@@ -10,16 +10,35 @@ const MODEL_METADATA_KEYS = new Set([
   'stop_sequences'
 ])
 
+/**
+ * @typedef {import('../../../opentracing/span')} Span
+ *
+ * @typedef {string | number | boolean | null | undefined | string[] | number[] | boolean[]} TagValue
+ * @typedef {Record<string, TagValue>} SpanTags
+ *
+ * @typedef {{ span?: Span }} CurrentStore
+ * @typedef {{ currentStore?: CurrentStore, attributes?: SpanTags }} AiPluginContext
+ */
+
+/**
+ * @typedef {{
+ *   type: string,
+ *   value?: unknown
+ * }} ToolCallOutput
+ *
+ * @typedef {{ output?: ToolCallOutput, result?: unknown } & Record<string, unknown>} ToolCallResultContent
+ */
+
 /**
  * Get the span tags from the context (either the attributes or the span tags).
  *
- * @param {Record<string, any>} ctx
- * @returns {Record<string, any>}
+ * @param {AiPluginContext} ctx
+ * @returns {SpanTags}
  */
 function getSpanTags (ctx) {
   const span = ctx.currentStore?.span
   const carrier = ctx.attributes ?? span?.context()._tags ?? {}
-  return carrier
+  return /** @type {SpanTags} */ (carrier)
 }
 
 /**
@@ -88,10 +107,11 @@ function getJsonStringValue (str, defaultValue) {
 
 /**
  * Get the model metadata from the span tags (top_p, top_k, temperature, etc.)
- * @param {Record<string, unknown>} tags
- * @returns {Record<string, string> | null}
+ * @param {SpanTags} tags
+ * @returns {Record<string, unknown> | null}
  */
 function getModelMetadata (tags) {
+  /** @type {Record<string, unknown>} */
   const modelMetadata = {}
   for (const metadata of MODEL_METADATA_KEYS) {
     const metadataTagKey = `gen_ai.request.${metadata}`
@@ -106,10 +126,11 @@ function getModelMetadata (tags) {
 
 /**
  * Get the generation metadata from the span tags (maxSteps, maxRetries, etc.)
- * @param {Record<string, string>} tags
- * @returns {Record<string, string> | null}
+ * @param {SpanTags} tags
+ * @returns {Record<string, unknown> | null}
  */
 function getGenerationMetadata (tags) {
+  /** @type {Record<string, unknown>} */
   const metadata = {}
 
   for (const tag of Object.keys(tags)) {
@@ -131,7 +152,7 @@ function getGenerationMetadata (tags) {
  * If the tool name is a parsable number, or is not found, null is returned.
  * Older versions of the ai sdk would tag the tool name as its index in the tools array.
  *
- * @param {Record<string, string>} tags
+ * @param {SpanTags} tags
  * @returns {string | null}
  */
 function getToolNameFromTags (tags) {
@@ -147,7 +168,7 @@ function getToolNameFromTags (tags) {
 /**
  * Get the content of a tool call result.
  * Version 5 of the ai sdk sets this tag as `content.output`, with a `
- * @param {Record<string, any>} content
+ * @param {{ output?: { type: string, value: unknown }, result?: unknown }} content
  * @returns {string}
  */
 function getToolCallResultContent (content) {