dd-trace 5.54.0 → 5.56.0

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

@@ -170,7 +170,7 @@ async function updateBreakpointInternal (breakpoint, probe) {
   const conditionBeforeNewProbe = compileCompoundCondition([...probesAtLocation.values()])
 
   // If a probe is provided, add it to the breakpoint. If not, it's because we're removing a probe, but potentially
-  // need to update the condtion of the breakpoint.
+  // need to update the condition of the breakpoint.
   if (probe) {
     probesAtLocation.set(probe.id, probe)
     probeToLocation.set(probe.id, breakpoint.locationKey)
@@ -194,7 +194,6 @@ async function updateBreakpointInternal (breakpoint, probe) {
     } catch (err) {
       throw new Error(`Error setting breakpoint for probe ${probe.id}`, { cause: err })
     }
-    breakpoint.id = result.breakpointId
     breakpointToProbes.set(result.breakpointId, probesAtLocation)
   }
 }

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

@@ -105,9 +105,8 @@ function compile (node) {
       return '$dd_key'
     } else if (value === '@value') {
       return '$dd_value'
-    } else {
-      return assertIdentifier(value)
     }
+    return assertIdentifier(value)
   } else if (Array.isArray(value)) {
     const args = value.map(compile)
     switch (type) {

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

@@ -109,6 +109,7 @@ session.on('Debugger.paused', async ({ params }) => {
       if (probe.condition !== undefined) {
         // TODO: Bundle all conditions and evaluate them in a single call
         // TODO: Handle errors
+        // eslint-disable-next-line no-await-in-loop
         const { result } = await session.post('Debugger.evaluateOnCallFrame', {
           callFrameId: params.callFrames[0].callFrameId,
           expression: probe.condition,
@@ -134,7 +135,7 @@ session.on('Debugger.paused', async ({ params }) => {
 
   const timestamp = Date.now()
 
-  let evalResults = null
+  let evalResults
   const { result } = await session.post('Debugger.evaluateOnCallFrame', {
     callFrameId: params.callFrames[0].callFrameId,
     expression: templateExpressions.length === 0

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

@@ -9,6 +9,7 @@ const request = require('../../exporters/common/request')
 const { GIT_COMMIT_SHA, GIT_REPOSITORY_URL } = require('../../plugins/util/tags')
 const log = require('../../log')
 const { version } = require('../../../../../package.json')
+const { getEnvironmentVariable } = require('../../config-helper')
 
 module.exports = send
 
@@ -21,8 +22,8 @@ const hostname = getHostname()
 const service = config.service
 
 const ddtags = [
-  ['env', process.env.DD_ENV],
-  ['version', process.env.DD_VERSION],
+  ['env', getEnvironmentVariable('DD_ENV')],
+  ['version', getEnvironmentVariable('DD_VERSION')],
   ['debugger_version', version],
   ['host_name', hostname],
   [GIT_COMMIT_SHA, config.commitSHA],
@@ -31,7 +32,11 @@ const ddtags = [
 
 const path = `/debugger/v1/input?${stringify({ ddtags })}`
 
-const jsonBuffer = new JSONBuffer({ size: config.maxTotalPayloadSize, timeout: 1000, onFlush })
+const jsonBuffer = new JSONBuffer({
+  size: config.maxTotalPayloadSize,
+  timeout: config.dynamicInstrumentation.uploadIntervalSeconds * 1000,
+  onFlush
+})
 
 function send (message, logger, dd, snapshot) {
   const payload = {

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

@@ -77,9 +77,8 @@ function getObjectProperties (subtype, objectId, opts, depth) {
     return getProxy(objectId, opts, depth)
   } else if (subtype === 'arraybuffer') {
     return getArrayBuffer(objectId, opts, depth)
-  } else {
-    return getObject(objectId, opts, depth + 1, subtype === 'array' || subtype === 'typedarray')
   }
+  return getObject(objectId, opts, depth + 1, subtype === 'array' || subtype === 'typedarray')
 }
 
 // TODO: The following extra information from `internalProperties` might be relevant to include for functions:

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

@@ -129,11 +129,10 @@ function toFunctionOrClass (value, maxLength) {
     // This is a function
     // TODO: Would it make sense to detect if it's an arrow function or not?
     return toObject(value.className, value.properties, maxLength)
-  } else {
-    // This is a class
-    const className = classMatch[1].trim()
-    return { type: className ? `class ${className}` : 'class' }
   }
+  // This is a class
+  const className = classMatch[1].trim()
+  return { type: className ? `class ${className}` : 'class' }
 }
 
 function toString (str, maxLength) {

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

@@ -103,7 +103,7 @@ const REDACTED_IDENTIFIERS = new Set(
 
 function normalizeName (name, isSymbol) {
   if (isSymbol) name = name.slice(7, -1) // Remove `Symbol(` and `)`
-  return name.toLowerCase().replace(/[-_@$.]/g, '')
+  return name.toLowerCase().replaceAll(/[-_@$.]/g, '')
 }
 
 module.exports = {

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

@@ -20,7 +20,11 @@ const runtimeId = config.runtimeId
 
 const cache = new TTLSet(60 * 60 * 1000) // 1 hour
 
-const jsonBuffer = new JSONBuffer({ size: config.maxTotalPayloadSize, timeout: 1000, onFlush })
+const jsonBuffer = new JSONBuffer({
+  size: config.maxTotalPayloadSize,
+  timeout: config.dynamicInstrumentation.uploadIntervalSeconds * 1000,
+  onFlush
+})
 
 const STATUSES = {
   RECEIVED: 'RECEIVED',

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

@@ -9,6 +9,7 @@ let worker = null
 let configChannel = null
 let ackId = 0
 
+// eslint-disable-next-line eslint-rules/eslint-process-env
 const { NODE_OPTIONS, ...env } = process.env
 
 module.exports = {

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

@@ -169,7 +169,7 @@ class DogStatsDClient {
         })
         .forEach(key => {
           // https://docs.datadoghq.com/tagging/#defining-tags
-          const value = config.tags[key].replace(/[^a-z0-9_:./-]/ig, '_')
+          const value = config.tags[key].replaceAll(/[^a-z0-9_:./-]/ig, '_')
 
           tags.push(`${key}:${value}`)
         })
@@ -244,7 +244,7 @@ class MetricsAggregationClient {
     const container = monotonic ? this._counters : this._gauges
     const node = this._ensureTree(container, name, tags, 0)
 
-    node.value = node.value + count
+    node.value += count
   }
 
   gauge (name, value, tags) {

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

@@ -6,6 +6,7 @@ const log = require('../log')
 const { isTrue } = require('../util')
 const coalesce = require('koalas')
 const { memoize } = require('../log/utils')
+const { getEnvironmentVariable } = require('../config-helper')
 
 const SOFT_LIMIT = 8 * 1024 * 1024 // 8MB
 
@@ -32,7 +33,7 @@ class AgentEncoder {
     this._writer = writer
     this._reset()
     this._debugEncoding = isTrue(coalesce(
-      process.env.DD_TRACE_ENCODING_DEBUG,
+      getEnvironmentVariable('DD_TRACE_ENCODING_DEBUG'),
       false
     ))
     this._config = this._writer?._config
@@ -349,15 +350,17 @@ const memoizedLogDebug = memoize((key, message) => {
 function formatSpanEvents (span) {
   for (const spanEvent of span.span_events) {
     if (spanEvent.attributes) {
+      let hasAttributes = false
       for (const [key, value] of Object.entries(spanEvent.attributes)) {
         const newValue = convertSpanEventAttributeValues(key, value)
         if (newValue === undefined) {
           delete spanEvent.attributes[key] // delete from attributes if undefined
         } else {
+          hasAttributes = true
           spanEvent.attributes[key] = newValue
         }
       }
-      if (Object.keys(spanEvent.attributes).length === 0) {
+      if (!hasAttributes) {
         delete spanEvent.attributes
       }
     }

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

@@ -23,12 +23,10 @@ class AgentEncoder extends BaseEncoder {
     const traceSize = this._traceBytes.length + 5
     const buffer = Buffer.allocUnsafe(prefixSize + stringSize + traceSize)
 
-    let offset = 0
+    buffer[0] = ARRAY_OF_TWO
 
-    buffer[offset++] = ARRAY_OF_TWO
-
-    offset = this._writeStrings(buffer, offset)
-    offset = this._writeTraces(buffer, offset)
+    const offset = this._writeStrings(buffer, 1)
+    this._writeTraces(buffer, offset)
 
     this._reset()
 

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

@@ -161,20 +161,20 @@ class AgentlessCiVisibilityEncoder extends AgentEncoder {
   _encodeEventContent (bytes, content) {
     let totalKeysLength = TEST_AND_SPAN_KEYS_LENGTH
     if (content.meta.test_session_id) {
-      totalKeysLength = totalKeysLength + 1
+      totalKeysLength += 1
     }
     if (content.meta.test_module_id) {
-      totalKeysLength = totalKeysLength + 1
+      totalKeysLength += 1
     }
     if (content.meta.test_suite_id) {
-      totalKeysLength = totalKeysLength + 1
+      totalKeysLength += 1
     }
     const itrCorrelationId = content.meta[ITR_CORRELATION_ID]
     if (itrCorrelationId) {
-      totalKeysLength = totalKeysLength + 1
+      totalKeysLength += 1
     }
     if (content.type) {
-      totalKeysLength = totalKeysLength + 1
+      totalKeysLength += 1
     }
     this._encodeMapPrefix(bytes, totalKeysLength)
     if (content.type) {

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

@@ -3,6 +3,7 @@
 const exporters = require('../../../ext/exporters')
 const fs = require('fs')
 const constants = require('./constants')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 module.exports = function getExporter (name) {
   switch (name) {
@@ -20,7 +21,7 @@ module.exports = function getExporter (name) {
     case exporters.PLAYWRIGHT_WORKER:
       return require('./ci-visibility/exporters/test-worker')
     default: {
-      const inAWSLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== undefined
+      const inAWSLambda = getEnvironmentVariable('AWS_LAMBDA_FUNCTION_NAME') !== undefined
       const usingLambdaExtension = inAWSLambda && fs.existsSync(constants.DATADOG_LAMBDA_EXTENSION_PATH)
       return require(inAWSLambda && !usingLambdaExtension ? './exporters/log' : './exporters/agent')
     }

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

@@ -69,7 +69,9 @@ function setHeader (headers, key, value) {
 }
 
 function getEncoder (protocolVersion) {
-  return require(`../../encode/${protocolVersion === '0.5' ? '0.5' : '0.4'}`).AgentEncoder
+  return protocolVersion === '0.5'
+    ? require('../../encode/0.5').AgentEncoder
+    : require('../../encode/0.4').AgentEncoder
 }
 
 function makeRequest (version, data, count, url, headers, lookup, needsStartupLog, cb) {

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

@@ -1,8 +1,9 @@
 'use strict'
 
 const fs = require('fs')
+const { getEnvironmentVariable } = require('../../config-helper')
 
-const { DD_EXTERNAL_ENV } = process.env
+const DD_EXTERNAL_ENV = getEnvironmentVariable('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
@@ -24,7 +25,7 @@ try {
 
 const inodePath = cgroup.match(lineReg)?.[3]
 if (inodePath) {
-  const strippedPath = inodePath.replace(/^\/|\/$/g, '')
+  const strippedPath = inodePath.replaceAll(/^\/|\/$/g, '')
 
   try {
     inode = fs.statSync(`/sys/fs/cgroup/${strippedPath}`).ino

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

@@ -56,9 +56,12 @@ function request (data, options, callback) {
   const timeout = options.timeout || 2000
   const isSecure = options.protocol === 'https:'
   const client = isSecure ? https : http
-  const dataArray = [].concat(data)
+  let dataArray = data
 
   if (!isReadable) {
+    if (!Array.isArray(data)) {
+      dataArray = [data]
+    }
     options.headers['Content-Length'] = byteLength(dataArray)
   }
 

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

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

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

@@ -174,11 +174,11 @@ function readInt32 (buffer, offset) {
 // Write unsigned integer bytes to a buffer.
 function writeUInt32BE (buffer, value, offset) {
   buffer[3 + offset] = value & 255
-  value = value >> 8
+  value >>= 8
   buffer[2 + offset] = value & 255
-  value = value >> 8
+  value >>= 8
   buffer[1 + offset] = value & 255
-  value = value >> 8
+  value >>= 8
   buffer[0 + offset] = value & 255
 }
 

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,7 +26,7 @@ let __lambdaTimeout
 function checkTimeout (context) {
   const remainingTimeInMillis = context.getRemainingTimeInMillis()
 
-  let apmFlushDeadline = Number.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(() => {

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,8 +58,8 @@ 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) {
   // Instrumentation is done manually.

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 {
@@ -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/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/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) {

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,

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}`)