Move sampler to options

Author: eldreygalindo

packages/opencensus-core/src/trace/model/root-span.ts

@@ -76,18 +76,12 @@ export class RootSpan extends SpanBaseModel implements OnEndSpanEventListener {
     }
 
     public startSpan(name: string, type: string) {
-        if(!this.sampler == null || this.sampler.continue(this._traceId)){
-            let newSpan = new Span(this);
-            newSpan.name = name
-            newSpan.type = type
-            newSpan.start();
-            this._spans.push(newSpan);
-            return newSpan;
-        }else{
-            //TODO
-            debug("ELDREY -> RootSpan return startSpan null")
-            return
-        }
+        let newSpan = new Span(this);
+        newSpan.name = name
+        newSpan.type = type
+        newSpan.start();
+        this._spans.push(newSpan);
+        return newSpan;
     }
 
 }

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

@@ -61,19 +61,20 @@ export class Span extends SpanBaseModel {
     }
 
     public end(): void {
-        super.end();
-        this.notifyEnd();
-        debug('ending span  %o',
-            {
-                spanId: this.id,
-                traceId: this.traceId,
-                name: this.name,
-                startTime: this.startTime,
-                endTime: this.endTime,
-                duration: this.duration
-            }
-        )
-
+        // if(this.sampler.continue(this.traceId)) {
+            
+            super.end();
+            this.notifyEnd();
+            debug('ending span  %o',
+                {
+                    spanId: this.id,
+                    traceId: this.traceId,
+                    name: this.name,
+                    startTime: this.startTime,
+                    endTime: this.endTime,
+                    duration: this.duration
+                });
+        // }
     }
 
 

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

@@ -77,12 +77,16 @@ export class Tracer implements OnEndSpanEventListener {
         return this.contextManager.runAndReturn((root) => {
             let newRoot = new RootSpan(this, options);
             this.setCurrentRootSpan(newRoot);
-            if(sampler == null){
-                sampler = new Sampler(newTrace.traceId);
-                sampler.always();
+            debug('ELDREY -> START ROOT SPAN OPTIONS: ',options);
+            if(options.sampler == null){
+                options.sampler = new Sampler(newRoot.traceId);
+                options.sampler.always();
+            }
+            newRoot.sampler = options.sampler;
+            if(newRoot.sampler.continue(newRoot.traceId)){
+                debug('ELDREY -> START ROOT SPAN .START()');
+                newRoot.start();
             }
-            newRoot.sampler = sampler;
-            newRoot.start();
             return fn(newRoot);
         });
     }
@@ -124,7 +128,7 @@ export class Tracer implements OnEndSpanEventListener {
         let newSpan: Span = null;
         if (!this.currentRootSpan) {
             debug('no current trace found - cannot start a new span');
-        } else {
+        } else{
             newSpan = this.currentRootSpan.startSpan(name, type);
         }
         return newSpan;

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

@@ -18,7 +18,7 @@ import { debug, randomSpanId } from '../../internal/util'
 
 
 const minNumber = 1e-4;
-const maxNumber = 1;
+const maxNumber = 0xffffffffffffffff;
 
 export class Sampler{
      traceId:       string;
@@ -69,13 +69,15 @@ export class Sampler{
 
      public continue (traceId:string):boolean{
         debug('Samplre continue')
-        let lower_bytes = traceId.substring(traceId.length - 4)
+        let lower_bytes = traceId.substring(16)
         let j;
         let lower_long: number
-        for(j = 0; j < lower_bytes.length; j++) {
-            lower_long =  lower_bytes.charCodeAt(j);
-        }
+        debug('ELDREY -> 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)
         if(lower_long <= this.idUpperBound){
             return true
         }else{

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

@@ -31,6 +31,7 @@ export interface TraceContext {
 export interface TraceOptions {
     name:string;
     traceContext?:TraceContext;
+    sampler?:Sampler;
 }
 
 export interface OnEndSpanEventListener {