dd-trace 6.14.0 → 6.16.0

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

@@ -51,11 +51,12 @@ class MeterProvider {
   }
 
   /**
-   * @param {Function} [done] Called after the metric export completes
+   * @param {(error: Error | null) => void} [done] Called after shutdown completes
+   * @returns {void}
    */
-  forceFlush (done) {
-    if (this.reader) this.reader.forceFlush(done)
-    else done?.()
+  shutdown (done) {
+    if (this.reader) this.reader.shutdown(done)
+    else done?.(null)
   }
 }
 

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

@@ -8,6 +8,19 @@ const {
 const { ObservableInstrument } = require('./instruments')
 const { nowUnixNano } = require('./time')
 
+/**
+ * @param {(error: Error | null) => void} [done]
+ * @param {Error | null} [error]
+ */
+function callDone (done, error) {
+  if (!done) return
+  try {
+    done(error ?? null)
+  } catch (callbackError) {
+    log.error('Error completing OTLP metrics lifecycle callback:', callbackError)
+  }
+}
+
 /**
  * @typedef {import('@opentelemetry/api').Attributes} Attributes
  * @typedef {import('@opentelemetry/core').InstrumentationScope} InstrumentationScope
@@ -105,6 +118,10 @@ class PeriodicMetricReader {
   #exportInterval
   #aggregator
   #batchCallbacks = []
+  #exportQueue = []
+  #isExporting = false
+  #shutdownCallbacks = []
+  #shutdownComplete = false
 
   /**
    * Creates a new PeriodicMetricReader instance.
@@ -197,47 +214,36 @@ class PeriodicMetricReader {
 
   /**
    * Forces an immediate collection and export of all metrics.
-   * @param {Function} [done] Called after the metric export completes
+   * @param {(error: Error | null) => void} [done] Called after the metric export completes
+   * @returns {void}
    */
   forceFlush (done) {
     if (this.#isShutdown) {
       log.warn('PeriodicMetricReader is shutdown. %d measurement(s) were dropped', this.#droppedCount)
-      done?.()
+      if (this.#shutdownComplete) callDone(done)
+      else if (done) this.#shutdownCallbacks.push(done)
       return
     }
-    let pending = 2
-    const complete = () => {
-      if (--pending === 0) done?.()
-    }
-
-    // Snapshot requests already active before starting this flush's export.
-    try {
-      if (typeof this.exporter.flush === 'function') this.exporter.flush(complete)
-      else complete()
-    } catch (error) {
-      log.error('Error flushing OTLP metrics:', error)
-      complete()
-    }
-    try {
-      this.#collectAndExport(complete)
-    } catch (error) {
-      log.error('Error exporting OTLP metrics:', error)
-      complete()
-    }
+    this.#enqueueExport(true, done)
   }
 
   /**
    * Shuts down the reader and stops periodic collection.
+   * @param {(error: Error | null) => void} [done] Called after the final export and exporter shutdown complete
    * @returns {void}
    */
-  shutdown () {
+  shutdown (done) {
     if (this.#isShutdown) {
       log.warn('PeriodicMetricReader is already shutdown')
+      if (this.#shutdownComplete) callDone(done)
+      else if (done) this.#shutdownCallbacks.push(done)
       return
     }
+    if (done) this.#shutdownCallbacks.push(done)
+
     this.#isShutdown = true
     this.#clearTimer()
-    this.forceFlush()
+    this.#enqueueExport(true, error => this.#shutdownExporter(error))
   }
 
   /**
@@ -248,7 +254,7 @@ class PeriodicMetricReader {
     if (this.#timer) return
 
     this.#timer = setInterval(() => {
-      this.#collectAndExport()
+      if (!this.#isExporting && this.#exportQueue.length === 0) this.#enqueueExport(false)
     }, this.#exportInterval)
     this.#timer.unref?.()
   }
@@ -264,6 +270,75 @@ class PeriodicMetricReader {
     }
   }
 
+  /**
+   * @param {boolean} flushExporter Whether to flush the exporter after export
+   * @param {(error: Error | null) => void} [done] Called when the queued export completes
+   * @returns {void}
+   */
+  #enqueueExport (flushExporter, done) {
+    this.#exportQueue.push({ flushExporter, done })
+    this.#drainExportQueue()
+  }
+
+  /** @returns {void} */
+  #drainExportQueue () {
+    if (this.#isExporting || this.#exportQueue.length === 0) return
+
+    this.#isExporting = true
+    const { flushExporter, done } = this.#exportQueue.shift()
+    let completed = false
+    const complete = error => {
+      if (completed) return
+      completed = true
+      this.#isExporting = false
+      queueMicrotask(() => this.#drainExportQueue())
+      callDone(done, error)
+    }
+    let exportCompleted = false
+    const afterExport = error => {
+      if (exportCompleted) return
+      exportCompleted = true
+      if (!flushExporter || typeof this.exporter.flush !== 'function') return complete(error)
+
+      try {
+        this.exporter.flush(flushError => complete(error || flushError))
+      } catch (flushError) {
+        log.error('Error flushing OTLP metrics:', flushError)
+        complete(error || flushError)
+      }
+    }
+
+    try {
+      this.#collectAndExport(afterExport)
+    } catch (error) {
+      log.error('Error exporting OTLP metrics:', error)
+      afterExport(error)
+    }
+  }
+
+  /**
+   * @param {Error} [exportError] Error from the final export
+   * @returns {void}
+   */
+  #shutdownExporter (exportError) {
+    let completed = false
+    const complete = shutdownError => {
+      if (completed) return
+      completed = true
+      this.#shutdownComplete = true
+      const callbacks = this.#shutdownCallbacks.splice(0)
+      for (const callback of callbacks) callDone(callback, exportError || shutdownError)
+    }
+
+    try {
+      if (typeof this.exporter.shutdown === 'function') this.exporter.shutdown(complete)
+      else complete()
+    } catch (error) {
+      log.error('Error shutting down OTLP metrics exporter:', error)
+      complete(error)
+    }
+  }
+
   /**
    * Collects measurements and exports metrics.
    *
@@ -322,7 +397,13 @@ class PeriodicMetricReader {
       this.#lastExportedState
     )
 
-    this.exporter.export(metrics, callback)
+    this.exporter.export(metrics, result => {
+      if (result?.code === 1) {
+        callback?.(result.error || new Error('OTLP metrics export failed'))
+      } else {
+        callback?.()
+      }
+    })
   }
 }
 

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

@@ -6,7 +6,9 @@ const { URL } = require('node:url')
 const { storage } = require('../../../../datadog-core')
 const log = require('../../log')
 const { createServerlessDeliveryTracker } = require('../../serverless')
+const { getHttpsProxyAgent } = require('../../exporters/common/proxy')
 const telemetryMetrics = require('../../telemetry/metrics')
+const { version: tracerVersion } = require('../../../../../package.json')
 
 const tracerMetrics = telemetryMetrics.manager.namespace('tracers')
 const legacyStorage = storage('legacy')
@@ -48,8 +50,10 @@ class OtlpHttpExporterBase {
       hostname: parsedUrl.hostname,
       port: parsedUrl.port,
       path: parsedUrl.pathname + parsedUrl.search,
+      agent: parsedUrl.protocol === 'https:' ? getHttpsProxyAgent(parsedUrl) : undefined,
       headers: {
         'Content-Type': isJson ? 'application/json' : 'application/x-protobuf',
+        'User-Agent': `dd-trace-js/${tracerVersion}`,
         ...headers,
       },
     }
@@ -169,10 +173,17 @@ class OtlpHttpExporterBase {
     this.options.hostname = parsedUrl.hostname
     this.options.port = parsedUrl.port
     this.options.path = parsedUrl.pathname + parsedUrl.search
+    this.options.agent = parsedUrl.protocol === 'https:' ? getHttpsProxyAgent(parsedUrl) : undefined
     this.telemetryTags[0] = `protocol:${this.#transport === https ? 'https' : 'http'}`
   }
 
-  shutdown () {}
+  /**
+   * @param {() => void} [done]
+   * @returns {void}
+   */
+  shutdown (done) {
+    done?.()
+  }
 }
 
 module.exports = OtlpHttpExporterBase

package/packages/dd-trace/src/opentracing/propagation/text_map.js

@@ -363,6 +363,11 @@ class TextMapPropagator {
    * @returns {DatadogSpanContext | null}
    */
   extract (carrier) {
+    if (!carrier || typeof carrier !== 'object') {
+      if (this.#config.DD_TRACE_PROPAGATION_BEHAVIOR_EXTRACT !== 'ignore') removeAllBaggageItems()
+      return null
+    }
+
     const spanContext = this.#extractSpanContext(carrier)
     if (spanContext === undefined) return null
 
@@ -825,7 +830,6 @@ class TextMapPropagator {
    * @returns {DatadogSpanContext | undefined}
    */
   #extractDatadogContext (carrier) {
-    if (!carrier) return
     const traceId = readDatadogTraceId(carrier)
     if (!traceId) return
     const spanContext = extractGenericContext(traceId, readDatadogParentId(carrier), 10)
@@ -860,6 +864,8 @@ class TextMapPropagator {
     } catch {
       return
     }
+    if (!parsed || typeof parsed !== 'object') return
+
     const spanContext = this.#extractDatadogContext(parsed)
     if (!spanContext) return
 
@@ -983,7 +989,7 @@ class TextMapPropagator {
    */
   #extractBaggageItems (carrier, spanContext, extractBaggage) {
     removeAllBaggageItems()
-    if (!carrier || !extractBaggage) return
+    if (!extractBaggage) return
     const header = readBaggage(carrier)
     if (!header) return
 

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

@@ -2,7 +2,11 @@
 
 const { channel } = require('dc-polyfill')
 
-const { getEnvironmentVariable, getValueFromEnvSources } = require('./config/helper')
+const {
+  getEnvironmentVariable,
+  getValueFromEnvSources,
+  isSupportedConfiguration,
+} = require('./config/helper')
 const { isFalse, isTrue, normalizePluginEnvName } = require('./util')
 const plugins = require('./plugins')
 const log = require('./log')
@@ -59,12 +63,14 @@ function maybeEnable (Plugin) {
 }
 
 function getEnabled (Plugin) {
-  const envName = `DD_TRACE_${Plugin.id.toUpperCase()}_ENABLED`
+  const envName = normalizePluginEnvName(`DD_TRACE_${Plugin.id.toUpperCase()}_ENABLED`)
+  if (!isSupportedConfiguration(envName)) return
+
   // skipDefault: only an explicitly configured value should drive enablement here. A registered
   // default of `false` (e.g. an opt-in plugin like `nats`) must not be read as an explicit
   // "disabled via configuration option" — that path both logs a misleading line and nulls the
   // plugin class, bypassing the opt-in handled by `loadPlugin`.
-  return getValueFromEnvSources(normalizePluginEnvName(envName), true)
+  return getValueFromEnvSources(envName, true)
 }
 
 // TODO this must always be a singleton.

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

@@ -19,6 +19,7 @@ const plugins = {
   get '@google-cloud/pubsub' () { return require('../../../datadog-plugin-google-cloud-pubsub/src') },
   get '@google-cloud/vertexai' () { return require('../../../datadog-plugin-google-cloud-vertexai/src') },
   get '@google/genai' () { return require('../../../datadog-plugin-google-genai/src') },
+  get '@graphql-tools/executor' () { return require('../../../datadog-plugin-graphql/src') },
   get '@grpc/grpc-js' () { return require('../../../datadog-plugin-grpc/src') },
   get '@hapi/hapi' () { return require('../../../datadog-plugin-hapi/src') },
   get '@happy-dom/jest-environment' () { return require('../../../datadog-plugin-jest/src') },

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

@@ -1135,7 +1135,10 @@ function getCodeOwnersPatternRegex (pattern) {
   }
 
   const directoryOnly = pattern.endsWith('/')
-  const normalizedPattern = pattern.replace(/^\/+/, '').replace(/\/+$/, '')
+  let normalizedPattern = pattern.replace(/^\/+/, '')
+  let normalizedPatternEnd = normalizedPattern.length
+  while (normalizedPatternEnd > 0 && normalizedPattern[normalizedPatternEnd - 1] === '/') normalizedPatternEnd--
+  normalizedPattern = normalizedPattern.slice(0, normalizedPatternEnd)
   const anchored = pattern.startsWith('/') || normalizedPattern.includes('/')
 
   if (!normalizedPattern) {

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

@@ -263,6 +263,10 @@ class PrioritySampler {
       context._sampling.mechanism = SAMPLING_MECHANISM_REMOTE_DYNAMIC
     }
 
+    if (rule.discard) {
+      context._sampling.discard = true
+    }
+
     return rule.sample(context) && this._isSampledByRateLimit(context)
       ? USER_KEEP
       : USER_REJECT

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

@@ -185,6 +185,7 @@ function resourceLocator (span) {
  * @property {number} [sampleRate=1] - Deterministic sampling rate in [0, 1].
  * @property {string} [provenance] - Optional provenance/metadata for this rule.
  * @property {number} [maxPerSecond] - Maximum samples per second (rate limit).
+ * @property {boolean} [discard=false] - Whether to fully drop a trace if not kept.
  */
 
 /**
@@ -195,7 +196,7 @@ class SamplingRule {
   /**
    * @param {SamplingRuleConfig} [config]
    */
-  constructor ({ name, service, resource, tags, sampleRate = 1, provenance, maxPerSecond } = {}) {
+  constructor ({ name, service, resource, tags, sampleRate = 1, provenance, maxPerSecond, discard = false } = {}) {
     this.matchers = []
 
     if (name !== undefined) {
@@ -216,6 +217,7 @@ class SamplingRule {
     this._sampler = new Sampler(sampleRate)
     this._limiter = undefined
     this.provenance = provenance
+    this.discard = !!discard
 
     if (Number.isFinite(maxPerSecond)) {
       this._limiter = new RateLimiter(maxPerSecond)

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

@@ -1,5 +1,6 @@
 'use strict'
 
+const { AUTO_REJECT } = require('../../../ext/priority')
 const log = require('./log')
 const spanFormat = require('./span_format')
 const SpanSampler = require('./span_sampler')
@@ -34,7 +35,20 @@ class SpanProcessor {
   sample (span) {
     const spanContext = span.context()
     this._prioritySampler.sample(spanContext)
-    this._spanSampler.sample(spanContext)
+    if (!this.#isDiscarded(spanContext)) {
+      this._spanSampler.sample(spanContext)
+    }
+  }
+
+  /**
+   * A rule's reject decision can later be overridden (e.g. a product force-keeping the trace via
+   * `PrioritySampler.keepTrace()`), so `discard` only applies while the priority is still a reject.
+   *
+   * @param {import('./opentracing/span_context')} spanContext
+   * @returns {boolean}
+   */
+  #isDiscarded (spanContext) {
+    return spanContext._sampling.discard && spanContext._sampling.priority <= AUTO_REJECT
   }
 
   process (span) {
@@ -56,11 +70,12 @@ class SpanProcessor {
 
       let isFirstSpanInChunk = true
       const stampApmDisabled = this._config.apmTracingEnabled === false
+      const discard = this.#isDiscarded(spanContext)
 
       for (const span of started) {
         if (span._duration === undefined) {
           active.push(span)
-        } else {
+        } else if (!discard) {
           const formattedSpan = spanFormat(span, isFirstSpanInChunk, this._processTags)
           if (stampApmDisabled) {
             formattedSpan.metrics[APM_TRACING_ENABLED_KEY] = 0
@@ -76,7 +91,7 @@ class SpanProcessor {
         }
       }
 
-      if (formatted.length !== 0 && trace.isRecording !== false) {
+      if (!discard && formatted.length !== 0 && trace.isRecording !== false) {
         this._exporter.export(formatted)
       }
 

package/packages/dd-trace/src/telemetry/send-data.js

@@ -76,9 +76,10 @@ let getTestOptimizationAgent
  * @param {import('../config/config-base')} config
  * @param {TelemetryApplication} application
  * @param {TelemetryRequestType} reqType
+ * @param {string} [apiKey]
  * @returns {Record<string, string>}
  */
-function getHeaders (config, application, reqType) {
+function getHeaders (config, application, reqType, apiKey) {
   const headers = {
     'DD-Client-Library-Language': application.language_name,
     'DD-Client-Library-Version': application.tracer_version,
@@ -94,8 +95,8 @@ function getHeaders (config, application, reqType) {
   if (debug) {
     headers['dd-telemetry-debug-enabled'] = 'true'
   }
-  if (config.DD_API_KEY) {
-    headers['dd-api-key'] = config.DD_API_KEY
+  if (apiKey) {
+    headers['dd-api-key'] = apiKey
   }
   return headers
 }
@@ -161,7 +162,7 @@ function sendData (config, application, host, reqType, payload = {}, cb = () =>
     port,
     method: 'POST',
     path: isAgentlessMode ? '/api/v2/apmtelemetry' : '/telemetry/proxy/api/v2/apmtelemetry',
-    headers: getHeaders(config, application, reqType),
+    headers: getHeaders(config, application, reqType, isAgentlessMode ? config.DD_API_KEY : undefined),
   }
   if (isCiVisibility) options.agent = getTestOptimizationAgent(url)
 

package/packages/dd-trace/src/llmobs/plugins/claude-agent-sdk/utils.js

@@ -1,10 +0,0 @@
-'use strict'
-
-function splitModel (model) {
-  if (!model) return { modelName: undefined, modelProvider: 'anthropic' }
-  const idx = model.indexOf('/')
-  if (idx === -1) return { modelName: model, modelProvider: 'anthropic' }
-  return { modelName: model.slice(idx + 1), modelProvider: model.slice(0, idx) }
-}
-
-module.exports = { splitModel }