chord: merge commit

Author: silva-fabio

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

@@ -14,58 +14,62 @@
  * limitations under the License.
  */
 
-import {Clock} from '../../internal/clock'
-import {Trace} from './trace'
-import {debug, randomSpanId} from '../../internal/util'
-import {TraceBaseModel} from '../types/tracetypes'
+import { Clock } from '../../internal/clock'
+import { Trace } from './trace'
+import { debug, randomSpanId } from '../../internal/util'
+import { TraceBaseModel } from '../types/tracetypes'
 
 
 export class Span extends TraceBaseModel {
 
-    private trace: TraceBaseModel;   
-   // private _parentSpanId: string;
-    
-   constructor(trace: TraceBaseModel) {
-      super()
-      this.trace = trace;
+    private trace: TraceBaseModel;
+    // private _parentSpanId: string;
+
+    constructor(trace: TraceBaseModel) {
+        super()
+        this.trace = trace;
     }
 
-    public get traceId() : string {
+    public get traceId(): string {
         return this.trace.traceId;
     }
 
-    public get parentSpanId() : string {
+    public get parentSpanId(): string {
         return this.trace.id;
     }
-        
+
     public get traceContext() {
         return {
-          traceId: this.traceId.toString(),
-          spanId: this.id.toString(),
-          options: 1  // always traced
+            traceId: this.traceId.toString(),
+            spanId: this.id.toString(),
+            options: 1  // always traced
         };
     }
-    
+
     public start() {
         super.start();
-         debug('starting span  %o', 
-                {id: this.id,
+        debug('starting span  %o',
+            {
+                id: this.id,
                 traceId: this.traceId,
-                name: this.name})
+                name: this.name
+            })
     }
 
     public end(): void {
         super.end();
-        debug('ending span  %o', 
-                {spanId: this.id, 
-                traceId: this.trace.id, 
-                name: this.name ,
-                startTime: this.startTime, 
-                endTime: this.endTime, 
-                duration: this.duration}
+        debug('ending span  %o',
+            {
+                spanId: this.id,
+                traceId: this.trace.id,
+                name: this.name,
+                startTime: this.startTime,
+                endTime: this.endTime,
+                duration: this.duration
+            }
         )
-       
+
     }
-    
+
 
 }

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

@@ -14,59 +14,61 @@
  * limitations under the License.
  */
 
-import * as uuid from 'uuid'
-
-import {Span} from './span'
-import {Clock} from '../../internal/clock'
-import {debug} from '../../internal/util'
-import {TraceBaseModel} from '../types/tracetypes'
+import { Span } from './span'
+import { Clock } from '../../internal/clock'
+import * as uuid from 'uuid';
+import { debug } from '../../internal/util'
+import { TraceBaseModel } from '../types/tracetypes'
 
 export class Trace extends TraceBaseModel {
 
-    private spans: Span[] = [];
+    private _spans: Span[];
     private _traceId: string;
 
     constructor() {
         super()
-       this._traceId = (uuid.v4().split('-').join(''));
+        this.setId((uuid.v4().split('-').join('')));
+        this._spans = [];
     }
 
-    public get traceSpans() : Span[] {
-        return this.spans;
+    public get spans() {
+        return this._spans;
     }
-    
-    public get traceId() : string {
+
+    public get traceId() {
         return this._traceId;
     }
-         
+
     public start() {
-        super.start()     
-        debug('starting trace  %o', {traceId: this.traceId})
+        super.start()
+        debug('starting trace  %o', { traceId: this.traceId })
     }
-    
+
     public end() {
         super.end()
 
         //TODO - Define logic for list of spans
-        this.spans.forEach(function (span) {
+        this._spans.forEach(function (span) {
             if (span.ended || !span.started) return
             span.truncate()
         })
-     
-        debug('ending trace  %o', 
-                {id: this.id,
+
+        debug('ending trace  %o',
+            {
+                id: this.id,
                 name: this.name,
                 startTime: this.startTime,
                 endTime: this.endTime,
-                duration: this.duration})
+                duration: this.duration
+            })
     }
 
     public startSpan(name: string, type: string) {
         let newSpan = new Span(this);
         newSpan.name = name
         newSpan.type = type
         newSpan.start();
-        this.spans.push(newSpan);
+        this._spans.push(newSpan);
         return newSpan;
     }
 

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

@@ -15,19 +15,19 @@
  */
 
 import * as cls from '../../internal/cls'
-import {Trace} from './trace'
-import {Span} from './span' 
-import {debug} from '../../internal/util'
-import {Stackdriver} from '../../exporters/stackdriver/stackdriver'
-import {StackdriverOptions} from '../../exporters/stackdriver/options'
+import { Trace } from './trace'
+import { Span } from './span'
+import { debug } from '../../internal/util'
+import { Stackdriver } from '../../exporters/stackdriver/stackdriver'
+import { StackdriverOptions } from '../../exporters/stackdriver/options'
 import { Exporter } from '../../exporters/exporter'
 
 export type Func<T> = (...args: any[]) => T;
 
 export class Tracer {
 
     readonly PLUGINS = ['http', 'https', 'mongodb-core', 'express'];
-    
+
     private _active: boolean;
     private contextManager: cls.Namespace;
     private exporter: Exporter;
@@ -40,15 +40,15 @@ export class Tracer {
         this.contextManager = cls.createNamespace();
     }
 
-    public get currentTrace(): Trace  {
-       return this.contextManager.get('trace');
+    public get currentTrace(): Trace {
+        return this.contextManager.get('trace');
     }
 
-    private setCurrentTrace(trace:Trace) {
-         this.contextManager.set('trace', trace);
+    private setCurrentTrace(trace: Trace) {
+        this.contextManager.set('trace', trace);
     }
 
-    public start(config?:Object): Tracer {
+    public start(config?: Object): Tracer {
         this._active = true;
         return this;
     }
@@ -65,22 +65,22 @@ export class Tracer {
     }
 
     public endTrace(): void {
-        if (!this.currentTrace){
+        if (!this.currentTrace) {
             return debug('cannot end trace - no active trace found')
         }
         this.currentTrace.end();
         this.addEndedTrace(this.currentTrace);
         //this.clearCurrentTrace();
     }
-    
+
     public clearCurrentTrace() {
         this.setCurrentTrace(null);
     }
 
-    public startSpan(name:string, type: string): Span {
+    public startSpan(name: string, type: string): Span {
         let newSpan: Span = null;
-        if (!this.currentTrace) { 
-            debug('no current trace found - cannot start a new span'); 
+        if (!this.currentTrace) {
+            debug('no current trace found - cannot start a new span');
         } else {
             newSpan = this.currentTrace.startSpan(name, type);
         }
@@ -97,35 +97,35 @@ export class Tracer {
         if (this.active) {
             //TODO: temp solution
             //this.endedTraces.push(trace);
-            this.exporter.emit(this.currentTrace);            
+            this.exporter.writeTrace(this.currentTrace);
         }
     }
 
     public wrap<T>(fn: Func<T>): Func<T> {
         if (!this.active) {
-           return fn;
-         }
-    
+            return fn;
+        }
+
         // This is safe because isActive checks the value of this.namespace.
         const namespace = this.contextManager as cls.Namespace;
         return namespace.bind<T>(fn);
     }
-    
+
     public wrapEmitter(emitter: NodeJS.EventEmitter): void {
-         if (!this.active) {
-           return;
-         }
+        if (!this.active) {
+            return;
+        }
 
         // This is safe because isActive checks the value of this.namespace.
         const namespace = this.contextManager as cls.Namespace;
         namespace.bindEmitter(emitter);
     }
 
-    public registerExporter(exporter:Exporter) {
+    public registerExporter(exporter: Exporter) {
         this.exporter = exporter;
     }
 
-}  
+}