chord: merge commit

Author: eldreygalindo

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

@@ -18,7 +18,7 @@ import { Span } from './span'
 import { Clock } from '../../internal/clock'
 import * as uuid from 'uuid';
 import { debug } from '../../internal/util'
-import { SpanBaseModel, TraceContext, OnEndSpanEventListener } from '../types/tracetypes'
+import { SpanBaseModel, TraceOptions, TraceContext, OnEndSpanEventListener } from '../types/tracetypes'
 import { Tracer } from './tracer'
 import { Sampler } from './sampler'
 
@@ -28,10 +28,12 @@ export class RootSpan extends SpanBaseModel implements OnEndSpanEventListener {
     private _spans: Span[];
     private _traceId: string;
 
-    constructor(tracer: Tracer, context?: TraceContext ) {
+    //TODO - improve root name setup
+    constructor(tracer: Tracer, context?: TraceOptions ) {
         super()
         this.tracer = tracer;
-        this._traceId = context&&context.traceId?context.traceId:(uuid.v4().split('-').join(''));
+        this._traceId = context&&context.traceContext&&context.traceContext.traceId?context.traceContext.traceId:(uuid.v4().split('-').join(''));
+        this.name = context&&context.name?context.name:'undefined';
         this._spans = [];
     }
 

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

@@ -20,10 +20,8 @@ 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 { TraceContext, OnEndSpanEventListener } from '../types/tracetypes';
-import { TracerConfig, defaultConfig } from '../tracing'
-import { Buffer } from '../../exporters/buffer'
+import { TraceContext, TraceOptions, OnEndSpanEventListener } from '../types/tracetypes';
+import {  TracerConfig, defaultConfig } from '../tracing';
 import { Sampler } from './sampler'
 
 export type Func<T> = (...args: any[]) => T;
@@ -74,18 +72,19 @@ export class Tracer implements OnEndSpanEventListener {
         return this._active;
     }
 
-    public startRootSpan(context?: TraceContext, sampler?: Sampler): RootSpan {
-        let newTrace = new RootSpan(this, context);
-        debug("tracer startRootSpan ")
-        this.setCurrentRootSpan(newTrace);
-        if(sampler == null){
-            sampler = new Sampler(newTrace.traceId);
-            sampler.always();
-        }
-        debug("tracer startRootSpan ")
-        newTrace.sampler = sampler;
-        newTrace.start();
-        return newTrace;
+    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);
+            if(sampler == null){
+                sampler = new Sampler(newTrace.traceId);
+                sampler.always();
+            }
+            newRoot.sampler = sampler;
+            newRoot.start();
+            return fn(newRoot);
+        });
     }
 
 
@@ -100,10 +99,6 @@ export class Tracer implements OnEndSpanEventListener {
         //this.clearCurrentTrace();
     }
 
-    //TODO: review
-    public runInContex<T>(fn: Func<T>): T {
-        return this.contextManager.runAndReturn(fn)
-    }
 
     public registerEndSpanListener(listener: OnEndSpanEventListener) {
         this.eventListeners.push(listener);

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

@@ -28,6 +28,11 @@ export interface TraceContext {
         options?: number  
 }
 
+export interface TraceOptions {
+    name:string;
+    traceContext?:TraceContext;
+}
+
 export interface OnEndSpanEventListener {
     onEndSpan(span: SpanBaseModel): void; 
 }