Changing class name TraceManger to Tracer, creating class Tracing. Moving class files Span.ts, Trace.ts and Tracer.ts to trace/model

Author: silva-fabio

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

@@ -15,7 +15,7 @@
  */
 
 export interface Plugin <TM> {
-    applyPatch: (module: any, manager: TM, version: string) => void; 
+    applyPatch(module: any, manager: TM, version: string): void; 
 }
 
 export abstract class BasePlugin <TM>  {

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

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-import {Clock} from '../internal/clock';
+import {Clock} from '../../internal/clock';
 import {Trace} from './trace';
-import {debug, randomSpanId} from '../internal/util'
-import {TracerComponent} from './types/tracetypes'
+import {debug, randomSpanId} from '../../internal/util'
+import {TraceBaseModel} from '../types/tracetypes'
 
 
-export class Span extends TracerComponent {
+export class Span extends TraceBaseModel {
 
-    private trace: TracerComponent;   
+    private trace: TraceBaseModel;   
     private _parentSpanId: string;
 
-   constructor(trace: TracerComponent) {
+   constructor(trace: TraceBaseModel) {
       super()
       this.trace = trace;
       this.setId(randomSpanId());

…census-core/src/trace/model/root-span.ts …opencensus-core/src/trace/model/trace.tspackages/opencensus-core/src/trace/model/root-span.ts renamed to packages/opencensus-core/src/trace/model/trace.ts packages/opencensus-core/src/trace/model/root-span.ts renamed to packages/opencensus-core/src/trace/model/trace.ts

@@ -15,12 +15,12 @@
  */
 
 import {Span} from './span' 
-import {Clock} from '../internal/clock'
+import {Clock} from '../../internal/clock'
 import * as uuid from 'uuid';
-import {debug} from '../internal/util'
-import {TracerComponent} from './types/tracetypes'
+import {debug} from '../../internal/util'
+import {TraceBaseModel} from '../types/tracetypes'
 
-export class Trace extends TracerComponent {
+export class Trace extends TraceBaseModel {
 
     private spans: Span[] = [];
 

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

@@ -14,33 +14,31 @@
  * 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 {PluginLoader} from './plugins/pluginloader'
-import {debug} from '../internal/util'
-import {Stackdriver} from '../exporters/stackdriver/stackdriver'
-import {StackdriverOptions} from '../exporters/stackdriver/options'
+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 TraceManager {
+export class Tracer {
 
     readonly PLUGINS = ['http', 'https', 'mongodb-core', 'express']
 
     private _active: boolean;
     private contextManager: cls.Namespace;
-    private pluginLoader: PluginLoader;
-    private exporter
+    private exporter: Exporter;
 
     //TODO: temp solution 
     private endedTraces: Trace[] = [];
 
-    constructor() {
+    constructor(exporter:Exporter) {
         this._active = false;
         this.contextManager = cls.createNamespace();
-        this.pluginLoader = new PluginLoader(this);
-        this.exporter = new Stackdriver(new StackdriverOptions('opencensus-cesar'));
+        this.exporter = exporter;
     }
 
     public get currentTrace(): Trace  {
@@ -51,8 +49,7 @@ export class TraceManager {
          this.contextManager.set('trace', trace);
     }
 
-    public start(config?:Object): TraceManager {
-        this.pluginLoader.loadPlugins(this.PLUGINS);
+    public start(config?:Object): Tracer {
         this._active = true;
         return this;
     }
@@ -71,10 +68,8 @@ export class TraceManager {
     public endTrace(): void {
         if (!this.currentTrace) return debug('cannot end trace - no active trace found')
         this.currentTrace.end();
-        this.exporter.emit(this.currentTrace);
         this.addEndedTrace(this.currentTrace);
         //this.clearCurrentTrace();
-        this.startTrace();
     }
 
     public clearCurrentTrace() {
@@ -97,11 +92,11 @@ export class TraceManager {
         this.exporter.emit(this.currentTrace);
     }*/
 
-    
     private addEndedTrace(trace: Trace) {
         if (this.active) {
             //TODO: temp solution
-            this.endedTraces.push(trace);
+            //this.endedTraces.push(trace);
+            this.exporter.emit(this.currentTrace);            
         }
     }
 

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

@@ -21,7 +21,7 @@ import {debug, randomSpanId} from '../../internal/util'
 export interface MapLabels { [propName: string]: string; }
 export interface MapObjects { [propName: string]: any; }
 
-export abstract class TracerComponent {
+export abstract class TraceBaseModel {
 
     private _className: string;
     private _id: string;