ref: Rename flush

Author: HazAT

packages/opentracing/src/span.ts

@@ -11,6 +11,7 @@ interface Log {
 
 /** JSDoc */
 export class Span extends opentracing.Span implements SpanInterface {
+  private flushed: boolean = false;
   private finishTime: number = 0;
 
   private readonly logs: Log[] = [];
@@ -105,6 +106,28 @@ export class Span extends opentracing.Span implements SpanInterface {
     return this.finishTime - this.startTime;
   }
 
+  /**
+   * Returns wether the span has been finished.
+   */
+  public isFinished(): boolean {
+    return this.finishTime > 0;
+  }
+
+  /**
+   * Marks the span as flushed.
+   */
+  public flush(): this {
+    this.flushed = true;
+    return this;
+  }
+
+  /**
+   * Returns wether the span has already be flushed.
+   */
+  public isFlushed(): boolean {
+    return this.flushed;
+  }
+
   /**
    * @inheritdoc
    */

packages/opentracing/src/tracer.ts

@@ -8,7 +8,7 @@ import { SpanContext } from './spancontext';
  */
 export class Tracer extends opentracing.Tracer {
   private traceId?: string = undefined;
-  private spans: Span[] = [];
+  private readonly spans: Span[] = [];
 
   /**
    * Called by public method startSpan
@@ -41,7 +41,9 @@ export class Tracer extends opentracing.Tracer {
    * Flushes all spans and sends an event
    */
   public flush(): void {
-    getCurrentHub().captureEvent({ spans: [...this.spans] });
-    this.spans = [];
+    const finishedSpans = this.spans.filter((span: Span) => span.isFinished() && !span.isFlushed());
+    if (finishedSpans.length) {
+      getCurrentHub().captureEvent({ spans: finishedSpans.map((span: Span) => span.flush()) });
+    }
   }
 }