dd-trace 5.44.0 → 5.46.0

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

@@ -6,6 +6,7 @@ const { URL, format } = require('url')
 const logger = require('../../log')
 
 const { encodeUnicode } = require('../util')
+const telemetry = require('../telemetry')
 const log = require('../../log')
 
 class BaseLLMObsWriter {
@@ -45,6 +46,7 @@ class BaseLLMObsWriter {
   append (event, byteLength) {
     if (this._buffer.length >= this._bufferLimit) {
       logger.warn(`${this.constructor.name} event buffer full (limit is ${this._bufferLimit}), dropping event`)
+      telemetry.recordDroppedPayload(1, this._eventType, 'buffer_full')
       return
     }
 
@@ -76,10 +78,12 @@ class BaseLLMObsWriter {
         logger.error(
           'Error sending %d LLMObs %s events to %s: %s', events.length, this._eventType, this._url, err.message, err
         )
+        telemetry.recordDroppedPayload(events.length, this._eventType, 'request_error')
       } else if (code >= 300) {
         logger.error(
           'Error sending %d LLMObs %s events to %s: %s', events.length, this._eventType, this._url, code
         )
+        telemetry.recordDroppedPayload(events.length, this._eventType, 'http_error')
       } else {
         logger.debug(`Sent ${events.length} LLMObs ${this._eventType} events to ${this._url}`)
       }

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

@@ -41,12 +41,12 @@ class LLMObsSpanWriter extends BaseWriter {
   }
 
   makePayload (events) {
-    return {
+    return events.map(event => ({
       '_dd.stage': 'raw',
       '_dd.tracer_version': tracerVersion,
       event_type: this._eventType,
-      spans: events
-    }
+      spans: [event]
+    }))
   }
 
   _truncateSpanEvent (event) {

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

@@ -9,7 +9,7 @@ const { timeInputToHrTime } = require('@opentelemetry/core')
 
 const tracer = require('../../')
 const DatadogSpan = require('../opentracing/span')
-const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../constants')
+const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK, IGNORE_OTEL_ERROR } = require('../constants')
 const { SERVICE_NAME, RESOURCE_NAME } = require('../../../../ext/tags')
 const kinds = require('../../../../ext/kinds')
 
@@ -237,7 +237,8 @@ class Span {
       this._hasStatus = true
       if (code === 2) {
         this._ddSpan.addTags({
-          [ERROR_MESSAGE]: message
+          [ERROR_MESSAGE]: message,
+          [IGNORE_OTEL_ERROR]: false
         })
       }
     }
@@ -278,12 +279,11 @@ class Span {
   }
 
   recordException (exception, timeInput) {
-    // HACK: identifier is added so that trace.error remains unchanged after a call to otel.recordException
     this._ddSpan.addTags({
       [ERROR_TYPE]: exception.name,
       [ERROR_MESSAGE]: exception.message,
       [ERROR_STACK]: exception.stack,
-      doNotSetTraceError: true
+      [IGNORE_OTEL_ERROR]: this._ddSpan.context()._tags[IGNORE_OTEL_ERROR] ?? true
     })
     const attributes = {}
     if (exception.message) attributes['exception.message'] = exception.message

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

@@ -133,6 +133,7 @@ module.exports = class PluginManager {
       dbmPropagationMode,
       dsmEnabled,
       clientIpEnabled,
+      clientIpHeader,
       memcachedCommandEnabled,
       ciVisibilityTestSessionName,
       ciVisAgentlessLogSubmissionEnabled,
@@ -148,6 +149,7 @@ module.exports = class PluginManager {
       site,
       url,
       headers: headerTags || [],
+      clientIpHeader,
       ciVisibilityTestSessionName,
       ciVisAgentlessLogSubmissionEnabled,
       isTestDynamicInstrumentationEnabled,

package/packages/dd-trace/src/plugins/util/test.js

@@ -96,6 +96,9 @@ const CUCUMBER_WORKER_TRACE_PAYLOAD_CODE = 70
 // mocha worker variables
 const MOCHA_WORKER_TRACE_PAYLOAD_CODE = 80
 
+// playwright worker variables
+const PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE = 90
+
 // Early flake detection util strings
 const EFD_STRING = "Retried by Datadog's Early Flake Detection"
 const EFD_TEST_NAME_REGEX = new RegExp(EFD_STRING + ' \\(#\\d+\\): ', 'g')
@@ -162,6 +165,7 @@ module.exports = {
   JEST_WORKER_LOGS_PAYLOAD_CODE,
   CUCUMBER_WORKER_TRACE_PAYLOAD_CODE,
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,
+  PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE,
   TEST_SOURCE_START,
   TEST_SKIPPED_BY_ITR,
   TEST_IS_NEW,

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

@@ -14,7 +14,7 @@ module.exports = {
       debug: (message) => log.debug(message),
       info: (message) => log.info(message),
       warn: (message) => log.warn(message),
-      error: (message) => log.error(message)
+      error: (...args) => log.error(...args)
     }
 
     const libraryInjected = injectionEnabled.length > 0

package/packages/dd-trace/src/profiling/config.js

@@ -15,6 +15,7 @@ const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../plugins/util/tags')
 const { tagger } = require('./tagger')
 const { isFalse, isTrue } = require('../util')
 const { getAzureTagsFromMetadata, getAzureAppMetadata } = require('../azure_metadata')
+const satisfies = require('semifies')
 
 class Config {
   constructor (options = {}) {
@@ -22,6 +23,7 @@ class Config {
       DD_AGENT_HOST,
       DD_ENV,
       DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED, // used for testing
+      DD_PROFILING_ASYNC_ID_ENABLED,
       DD_PROFILING_CODEHOTSPOTS_ENABLED,
       DD_PROFILING_CPU_ENABLED,
       DD_PROFILING_DEBUG_SOURCE_MAPS,
@@ -179,6 +181,10 @@ class Config {
     this.timelineSamplingEnabled = isTrue(coalesce(options.timelineSamplingEnabled,
       DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED, true))
 
+    // Async ID gathering only works reliably on Node >= 22.10.0
+    this.asyncIdEnabled = isTrue(coalesce(options.asyncIdEnabled,
+      DD_PROFILING_ASYNC_ID_ENABLED, this.timelineEnabled && satisfies(process.versions.node, '>=22.10.0')))
+
     this.codeHotspotsEnabled = isTrue(coalesce(options.codeHotspotsEnabled,
       DD_PROFILING_CODEHOTSPOTS_ENABLED,
       DD_PROFILING_EXPERIMENTAL_CODEHOTSPOTS_ENABLED, samplingContextsAvailable))

package/packages/dd-trace/src/profiling/profiler.js

@@ -18,9 +18,9 @@ function maybeSourceMap (sourceMap, SourceMapper, debug) {
   ], debug)
 }
 
-function logError (logger, err) {
+function logError (logger, ...args) {
   if (logger) {
-    logger.error(err)
+    logger.error(...args)
   }
 }
 
@@ -52,7 +52,8 @@ class Profiler extends EventEmitter {
 
   start (options) {
     return this._start(options).catch((err) => {
-      logError(options.logger, err)
+      logError(options.logger, 'Error starting profiler. For troubleshooting tips, see ' +
+        '<https://dtdg.co/nodejs-profiler-troubleshooting>', err)
       return false
     })
   }

package/packages/dd-trace/src/profiling/profilers/wall.js

@@ -70,12 +70,14 @@ function ensureChannelsActivated () {
 class NativeWallProfiler {
   constructor (options = {}) {
     this.type = 'wall'
-    this._samplingIntervalMicros = options.samplingInterval || 1e6 / 99 // 99hz
-    this._flushIntervalMillis = options.flushInterval || 60 * 1e3 // 60 seconds
+    this._asyncIdEnabled = !!options.asyncIdEnabled
     this._codeHotspotsEnabled = !!options.codeHotspotsEnabled
+    this._cpuProfilingEnabled = !!options.cpuProfilingEnabled
     this._endpointCollectionEnabled = !!options.endpointCollectionEnabled
+    this._flushIntervalMillis = options.flushInterval || 60 * 1e3 // 60 seconds
+    this._samplingIntervalMicros = options.samplingInterval || 1e6 / 99 // 99hz
     this._timelineEnabled = !!options.timelineEnabled
-    this._cpuProfilingEnabled = !!options.cpuProfilingEnabled
+    this._v8ProfilerBugWorkaroundEnabled = !!options.v8ProfilerBugWorkaroundEnabled
     // We need to capture span data into the sample context for either code hotspots
     // or endpoint collection.
     this._captureSpanData = this._codeHotspotsEnabled || this._endpointCollectionEnabled
@@ -84,7 +86,6 @@ class NativeWallProfiler {
     // timestamps require the sample contexts feature in the pprof wall profiler), or
     // cpu profiling is enabled.
     this._withContexts = this._captureSpanData || this._timelineEnabled || this._cpuProfilingEnabled
-    this._v8ProfilerBugWorkaroundEnabled = !!options.v8ProfilerBugWorkaroundEnabled
     this._mapper = undefined
     this._pprof = undefined
 
@@ -127,13 +128,14 @@ class NativeWallProfiler {
     }
 
     this._pprof.time.start({
-      intervalMicros: this._samplingIntervalMicros,
+      collectAsyncId: this._asyncIdEnabled,
+      collectCpuTime: this._cpuProfilingEnabled,
       durationMillis: this._flushIntervalMillis,
+      intervalMicros: this._samplingIntervalMicros,
+      lineNumbers: false,
       sourceMapper: this._mapper,
       withContexts: this._withContexts,
-      lineNumbers: false,
-      workaroundV8Bug: this._v8ProfilerBugWorkaroundEnabled,
-      collectCpuTime: this._cpuProfilingEnabled
+      workaroundV8Bug: this._v8ProfilerBugWorkaroundEnabled
     })
 
     if (this._withContexts) {

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

@@ -10,6 +10,7 @@ const { getExtraServices } = require('../service-naming/extra-services')
 const { UNACKNOWLEDGED, ACKNOWLEDGED, ERROR } = require('./apply_states')
 const Scheduler = require('./scheduler')
 const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../plugins/util/tags')
+const tagger = require('../tagger')
 
 const clientId = uuid()
 
@@ -34,6 +35,10 @@ class RemoteConfigManager extends EventEmitter {
       port: config.port
     }))
 
+    tagger.add(config.tags, {
+      '_dd.rc.client_id': clientId
+    })
+
     const tags = config.repositoryUrl
       ? {
           ...config.tags,

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

@@ -1,43 +1,55 @@
 'use strict'
 
-const constants = require('./constants')
 const log = require('./log')
-const ERROR_MESSAGE = constants.ERROR_MESSAGE
-const ERROR_STACK = constants.ERROR_STACK
-const ERROR_TYPE = constants.ERROR_TYPE
+
+function addNonEmpty (carrier, key, value) {
+  if (key !== '') {
+    carrier[key] = value
+  }
+}
 
 function add (carrier, keyValuePairs) {
-  if (!carrier || !keyValuePairs) return
+  if (!carrier) return
 
-  if (Array.isArray(keyValuePairs)) {
-    return keyValuePairs.forEach(tags => add(carrier, tags))
-  }
   try {
     if (typeof keyValuePairs === 'string') {
-      const segments = keyValuePairs.split(',')
-      for (const segment of segments) {
-        const separatorIndex = segment.indexOf(':')
-
-        let value = ''
-        let key = segment
-        if (separatorIndex !== -1) {
-          key = segment.slice(0, separatorIndex)
-          value = segment.slice(separatorIndex + 1)
+      let valueStart = 0
+      let keyStart = 0
+
+      for (let i = 0; i < keyValuePairs.length; i++) {
+        const char = keyValuePairs[i]
+
+        if (char === ':') {
+          if (valueStart === 0) {
+            valueStart = i
+          }
+        } else if (char === ',') {
+          valueStart ||= i
+          addNonEmpty(
+            carrier,
+            keyValuePairs.slice(keyStart, valueStart).trim(),
+            keyValuePairs.slice(valueStart + 1, i).trim()
+          )
+          keyStart = i + 1
+          valueStart = 0
         }
+      }
 
-        carrier[key.trim()] = value.trim()
+      if (keyValuePairs.at(-1) !== ',') {
+        valueStart ||= keyValuePairs.length
+        addNonEmpty(
+          carrier,
+          keyValuePairs.slice(keyStart, valueStart).trim(),
+          keyValuePairs.slice(valueStart + 1).trim()
+        )
       }
+    } else if (Array.isArray(keyValuePairs)) {
+      return keyValuePairs.forEach(tags => add(carrier, tags))
     } else {
-      // HACK: to ensure otel.recordException does not influence trace.error
-      if (ERROR_MESSAGE in keyValuePairs || ERROR_STACK in keyValuePairs || ERROR_TYPE in keyValuePairs) {
-        if (!('doNotSetTraceError' in keyValuePairs)) {
-          carrier.setTraceError = true
-        }
-      }
       Object.assign(carrier, keyValuePairs)
     }
-  } catch (e) {
-    log.error('Error adding tags', e)
+  } catch (error) {
+    log.error('Error adding tags', error)
   }
 }
 

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

@@ -13,13 +13,7 @@ function isFalse (str) {
 }
 
 function isError (value) {
-  if (value instanceof Error) {
-    return true
-  }
-  if (value && value.message) {
-    return true
-  }
-  return false
+  return Boolean(value?.message || value instanceof Error)
 }
 
 // Matches a glob pattern to a given subject string