feat: Add data/tags to span, Clear finishedSpans

HazAT · kamilogorek · commit fe382e7dfe46 · 2019-11-01T11:25:42.000+01:00
diff --git a/packages/hub/src/hub.ts b/packages/hub/src/hub.ts
@@ -422,14 +422,20 @@ export class Hub implements HubInterface {
       return undefined;
     }
 
-    return this.captureEvent({
+    const finishedSpans = span.finishedSpans.filter(s => s !== span);
+
+    const eventId = this.captureEvent({
       contexts: { trace: span.getTraceContext() },
-      spans: span.finishedSpans.filter(s => s !== span),
+      spans: finishedSpans,
       start_timestamp: span.startTimestamp,
       timestamp: span.timestamp,
       transaction: span.transaction,
       type: 'transaction',
     });
+
+    // After sending we reset the finishedSpans array
+    span.finishedSpans = [];
+    return eventId;
   }
 }
 
diff --git a/packages/hub/src/span.ts b/packages/hub/src/span.ts
@@ -38,20 +38,30 @@ export class Span implements SpanInterface, SpanProps {
   public timestamp?: number;
 
   /**
-   * Set the transaction of the Span.
+   * Transaction of the Span.
    */
   public transaction?: string;
 
   /**
-   * Set the operation of the Span.
+   * Operation of the Span.
    */
   public op?: string;
 
   /**
-   * Set the description of the Span.
+   * Description of the Span.
    */
   public description?: string;
 
+  /**
+   * Tags of the Span.
+   */
+  public tags?: { [key: string]: string };
+
+  /**
+   * Data of the Span.
+   */
+  public data?: { [key: string]: any };
+
   /**
    * List of spans that were finalized
    */
@@ -83,13 +93,19 @@ export class Span implements SpanInterface, SpanProps {
     if (spanProps.description) {
       this.description = spanProps.description;
     }
+    if (spanProps.data) {
+      this.data = spanProps.data;
+    }
+    if (spanProps.tags) {
+      this.tags = spanProps.tags;
+    }
   }
 
   /** JSDoc */
   public newSpan(spanProps?: Pick<SpanProps, Exclude<keyof SpanProps, 'spanId'>>): Span {
     const span = new Span({
       ...spanProps,
-      parentSpanId: this._parentSpanId,
+      parentSpanId: this._spanId,
       sampled: this.sampled,
       traceId: this._traceId,
     });
@@ -140,10 +156,12 @@ export class Span implements SpanInterface, SpanProps {
    */
   public getTraceContext(): object {
     return {
+      data: this.data,
       description: this.description,
       op: this.op,
       parent_span_id: this._parentSpanId,
       span_id: this._spanId,
+      tags: this.tags,
       trace_id: this._traceId,
     };
   }
@@ -153,12 +171,14 @@ export class Span implements SpanInterface, SpanProps {
    */
   public toJSON(): object {
     return {
+      data: this.data,
       description: this.description,
       op: this.op,
       parent_span_id: this._parentSpanId,
       sampled: this.sampled,
       span_id: this._spanId,
       start_timestamp: this.startTimestamp,
+      tags: this.tags,
       timestamp: this.timestamp,
       trace_id: this._traceId,
       transaction: this.transaction,
diff --git a/packages/types/src/span.ts b/packages/types/src/span.ts
@@ -17,4 +17,6 @@ export interface SpanProps {
   spanId?: string;
   traceId?: string;
   transaction?: string;
+  tags?: { [key: string]: string };
+  data?: { [key: string]: any };
 }

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,6 @@ export interface SpanProps {`
`17`	`17`	`spanId?: string;`
`18`	`18`	`traceId?: string;`
`19`	`19`	`transaction?: string;`
	`20`	`+ tags?: { [key: string]: string };`
	`21`	`+ data?: { [key: string]: any };`
`20`	`22`	`}`