dd-trace 5.96.0 → 5.98.0

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

@@ -1,19 +1,21 @@
 'use strict'
+
 const { inspect } = require('util')
+
+const { defaults } = require('../config/defaults')
 const { isTrue } = require('../util')
 const { getValueFromEnvSources } = require('../config/helper')
 const { traceChannel, debugChannel, infoChannel, warnChannel, errorChannel } = require('./channels')
 const logWriter = require('./writer')
 const { Log, LogConfig, NoTransmitError } = require('./log')
-const { memoize } = require('./utils')
 
 const config = {
-  enabled: false,
+  enabled: defaults.DD_TRACE_DEBUG,
   logger: undefined,
-  logLevel: 'debug',
+  logLevel: defaults.logLevel,
 }
 
-// in most places where we know we want to mute a log we use log.error() directly
+// In most places where we know we want to mute a log we use log.error() directly
 const NO_TRANSMIT = new LogConfig(false)
 
 const log = {
@@ -21,36 +23,6 @@ const log = {
   NO_TRANSMIT,
   NoTransmitError,
 
-  /**
-   * @returns Read-only version of logging config. To modify config, call `log.use` and `log.toggle`
-   */
-  getConfig () {
-    return { ...config }
-  },
-
-  use (logger) {
-    config.logger = logger
-    logWriter.use(logger)
-    return log
-  },
-
-  toggle (enabled, logLevel) {
-    config.enabled = enabled
-    config.logLevel = logLevel
-    logWriter.toggle(enabled, logLevel)
-    return log
-  },
-
-  reset () {
-    logWriter.reset()
-    log._deprecate = memoize((code, message) => {
-      publishFormatted(errorChannel, null, message)
-      return true
-    })
-
-    return log
-  },
-
   trace (...args) {
     if (traceChannel.hasSubscribers) {
       const logRecord = {}
@@ -66,6 +38,8 @@ const log = {
 
       publishFormatted(traceChannel, null, stack.join('\n'))
     }
+    // TODO: Why do we allow chaining here? This is likely not used anywhere.
+    // If it is used, that seems like a mistake.
     return log
   },
 
@@ -102,31 +76,20 @@ const log = {
     return log
   },
 
-  deprecate (code, message) {
-    return log._deprecate(code, message)
-  },
-
-  isEnabled (fleetStableConfigValue, localStableConfigValue) {
-    return isTrue(
-      fleetStableConfigValue ??
+  configure (options) {
+    config.logger = options.logger
+    config.logLevel = options.logLevel ??
+        getValueFromEnvSources('DD_TRACE_LOG_LEVEL') ??
+        config.logLevel
+    config.enabled = isTrue(
       getValueFromEnvSources('DD_TRACE_DEBUG') ??
-      (getValueFromEnvSources('OTEL_LOG_LEVEL') === 'debug' || undefined) ??
-      localStableConfigValue ??
-      config.enabled
+      // TODO: Handle this by adding a log buffer so that configure may be called with the actual configurations.
+      // eslint-disable-next-line eslint-rules/eslint-process-env
+      (process.env.OTEL_LOG_LEVEL === 'debug' || config.enabled)
     )
-  },
+    logWriter.configure(config.enabled, config.logLevel, options.logger)
 
-  getLogLevel (
-    optionsValue,
-    fleetStableConfigValue,
-    localStableConfigValue
-  ) {
-    return optionsValue ??
-      fleetStableConfigValue ??
-      getValueFromEnvSources('DD_TRACE_LOG_LEVEL') ??
-      getValueFromEnvSources('OTEL_LOG_LEVEL') ??
-      localStableConfigValue ??
-      config.logLevel
+    return config.enabled
   },
 }
 
@@ -150,8 +113,6 @@ function getErrorLog (err) {
   return err
 }
 
-log.reset()
-
-log.toggle(log.isEnabled(), log.getLogLevel())
+log.configure({})
 
 module.exports = log

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

@@ -2,6 +2,7 @@
 
 const { storage } = require('../../../datadog-core')
 const { LogChannel } = require('./channels')
+
 const defaultLogger = {
   debug: msg => console.debug(msg), /* eslint-disable-line no-console */
   info: msg => console.info(msg), /* eslint-disable-line no-console */
@@ -17,12 +18,8 @@ function withNoop (fn) {
   storage('legacy').run({ noop: true }, fn)
 }
 
-function unsubscribeAll () {
-  logChannel.unsubscribe({ trace, debug, info, warn, error })
-}
-
 function toggleSubscription (enable, level) {
-  unsubscribeAll()
+  logChannel.unsubscribe({ trace, debug, info, warn, error })
 
   if (enable) {
     logChannel = new LogChannel(level)
@@ -30,23 +27,14 @@ function toggleSubscription (enable, level) {
   }
 }
 
-function toggle (enable, level) {
+function configure (enable, level, newLogger) {
   enabled = enable
+  logger = typeof newLogger?.debug === 'function' && typeof newLogger.error === 'function'
+    ? newLogger
+    : defaultLogger
   toggleSubscription(enabled, level)
 }
 
-function use (newLogger) {
-  if (typeof newLogger?.debug === 'function' && typeof newLogger.error === 'function') {
-    logger = newLogger
-  }
-}
-
-function reset () {
-  logger = defaultLogger
-  enabled = false
-  toggleSubscription(false)
-}
-
 function error (err) {
   withNoop(() => logger.error(err))
 }
@@ -69,4 +57,4 @@ function trace (log) {
   withNoop(() => logger.debug(log))
 }
 
-module.exports = { use, toggle, reset, error, warn, info, debug, trace }
+module.exports = { configure, error, warn, info, debug, trace }

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

@@ -13,6 +13,10 @@ const noopDogStatsDClient = new NoopDogStatsDClient()
 const noopLLMObs = new NoopLLMObsSDK(noop)
 const noopOpenFeatureProvider = new NoopFlaggingProvider()
 const noopAIGuard = new NoopAIGuardSDK()
+const noopProfiling = {
+  setCustomLabelKeys () {},
+  runWithLabels (labels, fn) { return fn() },
+}
 
 /** @type {import('../../src/index')} Proxy */
 class NoopProxy {
@@ -98,6 +102,10 @@ class NoopProxy {
     return this
   }
 
+  get profiling () {
+    return noopProfiling
+  }
+
   get TracerProvider () {
     return require('../opentelemetry/tracer_provider')
   }

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

@@ -19,9 +19,14 @@ function enable (rc, config, getOpenfeatureProxy) {
 
   // Set product handler for FFE_FLAGS
   rc.setProductHandler('FFE_FLAGS', (action, conf) => {
-    // Feed UFC config directly to OpenFeature provider
     if (action === 'apply' || action === 'modify') {
+      // Feed UFC config directly to OpenFeature provider
       getOpenfeatureProxy()._setConfiguration(conf)
+    } else if (action === 'unapply') {
+      // Clear the configuration so evaluations return PROVIDER_NOT_READY,
+      // consistent with Go and Python which also set config to null on RC deletion.
+      // The evaluator returns PROVIDER_NOT_READY when config is null/undefined.
+      getOpenfeatureProxy()._setConfiguration(null)
     }
   })
 }

package/packages/dd-trace/src/opentelemetry/context_manager.js

@@ -4,7 +4,6 @@ const { trace, ROOT_CONTEXT, propagation } = require('@opentelemetry/api')
 const { storage } = require('../../../datadog-core')
 const { getAllBaggageItems, setBaggageItem, removeAllBaggageItems } = require('../baggage')
 
-const tracer = require('../../')
 const SpanContext = require('./span_context')
 
 class ContextManager {
@@ -16,7 +15,7 @@ class ContextManager {
   active () {
     const store = this._store.getStore()
     const baseContext = store || ROOT_CONTEXT
-    const activeSpan = tracer.scope().active()
+    const activeSpan = storage('legacy').getStore()?.span
 
     const storedSpan = store ? trace.getSpan(store) : null
 
@@ -60,7 +59,6 @@ class ContextManager {
   // converts otel to dd
   with (context, fn, thisArg, ...args) {
     const span = trace.getSpan(context)
-    const ddScope = tracer.scope()
     const run = () => {
       const cb = thisArg == null ? fn : fn.bind(thisArg)
       return this._store.run(context, cb, ...args)
@@ -74,7 +72,11 @@ class ContextManager {
     for (const baggage of baggageItems) {
       setBaggageItem(baggage[0], baggage[1].value)
     }
-    if (span && span._ddSpan) return ddScope.activate(span._ddSpan, run)
+    if (span && span._ddSpan) {
+      const ddSpan = span._ddSpan
+      const parentStore = storage('legacy').getStore(ddSpan._store) ?? storage('legacy').getStore()
+      return storage('legacy').run({ ...parentStore, span: ddSpan }, run)
+    }
     return run()
   }
 

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

@@ -33,7 +33,7 @@ const OtlpHttpLogExporter = require('./otlp_http_log_exporter')
 
 /**
  * Initializes OpenTelemetry Logs support
- * @param {Config} config - Tracer configuration instance
+ * @param {import('../../config/config-base')} config - Tracer configuration instance
  */
 function initializeOpenTelemetryLogs (config) {
   // Build resource attributes

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

@@ -35,7 +35,7 @@ const OtlpHttpMetricExporter = require('./otlp_http_metric_exporter')
 
 /**
  * Initializes OpenTelemetry Metrics support
- * @param {Config} config - Tracer configuration instance
+ * @param {import('../../config/config-base')} config - Tracer configuration instance
  */
 function initializeOpenTelemetryMetrics (config) {
   const resourceAttributes = {

package/packages/dd-trace/src/opentelemetry/otlp/otlp_http_exporter_base.js

@@ -116,11 +116,26 @@ class OtlpHttpExporterBase {
   }
 
   /**
-   * Parses additional HTTP headers from a comma-separated string.
-   * @param {string} [headersString=''] - Comma-separated key=value pairs
+   * Parses additional HTTP headers from a comma-separated string or pre-parsed map.
+   * @param {string|Record<string, string>} [headersString=''] - Comma-separated key=value pairs or map
    * @returns {Record<string, string>} Parsed headers object
    */
   #parseAdditionalHeaders (headersString = '') {
+    if (headersString !== null && typeof headersString === 'object') {
+      // The config MAP parser uses tagger.add (which splits on ':'), so OTEL-format
+      // headers ('key=value') arrive with the full 'key=value' string as the map key
+      // and an empty string as the value. Re-split on '=' to get the correct pairs.
+      const result = {}
+      for (const [k, v] of Object.entries(headersString)) {
+        if (v === '' && k.includes('=')) {
+          const idx = k.indexOf('=')
+          result[k.slice(0, idx).trim()] = k.slice(idx + 1).trim()
+        } else {
+          result[k] = v
+        }
+      }
+      return result
+    }
     const headers = {}
     let key = ''
     let value = ''

package/packages/dd-trace/src/opentelemetry/otlp/protobuf_loader.js

@@ -1,9 +1,9 @@
 'use strict'
 
 /**
- * Protobuf Loader for OpenTelemetry Logs and Metrics
+ * Protobuf Loader for OpenTelemetry Logs, Traces, and Metrics
  *
- * This module loads protobuf definitions for OpenTelemetry logs and metrics.
+ * This module loads protobuf definitions for OpenTelemetry logs, traces, and metrics.
  *
  * VERSION SUPPORT:
  * - OTLP Protocol: v1.7.0
@@ -20,6 +20,8 @@ const protobuf = require('../../../../../vendor/dist/protobufjs')
 let _root = null
 let protoLogsService = null
 let protoSeverityNumber = null
+let protoTraceService = null
+let protoSpanKind = null
 let protoMetricsService = null
 let protoAggregationTemporality = null
 
@@ -28,6 +30,8 @@ function getProtobufTypes () {
     return {
       protoLogsService,
       protoSeverityNumber,
+      protoTraceService,
+      protoSpanKind,
       protoMetricsService,
       protoAggregationTemporality,
     }
@@ -39,6 +43,8 @@ function getProtobufTypes () {
     'resource.proto',
     'logs.proto',
     'logs_service.proto',
+    'trace.proto',
+    'trace_service.proto',
     'metrics.proto',
     'metrics_service.proto',
   ].map(file => path.join(protoDir, file))
@@ -49,6 +55,10 @@ function getProtobufTypes () {
   protoLogsService = _root.lookupType('opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest')
   protoSeverityNumber = _root.lookupEnum('opentelemetry.proto.logs.v1.SeverityNumber')
 
+  // Get the message types for traces
+  protoTraceService = _root.lookupType('opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest')
+  protoSpanKind = _root.lookupEnum('opentelemetry.proto.trace.v1.SpanKind')
+
   // Get the message types for metrics
   protoMetricsService = _root.lookupType('opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest')
   protoAggregationTemporality = _root.lookupEnum('opentelemetry.proto.metrics.v1.AggregationTemporality')
@@ -56,6 +66,8 @@ function getProtobufTypes () {
   return {
     protoLogsService,
     protoSeverityNumber,
+    protoTraceService,
+    protoSpanKind,
     protoMetricsService,
     protoAggregationTemporality,
   }