chord: merge commit

Author: eldreygalindo

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

@@ -73,21 +73,19 @@ export class Tracer implements OnEndSpanEventListener {
     }
 
     public startRootSpan<T>(options: TraceOptions, fn: (root: RootSpan) => T): T {
-        debug('starting root span: %o', options)
         return this.contextManager.runAndReturn((root) => {
             let newRoot = new RootSpan(this, options);
             this.setCurrentRootSpan(newRoot);
-            debug('ELDREY -> START ROOT SPAN OPTIONS: ',options);
             if(options.sampler == null){
                 options.sampler = new Sampler(newRoot.traceId);
-                options.sampler.always();
+                options.sampler.probability(0.6);
             }
             newRoot.sampler = options.sampler;
             if(newRoot.sampler.continue(newRoot.traceId)){
-                debug('ELDREY -> START ROOT SPAN .START()');
                 newRoot.start();
+                return fn(newRoot);
             }
-            return fn(newRoot);
+            return fn(null);
         });
     }
 

packages/opencensus-core/src/trace/sampler/sampler.ts

@@ -70,17 +70,20 @@ export class Sampler{
      public continue (traceId:string):boolean{
         debug('Samplre continue')
         let lower_bytes = traceId.substring(16)
-        let j;
         let lower_long: number
-        debug('ELDREY -> SAMPLER CONTINUE lower_bytes :',lower_bytes)
+        debug('SAMPLER CONTINUE lower_bytes :',lower_bytes)
 
         lower_long = parseInt(lower_bytes, 16);
 
-        debug('ELDREY -> SAMPLER CONTINUE lower_long :',lower_long)
-        debug('ELDREY -> SAMPLER CONTINUE this.idUpperBound :',this.idUpperBound)
+        debug('SAMPLER CONTINUE lower_long :',lower_long)
+        debug('SAMPLER CONTINUE this.idUpperBound :',this.idUpperBound)
+        debug('SAMPLER CONTINUE diff :',lower_long - this.idUpperBound)
+
         if(lower_long <= this.idUpperBound){
+            debug('trace sampler TRUE')
             return true
         }else{
+            debug('trace sampler FALSE')
             return false;
         }
      }

packages/opencensus-core/src/trace/types/tracetypes.ts

@@ -69,6 +69,7 @@ export abstract class SpanBaseModel {
         this.setId(randomSpanId());
     }
 
+
     public get id(): string {
         return this._id;
     }
@@ -120,15 +121,22 @@ export abstract class SpanBaseModel {
     }
 
     public get startTime(): Date {
-        return this.clock.startTime;
+        if(this.clock){
+            return this.clock.startTime;
+        }
+        
     }
 
     public get endTime(): Date {
-        return this.clock.endTime;
+        if(this.clock){
+            return this.clock.endTime;
+        }
     }
 
     public get duration(): number {
-        return this.clock.duration;
+        if(this.clock){
+            return this.clock.duration;
+        }
     }
 
     public get traceContext(): TraceContext {
@@ -173,13 +181,16 @@ export abstract class SpanBaseModel {
     public end(): void {
         if (!this.started) {
             debug('calling %s.end() on un-started %s %o',
-                this._className, this._className,
-                { id: this.id, name: this.name, type: this.type })
+            this._className, this._className,
+            { id: this.id, name: this.name, type: this.type })
+            this._started = false;
+            this._ended = true;
+            // this.clock.end();
             return
         } else if (this.ended) {
             debug('calling %s.end() on already ended %s %o',
-                this._className, this._className,
-                { id: this.id, name: this.name, type: this.type })
+            this._className, this._className,
+            { id: this.id, name: this.name, type: this.type })
             return
         }
         this._started = false;