dd-trace 5.108.0 → 5.110.0

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

@@ -14,11 +14,13 @@ function guard (fn) {
   var initBailout = false
   var clobberBailout = false
   var forced = isTrue(process.env.DD_INJECT_FORCE)
-  var engines = require('../../../../package.json').engines
-  var versions = engines.node.match(/^>=(\d+) <(\d+)$/)
+  var pkg = require('../../../../package.json')
+  var engines = pkg.engines
+  var versions = engines.node.match(/^>=(\d+)$/)
   var minMajor = versions[1]
-  var nextMajor = versions[2]
+  var nextMajor = pkg.nodeMaxMajor
   var version = process.versions.node
+  var supportedRange = engines.node + ' <' + nextMajor
 
   if (process.env.DD_INJECTION_ENABLED) {
     // If we're running via single-step install, and we're in the app's
@@ -45,16 +47,17 @@ function guard (fn) {
   // should not initialize the tracer.
   if (!clobberBailout && (NODE_MAJOR < minMajor || NODE_MAJOR >= nextMajor)) {
     initBailout = true
+    var runtimeInfo = 'Incompatible runtime Node.js ' + version + ', supported runtimes: Node.js ' + supportedRange
     telemetry([
       { name: 'abort', tags: ['reason:incompatible_runtime'] },
       { name: 'abort.runtime', tags: [] }
     ], undefined, {
       result: 'abort',
       result_class: 'incompatible_runtime',
-      result_reason: 'Incompatible runtime Node.js ' + version + ', supported runtimes: Node.js ' + engines.node
+      result_reason: runtimeInfo
     })
     log.info('Aborting application instrumentation due to incompatible_runtime.')
-    log.info('Found incompatible runtime Node.js %s, Supported runtimes: Node.js %s.', version, engines.node)
+    log.info('Found incompatible runtime Node.js %s, Supported runtimes: Node.js %s.', version, supportedRange)
     if (forced) {
       log.info('DD_INJECT_FORCE enabled, allowing unsupported runtimes and continuing.')
     }

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

@@ -1,14 +1,16 @@
 'use strict'
 
 const { getValueFromEnvSources } = require('./config/helper')
-const { isFalse } = require('./util')
 
 // Global `jest` is only present in Jest workers.
 const inJestWorker = typeof jest !== 'undefined'
 
-const ddTraceDisabled = getValueFromEnvSources('DD_TRACE_ENABLED')
-  ? isFalse(getValueFromEnvSources('DD_TRACE_ENABLED'))
-  : String(getValueFromEnvSources('OTEL_TRACES_EXPORTER')).toLowerCase() === 'none'
+// skipDefault: distinguish an unset DD_TRACE_ENABLED (fall back to the OTel signal) from an
+// explicit value; the registered default would otherwise mask the OTEL_TRACES_EXPORTER check.
+const ddTraceEnabled = getValueFromEnvSources('DD_TRACE_ENABLED', true)
+const ddTraceDisabled = ddTraceEnabled === undefined
+  ? getValueFromEnvSources('OTEL_TRACES_EXPORTER') === 'none'
+  : ddTraceEnabled === false
 
 module.exports = ddTraceDisabled || inJestWorker
   ? require('./noop/proxy')

package/packages/dd-trace/src/llmobs/constants/tags.js

@@ -14,6 +14,12 @@ module.exports = {
   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',
+  PROPAGATED_SAMPLE_RATE_KEY: '_dd.p.llmobs_sr',
+  PROPAGATED_SAMPLING_DECISION_KEY: '_dd.p.llmobs_sd',
+  SAMPLE_RATE: '_ml_obs.sample_rate',
+  SAMPLING_DECISION: '_ml_obs.sampling_decision',
+  SAMPLING_DECISION_SAMPLED: '1',
+  SAMPLING_DECISION_DROPPED: '0',
   TAGS: '_ml_obs.tags',
   NAME: '_ml_obs.name',
   TRACE_ID: '_ml_obs.trace_id',

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

@@ -9,6 +9,10 @@ const {
   ML_APP,
   PROPAGATED_ML_APP_KEY,
   PROPAGATED_PARENT_ID_KEY,
+  SAMPLE_RATE,
+  SAMPLING_DECISION,
+  PROPAGATED_SAMPLE_RATE_KEY,
+  PROPAGATED_SAMPLING_DECISION_KEY,
 } = require('./constants/tags')
 const { storage } = require('./storage')
 const telemetry = require('./telemetry')
@@ -68,7 +72,7 @@ function enable (config) {
   spanFinishCh.subscribe(handleSpanProcess)
 
   // distributed tracing for llmobs
-  injectCh.subscribe(handleLLMObsParentIdInjection)
+  injectCh.subscribe(handleLLMObsInjection)
 
   setAgentStrategy(config, useAgentless => {
     if (useAgentless && !(config.apiKey && config.site)) {
@@ -92,7 +96,7 @@ function disable () {
   if (evalMetricAppendCh.hasSubscribers) evalMetricAppendCh.unsubscribe(handleEvalMetricAppend)
   if (flushCh.hasSubscribers) flushCh.unsubscribe(handleFlush)
   if (spanFinishCh.hasSubscribers) spanFinishCh.unsubscribe(handleSpanProcess)
-  if (injectCh.hasSubscribers) injectCh.unsubscribe(handleLLMObsParentIdInjection)
+  if (injectCh.hasSubscribers) injectCh.unsubscribe(handleLLMObsInjection)
   if (registerUserSpanProcessorCh.hasSubscribers) registerUserSpanProcessorCh.unsubscribe(handleRegisterProcessor)
 
   spanWriter?.destroy()
@@ -106,8 +110,8 @@ function disable () {
 }
 
 // since LLMObs traces can extend between services and be the same trace,
-// we need to propagate the parent id and mlApp.
-function handleLLMObsParentIdInjection ({ carrier }) {
+// we need to propagate the parent id, mlApp, and sampling rate/decision.
+function handleLLMObsInjection ({ carrier }) {
   // Respect the standard propagator's gate: when trace tag propagation is
   // disabled, don't write `x-datadog-tags` for LLMObs either.
   if (globalTracerConfig.DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH === 0) return
@@ -122,7 +126,12 @@ function handleLLMObsParentIdInjection ({ carrier }) {
     parentContext?._trace?.tags?.[PROPAGATED_ML_APP_KEY] ||
     globalTracerConfig.llmobs.mlApp
 
-  if (!parentId && !mlApp) return
+  const sampleRate =
+    mlObsSpanTags?.[SAMPLE_RATE] ?? parentContext?._trace?.tags?.[PROPAGATED_SAMPLE_RATE_KEY]
+  const samplingDecision =
+    mlObsSpanTags?.[SAMPLING_DECISION] ?? parentContext?._trace?.tags?.[PROPAGATED_SAMPLING_DECISION_KEY]
+
+  if (!parentId && !mlApp && samplingDecision == null) return
 
   // `_injectTags` only writes `x-datadog-tags` when the trace has `_dd.p.*`
   // tags, so it may be undefined here — coalesce before appending.
@@ -130,6 +139,8 @@ function handleLLMObsParentIdInjection ({ carrier }) {
   let tags = existing || ''
   if (parentId) tags += `${tags ? ',' : ''}${PROPAGATED_PARENT_ID_KEY}=${parentId}`
   if (mlApp) tags += `${tags ? ',' : ''}${PROPAGATED_ML_APP_KEY}=${mlApp}`
+  if (sampleRate != null) tags += `${tags ? ',' : ''}${PROPAGATED_SAMPLE_RATE_KEY}=${sampleRate}`
+  if (samplingDecision != null) tags += `${tags ? ',' : ''}${PROPAGATED_SAMPLING_DECISION_KEY}=${samplingDecision}`
   if (tags !== existing) carrier['x-datadog-tags'] = tags
 }
 

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

@@ -114,7 +114,7 @@ function extractMetrics (response) {
   }
 
   const totalTokens = tokenUsage.totalTokenCount ||
-                     (tokenUsage.promptTokenCount || 0) + (tokenUsage.candidatesTokenCount || 0)
+                    (tokenUsage.promptTokenCount || 0) + (tokenUsage.candidatesTokenCount || 0)
   if (totalTokens) {
     metrics.totalTokens = totalTokens
   }
@@ -458,8 +458,8 @@ function formatStreamingOutput (response) {
 
     // Skip special cases in streaming (handle them as non-streaming)
     if (content.parts.some(part => part.functionCall ||
-                                   part.executableCode ||
-                                   part.codeExecutionResult)) {
+                                  part.executableCode ||
+                                  part.codeExecutionResult)) {
       messages.push(...formatNonStreamingCandidate(candidate))
       continue
     }

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

@@ -9,7 +9,11 @@ const ANTHROPIC_PROVIDER_NAME = 'anthropic'
 const BEDROCK_PROVIDER_NAME = 'amazon_bedrock'
 const OPENAI_PROVIDER_NAME = 'openai'
 
-const SUPPORTED_INTEGRATIONS = new Set(['openai'])
+// Providers that ship their own LLMObs integration. When one of these is also
+// enabled, the LangChain model span is demoted to `workflow` so the provider
+// integration emits the single `llm` span — avoiding two llm spans (and
+// double-counted tokens/cost) for one underlying call.
+const SUPPORTED_INTEGRATIONS = new Set(['openai', 'anthropic'])
 const LLM_SPAN_TYPES = new Set(['llm', 'chat_model', 'embedding'])
 const LLM = 'llm'
 const WORKFLOW = 'workflow'

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

@@ -2,7 +2,7 @@
 
 const { channel } = require('dc-polyfill')
 
-const { isError, isTrue } = require('../util')
+const { isError } = require('../util')
 const tracerVersion = require('../../../../package.json').version
 const logger = require('../log')
 const { getValueFromEnvSources } = require('../config/helper')
@@ -65,9 +65,11 @@ class LLMObs extends NoopLLMObs {
 
     logger.debug('Enabling LLMObs')
 
-    const DD_LLMOBS_ENABLED = getValueFromEnvSources('DD_LLMOBS_ENABLED')
+    // skipDefault: only an explicit DD_LLMOBS_ENABLED=false blocks enable(); an unset value
+    // (its default is false) must still allow this programmatic opt-in.
+    const DD_LLMOBS_ENABLED = getValueFromEnvSources('DD_LLMOBS_ENABLED', true)
 
-    if (DD_LLMOBS_ENABLED != null && !isTrue(DD_LLMOBS_ENABLED)) {
+    if (DD_LLMOBS_ENABLED === false) {
       logger.debug('LLMObs.enable() called when DD_LLMOBS_ENABLED is false. No action taken.')
       return
     }

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

@@ -33,6 +33,8 @@ const {
   ROUTING_API_KEY,
   ROUTING_SITE,
   LLMOBS_SUBMITTED_TAG_KEY,
+  SAMPLE_RATE,
+  SAMPLING_DECISION,
 } = require('./constants/tags')
 const { UNSERIALIZABLE_VALUE_TEXT } = require('./constants/text')
 const telemetry = require('./telemetry')
@@ -248,6 +250,8 @@ class LLMObsSpanProcessor {
       _dd: {
         span_id: span.context().toSpanId(),
         trace_id: span.context().toTraceId(true),
+        sample_rate: mlObsTags[SAMPLE_RATE],
+        sampling_decision: mlObsTags[SAMPLING_DECISION],
       },
     }
 

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

@@ -1,6 +1,8 @@
 'use strict'
 
 const log = require('../log')
+const Sampler = require('../sampler')
+const { formatKnuthRate } = require('../util')
 const {
   MODEL_NAME,
   MODEL_PROVIDER,
@@ -41,6 +43,12 @@ const {
   ROUTING_SITE,
   PROMPT_TRACKING_INSTRUMENTATION_METHOD,
   INSTRUMENTATION_METHOD_ANNOTATED,
+  SAMPLE_RATE,
+  SAMPLING_DECISION,
+  SAMPLING_DECISION_SAMPLED,
+  SAMPLING_DECISION_DROPPED,
+  PROPAGATED_SAMPLE_RATE_KEY,
+  PROPAGATED_SAMPLING_DECISION_KEY,
 } = require('./constants/tags')
 const { storage } = require('./storage')
 const { findGenAIAncestorSpanId, validateCostTags, writeBridgeTags, validateToolDefinitions } = require('./util')
@@ -53,12 +61,31 @@ class LLMObsTagger {
   /** @type {import('../config/config-base')} */
   #config
 
+  /** @type {import('../sampler') | null} */
+  #sampler = null
+
   constructor (config, softFail = false) {
     this.#config = config
 
     this.softFail = softFail
   }
 
+  /**
+   * The sampler reads its rate from `config.llmobs.sampleRate`, which can change
+   * at runtime (e.g. via remote config). Rebuild the sampler whenever the rate
+   * changes so decisions reflect the current config, while reusing the existing
+   * sampler when it hasn't.
+   *
+   * @returns {import('../sampler')}
+   */
+  #getSampler () {
+    const rate = this.#config.llmobs?.sampleRate ?? 1
+    if (this.#sampler === null || rate !== this.#sampler.rate()) {
+      this.#sampler = new Sampler(rate)
+    }
+    return this.#sampler
+  }
+
   static get tagMap () {
     return registry
   }
@@ -124,6 +151,8 @@ class LLMObsTagger {
       ROOT_PARENT_ID
     this._setTag(span, PARENT_ID_KEY, parentId)
 
+    this.#tagSamplingDecision(span, parent)
+
     // apply annotation context
     const annotationContext = storage.getStore()?.annotationContext
 
@@ -153,6 +182,32 @@ class LLMObsTagger {
     }
   }
 
+  #tagSamplingDecision (span, parent) {
+    const traceTags = span.context()._trace.tags
+    const parentTags = registry.get(parent)
+
+    let sampleRate, samplingDecision
+    if (parentTags) {
+      // Local LLMObs parent: inherit its decision.
+      sampleRate = parentTags[SAMPLE_RATE]
+      samplingDecision = parentTags[SAMPLING_DECISION]
+    } else if (traceTags[PROPAGATED_PARENT_ID_KEY]) {
+      // Distributed LLMObs parent: inherit whatever was propagated. This may be
+      // absent if the upstream service predates sampling propagation, in which
+      // case we make no decision here rather than starting a divergent one.
+      sampleRate = traceTags[PROPAGATED_SAMPLE_RATE_KEY]
+      samplingDecision = traceTags[PROPAGATED_SAMPLING_DECISION_KEY]
+    } else {
+      // Root span: make the trace's one sampling decision.
+      const sampler = this.#getSampler()
+      sampleRate = formatKnuthRate(sampler.rate())
+      samplingDecision = sampler.isSampled(span) ? SAMPLING_DECISION_SAMPLED : SAMPLING_DECISION_DROPPED
+    }
+
+    if (sampleRate != null) this._setTag(span, SAMPLE_RATE, sampleRate)
+    if (samplingDecision != null) this._setTag(span, SAMPLING_DECISION, samplingDecision)
+  }
+
   // TODO: similarly for the following `tag` methods,
   // how can we transition from a span weakmap to core API functionality
   tagLLMIO (span, inputData, outputData) {

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

@@ -87,6 +87,7 @@ function recordLLMObsEnabled (startTime, config, value = 1) {
     site: config.site,
     auto: Number(autoEnabled),
     ml_app: config.llmobs.mlApp,
+    sample_rate: config.llmobs.sampleRate,
   }
   llmobsMetrics.count('product_enabled', tags).inc(value)
   llmobsMetrics.distribution('init_time', tags).track(initTimeMs)

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

@@ -2,19 +2,16 @@
 
 const { inspect } = require('util')
 
-const { defaults } = require('../config/defaults')
-const { isTrue } = require('../util')
 const { getValueFromEnvSources } = require('../config/helper')
+// Eager require restores the original startup module-load order: pulling `config/defaults` here
+// also installs the instrumented `dns` it transitively loads before the tracer/agent connects.
+// `config/defaults` defers its own `dns` require until after it exports, so this no longer hits
+// the `config/defaults` <-> log parse cycle that motivated the lazy require below.
+const { defaults } = require('../config/defaults')
 const { traceChannel, debugChannel, infoChannel, warnChannel, errorChannel } = require('./channels')
 const logWriter = require('./writer')
 const { Log, LogConfig, NoTransmitError } = require('./log')
 
-const config = {
-  enabled: defaults.DD_TRACE_DEBUG,
-  logger: undefined,
-  logLevel: defaults.logLevel,
-}
-
 // In most places where we know we want to mute a log we use log.error() directly
 const NO_TRANSMIT = new LogConfig(false)
 
@@ -77,19 +74,17 @@ const log = {
   },
 
   configure (options) {
-    config.logger = options.logger
-    config.logLevel = options.logLevel ??
-        getValueFromEnvSources('DD_TRACE_LOG_LEVEL') ??
-        config.logLevel
-    config.enabled = isTrue(
-      getValueFromEnvSources('DD_TRACE_DEBUG') ??
+    const logger = options.logger
+    const logLevel = options.logLevel ??
+        getValueFromEnvSources('DD_TRACE_LOG_LEVEL', true) ??
+        defaults?.logLevel
+    const enabled = getValueFromEnvSources('DD_TRACE_DEBUG', true) ??
       // 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)
+      (process.env.OTEL_LOG_LEVEL === 'debug' || defaults?.DD_TRACE_DEBUG)
+    logWriter.configure(enabled, logLevel, logger)
 
-    return config.enabled
+    return enabled
   },
 }
 
@@ -113,6 +108,9 @@ function getErrorLog (err) {
   return err
 }
 
-log.configure({})
-
+// Assign before the bootstrap configure() call: an invalid DD_TRACE_LOG_LEVEL
+// makes config/defaults re-require this module to warn, which must observe the
+// fully built log object rather than a half-initialized one.
 module.exports = log
+
+log.configure({})

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

@@ -1,12 +1,14 @@
 'use strict'
 
-const { DatadogNodeServerProvider } = require('@datadog/openfeature-node-server')
 const { channel } = require('dc-polyfill')
+const requireOptionalPeer = require('../../../datadog-instrumentations/src/helpers/require-optional-peer')
 const log = require('../log')
 const { EXPOSURE_CHANNEL } = require('./constants/constants')
 const EvalMetricsHook = require('./eval-metrics-hook')
 const SpanEnrichmentHook = require('./span-enrichment-hook')
 
+const { DatadogNodeServerProvider } = requireOptionalPeer('@datadog/openfeature-node-server')
+
 /**
  * OpenFeature provider that integrates with Datadog's feature flagging system.
  * Extends DatadogNodeServerProvider to add tracer integration and configuration management.

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

@@ -30,6 +30,7 @@ class BridgeSpanBase {
    */
   constructor (ddSpan) {
     this._ddSpan = ddSpan
+    this._otelTraceSemanticsEnabled = false
   }
 
   get ended () {
@@ -45,7 +46,7 @@ class BridgeSpanBase {
    * @param {import('@opentelemetry/api').AttributeValue} value
    */
   setAttribute (key, value) {
-    setOtelAttribute(this._ddSpan, key, value)
+    setOtelAttribute(this._ddSpan, key, value, this._otelTraceSemanticsEnabled)
     return this
   }
 
@@ -53,7 +54,7 @@ class BridgeSpanBase {
    * @param {import('@opentelemetry/api').Attributes} attributes
    */
   setAttributes (attributes) {
-    setOtelAttributes(this._ddSpan, attributes)
+    setOtelAttributes(this._ddSpan, attributes, this._otelTraceSemanticsEnabled)
     return this
   }
 
@@ -91,14 +92,14 @@ class BridgeSpanBase {
    * @param {import('@opentelemetry/api').TimeInput} [timeInput]
    */
   recordException (exception, timeInput) {
-    recordException(this._ddSpan, exception, timeInput)
+    recordException(this._ddSpan, exception, timeInput, this._otelTraceSemanticsEnabled)
   }
 
   /**
    * @param {import('@opentelemetry/api').SpanStatus} status
    */
   setStatus (status) {
-    this.#statusCode = applyOtelStatus(this._ddSpan, this.#statusCode, status)
+    this.#statusCode = applyOtelStatus(this._ddSpan, this.#statusCode, status, this._otelTraceSemanticsEnabled)
     return this
   }
 }

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

@@ -2,6 +2,7 @@
 
 const { sanitizeAttributes } = require('../../../../../vendor/dist/@opentelemetry/core')
 const { METRIC_TYPES } = require('./constants')
+const { nowUnixNano } = require('./time')
 
 /**
  * @typedef {import('@opentelemetry/api').Attributes} Attributes
@@ -62,7 +63,7 @@ class Instrument {
       type,
       value,
       attributes: sanitizeAttributes(attributes),
-      timestamp: Number(process.hrtime.bigint()),
+      timestamp: nowUnixNano(),
     }
   }
 }

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

@@ -6,6 +6,7 @@ const {
   METRIC_TYPES, TEMPORALITY, DEFAULT_HISTOGRAM_BUCKETS, DEFAULT_MAX_MEASUREMENT_QUEUE_SIZE,
 } = require('./constants')
 const { ObservableInstrument } = require('./instruments')
+const { nowUnixNano } = require('./time')
 
 /**
  * @typedef {import('@opentelemetry/api').Attributes} Attributes
@@ -309,7 +310,7 @@ class PeriodicMetricReader {
  *
  */
 class MetricAggregator {
-  #startTime = Number(process.hrtime.bigint())
+  #startTime = nowUnixNano()
   #temporalityPreference
   #maxBatchedQueueSize
 
@@ -444,8 +445,8 @@ class MetricAggregator {
    */
   #isDeltaType (type) {
     return type === METRIC_TYPES.COUNTER ||
-           type === METRIC_TYPES.OBSERVABLECOUNTER ||
-           type === METRIC_TYPES.HISTOGRAM
+          type === METRIC_TYPES.OBSERVABLECOUNTER ||
+          type === METRIC_TYPES.HISTOGRAM
   }
 
   /**

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

@@ -0,0 +1,19 @@
+'use strict'
+
+const { timeOrigin } = performance
+
+/**
+ * Current wall-clock time as UNIX epoch nanoseconds, the unit OTLP requires for
+ * `timeUnixNano` / `startTimeUnixNano`. `process.hrtime.bigint()` is a monotonic
+ * clock with an arbitrary origin, so its values decode as 1970 timestamps that
+ * the Datadog Agent silently drops. Anchoring on `performance.timeOrigin` puts
+ * the value on the epoch while `performance.now()` keeps it monotonic, so a
+ * backward wall-clock jump can't make `timeUnixNano` precede `startTimeUnixNano`.
+ *
+ * @returns {number} Nanoseconds since the UNIX epoch
+ */
+function nowUnixNano () {
+  return Math.round((timeOrigin + performance.now()) * 1e6)
+}
+
+module.exports = { nowUnixNano }

package/packages/dd-trace/src/opentelemetry/otlp/common.proto

@@ -68,7 +68,7 @@ message KeyValue {
 }
 
 // InstrumentationScope is a message representing the instrumentation scope information
-// such as the fully qualified name and version. 
+// such as the fully qualified name and version.
 message InstrumentationScope {
   // An empty instrumentation scope name means the name is unknown.
   string name = 1;
@@ -113,4 +113,4 @@ message EntityRef {
   // These attribute keys are not part of entity's identity.
   // These keys MUST exist in the containing {message}.attributes.
   repeated string description_keys = 4;
-}
+}

package/packages/dd-trace/src/opentelemetry/otlp/logs.proto

@@ -223,4 +223,4 @@ message LogRecord {
   //
   // [Optional].
   string event_name = 12;
-}
+}

package/packages/dd-trace/src/opentelemetry/otlp/logs_service.proto

@@ -75,4 +75,4 @@ message ExportLogsPartialSuccess {
   // error_message is an optional field. An error_message with an empty value
   // is equivalent to it not being set.
   string error_message = 2;
-}
+}

package/packages/dd-trace/src/opentelemetry/otlp/metrics.proto

@@ -717,4 +717,4 @@ message Exemplar {
   // trace_id may be missing if the measurement is not recorded inside a trace
   // or if the trace is not sampled.
   bytes trace_id = 5;
-}
+}

package/packages/dd-trace/src/opentelemetry/otlp/metrics_service.proto

@@ -75,4 +75,4 @@ message ExportMetricsPartialSuccess {
   // error_message is an optional field. An error_message with an empty value
   // is equivalent to it not being set.
   string error_message = 2;
-}
+}

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

@@ -1,7 +1,8 @@
 'use strict'
 
-const http = require('http')
-const { URL } = require('url')
+const http = require('node:http')
+const https = require('node:https')
+const { URL } = require('node:url')
 const log = require('../../log')
 const telemetryMetrics = require('../../telemetry/metrics')
 
@@ -16,6 +17,8 @@ const tracerMetrics = telemetryMetrics.manager.namespace('tracers')
  * @class OtlpHttpExporterBase
  */
 class OtlpHttpExporterBase {
+  #transport = https
+
   /**
    * Creates a new OtlpHttpExporterBase instance.
    *
@@ -45,7 +48,7 @@ class OtlpHttpExporterBase {
     this.setUrl(url)
 
     this.telemetryTags = [
-      'protocol:http',
+      `protocol:${this.#transport === https ? 'https' : 'http'}`,
       `encoding:${isJson ? 'json' : 'protobuf'}`,
     ]
   }
@@ -81,7 +84,7 @@ class OtlpHttpExporterBase {
       },
     }
 
-    const req = http.request(options, (res) => {
+    const req = this.#transport.request(options, (res) => {
       let data = ''
 
       res.on('data', (chunk) => {
@@ -124,6 +127,10 @@ class OtlpHttpExporterBase {
     this.options.hostname = parsedUrl.hostname
     this.options.port = parsedUrl.port
     this.options.path = parsedUrl.pathname + parsedUrl.search
+    this.#transport = parsedUrl.protocol === 'http:' ? http : https
+    if (this.telemetryTags !== undefined) {
+      this.telemetryTags[0] = `protocol:${this.#transport === https ? 'https' : 'http'}`
+    }
   }
 
   /**