correctly set parent activity as remote (#6585) (#6588)

Particular · Nov 8, 2022 · cfab2b5 · cfab2b5
1 parent 89fd67b
commit cfab2b5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/NServiceBus.Core/OpenTelemetry/Tracing/ActivityFactory.cs b/src/NServiceBus.Core/OpenTelemetry/Tracing/ActivityFactory.cs
@@ -27,7 +27,10 @@ public Activity StartIncomingActivity(MessageContext context)
         }
         else if (context.Headers.TryGetValue(Headers.DiagnosticsTraceParent, out var sendSpanId) && ActivityContext.TryParse(sendSpanId, null, out var sendSpanContext)) // otherwise directly create child from logical send
         {
-            activity = ActivitySources.Main.CreateActivity(name: ActivityNames.IncomingMessageActivityName, ActivityKind.Consumer, sendSpanContext);
+            // TryParse doesn't have an overload that supports changing the isRemote setting yet
+            // This can be removed with .NET 7, see https://github.com/dotnet/runtime/issues/42575
+            var remoteParentActivityContext = new ActivityContext(sendSpanContext.TraceId, sendSpanContext.SpanId, sendSpanContext.TraceFlags, sendSpanContext.TraceState, isRemote: true);
+            activity = ActivitySources.Main.CreateActivity(name: ActivityNames.IncomingMessageActivityName, ActivityKind.Consumer, remoteParentActivityContext);
         }
         else // otherwise start new trace
         {