dd-trace 5.53.0 → 5.55.0

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

@@ -1,27 +1,15 @@
 'use strict'
 
-const satisfies = require('semifies')
-const logger = require('./log')
 const { addHook } = require('import-in-the-middle')
 const dc = require('dc-polyfill')
 
-if (satisfies(process.versions.node, '>=14.13.1')) {
-  const moduleLoadStartChannel = dc.channel('dd-trace:moduleLoadStart')
-  addHook((name, namespace) => {
-    if (moduleLoadStartChannel.hasSubscribers) {
-      moduleLoadStartChannel.publish({
-        filename: name,
-        module: namespace
-      })
-    }
-  })
-  module.exports = require('import-in-the-middle')
-} else {
-  logger.warn('ESM is not fully supported by this version of Node.js, ' +
-    'so dd-trace will not intercept ESM loading.')
-  module.exports = () => ({
-    unhook: () => {}
-  })
-  module.exports.addHook = () => {}
-  module.exports.removeHook = () => {}
-}
+const moduleLoadStartChannel = dc.channel('dd-trace:moduleLoadStart')
+addHook((name, namespace) => {
+  if (moduleLoadStartChannel.hasSubscribers) {
+    moduleLoadStartChannel.publish({
+      filename: name,
+      module: namespace
+    })
+  }
+})
+module.exports = require('import-in-the-middle')

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

@@ -1,13 +1,14 @@
 'use strict'
 
 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 = process.env.DD_TRACE_ENABLED
-  ? isFalse(process.env.DD_TRACE_ENABLED)
-  : String(process.env.OTEL_TRACES_EXPORTER).toLowerCase() === 'none'
+const ddTraceDisabled = getEnvironmentVariable('DD_TRACE_ENABLED')
+  ? isFalse(getEnvironmentVariable('DD_TRACE_ENABLED'))
+  : String(getEnvironmentVariable('OTEL_TRACES_EXPORTER')).toLowerCase() === 'none'
 
 module.exports = ddTraceDisabled || inJestWorker
   ? require('./noop/proxy')

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

@@ -4,6 +4,7 @@ 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 globalTracer = global._ddtrace
 const tracer = globalTracer._tracer
@@ -25,11 +26,11 @@ let __lambdaTimeout
 function checkTimeout (context) {
   const remainingTimeInMillis = context.getRemainingTimeInMillis()
 
-  let apmFlushDeadline = parseInt(process.env.DD_APM_FLUSH_DEADLINE_MILLISECONDS) || 100
+  let apmFlushDeadline = Number.parseInt(getEnvironmentVariable('DD_APM_FLUSH_DEADLINE_MILLISECONDS')) || 100
   apmFlushDeadline = apmFlushDeadline < 0 ? 100 : apmFlushDeadline
 
   __lambdaTimeout = setTimeout(() => {
-    timeoutChannel.publish(undefined)
+    timeoutChannel.publish()
   }, remainingTimeInMillis - apmFlushDeadline)
 }
 
