Creates Traces with sent context

Author: eduardoemery

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

@@ -28,11 +28,14 @@ export class RootSpan extends SpanBaseModel implements OnEndSpanEventListener {
     private _traceId: string;
 
     //TODO - improve root name setup
-    constructor(tracer: Tracer, context?: TraceOptions ) {
+    constructor(tracer: Tracer, context?: TraceOptions) {
         super()
         this.tracer = tracer;
-        this._traceId = context&&context.traceContext&&context.traceContext.traceId?context.traceContext.traceId:(uuid.v4().split('-').join(''));
-        this.name = context&&context.name?context.name:'undefined';
+        this._traceId = context && context.traceContext && context.traceContext.traceId ? context.traceContext.traceId : (uuid.v4().split('-').join(''));
+        this.name = context && context.name ? context.name : 'undefined';
+        if (context && context.traceContext) {
+            this.setParentSpanId(context.traceContext.spanId || '')
+        }
         this._spans = [];
     }
 
@@ -44,9 +47,20 @@ export class RootSpan extends SpanBaseModel implements OnEndSpanEventListener {
         return this._traceId;
     }
 
+    public getOptions() {
+        return {
+            name: this.name,
+            traceContext: {
+                traceId: this.traceId,
+                spanId: this.id,
+                parentSpanId: this.getParentSpanId
+            }
+        }
+    }
+
     public start() {
         super.start()
-        debug('starting %s  %o', this._className, { traceId: this.traceId, id: this.id })
+        debug('starting %s  %o', this._className, { traceId: this.traceId, id: this.id, parentSpanId: this.getParentSpanId() })
     }
 
     public end() {
@@ -76,14 +90,14 @@ export class RootSpan extends SpanBaseModel implements OnEndSpanEventListener {
         debug('%s notified ending by %o', { id: span.id, name: span.name })
     }
 
-    public startSpan(name?: string, type?: string) {
+    public startSpan(name?: string, type?: string, parentSpanId?: string) {
         let newSpan = new Span(this);
         if (name) { newSpan.name = name }
         if (type) { newSpan.type = type }
+        if (type) { newSpan.setParentSpanId(parentSpanId || '') }
         newSpan.start();
         this._spans.push(newSpan);
         return newSpan;
     }
-
 }
 

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

@@ -20,8 +20,8 @@ import { Span } from './span'
 import { debug } from '../../internal/util'
 import { Stackdriver } from '../../exporters/stackdriver/stackdriver'
 import { StackdriverOptions } from '../../exporters/stackdriver/options'
-import { TraceContext, TraceOptions, OnEndSpanEventListener } from '../types/tracetypes';
-import {  TracerConfig, defaultConfig } from '../tracing';
+import { TraceContext, TraceOptions, OnEndSpanEventListener, SpanBaseModel } from '../types/tracetypes';
+import { TracerConfig, defaultConfig } from '../tracing';
 
 export type Func<T> = (...args: any[]) => T;
 
@@ -81,28 +81,24 @@ export class Tracer implements OnEndSpanEventListener {
         });
     }
 
-
     public onEndSpan(root: RootSpan): void {
         if (!this.currentRootSpan) {
-            return debug('cannot end trace - no active trace found')
+            return debug('cannot end trace - no active trace found', this.currentRootSpan)
         }
         if (this.currentRootSpan != root) {
-            return debug('currentRootSpan != root on notifyEnd. Possbile implementation bug.')
+            debug('currentRootSpan != root on notifyEnd. Possbile implementation bug.')
+            debug('ROOT SPAN ', root)
+            return debug('CURRENT ROOT SPAN ', this.currentRootSpan)
+            //return debug('currentRootSpan != root on notifyEnd. Possbile implementation bug.')
         }
         this.notifyEndSpan(this.currentRootSpan);
         //this.clearCurrentTrace();
     }
 
-    
     public registerEndSpanListener(listner: OnEndSpanEventListener) {
-            this.eventListeners.push(listner);
+        this.eventListeners.push(listner);
     }
 
-    /*public registerExporter(exporter: Exporter) {
-        //this.eventListeners.push(listner);
-        this.buffer.registerExporter(exporter)
-    }*/
-
     private notifyEndSpan(root: RootSpan) {
         if (this.active) {
             //this.buffer.onEndSpan(root);
@@ -118,16 +114,50 @@ export class Tracer implements OnEndSpanEventListener {
         this.setCurrentRootSpan(null);
     }
 
-    public startSpan(name?: string, type?: string): Span {
+    public startSpan(name?: string, type?: string, parentSpanId?: string): Span {
         let newSpan: Span = null;
         if (!this.currentRootSpan) {
             debug('no current trace found - must start a new root span first');
         } else {
-            newSpan = this.currentRootSpan.startSpan(name, type);
+            newSpan = this.currentRootSpan.startSpan(name, type, parentSpanId);
         }
         return newSpan;
     }
 
+    /*public startSpan<T>(fn: (span: Span) => T): T {
+        //debug('starting span: %o', options)
+        if (!this.currentRootSpan) {
+            debug('no current trace found - must start a new root span first');
+            return null;
+        } else {
+            return this.contextManager.runAndReturn((span) => {
+                let newSpan = this.currentRootSpan.startSpan();
+                return fn(newSpan);
+            });
+        }
+    }*/
+
+    /*public startSpan<T>(options: TraceOptions, fn: (span: SpanBaseModel) => T): T {
+        //debug('starting span: %o', options)
+        if (this.currentRootSpan) {
+            // Has an active root span
+            debug('starting span')
+            return this.contextManager.runAndReturn((span) => {
+                let newSpan = this.currentRootSpan.startSpan();
+                return fn(newSpan);
+            });
+        } else {
+            // Has no active root span
+            debug('starting root span: %o', options)
+            return this.contextManager.runAndReturn((root) => {
+                let newRoot = new RootSpan(this, options);
+                this.setCurrentRootSpan(newRoot);
+                newRoot.start();
+                return fn(newRoot);
+            });
+        }
+    }*/
+
     public wrap<T>(fn: Func<T>): Func<T> {
         if (!this.active) {
             return fn;

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

@@ -24,7 +24,7 @@ export interface MapObjects { [propName: string]: any; }
 export interface TraceContext {
         traceId: string,
         spanId: string,
-        options?: number  
+        options?: number
 }
 
 export interface TraceOptions {
@@ -43,6 +43,7 @@ export abstract class SpanBaseModel {
     private clock: Clock;
     //--Tra----
     private _remoteParent: string;
+    private _parentSpanId: string;
     private _name: string;
     private _started: boolean;
     private _ended: boolean;
@@ -63,6 +64,7 @@ export abstract class SpanBaseModel {
         this.clock = null;
         this._truncated = false;
         this._ended = false;
+        this._parentSpanId = ''
         this.setId(randomSpanId());
     }
 
@@ -92,6 +94,14 @@ export abstract class SpanBaseModel {
         this._name = name;
     }
 
+    public setParentSpanId(parentSpanId: string) {
+        this._parentSpanId = parentSpanId;
+    }
+
+    public getParentSpanId() {
+        return this._parentSpanId
+    }
+
     public get type(): string {
         return this._type;
     }