tracing: Adds isRemote to the span context (#4153)

* tracing: Adds isRemote to the span context * convert default value to true to align with python
DataDog · Mar 20, 2024 · 9144242 · 9144242
1 parent 4138bf5
commit 9144242
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 2 deletions.
diff --git a/packages/dd-trace/src/opentracing/propagation/text_map.js b/packages/dd-trace/src/opentracing/propagation/text_map.js
@@ -279,7 +279,8 @@ class TextMapPropagator {
         return new DatadogSpanContext({
           traceId: id(),
           spanId: null,
-          sampling: { priority }
+          sampling: { priority },
+          isRemote: true
         })
       }
 
@@ -327,6 +328,7 @@ class TextMapPropagator {
       const spanContext = new DatadogSpanContext({
         traceId: id(traceId, 16),
         spanId: id(spanId, 16),
+        isRemote: true,
         sampling: { priority: parseInt(flags, 10) & 1 ? 1 : 0 },
         traceparent,
         tracestate
@@ -379,7 +381,8 @@ class TextMapPropagator {
 
       return new DatadogSpanContext({
         traceId: id(carrier[traceKey], radix),
-        spanId: id(carrier[spanKey], radix)
+        spanId: id(carrier[spanKey], radix),
+        isRemote: true
       })
     }
 

diff --git a/packages/dd-trace/src/opentracing/span.js b/packages/dd-trace/src/opentracing/span.js
@@ -266,6 +266,8 @@ class DatadogSpan {
     if (startTime) {
       spanContext._trace.startTime = startTime
     }
+    // SpanContext was NOT propagated from a remote parent
+    spanContext._isRemote = false
 
     return spanContext
   }

diff --git a/packages/dd-trace/src/opentracing/span_context.js b/packages/dd-trace/src/opentracing/span_context.js
@@ -11,6 +11,7 @@ class DatadogSpanContext {
 
     this._traceId = props.traceId
     this._spanId = props.spanId
+    this._isRemote = props.isRemote ?? true
     this._parentId = props.parentId || null
     this._name = props.name
     this._isFinished = props.isFinished || false

diff --git a/packages/dd-trace/test/opentracing/propagation/text_map.spec.js b/packages/dd-trace/test/opentracing/propagation/text_map.spec.js
@@ -23,6 +23,7 @@ describe('TextMapPropagator', () => {
     const spanContext = new SpanContext({
       traceId: id('123', 10),
       spanId: id('456', 10),
+      isRemote: true,
       baggageItems,
       ...params,
       trace: {
@@ -326,6 +327,7 @@ describe('TextMapPropagator', () => {
       expect(spanContext.toTraceId()).to.equal(carrier['x-datadog-trace-id'])
       expect(spanContext.toSpanId()).to.equal(carrier['x-datadog-parent-id'])
       expect(spanContext._baggageItems['foo']).to.equal(carrier['ot-baggage-foo'])
+      expect(spanContext._isRemote).to.equal(true)
     })
 
     it('should convert signed IDs to unsigned', () => {

diff --git a/packages/dd-trace/test/opentracing/span.spec.js b/packages/dd-trace/test/opentracing/span.spec.js
@@ -66,6 +66,7 @@ describe('Span', () => {
 
     expect(span.context()._traceId).to.deep.equal('123')
     expect(span.context()._spanId).to.deep.equal('123')
+    expect(span.context()._isRemote).to.deep.equal(false)
   })
 
   it('should add itself to the context trace started spans', () => {
@@ -148,6 +149,7 @@ describe('Span', () => {
     expect(span.context()._parentId).to.deep.equal('456')
     expect(span.context()._baggageItems).to.deep.equal({ foo: 'bar' })
     expect(span.context()._trace).to.equal(parent._trace)
+    expect(span.context()._isRemote).to.equal(false)
   })
 
   it('should generate a 128-bit trace ID when configured', () => {

diff --git a/packages/dd-trace/test/opentracing/span_context.spec.js b/packages/dd-trace/test/opentracing/span_context.spec.js
@@ -20,6 +20,7 @@ describe('SpanContext', () => {
       traceId: '123',
       spanId: '456',
       parentId: '789',
+      isRemote: false,
       name: 'test',
       isFinished: true,
       tags: {},
@@ -41,6 +42,7 @@ describe('SpanContext', () => {
       _traceId: '123',
       _spanId: '456',
       _parentId: '789',
+      _isRemote: false,
       _name: 'test',
       _isFinished: true,
       _tags: {},
@@ -68,6 +70,7 @@ describe('SpanContext', () => {
       _traceId: '123',
       _spanId: '456',
       _parentId: null,
+      _isRemote: true,
       _name: undefined,
       _isFinished: false,
       _tags: {},