set CurrentRootSpan when parentSpanId passed on wire (#570)

census-instrumentation · Jun 3, 2019 · eff8921 · eff8921
1 parent 338ed3a
commit eff8921
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/packages/opencensus-core/src/trace/model/span.ts b/packages/opencensus-core/src/trace/model/span.ts
@@ -310,10 +310,8 @@ export class Span implements types.Span {
       parentSpanId: this.parentSpanId,
       traceState: this.traceState
     });
-    if (!this.parentSpanId) {
-      this.tracer.setCurrentRootSpan(this);
-    }
 
+    if (this.isRootSpan()) this.tracer.setCurrentRootSpan(this);
     this.tracer.onStartSpan(this);
   }
 

diff --git a/packages/opencensus-core/test/test-span.ts b/packages/opencensus-core/test/test-span.ts
@@ -113,6 +113,34 @@ describe('Span', () => {
 
       assert.ok(span.started);
     });
+
+
+    it('should start a RootSpan and set CurrentRootSpan when parentSpanId is empty',
+       () => {
+         const rootSpan = new RootSpan(tracer, name, kind, traceId, '');
+         rootSpan.start();
+         assert.strictEqual(tracer.currentRootSpan, rootSpan);
+
+         const span = new Span(tracer, rootSpan);
+         span.start();
+         assert.strictEqual(tracer.currentRootSpan, rootSpan);
+
+         assert.ok(span.started);
+       });
+
+    it('should start a RootSpan and set CurrentRootSpan when parentSpanId is not empty',
+       () => {
+         const rootSpan =
+             new RootSpan(tracer, name, kind, traceId, 'd5955a12632d46a1');
+         rootSpan.start();
+         assert.strictEqual(tracer.currentRootSpan, rootSpan);
+
+         const span = new Span(tracer, rootSpan);
+         span.start();
+         assert.strictEqual(tracer.currentRootSpan, rootSpan);
+
+         assert.ok(span.started);
+       });
   });
 
   /**