[server] tracing: fix creation of "FOLLOWS_FROM" reference

gitpod-io · Dec 15, 2021 · 38c3d8e · 38c3d8e
1 parent af13739
commit 38c3d8e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/components/gitpod-protocol/src/util/tracing.ts b/components/gitpod-protocol/src/util/tracing.ts
@@ -22,13 +22,14 @@ export type TraceContextWithSpan = TraceContext & {
 
 
 export namespace TraceContext {
-    export function startSpan(operation: string, parentCtx?: TraceContext, ...referencedSpans: (opentracing.Span | opentracing.SpanContext | undefined)[]): opentracing.Span {
+    export function startSpan(operation: string, parentCtx?: TraceContext, ...referencedSpans: (opentracing.Span | undefined)[]): opentracing.Span {
         const options: opentracing.SpanOptions = {};
         if (parentCtx) {
             options.childOf = parentCtx.span;
         }
         if (referencedSpans) {
-            options.references = referencedSpans.filter(s => s !== undefined).map(s => followsFrom(s!));
+            // note: allthough followsForm's type says it takes 'opentracing.Span | opentracing.SpanContext', it only works with SpanContext (typing mismatch)
+            options.references = referencedSpans.filter(s => s !== undefined).map(s => followsFrom(s!.context()));
         }
 
         return opentracing.globalTracer().startSpan(operation, options);