Propagate trace context over B3 format

Author: eduardoemery

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

@@ -47,14 +47,11 @@ export class RootSpan extends SpanBaseModel implements OnEndSpanEventListener {
         return this._traceId;
     }
 
-    public getOptions() {
-        return {
-            name: this.name,
-            traceContext: {
-                traceId: this.traceId,
-                spanId: this.id,
-                parentSpanId: this.getParentSpanId
-            }
+    public getContext(): TraceContext {
+        return <TraceContext>{
+            traceId: this.traceId,
+            spanId: this.id,
+            parentSpanId: this.getParentSpanId
         }
     }
 

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

@@ -80,9 +80,8 @@ export class Tracer implements OnEndSpanEventListener {
                 options = <TraceOptions>{}
             }
             if (!options.sampler) {
-                // options.sampler = new Sampler(newRoot.traceId);
-                // options.sampler.probability(0.6);
                 options.sampler = new Sampler(newRoot.traceId);
+                // options.sampler.probability(0.6);
                 options.sampler.always();
             }
             newRoot.sampler = options.sampler;
@@ -135,40 +134,6 @@ export class Tracer implements OnEndSpanEventListener {
         return newSpan;
     }
 
-    /*public startSpan<T>(fn: (span: Span) => T): T {
-        //debug('starting span: %o', options)
-        if (!this.currentRootSpan) {
-            debug('no current trace found - must start a new root span first');
-            return null;
-        } else {
-            return this.contextManager.runAndReturn((span) => {
-                let newSpan = this.currentRootSpan.startSpan();
-                return fn(newSpan);
-            });
-        }
-    }*/
-
-    /*public startSpan<T>(options: TraceOptions, fn: (span: SpanBaseModel) => T): T {
-        //debug('starting span: %o', options)
-        if (this.currentRootSpan) {
-            // Has an active root span
-            debug('starting span')
-            return this.contextManager.runAndReturn((span) => {
-                let newSpan = this.currentRootSpan.startSpan();
-                return fn(newSpan);
-            });
-        } else {
-            // Has no active root span
-            debug('starting root span: %o', options)
-            return this.contextManager.runAndReturn((root) => {
-                let newRoot = new RootSpan(this, options);
-                this.setCurrentRootSpan(newRoot);
-                newRoot.start();
-                return fn(newRoot);
-            });
-        }
-    }*/
-
     public wrap<T>(fn: Func<T>): Func<T> {
         if (!this.active) {
             return fn;

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

@@ -20,54 +20,54 @@ import { debug, randomSpanId } from '../../internal/util'
 const minNumber = 1e-4;
 const maxNumber = 0xffffffffffffffff;
 
-export class Sampler{
-     traceId:       string;
-     spanId:        string;
-     isRemote:      boolean;
-     idUpperBound:  number;
-
-     /**
-      * 
-      * @param traceId 
-      * @param spanId 
-      * @param isRemote 
-      */
-    constructor(traceId?:string, spanId?:string, isRemote?:boolean){
-         debug('Samplre constructor')
-         if(traceId){ 
-             this.traceId   = traceId;
-         }
-         if(spanId){
-            this.spanId    = spanId;
-         }
-        this.isRemote  = isRemote || false;
-
-     }
-
-     public always(): Sampler{
-         this.idUpperBound = maxNumber;
-         return this;
-     }
-
-     public never(): Sampler{
-         this.idUpperBound = minNumber;
-         return this;
-     }
-
-     public probability(probability:number): Sampler{
-        if(probability < minNumber){
+export class Sampler {
+    traceId: string;
+    spanId: string;
+    isRemote: boolean;
+    idUpperBound: number;
+
+    /**
+     * 
+     * @param traceId 
+     * @param spanId 
+     * @param isRemote 
+     */
+    constructor(traceId?: string, spanId?: string, isRemote?: boolean) {
+        debug('Samplre constructor')
+        if (traceId) {
+            this.traceId = traceId;
+        }
+        if (spanId) {
+            this.spanId = spanId;
+        }
+        this.isRemote = isRemote || false;
+
+    }
+
+    public always(): Sampler {
+        this.idUpperBound = maxNumber;
+        return this;
+    }
+
+    public never(): Sampler {
+        this.idUpperBound = minNumber;
+        return this;
+    }
+
+    public probability(probability: number): Sampler {
+        if (probability < minNumber) {
             return this.never();
 
-        } else if (probability > maxNumber){
+        } else if (probability > maxNumber) {
             return this.always();
 
         }
 
         this.idUpperBound = probability * maxNumber;
         return this;
-     }
+    }
 
-     public continue (traceId:string):boolean{
+    public continue(traceId: string): boolean {
         //debug('Samplre continue')
         let lower_bytes = traceId.substring(16)
         let lower_long: number
@@ -79,13 +79,12 @@ export class Sampler{
         //debug('SAMPLER CONTINUE this.idUpperBound :',this.idUpperBound)
         //debug('SAMPLER CONTINUE diff :',lower_long - this.idUpperBound)
 
-        if(lower_long <= this.idUpperBound){
+        if (lower_long <= this.idUpperBound) {
             debug('trace sampler TRUE')
             return true
-        }else{
+        } else {
             debug('trace sampler FALSE')
             return false;
         }
-     }
-
- }
+    }
+}

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

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