fix: nodejs 6 async_hook issue (#9)

PR-URL: #9

Author: fabiogomessilva

packages/opencensus-core/src/internal/cls.ts

@@ -20,8 +20,6 @@
 import * as CLS from 'continuation-local-storage';
 import * as semver from 'semver';
 
-import * as cls_ah from './cls-ah';
-
 export type Namespace = CLS.Namespace;
 export type Func<T> = CLS.Func<T>;
 
@@ -33,7 +31,7 @@ import * as Debug from 'debug';
 const debug = Debug('opencensus');
 debug('useAsyncHooks = %s', useAsyncHooks);
 
-const cls: typeof CLS = useAsyncHooks ? cls_ah : CLS;
+const cls: typeof CLS = useAsyncHooks ? require('./cls-ah') : CLS;
 
 
 const TRACE_NAMESPACE = 'opencensus.io';

packages/opencensus-core/src/trace/model/tracer.ts

@@ -52,7 +52,6 @@ export class Tracer implements types.Tracer {
   constructor() {
     this.activeLocal = false;
     this.contextManager = cls.createNamespace();
-    this.clearCurrentTrace();
   }
 
   /** Gets the current root span. */
@@ -170,6 +169,7 @@ export class Tracer implements types.Tracer {
     }
   }
 
+  // TODO: reveiw clearCurrentTrace when using continuation-local-storage
   /** Clears the current root span. */
   clearCurrentTrace() {
     this.currentRootSpan = null;

packages/opencensus-core/test/test-tracer.ts

@@ -52,17 +52,13 @@ describe('Tracer', () => {
 
   /** Should get/set the current RootSpan from tracer instance */
   describe('get/set currentRootSpan()', () => {
-    let tracer, rootSpan;
-    before(() => {
-      tracer = new Tracer();
-      rootSpan = new RootSpan(tracer);
-      tracer.currentRootSpan = rootSpan;
-    });
+    const tracer = new Tracer().start(defaultConfig);
     it('should get the current RootSpan from tracer instance', () => {
-      assert.ok(tracer.currentRootSpan instanceof RootSpan);
-    });
-    it('should set the current RootSpan from tracer instance', () => {
-      assert.strictEqual(tracer.currentRootSpan, rootSpan);
+      tracer.startRootSpan(options, (root) => {
+        assert.ok(root);
+        assert.ok(tracer.currentRootSpan instanceof RootSpan);
+        assert.strictEqual(tracer.currentRootSpan, root);
+      });
     });
   });