chord: merge commit

Author: eldreygalindo

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

@@ -75,6 +75,18 @@ export class RootSpan extends SpanBaseModel implements OnEndSpanEventListener {
     }
 
     public startSpan(name: string, type: string) {
+        if (!this.started) {
+            debug('calling %s.startSpan() on un-started %s %o',
+                this._className, this._className,
+                { id: this.id, name: this.name, type: this.type })
+            return
+        }
+        if (this.ended) {
+            debug('calling %s.startSpan() on ended %s %o',
+                this._className, this._className,
+                { id: this.id, name: this.name, type: this.type })
+            return
+        }
         let newSpan = new Span(this);
         newSpan.name = name
         newSpan.type = type

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

@@ -71,7 +71,7 @@ export class Sampler{
         if(probability < minNumber){
             return this.never();
 
-        } else if (probability > maxNumber){
+        } else if (probability > maxNumber) {
             return this.always();
 
         }
@@ -93,6 +93,6 @@ export class Sampler{
         }else{
             return false;
         }
-     }
+    }
 
- }
+}

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

@@ -23,27 +23,27 @@ 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
 }
 
 export interface TraceOptions {
-    name:string;
-    traceContext?:TraceContext;
-    sampler?:Sampler;
+    name: string;
+    traceContext?: TraceContext;
+    sampler?: Sampler;
 }
 
 export interface OnEndSpanEventListener {
-    onEndSpan(span: SpanBaseModel): void; 
+    onEndSpan(span: SpanBaseModel): void;
 }
 
 export interface SpanData {
-    labels: {[key: string]: string};
+    labels: { [key: string]: string };
     name: string;
     spanId: string;
     parentSpanId?: string;
-  }
+}
 
 
 export abstract class SpanBaseModel {
@@ -129,20 +129,20 @@ export abstract class SpanBaseModel {
     }
 
     public get startTime(): Date {
-        if(this.clock){
+        if (this.clock) {
             return this.clock.startTime;
         }
-        
+
     }
 
     public get endTime(): Date {
-        if(this.clock){
+        if (this.clock) {
             return this.clock.endTime;
         }
     }
 
     public get duration(): number {
-        if(this.clock){
+        if (this.clock) {
             return this.clock.duration;
         }
     }
@@ -165,12 +165,12 @@ export abstract class SpanBaseModel {
         this.annotations[key] = value;
     }
 
-    public get sampler(){
+    public get sampler() {
         debug('tracetypes get sampler()')
         return this._sampler;
     }
 
-    public set sampler(sampler:Sampler){
+    public set sampler(sampler: Sampler) {
         debug('tracetypes set sempler(sampler)')
         this._sampler = sampler;
     }
@@ -192,10 +192,11 @@ export abstract class SpanBaseModel {
             this._className, this._className,
             { id: this.id, name: this.name, type: this.type })
             return
-        } else if (this.ended) {
+        }
+        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;

packages/opencensus-core/test/test-root-span.ts

@@ -1,5 +1,5 @@
 /**
-* Copyright 2017 Google Inc. All Rights Reserved.
+* 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.

packages/opencensus-core/test/test-span.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 Google Inc. All Rights Reserved.
+ * 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.

packages/opencensus-core/test/test-tracer.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 Google Inc. All Rights Reserved.
+ * 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.
@@ -23,10 +23,7 @@ let assert = require('assert');
 
 describe('Tracer', function () {
   const options = { name: "test" };
-  const callback = (root) => {
-
-    return root;
-  }
+  const callback = (root) => { return root; }
 
   describe('new Tracer()', function () {
     it('should create a Tracer instance', function () {
@@ -52,35 +49,27 @@ describe('Tracer', function () {
   describe('startRootSpan()', function () {
 
     it('should start the rootSpan', function () {
-      const tracer = new Tracer();
-      tracer.start();
-      const root = tracer.startRootSpan(options, callback);
-
-      assert.ok(root.started);
-    });
-
-    it('should set the new span root as currentRootSpan', function () {
-      const tracer = new Tracer();
+      let tracer = new Tracer();
       tracer.start();
-      const root = tracer.startRootSpan(options, callback);
+      let rootSpan = tracer.startRootSpan(options, callback);
 
-      assert.equal(tracer.currentRootSpan.id, root.id);
+      assert.ok(rootSpan.started);
     });
   });
 
   describe('end()', function () {
     it('should end current trace', function () {
-      const tracer = new Tracer();
-      const trace = tracer.startRootSpan(options, callback);
-      trace.end();
-      assert.ok(trace.ended);
+      let tracer = new Tracer();
+      let rootSpan = tracer.startRootSpan(options, callback);
+      rootSpan.end();
+      assert.ok(rootSpan.ended);
     });
   });
 
   describe('clearCurrentRootSpan()', function () {
     it('should set the current root span to null', function () {
-      const tracer = new Tracer();
-      const trace = tracer.startRootSpan(options, callback);
+      let tracer = new Tracer();
+      let rootSpan = tracer.startRootSpan(options, callback);
       tracer.clearCurrentTrace();
 
       assert.ok(tracer.currentRootSpan == null);
@@ -89,19 +78,16 @@ describe('Tracer', function () {
 
   describe('startSpan()', function () {
     it('should return a Span instance', function () {
-      const tracer = new Tracer();
-      const trace = tracer.startRootSpan(options, callback);
-      trace.start();
-      const span = tracer.startSpan("spanName", "spanType");
-      console.log(span);
+      let tracer = new Tracer();
+      let rootSpan = tracer.startRootSpan(options, callback);
+      let span = tracer.startSpan("spanName", "spanType");
       assert.ok(span instanceof Span);
     });
 
     it('should start a span', function () {
-      const tracer = new Tracer();
-      const trace = tracer.startRootSpan(options, callback);
-      trace.start();
-      const span = tracer.startSpan("spanName", "spanType");
+      let tracer = new Tracer();
+      let rootSpan = tracer.startRootSpan(options, callback);
+      let span = tracer.startSpan("spanName", "spanType");
       assert.ok(span.started);
     });
   });