refactor: reveiw TODO for clearCurrentTrace when using continuation-l…

…ocal-storage
census-instrumentation · Jun 20, 2018 · ca13536 · ca13536
1 parent 81b6be8
commit ca13536
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/opencensus-core/src/internal/cls-ah.ts b/packages/opencensus-core/src/internal/cls-ah.ts
@@ -37,7 +37,7 @@ class AsyncHooksNamespace implements CLSNamespace {
   }
 
   get active(): Context {
-    throw new Error('Not implemented');
+    return current;
   }
 
   createContext(): Context {

diff --git a/packages/opencensus-core/src/trace/model/tracer.ts b/packages/opencensus-core/src/trace/model/tracer.ts
@@ -53,6 +53,7 @@ export class Tracer implements types.Tracer {
   constructor() {
     this.activeLocal = false;
     this.contextManager = cls.createNamespace();
+    this.clearCurrentTrace();
   }
 
   /** Gets the current root span. */
@@ -62,7 +63,9 @@ export class Tracer implements types.Tracer {
 
   /** Sets the current root span. */
   set currentRootSpan(root: types.RootSpan) {
-    this.contextManager.set('rootspan', root);
+    if (this.contextManager.active) {
+      this.contextManager.set('rootspan', root);
+    }
   }
 
   /** A propagation instance */
@@ -197,7 +200,6 @@ export class Tracer implements types.Tracer {
     }
   }
 
-  // TODO: reveiw clearCurrentTrace when using continuation-local-storage
   /** Clears the current root span. */
   clearCurrentTrace() {
     this.currentRootSpan = null;