feat: Add traceId + references

Author: HazAT

packages/opentracing/src/index.ts

@@ -1,14 +1,3 @@
 export { Span } from './span';
 export { Tracer } from './tracer';
-export { SessionTracking } from './sessiontracking';
-export { initGlobalTracer } from 'opentracing/lib/global_tracer';
-
-import { globalTracer as otGlobalTracer } from 'opentracing/lib/global_tracer';
-import { Tracer } from './tracer';
-
-/**
- * Return the global set Tracer
- */
-export function globalTracer(): Tracer {
-  return (otGlobalTracer() as unknown) as Tracer;
-}
+export { OpenTracingIntegration as Integration } from './opentracingintegration';

packages/opentracing/src/opentracingintegration.ts

@@ -0,0 +1,45 @@
+import { Integration } from '@sentry/types';
+import { Tracer } from './tracer';
+
+/**
+ * Session Tracking Integration
+ */
+export class OpenTracingIntegration implements Integration {
+  /**
+   * @inheritDoc
+   */
+  public name: string = OpenTracingIntegration.id;
+
+  /**
+   * @inheritDoc
+   */
+  public static id: string = 'OpenTracingIntegration';
+
+  /**
+   * Constructor for OpenTracingIntegration
+   *
+   * @param traceId Optional TraceId that should be set into the integration.
+   * @param tracer Optional custom tracer that should be used.
+   */
+  public constructor(traceId?: string, private readonly tracer: Tracer = new Tracer()) {
+    tracer.setTraceId(traceId);
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public setupOnce(): void {
+    const span = this.tracer.startSpan('sdk.init');
+    span.finish();
+    setTimeout(() => {
+      this.tracer.flush();
+    });
+  }
+
+  /**
+   * Returns the Tracer which can be used as the parent.
+   */
+  public getTracer(): Tracer {
+    return this.tracer;
+  }
+}

packages/opentracing/src/sessiontracking.ts

@@ -1,5 +1,5 @@
 import { Span as SpanInterface } from '@sentry/types';
-import { Span as otSpan } from 'opentracing/lib/span';
+import * as opentracing from 'opentracing';
 import { SpanContext } from './spancontext';
 import { Tracer } from './tracer';
 
@@ -10,7 +10,7 @@ interface Log {
 }
 
 /** JSDoc */
-export class Span extends otSpan implements SpanInterface {
+export class Span extends opentracing.Span implements SpanInterface {
   private finishTime: number = 0;
 
   private readonly logs: Log[] = [];
@@ -27,6 +27,7 @@ export class Span extends otSpan implements SpanInterface {
     private readonly usedTracer: Tracer,
     private operation: string,
     private readonly spanContext: SpanContext,
+    private readonly references?: opentracing.Reference[],
     private readonly startTime: number = Date.now(),
   ) {
     super();
@@ -107,9 +108,15 @@ export class Span extends otSpan implements SpanInterface {
   /**
    * @inheritdoc
    */
-  public toJSON(): any {
-    // TODO
-    console.log('ajajajajaj');
-    return 'ababab';
+  public toJSON(): object {
+    return {
+      finishTime: this.finishTime || undefined,
+      logs: this.logs,
+      references: this.references,
+      span_id: this.spanContext.spanId,
+      startTime: this.startTime,
+      tags: this.tags,
+      trace_id: this.spanContext.traceId,
+    };
   }
 }

packages/opentracing/src/span.ts

@@ -4,8 +4,8 @@ import { uuid4 } from '@sentry/utils/misc';
  */
 export class SpanContext {
   public constructor(
-    private readonly traceId: string,
-    private readonly spanId: string = uuid4(), // private readonly parentId: string,
+    public readonly traceId?: string,
+    public readonly spanId: string = uuid4(), // private readonly parentId: string,
   ) {}
 
   /**

packages/opentracing/src/spancontext.ts

@@ -1,30 +1,47 @@
-import { SpanOptions, Tracer as otTracer } from 'opentracing/lib/tracer';
+import { getCurrentHub } from '@sentry/hub';
+import * as opentracing from 'opentracing';
 import { Span } from './span';
 import { SpanContext } from './spancontext';
 
 /**
  * JSDoc
  */
-export class Tracer extends otTracer {
-  private readonly spans: Span[] = [];
+export class Tracer extends opentracing.Tracer {
+  private traceId?: string = undefined;
+  private spans: Span[] = [];
 
   /**
    * Called by public method startSpan
    * @param name Name of the operation
    * @param fields Options for the span {@link opentracing.SpanOptions}
    */
-  protected _startSpan(name: string, fields: SpanOptions): Span {
-    // TODO: Traceid
-    const span = new Span(this, name, new SpanContext('1'), fields.startTime);
+  protected _startSpan(name: string, fields: opentracing.SpanOptions): Span {
+    const span = new Span(this, name, new SpanContext(this.traceId), fields.references, fields.startTime);
     this.spans.push(span);
-    // TODO: Implement childof
     return span;
   }
 
   /**
    * @inheritdoc
    */
-  public startSpan(name: string, options: SpanOptions = {}): Span {
+  public startSpan(name: string, options: opentracing.SpanOptions = {}): Span {
     return (super.startSpan(name, options) as unknown) as Span;
   }
+
+  /**
+   * Sets the current traceId, all new created spans will receive the traceId.
+   *
+   * @param traceId A string representing the traceId
+   */
+  public setTraceId(traceId?: string): void {
+    this.traceId = traceId;
+  }
+
+  /**
+   * Flushes all spans and sends an event
+   */
+  public flush(): void {
+    getCurrentHub().captureEvent({ spans: [...this.spans] });
+    this.spans = [];
+  }
 }

packages/opentracing/src/tracer.ts

@@ -1,5 +1,5 @@
 /** JSDoc */
 export interface Span {
   /** JSDoc */
-  toJSON(): string;
+  toJSON(): object;
 }