- add back follows from boolean

- remove !! operator in 'isValid'
jaegertracing · Nov 11, 2016 · 5ee3ef3 · 5ee3ef3
1 parent 7e86cc9
commit 5ee3ef3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/span_context.js b/src/span_context.js
@@ -55,8 +55,8 @@ export default class SpanContext {
     }
 
     get isValid(): boolean {
-        return !!(this._traceId || this._traceIdStr) &&
-               !!(this._spanId || this._spanIdStr);
+        return (this._traceId || this._traceIdStr) &&
+               (this._spanId || this._spanIdStr);
     }
 
     get traceId(): any {

diff --git a/src/tracer.js b/src/tracer.js
@@ -184,18 +184,22 @@ export default class Tracer {
             startTime = Utils.getTimestampMicros();
         }
 
+        // This boolean ensures that a parent with reference type 'follows_from'
+        // is selected when no childOf is passed in.
+        let followsFromIsParent = false;
         let parent: ?SpanContext = options.childOf instanceof Span ? options.childOf.context(): options.childOf;
         // If there is no childOf in options, then search list of references
         for (let i = 0; i < options.references.length; i++) {
             let ref: Reference = options.references[i];
             if (ref.type() === opentracing.REFERENCE_CHILD_OF) {
-                if (!parent) {
+                if (!parent || followsFromIsParent) {
                     parent = ref.referencedContext();
                     break;
                 }
             } else if (ref.type() === opentracing.REFERENCE_FOLLOWS_FROM) {
                 if (!parent) {
                     parent = ref.referencedContext();
+                    followsFromIsParent = true;
                 }
             }
         }