dd-trace 5.83.0 → 5.85.0

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

@@ -10,7 +10,7 @@ const {
   SESSION_ID,
   ROOT_PARENT_ID,
   INTEGRATION,
-  DECORATOR
+  DECORATOR,
 } = require('./constants/tags')
 
 const LLMObsTagger = require('./tagger')
@@ -34,7 +34,7 @@ function extractTagsFromSpanEvent (event) {
     span_kind: spanKind,
     autoinstrumented: Number(autoinstrumented),
     error: error ? 1 : 0,
-    integration: integration || 'N/A'
+    integration: integration || 'N/A',
   }
 }
 
@@ -61,7 +61,7 @@ function incrementLLMObsSpanFinishedCount (span, value = 1) {
     is_root_span: Number(isRootSpan),
     span_kind: spanKind,
     integration: integration || 'N/A',
-    error: error ? 1 : 0
+    error: error ? 1 : 0,
   }
   if (!autoInstrumented) {
     tags.decorator = Number(decorator)
@@ -85,7 +85,7 @@ function recordLLMObsEnabled (startTime, config, value = 1) {
     agentless: Number(config.llmobs.agentlessEnabled),
     site: config.site,
     auto: Number(autoEnabled),
-    ml_app: config.llmobs.mlApp
+    ml_app: config.llmobs.mlApp,
   }
   llmobsMetrics.count('product_enabled', tags).inc(value)
   llmobsMetrics.distribution('init_time', tags).track(initTimeMs)
@@ -117,7 +117,7 @@ function recordLLMObsAnnotate (span, err, value = 1) {
   const tags = {
     error: Number(!!err),
     span_kind: spanKind,
-    is_root_span: Number(isRootSpan)
+    is_root_span: Number(isRootSpan),
   }
   if (err) tags.error_type = err
   llmobsMetrics.count('annotations', tags).inc(value)
@@ -137,7 +137,7 @@ function recordExportSpan (span, err, value = 1) {
   const tags = {
     error: Number(!!err),
     span_kind: spanKind,
-    is_root_span: Number(isRootSpan)
+    is_root_span: Number(isRootSpan),
   }
   if (err) tags.error_type = err
   llmobsMetrics.count('spans_exported', tags).inc(value)
@@ -146,7 +146,7 @@ function recordExportSpan (span, err, value = 1) {
 function recordSubmitEvaluation (options, err, value = 1) {
   const tags = {
     error: Number(!!err),
-    custom_joining_key: 0
+    custom_joining_key: 0,
   }
   const metricType = options?.metricType?.toLowerCase()
   if (metricType !== 'categorical' && metricType !== 'score') tags.metric_type = 'other'
@@ -170,5 +170,5 @@ module.exports = {
   recordUserFlush,
   recordExportSpan,
   recordSubmitEvaluation,
-  recordLLMObsUserProcessorCalled
+  recordLLMObsUserProcessorCalled,
 }

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

@@ -178,5 +178,5 @@ module.exports = {
   encodeUnicode,
   validateKind,
   getFunctionArguments,
-  spanHasError
+  spanHasError,
 }

package/packages/dd-trace/src/llmobs/writers/base.js

@@ -12,8 +12,9 @@ const telemetry = require('../telemetry')
 const log = require('../../log')
 const {
   EVP_SUBDOMAIN_HEADER_NAME,
-  EVP_PROXY_AGENT_BASE_PATH
+  EVP_PROXY_AGENT_BASE_PATH,
 } = require('../constants/writers')
+const { getAgentUrl } = require('../../agent/url')
 const { parseResponseAndLog } = require('./util')
 
 class LLMObsBuffer {
@@ -132,15 +133,15 @@ class BaseLLMObsWriter {
       const options = {
         headers: {
           'Content-Type': 'application/json',
-          'DD-API-KEY': apiKey
+          'DD-API-KEY': apiKey,
         },
         method: 'POST',
         timeout: this._timeout,
         url: new URL(format({
           protocol: 'https:',
-          hostname: `${this._intake}.${site}`
+          hostname: `${this._intake}.${site}`,
         })),
-        path: this._baseEndpoint
+        path: this._baseEndpoint,
       }
       const url = this.#buildUrl(options.url.href, options.path)
       const maskedApiKey = apiKey ? `****${apiKey.slice(-4)}` : ''
@@ -192,38 +193,31 @@ class BaseLLMObsWriter {
       return {
         url: new URL(format({
           protocol: 'https:',
-          hostname: `${this._intake}.${site}`
+          hostname: `${this._intake}.${site}`,
         })),
-        endpoint: this._endpoint
+        endpoint: this._endpoint,
       }
     }
 
-    const { hostname, port } = this._config
-
     const overrideOriginEnv = getEnvironmentVariable('_DD_LLMOBS_OVERRIDE_ORIGIN')
     const overrideOriginUrl = overrideOriginEnv && new URL(overrideOriginEnv)
-
-    const base = overrideOriginUrl ?? this._config.url ?? new URL(format({
-      protocol: 'http:',
-      hostname,
-      port
-    }))
+    const base = overrideOriginUrl ?? getAgentUrl(this._config)
 
     return {
       url: base,
-      endpoint: path.join(EVP_PROXY_AGENT_BASE_PATH, this._endpoint)
+      endpoint: path.join(EVP_PROXY_AGENT_BASE_PATH, this._endpoint),
     }
   }
 
   _getOptions () {
     const options = {
       headers: {
-        'Content-Type': 'application/json'
+        'Content-Type': 'application/json',
       },
       method: 'POST',
       timeout: this._timeout,
       url: this._baseUrl,
-      path: this._endpoint
+      path: this._endpoint,
     }
 
     if (this._agentless) {

package/packages/dd-trace/src/llmobs/writers/evaluations.js

@@ -3,7 +3,7 @@
 const {
   EVALUATIONS_ENDPOINT,
   EVALUATIONS_EVENT_TYPE,
-  EVALUATIONS_INTAKE
+  EVALUATIONS_INTAKE,
 } = require('../constants/writers')
 const BaseWriter = require('./base')
 
@@ -13,7 +13,7 @@ class LLMObsEvalMetricsWriter extends BaseWriter {
       config,
       intake: EVALUATIONS_INTAKE,
       eventType: EVALUATIONS_EVENT_TYPE,
-      endpoint: EVALUATIONS_ENDPOINT
+      endpoint: EVALUATIONS_ENDPOINT,
     })
   }
 
@@ -22,9 +22,9 @@ class LLMObsEvalMetricsWriter extends BaseWriter {
       data: {
         type: this._eventType,
         attributes: {
-          metrics: events
-        }
-      }
+          metrics: events,
+        },
+      },
     }
   }
 }

package/packages/dd-trace/src/llmobs/writers/spans.js

@@ -5,7 +5,7 @@ const {
   EVP_PAYLOAD_SIZE_LIMIT,
   SPANS_ENDPOINT,
   SPANS_EVENT_TYPE,
-  SPANS_INTAKE
+  SPANS_INTAKE,
 } = require('../constants/writers')
 const { DROPPED_VALUE_TEXT } = require('../constants/text')
 const { DROPPED_IO_COLLECTION_ERROR } = require('../constants/tags')
@@ -20,7 +20,7 @@ class LLMObsSpanWriter extends BaseWriter {
       config,
       eventType: SPANS_EVENT_TYPE,
       intake: SPANS_INTAKE,
-      endpoint: SPANS_ENDPOINT
+      endpoint: SPANS_ENDPOINT,
     })
   }
 
