chord: merge commit

silva-fabio · silva-fabio · commit c1482fefaaee · 2018-03-31T11:51:58.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
@@ -18,8 +18,9 @@ import { Span } from './span'
 import { Clock } from '../../internal/clock'
 import * as uuid from 'uuid';
 import { debug } from '../../internal/util'
-import { SpanBaseModel, TraceContext, OnEndSpanEventListener, TraceOptions } from '../types/tracetypes'
-import { Tracer } from './tracer';
+import { SpanBaseModel, TraceOptions, TraceContext, OnEndSpanEventListener } from '../types/tracetypes'
+import { Tracer } from './tracer'
+import { Sampler } from './sampler'
 
 export class RootSpan extends SpanBaseModel implements OnEndSpanEventListener {
 
diff --git a/packages/opencensus-core/src/trace/model/span.ts b/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
+                });
+        // }
     }
 
 
diff --git a/packages/opencensus-core/src/trace/model/tracer.ts b/packages/opencensus-core/src/trace/model/tracer.ts
@@ -22,6 +22,7 @@ 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 './sampler'
 
 export type Func<T> = (...args: any[]) => T;
 
@@ -30,6 +31,7 @@ export class Tracer implements OnEndSpanEventListener {
 
     readonly PLUGINS = ['http', 'https', 'mongodb-core', 'express'];
 
+    //public buffer: Buffer;
     private _active: boolean;
     private contextManager: cls.Namespace;
     private config: TracerConfig;
@@ -58,6 +60,10 @@ export class Tracer implements OnEndSpanEventListener {
         return this;
     }
 
+    public getEventListeners(): OnEndSpanEventListener[] {
+        return this.eventListeners;
+    }
+
     public stop() {
         this._active = false;
     }
@@ -67,12 +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);
-            newRoot.start();
-            return fn(newRoot);
+            if(options.sampler == null){
+                options.sampler = new Sampler(newRoot.traceId);
+                options.sampler.probability(0.6);
+            }
+            newRoot.sampler = options.sampler;
+            if(newRoot.sampler.continue(newRoot.traceId)){
+                newRoot.start();
+                return fn(newRoot);
+            }
+            return fn(null);
         });
     }
 
@@ -89,8 +102,9 @@ export class Tracer implements OnEndSpanEventListener {
     }
 
     
-    public registerEndSpanListener(listner: OnEndSpanEventListener) {
-            this.eventListeners.push(listner);
+    public registerEndSpanListener(listener: OnEndSpanEventListener) {
+        this.eventListeners.push(listener);
+        //this.buffer.registerExporter(exporter)
     }
 
     private notifyEndSpan(root: RootSpan) {
@@ -100,7 +114,7 @@ export class Tracer implements OnEndSpanEventListener {
                 this.eventListeners.forEach((listener) => listener.onEndSpan(root))
             }
         } else {
-            debug ('this tracer is inactivate cant notify endspan')
+            debug('this tracer is inactivate cant notify endspan')
         }
     }
 
@@ -112,7 +126,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;
diff --git a/packages/opencensus-core/src/trace/sampler/sampler.ts b/packages/opencensus-core/src/trace/sampler/sampler.ts
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+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){
+            return this.never();
+
+        } else if (probability > maxNumber){
+            return this.always();
+
+        }
+
+        this.idUpperBound = probability * maxNumber;
+        return this;
+     }
+
+     public continue (traceId:string):boolean{
+        debug('Samplre continue')
+        let lower_bytes = traceId.substring(16)
+        let lower_long: number
+        debug('SAMPLER CONTINUE lower_bytes :',lower_bytes)
+
+        lower_long = parseInt(lower_bytes, 16);
+
+        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;
+        }
+     }
+
+ }
diff --git a/packages/opencensus-core/src/trace/types/tracetypes.ts b/packages/opencensus-core/src/trace/types/tracetypes.ts
@@ -16,6 +16,7 @@
 
 import { Clock } from '../../internal/clock'
 import { debug, randomSpanId } from '../../internal/util'
+import { Sampler } from '../model/sampler'
 
 
 export interface MapLabels { [propName: string]: string; }
@@ -30,6 +31,7 @@ export interface TraceContext {
 export interface TraceOptions {
     name:string;
     traceContext?:TraceContext;
+    sampler?:Sampler;
 }
 
 export interface OnEndSpanEventListener {
@@ -54,6 +56,7 @@ export abstract class SpanBaseModel {
     //links
     //TODO truncated 
     private _truncated: boolean;
+    private _sampler: Sampler;
 
     constructor() {
         this._className = this.constructor.name;
@@ -66,6 +69,7 @@ export abstract class SpanBaseModel {
         this.setId(randomSpanId());
     }
 
+
     public get id(): string {
         return this._id;
     }
@@ -117,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 {
@@ -146,6 +157,16 @@ export abstract class SpanBaseModel {
         this.annotations[key] = value;
     }
 
+    public get sampler(){
+        debug('tracetypes get sampler()')
+        return this._sampler;
+    }
+
+    public set sampler(sampler:Sampler){
+        debug('tracetypes set sempler(sampler)')
+        this._sampler = sampler;
+    }
+
     public start() {
         if (this.started) {
             debug('calling %s.start() on already started %s %o',
@@ -160,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;
