chord: merge commit

silva-fabio · silva-fabio · commit 25fa96f6d8b9 · 2018-04-06T10:20:16.000-03:00
diff --git a/packages/opencensus-core/src/trace/model/root-span.ts b/packages/opencensus-core/src/trace/model/root-span.ts
@@ -28,11 +28,14 @@ export class RootSpan extends SpanBaseModel implements OnEndSpanEventListener {
     private _traceId: string;
 
     //TODO - improve root name setup
-    constructor(tracer: Tracer, context?: TraceOptions ) {
+    constructor(tracer: Tracer, context?: TraceOptions) {
         super()
         this.tracer = tracer;
-        this._traceId = context&&context.traceContext&&context.traceContext.traceId?context.traceContext.traceId:(uuid.v4().split('-').join(''));
-        this.name = context&&context.name?context.name:'undefined';
+        this._traceId = context && context.traceContext && context.traceContext.traceId ? context.traceContext.traceId : (uuid.v4().split('-').join(''));
+        this.name = context && context.name ? context.name : 'undefined';
+        if (context && context.traceContext) {
+            this.setParentSpanId(context.traceContext.spanId || '')
+        }
         this._spans = [];
     }
 
@@ -46,7 +49,7 @@ export class RootSpan extends SpanBaseModel implements OnEndSpanEventListener {
 
     public start() {
         super.start()
-        debug('starting %s  %o', this._className, { traceId: this.traceId, id: this.id })
+        debug('starting %s  %o', this._className, { traceId: this.traceId, id: this.id, parentSpanId: this.getParentSpanId() })
     }
 
     public end() {
@@ -60,21 +63,23 @@ export class RootSpan extends SpanBaseModel implements OnEndSpanEventListener {
 
         debug('ending %s  %o',
             this._className,
-            {   id: this.id,
+            {
+                id: this.id,
                 traceId: this.traceId,
                 name: this.name,
                 startTime: this.startTime,
                 endTime: this.endTime,
-                duration: this.duration })
-        
+                duration: this.duration
+            })
+
         this.tracer.onEndSpan(this)
     }
 
     public onEndSpan(span: Span) {
-        debug('ended span notified  %o', {id: span.id, name: span.name})
+        debug('%s notified ending by %o', { id: span.id, name: span.name })
     }
 
-    public startSpan(name: string, type: string) {
+    public startSpan(name: string, type: string, parentSpanId?: string) {
         if (!this.started) {
             debug('calling %s.startSpan() on un-started %s %o',
                 this._className, this._className,
@@ -88,12 +93,12 @@ export class RootSpan extends SpanBaseModel implements OnEndSpanEventListener {
             return
         }
         let newSpan = new Span(this);
-        newSpan.name = name
-        newSpan.type = type
+        if (name) { newSpan.name = name }
+        if (type) { newSpan.type = type }
+        if (type) { newSpan.setParentSpanId(parentSpanId || '') }
         newSpan.start();
         this._spans.push(newSpan);
         return newSpan;
     }
-
 }
 
diff --git a/packages/opencensus-core/src/trace/model/tracer.ts b/packages/opencensus-core/src/trace/model/tracer.ts
@@ -20,24 +20,24 @@ import { Span } from './span'
 import { debug } from '../../internal/util'
 import { Stackdriver } from '../../exporters/stackdriver/stackdriver'
 import { StackdriverOptions } from '../../exporters/stackdriver/options'
-import { TraceContext, TraceOptions, OnEndSpanEventListener } from '../types/tracetypes';
-import {  TracerConfig, defaultConfig } from '../tracing';
 import { Sampler } from '../config/sampler'
+import { TraceContext, TraceOptions, OnEndSpanEventListener, SpanBaseModel } from '../types/tracetypes';
+import { TracerConfig, defaultConfig } from '../tracing';
 
 export type Func<T> = (...args: any[]) => T;
 
 
 export class Tracer implements OnEndSpanEventListener {
 
-    readonly PLUGINS = ['http', 'https', 'mongodb-core', 'express'];
+    readonly PLUGINS = ['http', 'https', 'mongodb-core'];
 
     //public buffer: Buffer;
     private _active: boolean;
     private contextManager: cls.Namespace;
     private config: TracerConfig;
 
     //TODO: simple solution - to be rewied in future
-    private eventListeners: OnEndSpanEventListener[] = [];   
+    private eventListeners: OnEndSpanEventListener[] = [];
     //TODO: temp solution 
     private endedTraces: RootSpan[] = [];
 
@@ -76,12 +76,16 @@ export class Tracer implements OnEndSpanEventListener {
         return this.contextManager.runAndReturn((root) => {
             let newRoot = new RootSpan(this, options);
             this.setCurrentRootSpan(newRoot);
-            if(options.sampler == null){
+            if (!options) {
+                options = <TraceOptions>{}
+            }
+            if (!options.sampler) {
                 options.sampler = new Sampler(newRoot.traceId);
+                //options.sampler.probability(0.5);
                 options.sampler.always();
             }
             newRoot.sampler = options.sampler;
-            if(newRoot.sampler.shouldSample(newRoot.traceId)){
+            if (newRoot.sampler.shouldSample(newRoot.traceId)) {
                 newRoot.start();
                 return fn(newRoot);
             }
@@ -90,27 +94,25 @@ export class Tracer implements OnEndSpanEventListener {
     }
 
 
-    public onEndSpan(root:RootSpan): void {
+    public onEndSpan(root: RootSpan): void {
         if (!root) {
             return debug('cannot end trace - no active trace found')
         }
-        if(this.currentRootSpan != root) {
-             debug('currentRootSpan != root on notifyEnd. Need more investigation.') 
+        if (this.currentRootSpan != root) {
+            debug('currentRootSpan != root on notifyEnd. Need more investigation.')
         }
         this.notifyEndSpan(root);
         //this.clearCurrentTrace();
     }
 
-    
-    public registerEndSpanListener(listener: OnEndSpanEventListener) {
-        this.eventListeners.push(listener);
-        //this.buffer.registerExporter(exporter)
+    public registerEndSpanListener(listner: OnEndSpanEventListener) {
+        this.eventListeners.push(listner);
     }
 
     private notifyEndSpan(root: RootSpan) {
         if (this.active) {
-            debug ('starting to notify listeners the end of rootspans')
-            if(this.eventListeners&&this.eventListeners.length >0) {
+            debug('starting to notify listeners the end of rootspans')
+            if (this.eventListeners && this.eventListeners.length > 0) {
                 this.eventListeners.forEach((listener) => listener.onEndSpan(root))
             }
         } else {
@@ -122,12 +124,12 @@ export class Tracer implements OnEndSpanEventListener {
         this.setCurrentRootSpan(null);
     }
 
-    public startSpan(name: string, type: string): Span {
+    public startSpan(name?: string, type?: string, parentSpanId?: string): Span {
         let newSpan: Span = null;
         if (!this.currentRootSpan) {
-            debug('no current trace found - cannot start a new span');
-        } else{
-            newSpan = this.currentRootSpan.startSpan(name, type);
+            debug('no current trace found - must start a new root span first');
+        } else {
+            newSpan = this.currentRootSpan.startSpan(name, type, parentSpanId);
         }
         return newSpan;
     }
diff --git a/packages/opencensus-core/src/trace/sampler/sampler.ts b/packages/opencensus-core/src/trace/sampler/sampler.ts
@@ -23,38 +23,38 @@ const maxNumber = 0xffffffffffffffff;
 /**
  * Class Sampler
  */
-export class Sampler{
-     traceId:               string;
-     private idUpperBound:  number;
+export class Sampler {
+    traceId: string;
+    private idUpperBound: number;
 
-     /**
-      * @param traceId Used for probability calculation
-      * @param spanId todo: integration with propagation class
-      * @param isRemote todo: integration with propagation class
-      */
-     constructor(traceId?:string, spanId?:string, isRemote?:boolean){
-         if(traceId){ 
-             this.traceId   = traceId;
-         }
-     }
+    /**
+     * @param traceId Used for probability calculation
+     * @param spanId todo: integration with propagation class
+     * @param isRemote todo: integration with propagation class
+     */
+    constructor(traceId?: string, spanId?: string, isRemote?: boolean) {
+        if (traceId) {
+            this.traceId = traceId;
+        }
+    }
 
     /**
      * @description Set idUpperBound with maxNumber
      * @returns a Sampler object
      */
-     public always(): Sampler{
-         this.idUpperBound = maxNumber;
-         return this;
-     }
+    public always(): Sampler {
+        this.idUpperBound = maxNumber;
+        return this;
+    }
 
     /**
      * @description Set idUpperBound with minNumber
      * @returns a Sampler object
      */
-     public never(): Sampler{
-         this.idUpperBound = minNumber;
-         return this;
-     }
+    public never(): Sampler {
+        this.idUpperBound = minNumber;
+        return this;
+    }
 
     /**
      * @description Set idUpperBound with the probability. If probability 
@@ -63,8 +63,8 @@ export class Sampler{
      * @param probability probability between 0 and 1 
      * @returns a Sampler object
      */
-     public probability(probability:number): Sampler{
-        if(probability < minNumber){
+    public probability(probability: number): Sampler {
+        if (probability < minNumber) {
             return this.never();
 
         } else if (probability > maxNumber) {
@@ -74,20 +74,20 @@ export class Sampler{
 
         this.idUpperBound = probability * maxNumber;
         return this;
-     }
-     
+    }
+
     /**
      * @description 
      * @param traceId 
      * @returns a boolean
      */
-     public shouldSample (traceId:string):boolean{
+    public shouldSample(traceId: string): boolean {
         const lower_bytes = traceId.substring(16)
         const lower_long = parseInt(lower_bytes, 16);
 
-        if(lower_long <= this.idUpperBound){
+        if (lower_long <= this.idUpperBound) {
             return true
-        }else{
+        } else {
             return false;
         }
     }
diff --git a/packages/opencensus-core/src/trace/types/tracetypes.ts b/packages/opencensus-core/src/trace/types/tracetypes.ts
@@ -23,15 +23,17 @@ export interface MapLabels { [propName: string]: string; }
 export interface MapObjects { [propName: string]: any; }
 
 export interface TraceContext {
-    traceId: string,
-    spanId: string,
-    options?: number
+        traceId: string,
+        spanId: string,
+        options?: number,
+        sampleDecision?: boolean
 }
 
 export interface TraceOptions {
-    name: string;
-    traceContext?: TraceContext;
-    sampler?: Sampler;
+    name:string;
+    traceContext?:TraceContext;
+    sampler?:Sampler;
+    type?:string;
 }
 
 export interface OnEndSpanEventListener {
@@ -53,6 +55,7 @@ export abstract class SpanBaseModel {
     private clock: Clock;
     //--Tra----
     private _remoteParent: string;
+    private _parentSpanId: string;
     private _name: string;
     private _started: boolean;
     private _ended: boolean;
@@ -74,6 +77,7 @@ export abstract class SpanBaseModel {
         this.clock = null;
         this._truncated = false;
         this._ended = false;
+        this._parentSpanId = ''
         this.setId(randomSpanId());
     }
 
@@ -104,6 +108,14 @@ export abstract class SpanBaseModel {
         this._name = name;
     }
 
+    public setParentSpanId(parentSpanId: string) {
+        this._parentSpanId = parentSpanId;
+    }
+
+    public getParentSpanId() {
+        return this._parentSpanId
+    }
+
     public get type(): string {
         return this._type;
     }
@@ -112,7 +124,7 @@ export abstract class SpanBaseModel {
         this._type = type;
     }
 
-    public set remoteParente(remoteParent: string) {
+    public set remoteParent(remoteParent: string) {
         this._remoteParent = remoteParent;
     }
 
@@ -148,11 +160,11 @@ export abstract class SpanBaseModel {
     }
 
     public get traceContext(): TraceContext {
-        return {
+        return <TraceContext>{
             traceId: this.traceId.toString(),
             spanId: this.id.toString(),
-            options: 1  // always traced
-        };
+            parentSpanId: this.getParentSpanId
+        }
     }
 
     //TODO: maybe key and values must be truncate
@@ -166,12 +178,10 @@ export abstract class SpanBaseModel {
     }
 
     public get sampler() {
-        debug('tracetypes get sampler()')
         return this._sampler;
     }
 
     public set sampler(sampler: Sampler) {
-        debug('tracetypes set sempler(sampler)')
         this._sampler = sampler;
     }
 