@@ -53,7 +53,7 @@ class LLMObsSpanWriter extends BaseWriter {
       '_dd.stage': 'raw',
       '_dd.tracer_version': tracerVersion,
       event_type: this._eventType,
-      spans: [event]
+      spans: [event],
     }))
   }
 

package/packages/dd-trace/src/llmobs/writers/util.js

@@ -3,10 +3,8 @@
 const logger = require('../../log')
 const { EVP_PROXY_AGENT_BASE_PATH } = require('../constants/writers')
 const telemetry = require('../telemetry')
-
-const AgentInfoExporter = require('../../exporters/common/agent-info-exporter')
-/** @type {AgentInfoExporter} */
-let agentInfoExporter
+const { fetchAgentInfo } = require('../../agent/info')
+const { getAgentUrl } = require('../../agent/url')
 
 function setAgentStrategy (config, setWritersAgentlessValue) {
   const agentlessEnabled = config.llmobs.agentlessEnabled
@@ -16,11 +14,7 @@ function setAgentStrategy (config, setWritersAgentlessValue) {
     return
   }
 
-  if (!agentInfoExporter) {
-    agentInfoExporter = new AgentInfoExporter(config)
-  }
-
-  agentInfoExporter.getAgentInfo((err, agentInfo) => {
+  fetchAgentInfo(getAgentUrl(config), (err, agentInfo) => {
     if (err) {
       setWritersAgentlessValue(true)
       return
@@ -56,5 +50,5 @@ function parseResponseAndLog (err, code, eventsLength, url, eventType) {
 
 module.exports = {
   setAgentStrategy,
-  parseResponseAndLog
+  parseResponseAndLog,
 }

package/packages/dd-trace/src/log/channels.js

@@ -9,7 +9,7 @@ const Level = {
   warn: 40,
   error: 50,
   critical: 50,
-  off: 100
+  off: 100,
 }
 
 const traceChannel = channel('datadog:log:trace')
@@ -74,5 +74,5 @@ module.exports = {
   debugChannel,
   infoChannel,
   warnChannel,
-  errorChannel
+  errorChannel,
 }

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

@@ -10,7 +10,7 @@ const { memoize } = require('./utils')
 const config = {
   enabled: false,
   logger: undefined,
-  logLevel: 'debug'
+  logLevel: 'debug',
 }
 
 // in most places where we know we want to mute a log we use log.error() directly
@@ -31,31 +31,31 @@ const log = {
   use (logger) {
     config.logger = logger
     logWriter.use(logger)
-    return this
+    return log
   },
 
   toggle (enabled, logLevel) {
     config.enabled = enabled
     config.logLevel = logLevel
     logWriter.toggle(enabled, logLevel)
-    return this
+    return log
   },
 
   reset () {
     logWriter.reset()
-    this._deprecate = memoize((code, message) => {
-      errorChannel.publish(Log.parse(message))
+    log._deprecate = memoize((code, message) => {
+      publishFormatted(errorChannel, null, message)
       return true
     })
 
-    return this
+    return log
   },
 
   trace (...args) {
     if (traceChannel.hasSubscribers) {
       const logRecord = {}
 
-      Error.captureStackTrace(logRecord, this.trace)
+      Error.captureStackTrace(logRecord, log.trace)
 
       const stack = logRecord.stack.split('\n')
       const fn = stack[1].replace(/^\s+at ([^\s]+) .+/, '$1')
@@ -64,49 +64,46 @@ const log = {
 
       stack[0] = `Trace: ${fn}(${params})`
 
-      traceChannel.publish(Log.parse(stack.join('\n')))
+      publishFormatted(traceChannel, null, stack.join('\n'))
     }
-    return this
+    return log
   },
 
   debug (...args) {
-    if (debugChannel.hasSubscribers) {
-      debugChannel.publish(Log.parse(...args))
-    }
-    return this
+    publishFormatted(debugChannel, null, ...args)
+    return log
   },
 
   info (...args) {
-    if (infoChannel.hasSubscribers) {
-      infoChannel.publish(Log.parse(...args))
-    }
-    return this
+    publishFormatted(infoChannel, null, ...args)
+    return log
   },
 
   warn (...args) {
-    if (warnChannel.hasSubscribers) {
-      warnChannel.publish(Log.parse(...args))
-    }
-    return this
+    publishFormatted(warnChannel, null, ...args)
+    return log
   },
 
   error (...args) {
-    if (errorChannel.hasSubscribers) {
-      errorChannel.publish(Log.parse(...args))
-    }
-    return this
+    publishFormatted(errorChannel, formatted => {
+      const stackTraceLimitBackup = Error.stackTraceLimit
+      Error.stackTraceLimit = 0
+      const newError = new Error(formatted)
+      Error.stackTraceLimit = stackTraceLimitBackup
+      Error.captureStackTrace(newError, log.error)
+      return newError
+    }, ...args)
+    return log
   },
 
   errorWithoutTelemetry (...args) {
     args.push(NO_TRANSMIT)
-    if (errorChannel.hasSubscribers) {
-      errorChannel.publish(Log.parse(...args))
-    }
-    return this
+    publishFormatted(errorChannel, null, ...args)
+    return log
   },
 
   deprecate (code, message) {
-    return this._deprecate(code, message)
+    return log._deprecate(code, message)
   },
 
   isEnabled (fleetStableConfigValue, localStableConfigValue) {
@@ -130,10 +127,28 @@ const log = {
       getValueFromEnvSources('OTEL_LOG_LEVEL') ??
       localStableConfigValue ??
       config.logLevel
+  },
+}
+
+function publishFormatted (ch, formatter, ...args) {
+  if (ch.hasSubscribers) {
+    const log = Log.parse(...args)
+    const { formatted, cause } = getErrorLog(log)
+
+    // calling twice ch.publish() because Error cause is only available in Node.js v16.9.0
+    // TODO: replace it with Error(message, { cause }) when cause has broad support
+    if (formatted) ch.publish(formatter?.(formatted) || formatted)
+    if (cause) ch.publish(cause)
   }
 }
 
-logWriter.setStackTraceLimitFunction(log.error)
+function getErrorLog (err) {
+  if (typeof err?.delegate === 'function') {
+    const result = err.delegate()
+    return Array.isArray(result) ? Log.parse(...result) : Log.parse(result)
+  }
+  return err
+}
 
 log.reset()
 

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

@@ -44,7 +44,7 @@ class Log {
     if (firstArg) {
       if (typeof firstArg === 'string') {
         message = firstArg
-      } else if (typeof firstArg === 'object') { // eslint-disable-line eslint-rules/eslint-safe-typeof-object
+      } else if (typeof firstArg === 'object') {
         message = String(firstArg.message || firstArg)
       } else if (typeof firstArg === 'function') {
         delegate = firstArg

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

@@ -2,18 +2,16 @@
 
 const { storage } = require('../../../datadog-core')
 const { LogChannel } = require('./channels')
-const { Log } = require('./log')
 const defaultLogger = {
   debug: msg => console.debug(msg), /* eslint-disable-line no-console */
   info: msg => console.info(msg), /* eslint-disable-line no-console */
   warn: msg => console.warn(msg), /* eslint-disable-line no-console */
-  error: msg => console.error(msg) /* eslint-disable-line no-console */
+  error: msg => console.error(msg), /* eslint-disable-line no-console */
 }
 
 let enabled = false
 let logger = defaultLogger
 let logChannel = new LogChannel()
-let stackTraceLimitFunction = onError
 
 function withNoop (fn) {
   const store = storage('legacy').getStore()
@@ -24,7 +22,7 @@ function withNoop (fn) {
 }
 
 function unsubscribeAll () {
-  logChannel.unsubscribe({ trace: onTrace, debug: onDebug, info: onInfo, warn: onWarn, error: onError })
+  logChannel.unsubscribe({ trace, debug, info, warn, error })
 }
 
 function toggleSubscription (enable, level) {
@@ -32,7 +30,7 @@ function toggleSubscription (enable, level) {
 
   if (enable) {
     logChannel = new LogChannel(level)
-    logChannel.subscribe({ trace: onTrace, debug: onDebug, info: onInfo, warn: onWarn, error: onError })
+    logChannel.subscribe({ trace, debug, info, warn, error })
   }
 }
 
@@ -53,89 +51,26 @@ function reset () {
   toggleSubscription(false)
 }
 
-function getErrorLog (err) {
-  if (typeof err?.delegate === 'function') {
-    const result = err.delegate()
-    return Array.isArray(result) ? Log.parse(...result) : Log.parse(result)
-  }
-  return err
-}
-
-function setStackTraceLimitFunction (fn) {
-  if (typeof fn !== 'function') {
-    throw new TypeError('stackTraceLimitFunction must be a function')
-  }
-  stackTraceLimitFunction = fn
-}
-
-function onError (err) {
-  const { formatted, cause } = getErrorLog(err)
-
-  // calling twice logger.error() because Error cause is only available in Node.js v16.9.0
-  // TODO: replace it with Error(message, { cause }) when cause has broad support
-  if (formatted) {
-    withNoop(() => {
-      const stackTraceLimitBackup = Error.stackTraceLimit
-      Error.stackTraceLimit = 0
-      const newError = new Error(formatted)
-      Error.stackTraceLimit = stackTraceLimitBackup
-      Error.captureStackTrace(newError, stackTraceLimitFunction)
-      logger.error(newError)
-    })
-  }
-  if (cause) withNoop(() => logger.error(cause))
+function error (err) {
+  withNoop(() => logger.error(err))
 }
 
-function onWarn (log) {
-  const { formatted, cause } = getErrorLog(log)
-  if (formatted) withNoop(() => logger.warn(formatted))
-  if (cause) withNoop(() => logger.warn(cause))
+function warn (log) {
+  withNoop(() => logger.warn ? logger.warn(log) : logger.debug(log))
 }
 
-function onInfo (log) {
-  const { formatted, cause } = getErrorLog(log)
-  if (formatted) withNoop(() => logger.info(formatted))
-  if (cause) withNoop(() => logger.info(cause))
+function info (log) {
+  withNoop(() => logger.info ? logger.info(log) : logger.debug(log))
 }
 
-function onDebug (log) {
-  const { formatted, cause } = getErrorLog(log)
-  if (formatted) withNoop(() => logger.debug(formatted))
-  if (cause) withNoop(() => logger.debug(cause))
+function debug (log) {
+  withNoop(() => logger.debug(log))
 }
 
-function onTrace (log) {
-  const { formatted, cause } = getErrorLog(log)
+function trace (log) {
   // Using logger.debug() because not all loggers have trace level,
   // and console.trace() has a completely different meaning.
-  if (formatted) withNoop(() => logger.debug(formatted))
-  if (cause) withNoop(() => logger.debug(cause))
-}
-
-function error (...args) {
-  onError(Log.parse(...args))
-}
-
-function warn (...args) {
-  const log = Log.parse(...args)
-  if (!logger.warn) return onDebug(log)
-
-  onWarn(log)
-}
-
-function info (...args) {
-  const log = Log.parse(...args)
-  if (!logger.info) return onDebug(log)
-
-  onInfo(log)
-}
-
-function debug (...args) {
-  onDebug(Log.parse(...args))
-}
-
-function trace (...args) {
-  onTrace(Log.parse(...args))
+  withNoop(() => logger.debug(log))
 }
 
-module.exports = { use, toggle, reset, error, warn, info, debug, trace, setStackTraceLimitFunction }
+module.exports = { use, toggle, reset, error, warn, info, debug, trace }

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

@@ -37,12 +37,12 @@ class NoopSpan {
         traceId: parent._traceId,
         spanId,
         parentId: parent._spanId,
-        baggageItems: { ...parent._baggageItems }
+        baggageItems: { ...parent._baggageItems },
       })
       : new NoopSpanContext({
         noop: this,
         traceId: spanId,
-        spanId
+        spanId,
       })
   }
 }

package/packages/dd-trace/src/openfeature/constants/constants.js

@@ -47,5 +47,5 @@ module.exports = {
    * @constant
    * @type {string} Reason code for noop provider evaluations
    */
-  NOOP_REASON: 'STATIC'
+  NOOP_REASON: 'STATIC',
 }

package/packages/dd-trace/src/openfeature/flagging_provider.js

@@ -18,14 +18,14 @@ class FlaggingProvider extends DatadogNodeServerProvider {
     // Call parent constructor with required options and timeout
     super({
       exposureChannel: channel(EXPOSURE_CHANNEL),
-      initializationTimeoutMs: config.experimental.flaggingProvider.initializationTimeoutMs
+      initializationTimeoutMs: config.experimental.flaggingProvider.initializationTimeoutMs,
     })
 
     this._tracer = tracer
     this._config = config
 
-    log.debug(this.constructor.name + ' created with timeout: ' +
-      config.experimental.flaggingProvider.initializationTimeoutMs + 'ms')
+    log.debug('%s created with timeout: %dms', this.constructor.name,
+      config.experimental.flaggingProvider.initializationTimeoutMs)
   }
 
   /**
@@ -40,7 +40,7 @@ class FlaggingProvider extends DatadogNodeServerProvider {
     if (typeof this.setConfiguration === 'function') {
       this.setConfiguration(ufc)
     }
-    log.debug(this.constructor.name + ' provider configuration updated')
+    log.debug('%s provider configuration updated', this.constructor.name)
   }
 }
 

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

@@ -36,7 +36,7 @@ function _handleFlush () {
  */
 function enable (config) {
   if (exposuresWriter) {
-    log.warn(exposuresWriter.constructor.name + ' already enabled')
+    log.warn('%s already enabled', exposuresWriter.constructor.name)
     return
   }
 
@@ -73,5 +73,5 @@ function disable () {
 
 module.exports = {
   enable,
-  disable
+  disable,
 }

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

@@ -29,7 +29,7 @@ class NoopFlaggingProvider {
   resolveBooleanEvaluation (flagKey, defaultValue, context, logger) {
     return Promise.resolve({
       value: defaultValue,
-      reason: NOOP_REASON
+      reason: NOOP_REASON,
     })
   }
 
@@ -43,7 +43,7 @@ class NoopFlaggingProvider {
   resolveStringEvaluation (flagKey, defaultValue, context, logger) {
     return Promise.resolve({
       value: defaultValue,
-      reason: NOOP_REASON
+      reason: NOOP_REASON,
     })
   }
 
@@ -71,7 +71,7 @@ class NoopFlaggingProvider {
   resolveObjectEvaluation (flagKey, defaultValue, context, logger) {
     return Promise.resolve({
       value: defaultValue,
-      reason: NOOP_REASON
+      reason: NOOP_REASON,
     })
   }
 

package/packages/dd-trace/src/openfeature/remote_config.js

@@ -27,5 +27,5 @@ function enable (rc, config, getOpenfeatureProxy) {
 }
 
 module.exports = {
-  enable
+  enable,
 }