fix: SpanContext var name, Timestamp in secs

HazAT · kamilogorek · commit cff9c0ed2c3f · 2019-11-01T11:26:35.000+01:00
diff --git a/packages/hub/src/hub.ts b/packages/hub/src/hub.ts
@@ -389,17 +389,17 @@ export class Hub implements HubInterface {
   /**
    * @inheritDoc
    */
-  public startSpan(SpanContext?: SpanContext): Span {
+  public startSpan(spanContext?: SpanContext): Span {
     const scope = this.getScope();
 
     if (scope) {
       const span = scope.getSpan();
       if (span) {
-        return span.newSpan(SpanContext);
+        return span.newSpan(spanContext);
       }
     }
 
-    return new Span(SpanContext);
+    return new Span(spanContext);
   }
 
   /**
diff --git a/packages/hub/src/span.ts b/packages/hub/src/span.ts
@@ -30,7 +30,7 @@ export class Span implements SpanInterface, SpanContext {
   /**
    * Timestamp when the span was created.
    */
-  public readonly startTimestamp: number = new Date().getTime();
+  public readonly startTimestamp: number = new Date().getTime() / 1000;
 
   /**
    * Finish timestamp of the span.
@@ -67,44 +67,44 @@ export class Span implements SpanInterface, SpanContext {
    */
   public finishedSpans: Span[] = [];
 
-  public constructor(SpanContext?: SpanContext) {
-    if (!SpanContext) {
+  public constructor(spanContext?: SpanContext) {
+    if (!spanContext) {
       return this;
     }
 
-    if (SpanContext.traceId) {
-      this._traceId = SpanContext.traceId;
+    if (spanContext.traceId) {
+      this._traceId = spanContext.traceId;
     }
-    if (SpanContext.spanId) {
-      this._spanId = SpanContext.spanId;
+    if (spanContext.spanId) {
+      this._spanId = spanContext.spanId;
     }
-    if (SpanContext.parentSpanId) {
-      this._parentSpanId = SpanContext.parentSpanId;
+    if (spanContext.parentSpanId) {
+      this._parentSpanId = spanContext.parentSpanId;
     }
-    if (SpanContext.sampled) {
-      this.sampled = SpanContext.sampled;
+    if (spanContext.sampled) {
+      this.sampled = spanContext.sampled;
     }
-    if (SpanContext.transaction) {
-      this.transaction = SpanContext.transaction;
+    if (spanContext.transaction) {
+      this.transaction = spanContext.transaction;
     }
-    if (SpanContext.op) {
-      this.op = SpanContext.op;
+    if (spanContext.op) {
+      this.op = spanContext.op;
     }
-    if (SpanContext.description) {
-      this.description = SpanContext.description;
+    if (spanContext.description) {
+      this.description = spanContext.description;
     }
-    if (SpanContext.data) {
-      this.data = SpanContext.data;
+    if (spanContext.data) {
+      this.data = spanContext.data;
     }
-    if (SpanContext.tags) {
-      this.tags = SpanContext.tags;
+    if (spanContext.tags) {
+      this.tags = spanContext.tags;
     }
   }
 
   /** JSDoc */
-  public newSpan(SpanContext?: Pick<SpanContext, Exclude<keyof SpanContext, 'spanId'>>): Span {
+  public newSpan(spanContext?: Pick<SpanContext, Exclude<keyof SpanContext, 'spanId'>>): Span {
     const span = new Span({
-      ...SpanContext,
+      ...spanContext,
       parentSpanId: this._spanId,
       sampled: this.sampled,
       traceId: this._traceId,
@@ -121,7 +121,7 @@ export class Span implements SpanInterface, SpanContext {
    */
   public static fromTraceparent(
     traceparent: string,
-    SpanContext?: Pick<SpanContext, Exclude<keyof SpanContext, 'spanId' | 'sampled' | 'traceid'>>,
+    spanContext?: Pick<SpanContext, Exclude<keyof SpanContext, 'spanId' | 'sampled' | 'traceid'>>,
   ): Span | undefined {
     const matches = traceparent.match(TRACEPARENT_REGEXP);
     if (matches) {
@@ -133,7 +133,7 @@ export class Span implements SpanInterface, SpanContext {
       }
 
       return new Span({
-        ...SpanContext,
+        ...spanContext,
         parentSpanId: matches[2],
         sampled,
         traceId: matches[1],
@@ -146,7 +146,7 @@ export class Span implements SpanInterface, SpanContext {
    * Sets the finish timestamp on the current span
    */
   public finish(): void {
-    this.timestamp = new Date().getTime();
+    this.timestamp = new Date().getTime() / 1000;
     this.finishedSpans.push(this);
   }
 
diff --git a/packages/types/src/hub.ts b/packages/types/src/hub.ts
@@ -173,7 +173,7 @@ export interface Hub {
   traceHeaders(): { [key: string]: string };
 
   /** JSDoc */
-  startSpan(SpanContext?: SpanContext): Span;
+  startSpan(spanContext?: SpanContext): Span;
 
   /** JSDoc */
   finishSpan(span: Span): string | undefined;

Original file line number	Diff line number	Diff line change
`@@ -389,17 +389,17 @@ export class Hub implements HubInterface {`
`389`	`389`	`/**`
`390`	`390`	`* @inheritDoc`
`391`	`391`	`*/`
`392`		`- public startSpan(SpanContext?: SpanContext): Span {`
	`392`	`+ public startSpan(spanContext?: SpanContext): Span {`
`393`	`393`	`const scope = this.getScope();`
`394`	`394`
`395`	`395`	`if (scope) {`
`396`	`396`	`const span = scope.getSpan();`
`397`	`397`	`if (span) {`
`398`		`- return span.newSpan(SpanContext);`
	`398`	`+ return span.newSpan(spanContext);`
`399`	`399`	`}`
`400`	`400`	`}`
`401`	`401`
`402`		`- return new Span(SpanContext);`
	`402`	`+ return new Span(spanContext);`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`/**`