dd-trace 5.81.0 → 5.83.0

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

@@ -1,13 +1,14 @@
 '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')
+const defaults = require('./config/defaults')
 
 const MAX_BUFFER_SIZE = 1024 // limit from the agent
 
@@ -359,7 +360,7 @@ class CustomMetrics {
     // TODO(bengl) this magic number should be configurable
     setInterval(flush, 10 * 1000).unref()
 
-    process.once('beforeExit', flush)
+    globalThis[Symbol.for('dd-trace')].beforeExitHandlers.add(flush)
   }
 
   increment (stat, value = 1, tags) {

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 { getValueFromEnvSources } = require('../config/helper')
+const { truncateSpan, normalizeSpan } = require('./tags-processors')
 
 const SOFT_LIMIT = 8 * 1024 * 1024 // 8MB
 
@@ -31,7 +31,7 @@ class AgentEncoder {
     this._stringBytes = new MsgpackChunk()
     this._writer = writer
     this._reset()
-    this._debugEncoding = isTrue(getEnvironmentVariable('DD_TRACE_ENCODING_DEBUG'))
+    this._debugEncoding = isTrue(getValueFromEnvSources('DD_TRACE_ENCODING_DEBUG'))
     this._config = this._writer?._config
   }
 

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 exporters = require('../../../ext/exporters')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const constants = require('./constants')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 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 defaults = require('../../config/defaults')
 const Writer = require('./writer')
-const defaults = require('../../config_defaults')
 
 class AgentExporter {
   #timer
@@ -31,9 +31,7 @@ class AgentExporter {
       config
     })
 
-    process.once('beforeExit', () => {
-      this.flush()
-    })
+    globalThis[Symbol.for('dd-trace')].beforeExitHandlers.add(this.flush.bind(this))
   }
 
   setUrl (url) {

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

@@ -1,5 +1,7 @@
 'use strict'
 
+const { inspect } = require('util')
+
 const request = require('../common/request')
 const { startupLog } = require('../../startup-log')
 const runtimeMetrics = require('../../runtime_metrics')
@@ -26,7 +28,10 @@ class AgentWriter extends BaseWriter {
     runtimeMetrics.increment(`${METRIC_PREFIX}.requests`, true)
 
     const { _headers, _lookup, _protocolVersion, _url } = this
-    makeRequest(_protocolVersion, data, count, _url, _headers, _lookup, true, (err, res, status) => {
+    makeRequest(_protocolVersion, data, count, _url, _headers, _lookup, (err, res, status) => {
+      // Note that logging will only happen once, regardless of how many times this is called.
+      startupLog(status !== 404 && status !== 200 ? { status, message: err?.message ?? inspect(err) } : undefined)
+
       if (status) {
         runtimeMetrics.increment(`${METRIC_PREFIX}.responses`, true)
         runtimeMetrics.increment(`${METRIC_PREFIX}.responses.by.status`, `status:${status}`, true)
@@ -39,8 +44,6 @@ class AgentWriter extends BaseWriter {
         }
       }
 
-      startupLog({ agentError: err })
-
       if (err) {
         log.errorWithoutTelemetry('Error sending payload to the agent (status code: %s)', err.status, err)
         done()
@@ -68,7 +71,7 @@ function getEncoder (protocolVersion) {
     : require('../../encode/0.4').AgentEncoder
 }
 
-function makeRequest (version, data, count, url, headers, lookup, needsStartupLog, cb) {
+function makeRequest (version, data, count, url, headers, lookup, cb) {
   const options = {
     path: `/v${version}/traces`,
     method: 'PUT',
@@ -79,7 +82,7 @@ function makeRequest (version, data, count, url, headers, lookup, needsStartupLo
       'X-Datadog-Trace-Count': String(count),
       'Datadog-Meta-Lang': 'nodejs',
       'Datadog-Meta-Lang-Version': process.version,
-      'Datadog-Meta-Lang-Interpreter': process.jsEngine || 'v8'
+      'Datadog-Meta-Lang-Interpreter': process.versions.bun ? 'JavaScriptCore' : 'v8'
     },
     lookup,
     url
@@ -87,15 +90,7 @@ function makeRequest (version, data, count, url, headers, lookup, needsStartupLo
 
   log.debug('Request to the agent: %j', options)
 
-  request(data, options, (err, res, status) => {
-    if (needsStartupLog) {
-      // Note that logging will only happen once, regardless of how many times this is called.
-      startupLog({
-        agentError: status !== 404 && status !== 200 ? err : undefined
-      })
-    }
-    cb(err, res, status)
-  })
+  request(data, options, cb)
 }
 
 module.exports = AgentWriter

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 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/docker.js

@@ -1,9 +1,9 @@
 'use strict'
 
 const fs = require('fs')
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getValueFromEnvSources } = require('../../config/helper')
 
-const DD_EXTERNAL_ENV = getEnvironmentVariable('DD_EXTERNAL_ENV')
+const DD_EXTERNAL_ENV = getValueFromEnvSources('DD_EXTERNAL_ENV')
 
 // The second part is the PCF / Garden regexp. We currently assume no suffix($) to avoid matching pod UIDs
 // See https://github.com/DataDog/datadog-agent/blob/7.40.x/pkg/util/cgroups/reader.go#L50

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
 
@@ -77,7 +77,7 @@ function request (data, options, callback) {
     res.on('data', chunk => {
       chunks.push(chunk)
     })
-    res.on('end', () => {
+    res.once('end', () => {
       activeRequests--
       const buffer = Buffer.concat(chunks)
 

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

@@ -1,12 +1,12 @@
 'use strict'
 
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getValueFromEnvSources } = require('../../config/helper')
 
 function safeJSONStringify (value) {
   return JSON.stringify(
     value,
     (key, value) => key === 'dd-api-key' ? undefined : value,
-    getEnvironmentVariable('DD_TRACE_BEAUTIFUL_LOGS') ? 2 : undefined
+    getValueFromEnvSources('DD_TRACE_BEAUTIFUL_LOGS') ? 2 : undefined
   )
 }
 

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 defaults = require('../../config/defaults')
 const { Writer } = require('./writer')
-const defaults = require('../../config_defaults')
 
 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
@@ -64,7 +64,7 @@ const flare = {
   },
 
   _sendFile (task, file, filename) {
-    if (!file) return
+    if (!file || file.length === 0) return
 
     const form = new FormData()
 

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/guardrails/telemetry.js

@@ -80,7 +80,7 @@ function sendTelemetry (name, tags, resultMetadata) {
   proc.on('error', function () {
     log.error('Failed to spawn telemetry forwarder')
   })
-  proc.on('exit', function (code) {
+  proc.once('exit', function (code) {
     if (code !== 0) {
       log.error('Telemetry forwarder exited with code', code)
     }

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,14 +1,14 @@
 'use strict'
 
+const { getValueFromEnvSources } = require('./config/helper')
 const { isFalse } = require('./util')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 // Global `jest` is only present in Jest workers.
 const inJestWorker = typeof jest !== 'undefined'
 
-const ddTraceDisabled = getEnvironmentVariable('DD_TRACE_ENABLED')
-  ? isFalse(getEnvironmentVariable('DD_TRACE_ENABLED'))
-  : String(getEnvironmentVariable('OTEL_TRACES_EXPORTER')).toLowerCase() === 'none'
+const ddTraceDisabled = getValueFromEnvSources('DD_TRACE_ENABLED')
+  ? isFalse(getValueFromEnvSources('DD_TRACE_ENABLED'))
+  : String(getValueFromEnvSources('OTEL_TRACES_EXPORTER')).toLowerCase() === 'none'
 
 module.exports = ddTraceDisabled || inJestWorker
   ? require('./noop/proxy')

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 { getValueFromEnvSources } = require('../config/helper')
 const { ImpendingTimeout } = require('./runtime/errors')
-const { getEnvironmentVariable } = require('../config-helper')
 
 const globalTracer = global._ddtrace
 const tracer = globalTracer._tracer
@@ -21,12 +21,12 @@ 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()
 
-  let apmFlushDeadline = Number.parseInt(getEnvironmentVariable('DD_APM_FLUSH_DEADLINE_MILLISECONDS')) || 100
+  let apmFlushDeadline = Number.parseInt(getValueFromEnvSources('DD_APM_FLUSH_DEADLINE_MILLISECONDS')) || 100
   apmFlushDeadline = apmFlushDeadline < 0 ? 100 : apmFlushDeadline
 
   __lambdaTimeout = setTimeout(() => {
@@ -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,13 +1,13 @@
 'use strict'
 
+const { getValueFromEnvSources } = require('../config/helper')
 const { registerLambdaHook } = require('./runtime/ritm')
-const { getEnvironmentVariable } = require('../config-helper')
 
 /**
  * It is safe to do it this way, since customers will never be expected to disable
  * this specific instrumentation through the init config object.
  */
-const _DD_TRACE_DISABLED_INSTRUMENTATIONS = getEnvironmentVariable('DD_TRACE_DISABLED_INSTRUMENTATIONS') || ''
+const _DD_TRACE_DISABLED_INSTRUMENTATIONS = getValueFromEnvSources('DD_TRACE_DISABLED_INSTRUMENTATIONS') || ''
 const _disabledInstrumentations = new Set(
   _DD_TRACE_DISABLED_INSTRUMENTATIONS ? _DD_TRACE_DISABLED_INSTRUMENTATIONS.split(',') : []
 )

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 { getEnvironmentVariable, getValueFromEnvSources } = 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) {
@@ -59,7 +59,7 @@ function patchLambdaHandler (lambdaHandler) {
 }
 
 const lambdaTaskRoot = getEnvironmentVariable('LAMBDA_TASK_ROOT')
-const originalLambdaHandler = getEnvironmentVariable('DD_LAMBDA_HANDLER')
+const originalLambdaHandler = getValueFromEnvSources('DD_LAMBDA_HANDLER')
 
 if (originalLambdaHandler === undefined) {
   // Instrumentation is done manually.

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

@@ -10,7 +10,7 @@
 const path = require('path')
 
 const log = require('../../log')
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getEnvironmentVariable, getValueFromEnvSources } = require('../../config/helper')
 const Hook = require('../../../../datadog-instrumentations/src/helpers/hook')
 const instrumentations = require('../../../../datadog-instrumentations/src/helpers/instrumentations')
 const {
@@ -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.
  */
@@ -79,7 +79,7 @@ function _getLambdaFilePaths (lambdaStylePath) {
  */
 const registerLambdaHook = () => {
   const lambdaTaskRoot = getEnvironmentVariable('LAMBDA_TASK_ROOT')
-  const originalLambdaHandler = getEnvironmentVariable('DD_LAMBDA_HANDLER')
+  const originalLambdaHandler = getValueFromEnvSources('DD_LAMBDA_HANDLER')
 
   if (originalLambdaHandler !== undefined && lambdaTaskRoot !== undefined) {
     const [moduleRoot, moduleAndHandler] = _extractModuleRootAndHandler(originalLambdaHandler)

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

@@ -17,6 +17,9 @@ module.exports = {
   TRACE_ID: '_ml_obs.trace_id',
   PROPAGATED_TRACE_ID_KEY: '_dd.p.llmobs_trace_id',
   ROOT_PARENT_ID: 'undefined',
+  DEFAULT_PROMPT_NAME: 'unnamed-prompt',
+  INTERNAL_CONTEXT_VARIABLE_KEYS: '_dd_context_variable_keys',
+  INTERNAL_QUERY_VARIABLE_KEYS: '_dd_query_variable_keys',
 
   MODEL_NAME: '_ml_obs.meta.model_name',
   MODEL_PROVIDER: '_ml_obs.meta.model_provider',
@@ -24,6 +27,7 @@ module.exports = {
   INPUT_DOCUMENTS: '_ml_obs.meta.input.documents',
   INPUT_MESSAGES: '_ml_obs.meta.input.messages',
   INPUT_VALUE: '_ml_obs.meta.input.value',
+  INPUT_PROMPT: '_ml_obs.meta.input.prompt',
 
   OUTPUT_DOCUMENTS: '_ml_obs.meta.output.documents',
   OUTPUT_MESSAGES: '_ml_obs.meta.output.messages',
@@ -36,5 +40,14 @@ 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',
+
+  ROUTING_API_KEY: '_dd.llmobs.routing.api_key',
+  ROUTING_SITE: '_dd.llmobs.routing.site'
 }

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.
@@ -137,9 +136,9 @@ function handleSpanProcess (span) {
   spanProcessor.process(span)
 }
 
-function handleEvalMetricAppend (payload) {
+function handleEvalMetricAppend ({ payload, routing }) {
   try {
-    evalWriter.append(payload)
+    evalWriter.append(payload, routing)
   } catch (e) {
     log.warn(
       // eslint-disable-next-line @stylistic/max-len

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

@@ -81,6 +81,8 @@ class NoopLLMObs {
   deregisterProcessor () {}
 
   annotationContext (options, fn) { return fn() }
+
+  routingContext (options, fn) { return fn() }
 }
 
 module.exports = NoopLLMObs