chord: merge commit

Author: silva-fabio

packages/opencensus-core/package-lock.json

@@ -46,6 +46,7 @@
     "continuation-local-storage": "^3.2.1",
     "debug": "^3.1.0",
     "end-of-stream": "^1.4.1",
+    "npm": "^5.7.1",
     "require-in-the-middle": "^2.2.1",
     "semver": "^5.5.0",
     "shimmer": "^1.2.0",

packages/opencensus-core/package.json

@@ -1,3 +1,20 @@
+/**
+ * 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.
+ */
+
+
 export interface ExporterOptions {
 
 }

packages/opencensus-core/src/exporters

@@ -28,13 +28,17 @@ export class Clock {
     }
 
     public end(): void {
-        if (this._ended) return
+        if (this._ended){
+            return
+        }
         this.diff = process.hrtime(this._hrtime)
         this._ended = true
       }
 
     public get duration(): number {
-        if (!this._ended) return null
+        if (!this._ended){
+             return null
+        }
         var ns = this.diff[0] * 1e9 + this.diff[1]
         return ns / 1e6
       }

packages/opencensus-core/src/internal/clock.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.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import * as asyncHook from 'async_hooks';
-import {Context, Func, Namespace as CLSNamespace} from 'continuation-local-storage';
-import {EventEmitter} from 'events';
-import * as shimmer from 'shimmer';
+import * as asyncHook from 'async_hooks'
+import {Context, Func, Namespace as CLSNamespace} from 'continuation-local-storage'
+import {EventEmitter} from 'events'
+import * as shimmer from 'shimmer'
 
 const wrappedSymbol = Symbol('context_wrapped');
 let contexts: {[asyncId: number]: Context;} = {};

packages/opencensus-core/src/internal/cls-ah.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 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.
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import * as CLS from 'continuation-local-storage';
-import * as semver from 'semver';
+import * as CLS from 'continuation-local-storage'
+import * as semver from 'semver'
 
 export type Namespace = CLS.Namespace;
 export type Func<T> = CLS.Func<T>;

packages/opencensus-core/src/internal/cls.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import * as crypto from 'crypto';
-import * as Debug from "debug";
+import * as crypto from 'crypto'
+import * as Debug from "debug"
 
 export  const debug = Debug("opencensus");
 

packages/opencensus-core/src/internal/util.ts

@@ -14,57 +14,55 @@
  * limitations under the License.
  */
 
-import {Clock} from '../../internal/clock';
-import {Trace} from './trace';
+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;
+   // private _parentSpanId: string;
 
    constructor(trace: TraceBaseModel) {
       super()
       this.trace = trace;
-      this.setId(randomSpanId());
     }
 
     public get traceId() : string {
-        return this.trace.id;
-    }
-
-    public set parentSpanId(parentSpanId : string) {
-        this._parentSpanId = parentSpanId;
+        return this.trace.traceId;
     }
 
     public get parentSpanId() : string {
-        return this._parentSpanId;
+        return this.trace.id;
     }
 
     public get traceContext() {
         return {
-          traceId: this.trace.id.toString(),
+          traceId: this.traceId.toString(),
           spanId: this.id.toString(),
           options: 1  // always traced
         };
     }
 
     public start() {
         super.start();
-         debug('starting span  %o', {id: this.id, traceId: this.traceId, name: this.name })
+         debug('starting span  %o', 
+                {id: this.id,
+                traceId: this.traceId,
+                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}
+                {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/span.ts

@@ -14,24 +14,34 @@
  * limitations under the License.
  */
 
-import {Span} from './span' 
+import * as uuid from 'uuid'
+
+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 _traceId: string;
 
     constructor() {
         super()
-       this.setId((uuid.v4().split('-').join('')));
+       this._traceId = (uuid.v4().split('-').join(''));
     }
-     
+
+    public get traceSpans() : Span[] {
+        return this.spans;
+    }
+    
+    public get traceId() : string {
+        return this._traceId;
+    }
+         
     public start() {
         super.start()     
-        debug('starting trace  %o', {id: this.id})
+        debug('starting trace  %o', {traceId: this.traceId})
     }
 
     public end() {
@@ -44,7 +54,11 @@ export class Trace extends TraceBaseModel {
         })
 
         debug('ending trace  %o', 
-            {id: this.id, name: this.name, startTime: this.startTime, endTime: this.endTime, duration: this.duration})
+                {id: this.id,
+                name: this.name,
+                startTime: this.startTime,
+                endTime: this.endTime,
+                duration: this.duration})
     }
 
     public startSpan(name: string, type: string) {

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

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-import * as cls from '../../internal/cls';
+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 { Exporter } from '../../exporters/exporter';
+import { Exporter } from '../../exporters/exporter'
 
 export type Func<T> = (...args: any[]) => T;
 
 export class Tracer {
 
-    readonly PLUGINS = ['http', 'https', 'mongodb-core', 'express']
+    readonly PLUGINS = ['http', 'https', 'mongodb-core', 'express'];
 
     private _active: boolean;
     private contextManager: cls.Namespace;
@@ -35,10 +35,9 @@ export class Tracer {
     //TODO: temp solution 
     private endedTraces: Trace[] = [];
 
-    constructor(exporter:Exporter) {
+    constructor() {
         this._active = false;
         this.contextManager = cls.createNamespace();
-        this.exporter = exporter;
     }
 
     public get currentTrace(): Trace  {
@@ -66,7 +65,9 @@ export class Tracer {
     }
 
     public endTrace(): void {
-        if (!this.currentTrace) return debug('cannot end trace - no active trace found')
+        if (!this.currentTrace){
+            return debug('cannot end trace - no active trace found')
+        }
         this.currentTrace.end();
         this.addEndedTrace(this.currentTrace);
         //this.clearCurrentTrace();
@@ -81,7 +82,7 @@ export class Tracer {
         if (!this.currentTrace) { 
             debug('no current trace found - cannot start a new span'); 
         } else {
-            newSpan = this.currentTrace.startSpan(name, type)
+            newSpan = this.currentTrace.startSpan(name, type);
         }
         return newSpan;
     }
@@ -120,6 +121,10 @@ export class Tracer {
         namespace.bindEmitter(emitter);
     }
 
+    public registerExporter(exporter:Exporter) {
+        this.exporter = exporter;
+    }
+
 }