fix baggage items at the span level instead of trace level (#398)

DataDog · Dec 19, 2018 · c7260e1 · c7260e1
1 parent c777e5b
commit c7260e1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/opentracing/span.js b/src/opentracing/span.js
@@ -58,7 +58,7 @@ class DatadogSpan extends Span {
         parentId: parent._spanId,
         sampled: parent._sampled,
         sampling: parent._sampling,
-        baggageItems: Object.assign({}, parent._baggageItems),
+        baggageItems: parent._baggageItems,
         trace: parent._trace.started.length !== parent._trace.finished.length ? parent._trace : null
       })
     } else {

diff --git a/test/opentracing/span.spec.js b/test/opentracing/span.spec.js
@@ -111,11 +111,23 @@ describe('Span', () => {
   })
 
   describe('setBaggageItem', () => {
-    it('should set a baggage item', () => {
-      span = new Span(tracer, recorder, sampler, prioritySampler, { operationName: 'operation' })
+    it('should set a baggage item on the trace', () => {
+      const parent = {
+        traceId: new Uint64BE(123, 123),
+        spanId: new Uint64BE(456, 456),
+        _sampled: false,
+        _baggageItems: {},
+        _trace: {
+          started: ['span'],
+          finished: ['span']
+        }
+      }
+
+      span = new Span(tracer, recorder, sampler, prioritySampler, { operationName: 'operation', parent })
       span.setBaggageItem('foo', 'bar')
 
       expect(span.context()._baggageItems).to.have.property('foo', 'bar')
+      expect(parent._baggageItems).to.have.property('foo', 'bar')
     })
   })