@@ -43,14 +44,14 @@ function checkTimeout (context) {
  */
 function crashFlush () {
   const activeSpan = tracer.scope().active()
-  if (activeSpan !== null) {
+  if (activeSpan === null) {
+    log.debug('An impending timeout was reached, but no root span was found. No error will be tagged.')
+  } else {
     const error = new ImpendingTimeout('Datadog detected an impending timeout')
     activeSpan.addTags({
       [ERROR_MESSAGE]: error.message,
       [ERROR_TYPE]: error.name
     })
-  } else {
-    log.debug('An impending timeout was reached, but no root span was found. No error will be tagged.')
   }
 
   tracer._processor.killAll()
@@ -70,7 +71,7 @@ function extractContext (args) {
   if (context === undefined || context.getRemainingTimeInMillis === undefined) {
     context = args.length > 2 ? args[2] : undefined
     if (context === undefined || context.getRemainingTimeInMillis === undefined) {
-      throw Error('Could not extract context')
+      throw new Error('Could not extract context')
     }
   }
   return context

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

@@ -1,12 +1,13 @@
 'use strict'
 
 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 = process.env.DD_TRACE_DISABLED_INSTRUMENTATIONS || ''
+const _DD_TRACE_DISABLED_INSTRUMENTATIONS = getEnvironmentVariable('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

@@ -6,6 +6,7 @@ const { _extractModuleNameAndHandlerPath, _extractModuleRootAndHandler, _getLamb
 const { datadog } = require('../handler')
 const { addHook } = require('../../../../datadog-instrumentations/src/helpers/instrument')
 const shimmer = require('../../../../datadog-shimmer')
+const { getEnvironmentVariable } = require('../../config-helper')
 
 /**
  * Patches a Datadog Lambda module by calling `patchDatadogLambdaHandler`
@@ -57,10 +58,13 @@ function patchLambdaHandler (lambdaHandler) {
   return datadog(lambdaHandler)
 }
 
-const lambdaTaskRoot = process.env.LAMBDA_TASK_ROOT
-const originalLambdaHandler = process.env.DD_LAMBDA_HANDLER
+const lambdaTaskRoot = getEnvironmentVariable('LAMBDA_TASK_ROOT')
+const originalLambdaHandler = getEnvironmentVariable('DD_LAMBDA_HANDLER')
 
-if (originalLambdaHandler !== undefined) {
+if (originalLambdaHandler === undefined) {
+  // Instrumentation is done manually.
+  addHook({ name: 'datadog-lambda-js' }, patchDatadogLambdaModule)
+} else {
   const [moduleRoot, moduleAndHandler] = _extractModuleRootAndHandler(originalLambdaHandler)
   const [_module, handlerPath] = _extractModuleNameAndHandlerPath(moduleAndHandler)
 
@@ -70,7 +74,4 @@ if (originalLambdaHandler !== undefined) {
   for (const lambdaFilePath of lambdaFilePaths) {
     addHook({ name: lambdaFilePath }, patchLambdaModule(handlerPath))
   }
-} else {
-  // Instrumentation is done manually.
-  addHook({ name: 'datadog-lambda-js' }, patchDatadogLambdaModule)
 }

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

@@ -10,6 +10,7 @@
 const path = require('path')
 
 const log = require('../../log')
+const { getEnvironmentVariable } = require('../../config-helper')
 const Hook = require('../../../../datadog-instrumentations/src/helpers/hook')
 const instrumentations = require('../../../../datadog-instrumentations/src/helpers/instrumentations')
 const {
@@ -31,7 +32,7 @@ const {
  */
 function _extractModuleRootAndHandler (fullHandler) {
   const handlerString = path.basename(fullHandler)
-  const moduleRoot = fullHandler.substring(0, fullHandler.indexOf(handlerString))
+  const moduleRoot = fullHandler.slice(0, Math.max(0, fullHandler.indexOf(handlerString)))
 
   return [moduleRoot, handlerString]
 }
@@ -78,8 +79,8 @@ function _getLambdaFilePaths (lambdaStylePath) {
  * the file is required.
  */
 const registerLambdaHook = () => {
-  const lambdaTaskRoot = process.env.LAMBDA_TASK_ROOT
-  const originalLambdaHandler = process.env.DD_LAMBDA_HANDLER
+  const lambdaTaskRoot = getEnvironmentVariable('LAMBDA_TASK_ROOT')
+  const originalLambdaHandler = getEnvironmentVariable('DD_LAMBDA_HANDLER')
 
   if (originalLambdaHandler !== undefined && lambdaTaskRoot !== undefined) {
     const [moduleRoot, moduleAndHandler] = _extractModuleRootAndHandler(originalLambdaHandler)

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

@@ -10,6 +10,7 @@ module.exports = {
   METRICS: '_ml_obs.metrics',
   ML_APP: '_ml_obs.meta.ml_app',
   PROPAGATED_PARENT_ID_KEY: '_dd.p.llmobs_parent_id',
+  PROPAGATED_ML_APP_KEY: '_dd.p.llmobs_ml_app',
   PARENT_ID_KEY: '_ml_obs.llmobs_parent_id',
   TAGS: '_ml_obs.tags',
   NAME: '_ml_obs.name',

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

@@ -1,7 +1,11 @@
 'use strict'
 
 const log = require('../log')
-const { PROPAGATED_PARENT_ID_KEY } = require('./constants/tags')
+const {
+  ML_APP,
+  PROPAGATED_ML_APP_KEY,
+  PROPAGATED_PARENT_ID_KEY
+} = require('./constants/tags')
 const { storage } = require('./storage')
 
 const telemetry = require('./telemetry')
@@ -14,6 +18,7 @@ const flushCh = channel('llmobs:writers:flush')
 const injectCh = channel('dd-trace:span:inject')
 
 const LLMObsEvalMetricsWriter = require('./writers/evaluations')
+const LLMObsTagger = require('./tagger')
 const LLMObsSpanWriter = require('./writers/spans')
 const { setAgentStrategy } = require('./writers/util')
 
@@ -35,7 +40,12 @@ let spanWriter
 /** @type {LLMObsEvalMetricsWriter | null} */
 let evalWriter
 
+/** @type {import('../config')} */
+let globalTracerConfig
+
 function enable (config) {
+  globalTracerConfig = config
+
   const startTime = performance.now()
   // create writers and eval writer append and flush channels
   // span writer append is handled by the span processor
@@ -83,14 +93,20 @@ function disable () {
 }
 
 // since LLMObs traces can extend between services and be the same trace,
-// we need to propogate the parent id.
+// we need to propagate the parent id and mlApp.
 function handleLLMObsParentIdInjection ({ carrier }) {
   const parent = storage.getStore()?.span
-  if (!parent) return
+  const mlObsSpanTags = LLMObsTagger.tagMap.get(parent)
 
-  const parentId = parent?.context().toSpanId()
+  const parentContext = parent?.context()
+  const parentId = parentContext?.toSpanId()
+  const mlApp =
+    mlObsSpanTags?.[ML_APP] ||
+    parentContext?._trace?.tags?.[PROPAGATED_ML_APP_KEY] ||
+    globalTracerConfig.llmobs.mlApp
 
-  carrier['x-datadog-tags'] += `,${PROPAGATED_PARENT_ID_KEY}=${parentId}`
+  if (parentId) carrier['x-datadog-tags'] += `,${PROPAGATED_PARENT_ID_KEY}=${parentId}`
+  if (mlApp) carrier['x-datadog-tags'] += `,${PROPAGATED_ML_APP_KEY}=${mlApp}`
 }
 
 function handleFlush () {

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

@@ -44,27 +44,25 @@ class NoopLLMObs {
         if (ctx.kind !== 'method') return target
 
         return llmobs.wrap({ name: ctx.name, _decorator: true, ...options }, target)
-      } else {
-        const propertyKey = ctxOrPropertyKey
-        if (descriptor) {
-          if (typeof descriptor.value !== 'function') return descriptor
-
-          const original = descriptor.value
-          descriptor.value = llmobs.wrap({ name: propertyKey, _decorator: true, ...options }, original)
-
-          return descriptor
-        } else {
-          if (typeof target[propertyKey] !== 'function') return target[propertyKey]
-
-          const original = target[propertyKey]
-          Object.defineProperty(target, propertyKey, {
-            ...Object.getOwnPropertyDescriptor(target, propertyKey),
-            value: llmobs.wrap({ name: propertyKey, _decorator: true, ...options }, original)
-          })
-
-          return target
-        }
       }
+      const propertyKey = ctxOrPropertyKey
+      if (descriptor) {
+        if (typeof descriptor.value !== 'function') return descriptor
+
+        const original = descriptor.value
+        descriptor.value = llmobs.wrap({ name: propertyKey, _decorator: true, ...options }, original)
+
+        return descriptor
+      }
+      if (typeof target[propertyKey] !== 'function') return target[propertyKey]
+
+      const original = target[propertyKey]
+      Object.defineProperty(target, propertyKey, {
+        ...Object.getOwnPropertyDescriptor(target, propertyKey),
+        value: llmobs.wrap({ name: propertyKey, _decorator: true, ...options }, original)
+      })
+
+      return target
     }
   }
 

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

@@ -9,7 +9,7 @@ const {
   parseModelId
 } = require('../../../../datadog-plugin-aws-sdk/src/services/bedrockruntime/utils')
 
-const ENABLED_OPERATIONS = ['invokeModel']
+const ENABLED_OPERATIONS = new Set(['invokeModel'])
 
 const requestIdsToTokens = {}
 
@@ -21,7 +21,7 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
       const request = response.request
       const operation = request.operation
       // avoids instrumenting other non supported runtime operations
-      if (!ENABLED_OPERATIONS.includes(operation)) {
+      if (!ENABLED_OPERATIONS.has(operation)) {
         return
       }
       const { modelProvider, modelName } = parseModelId(request.params.modelId)
@@ -40,8 +40,8 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
       const outputTokenCount = headers['x-amzn-bedrock-output-token-count']
 
       requestIdsToTokens[requestId] = {
-        inputTokensFromHeaders: inputTokenCount && parseInt(inputTokenCount),
-        outputTokensFromHeaders: outputTokenCount && parseInt(outputTokenCount)
+        inputTokensFromHeaders: inputTokenCount && Number.parseInt(inputTokenCount),
+        outputTokensFromHeaders: outputTokenCount && Number.parseInt(outputTokenCount)
       }
     })
   }
@@ -64,8 +64,8 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
 
     // add metadata tags
     this._tagger.tagMetadata(span, {
-      temperature: parseFloat(requestParams.temperature) || 0.0,
-      max_tokens: parseInt(requestParams.maxTokens) || 0
+      temperature: Number.parseFloat(requestParams.temperature) || 0,
+      max_tokens: Number.parseInt(requestParams.maxTokens) || 0
     })
 
     // add I/O tags

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

@@ -5,16 +5,12 @@ const { spanHasError } = require('../../../util')
 
 class LangChainLLMObsChainHandler extends LangChainLLMObsHandler {
   setMetaTags ({ span, inputs, results }) {
-    let input, output
+    let input
     if (inputs) {
       input = this.formatIO(inputs)
     }
 
-    if (!results || spanHasError(span)) {
-      output = ''
-    } else {
-      output = this.formatIO(results)
-    }
+    const output = !results || spanHasError(span) ? '' : this.formatIO(results)
 
     // chain spans will always be workflows
     this._tagger.tagTextIO(span, input, output)

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

@@ -61,12 +61,12 @@ class LangChainLLMObsChatModelHandler extends LangChainLLMObsHandler {
 
         if (!isWorkflow && !tokensSetTopLevel) {
           const { tokens, runId } = this.checkTokenUsageFromAIMessage(chatCompletionMessage)
-          if (!tokensPerRunId[runId]) {
-            tokensPerRunId[runId] = tokens
-          } else {
+          if (tokensPerRunId[runId]) {
             tokensPerRunId[runId].inputTokens += tokens.inputTokens
             tokensPerRunId[runId].outputTokens += tokens.outputTokens
             tokensPerRunId[runId].totalTokens += tokens.totalTokens
+          } else {
+            tokensPerRunId[runId] = tokens
           }
         }
       }

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

@@ -23,26 +23,24 @@ class LangChainLLMObsHandler {
       return formatted
     } else if (Array.isArray(messages)) {
       return messages.map(message => this.formatIO(message))
-    } else { // either a BaseMesage type or a string
-      return this.getContentFromMessage(messages)
-    }
+    } // either a BaseMesage type or a string
+    return this.getContentFromMessage(messages)
   }
 
   getContentFromMessage (message) {
     if (typeof message === 'string') {
       return message
-    } else {
-      try {
-        const messageContent = {}
-        messageContent.content = message.content || ''
+    }
+    try {
+      const messageContent = {}
+      messageContent.content = message.content || ''
 
-        const role = this.getRole(message)
-        if (role) messageContent.role = role
+      const role = this.getRole(message)
+      if (role) messageContent.role = role
 
-        return messageContent
-      } catch {
-        return JSON.stringify(message)
-      }
+      return messageContent
+    } catch {
+      return JSON.stringify(message)
     }
   }
 

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

@@ -9,8 +9,8 @@ const ANTHROPIC_PROVIDER_NAME = 'anthropic'
 const BEDROCK_PROVIDER_NAME = 'amazon_bedrock'
 const OPENAI_PROVIDER_NAME = 'openai'
 
-const SUPPORTED_INTEGRATIONS = ['openai']
-const LLM_SPAN_TYPES = ['llm', 'chat_model', 'embedding']
+const SUPPORTED_INTEGRATIONS = new Set(['openai'])
+const LLM_SPAN_TYPES = new Set(['llm', 'chat_model', 'embedding'])
 const LLM = 'llm'
 const WORKFLOW = 'workflow'
 const EMBEDDING = 'embedding'
@@ -94,18 +94,18 @@ class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
       span?.context()._tags[`langchain.request.${provider}.parameters.model_kwargs.max_tokens`]
 
     if (temperature) {
-      metadata.temperature = parseFloat(temperature)
+      metadata.temperature = Number.parseFloat(temperature)
     }
 
     if (maxTokens) {
-      metadata.maxTokens = parseInt(maxTokens)
+      metadata.maxTokens = Number.parseInt(maxTokens)
     }
 
     this._tagger.tagMetadata(span, metadata)
   }
 
   getKind (type, provider) {
-    if (LLM_SPAN_TYPES.includes(type)) {
+    if (LLM_SPAN_TYPES.has(type)) {
       const llmobsIntegration = this.getIntegrationName(type, provider)
 
       if (!this.isLLMIntegrationEnabled(llmobsIntegration)) {
@@ -129,7 +129,7 @@ class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
   }
 
   isLLMIntegrationEnabled (integration) {
-    return SUPPORTED_INTEGRATIONS.includes(integration) && pluginManager?._pluginsByName[integration]?.llmobs?._enabled
+    return SUPPORTED_INTEGRATIONS.has(integration) && pluginManager?._pluginsByName[integration]?.llmobs?._enabled
   }
 }
 

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

@@ -68,9 +68,8 @@ class OpenAiLLMObsPlugin extends LLMObsPlugin {
       return { modelProvider: 'azure_openai', client: 'AzureOpenAI' }
     } else if (baseUrl.includes('deepseek')) {
       return { modelProvider: 'deepseek', client: 'DeepSeek' }
-    } else {
-      return { modelProvider: 'openai', client: 'OpenAI' }
     }
+    return { modelProvider: 'openai', client: 'OpenAI' }
   }
 
   _extractMetrics (response) {
@@ -105,7 +104,7 @@ class OpenAiLLMObsPlugin extends LLMObsPlugin {
     const embeddingInput = embeddingInputs.map(input => ({ text: input }))
 
     if (error) {
-      this._tagger.tagEmbeddingIO(span, embeddingInput, undefined)
+      this._tagger.tagEmbeddingIO(span, embeddingInput)
       return
     }
 

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

@@ -14,6 +14,7 @@ const Span = require('../opentracing/span')
 
 const tracerVersion = require('../../../../package.json').version
 const logger = require('../log')
+const { getEnvironmentVariable } = require('../config-helper')
 const telemetry = require('./telemetry')
 
 const LLMObsTagger = require('./tagger')
@@ -47,7 +48,7 @@ class LLMObs extends NoopLLMObs {
 
     const { mlApp, agentlessEnabled } = options
 
-    const { DD_LLMOBS_ENABLED } = process.env
+    const DD_LLMOBS_ENABLED = getEnvironmentVariable('DD_LLMOBS_ENABLED')
 
     const llmobsConfig = {
       mlApp,
@@ -121,7 +122,7 @@ class LLMObs extends NoopLLMObs {
     }
 
     const kind = validateKind(options.kind) // will throw if kind is undefined or not an expected kind
-    let name = options.name || (fn?.name ? fn.name : undefined) || kind
+    let name = options.name || fn?.name || kind
 
     if (!name) {
       logger.warn('No span name provided for `wrap`. Defaulting to "unnamed-anonymous-function".')
@@ -285,7 +286,7 @@ class LLMObs extends NoopLLMObs {
       }
       if (!(span instanceof Span)) {
         err = 'invalid_span'
-        throw new Error('Span must be a valid Span object.')
+        throw new TypeError('Span must be a valid Span object.')
       }
       if (!LLMObsTagger.tagMap.has(span)) {
         err = 'invalid_span'

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

@@ -158,7 +158,7 @@ class LLMObsSpanProcessor {
     const add = (obj, carrier) => {
       for (const key in obj) {
         const value = obj[key]
-        if (!Object.prototype.hasOwnProperty.call(obj, key)) continue
+        if (!Object.hasOwn(obj, key)) continue
         if (typeof value === 'bigint' || isCircular(value)) {
           // mark as unserializable instead of dropping
           logger.warn(`Unserializable property found in metadata: ${key}`)