Add propagated flag to start span to start span with propagated paren…

…t spanContext
thundra-io · Dec 13, 2018 · 88e78f5 · 88e78f5
1 parent abebffb
commit 88e78f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/opentracing/Tracer.ts b/src/opentracing/Tracer.ts
@@ -92,7 +92,7 @@ class ThundraTracer extends Tracer {
 
     const parentContext = fields.parentContext ? fields.parentContext : Utils.getParentContext(fields.references);
 
-    if (parentContext && !this.activeSpans.get(parentContext.spanId)) {
+    if (!fields.propagated && (parentContext && !this.activeSpans.get(parentContext.spanId))) {
       throw new Error('Invalid spanId : ' + parentContext.spanId);
     }
 

diff --git a/src/plugins/Trace.ts b/src/plugins/Trace.ts
@@ -76,14 +76,15 @@ export class Trace {
         if (propagatedSpanContext) {
             this.pluginContext.transactionId = Utils.getConfiguration(
                 envVariableKeys.THUNDRA_LAMBDA_TRACE_USE_PROPAGATED_TRANSACTION_ID) === 'true' ?
-                originalContext.awsRequestId : propagatedSpanContext.transactionId;
+                propagatedSpanContext.transactionId : originalContext.awsRequestId;
 
             this.pluginContext.traceId = propagatedSpanContext.traceId;
             this.pluginContext.spanId = propagatedSpanContext.spanId;
 
             this.tracer.transactionId = this.pluginContext.transactionId;
 
             this.rootSpan = this.tracer._startSpan(originalContext.functionName, {
+                propagated : true,
                 parentContext : propagatedSpanContext,
                 rootTraceId: this.pluginContext.traceId,
                 domainName: DomainNames.API,