save

DataDog · Feb 5, 2025 · 1cc6a0c · 1cc6a0c
1 parent 76136b0
commit 1cc6a0c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/packages/dd-trace/src/opentracing/propagation/log.js b/packages/dd-trace/src/opentracing/propagation/log.js
@@ -14,7 +14,10 @@ class LogPropagator {
     carrier.dd = {}
 
     if (spanContext) {
-      if (!this._config.traceId128BitLoggingEnabled || !spanContext._trace.tags['_dd.p.tid']) {
+      if (this._config.traceId128BitLoggingEnabled && spanContext._trace.tags['_dd.p.tid']) {
+        carrier.dd.trace_id = spanContext.toTraceId()
+      }
+      else if (this._config.traceId128BitLoggingEnabled == false || this._config.traceId128BitGenerationEnabled == false) {
         carrier.dd.trace_id = spanContext.toTraceId(false)
       } else {
         carrier.dd.trace_id = spanContext.toTraceId()

diff --git a/packages/dd-trace/src/opentracing/span.js b/packages/dd-trace/src/opentracing/span.js
@@ -331,11 +331,10 @@ class DatadogSpan {
       spanContext = new SpanContext({
         traceId: spanId,
         spanId,
-        traceId128BitGenerationEnabled: fields.traceId128BitGenerationEnabled
       })
       spanContext._trace.startTime = startTime
 
-      if (fields.traceId128BitGenerationEnabled) {
+      if (fields.traceId128BitGenerationEnabled !== false) {
         spanContext._trace.tags['_dd.p.tid'] = Math.floor(startTime / 1000).toString(16)
           .padStart(8, '0')
           .padEnd(16, '0')

diff --git a/packages/dd-trace/src/opentracing/span_context.js b/packages/dd-trace/src/opentracing/span_context.js
@@ -30,7 +30,6 @@ class DatadogSpanContext {
       tags: {}
     }
     this._otelSpanContext = undefined
-    this._traceId128BitGenerationEnabled = this._trace.tags['_dd.p.tid'] ? true : (props.traceId128BitGenerationEnabled || false)
   }
 
   [util.inspect.custom] () {
@@ -45,7 +44,7 @@ class DatadogSpanContext {
   }
 
   toTraceId (get128bitId = true) {
-    if (get128bitId == false || this._traceId128BitGenerationEnabled == false) {
+    if (get128bitId == false) {
       return this._traceId.toString(10)
     }
     return this._traceId.toBuffer().length <= 8 && this._trace.tags[TRACE_ID_128]