fix: Sampled, parent span id and tests

HazAT · kamilogorek · commit 8e8de119feb6 · 2019-11-01T11:25:42.000+01:00
diff --git a/packages/hub/src/span.ts b/packages/hub/src/span.ts
@@ -25,7 +25,7 @@ export class Span implements SpanInterface, SpanProps {
   /**
    * Has the sampling decision been made?
    */
-  public readonly sampled?: string;
+  public readonly sampled?: boolean;
 
   /**
    * Timestamp when the span was created.
@@ -125,12 +125,18 @@ export class Span implements SpanInterface, SpanProps {
   ): Span | undefined {
     const matches = traceparent.match(TRACEPARENT_REGEXP);
     if (matches) {
-      const [traceId, spanId, sampled] = matches;
+      let sampled: boolean | undefined;
+      if (matches[3] === '1') {
+        sampled = true;
+      } else if (matches[3] === '0') {
+        sampled = false;
+      }
+
       return new Span({
         ...spanProps,
+        parentSpanId: matches[2],
         sampled,
-        spanId,
-        traceId,
+        traceId: matches[1],
       });
     }
     return undefined;
@@ -148,7 +154,11 @@ export class Span implements SpanInterface, SpanProps {
    * @inheritDoc
    */
   public toTraceparent(): string {
-    return `${this._traceId}-${this._spanId}${this.sampled ? '-1' : '0'}`;
+    let sampledString = '';
+    if (this.sampled !== undefined) {
+      sampledString = this.sampled ? '-1' : '-0';
+    }
+    return `${this._traceId}-${this._spanId}${sampledString}`;
   }
 
   /**
diff --git a/packages/hub/test/span.test.ts b/packages/hub/test/span.test.ts
@@ -8,8 +8,8 @@ describe('Span', () => {
   describe('fromTraceparent', () => {
     test('no sample', () => {
       const from = Span.fromTraceparent('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb') as any;
-      expect(from._parent._traceId).toEqual('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
-      expect(from._parent._spanId).toEqual('bbbbbbbbbbbbbbbb');
+
+      expect(from._parentSpanId).toEqual('bbbbbbbbbbbbbbbb');
       expect(from._traceId).toEqual('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
       expect(from._spanId).not.toEqual('bbbbbbbbbbbbbbbb');
       expect(from.sampled).toBeUndefined();
@@ -30,16 +30,19 @@ describe('Span', () => {
   });
 
   test('toJSON', () => {
-    expect(JSON.stringify(new Span('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'bbbbbbbbbbbbbbbb'))).toEqual(
-      `{"span_id":"bbbbbbbbbbbbbbbb","trace_id":"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}`,
+    const span = JSON.parse(
+      JSON.stringify(new Span({ traceId: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', spanId: 'bbbbbbbbbbbbbbbb' })),
     );
+    expect(span).toHaveProperty('span_id', 'bbbbbbbbbbbbbbbb');
+    expect(span).toHaveProperty('trace_id', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
   });
 
   test('toJSON with parent', () => {
-    const spanA = new Span('a', 'b');
-    const spanB = new Span('c', 'd', false, spanA);
-    expect(JSON.stringify(spanB)).toEqual(
-      `{"parent":{"span_id":"b","trace_id":"a"},"sampled":false,"span_id":"d","trace_id":"c"}`,
-    );
+    const spanA = new Span({ traceId: 'a', spanId: 'b' }) as any;
+    const spanB = new Span({ traceId: 'c', spanId: 'd', sampled: false, parentSpanId: spanA._spanId });
+    const serialized = JSON.parse(JSON.stringify(spanB));
+    expect(serialized).toHaveProperty('parent_span_id', 'b');
+    expect(serialized).toHaveProperty('span_id', 'd');
+    expect(serialized).toHaveProperty('trace_id', 'c');
   });
 });
diff --git a/packages/types/src/span.ts b/packages/types/src/span.ts
@@ -13,7 +13,7 @@ export interface SpanProps {
   description?: string;
   op?: string;
   parentSpanId?: string;
-  sampled?: string;
+  sampled?: boolean;
   spanId?: string;
   traceId?: string;
   transaction?: string;
