It got worse...

Eventuous · Jun 15, 2022 · 82b8f6c · 82b8f6c
1 parent 35cf1f6
commit 82b8f6c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Core/src/Eventuous.Subscriptions/Diagnostics/SubscriptionActivity.cs b/src/Core/src/Eventuous.Subscriptions/Diagnostics/SubscriptionActivity.cs
@@ -14,7 +14,7 @@ public static class SubscriptionActivity {
         IMessageConsumeContext                      context,
         IEnumerable<KeyValuePair<string, object?>>? tags = null
     ) {
-        context.ParentContext ??= GetParentContext(context);
+        context.ParentContext = GetParentContext(context);
         var activity = Create(name, activityKind, context.ParentContext, tags);
         return activity?.SetContextTags(context);
     }
@@ -44,6 +44,8 @@ public static class SubscriptionActivity {
     }
 
     static ActivityContext? GetParentContext(IBaseConsumeContext context) {
+        if (Activity.Current != null) return Activity.Current.Context;
+
         if (context.Items.TryGetItem<Activity>(ContextItemKeys.Activity, out var parentActivity)) {
             return parentActivity?.Context;
         }