Hardening Activity usage for listener attached / not attached

src/Jasper.Testing/Runtime/CommandBusTests.cs

@@ -12,8 +12,8 @@ public class CommandBusTests
  [Fact]
  public void use_current_activity_root_id_as_correlation_id_if_exists()
  {
- var activity = JasperTracing.StartExecution("foo", ObjectMother.Envelope());
- activity.Start();
+ var activity = new Activity("process");
+ activity?.Start();
 
  try
  {
@@ -22,7 +22,7 @@ public void use_current_activity_root_id_as_correlation_id_if_exists()
  }
  finally
  {
- activity.Stop();
+ activity?.Stop();
  }
  }
 }

src/Jasper.Testing/Runtime/JasperTracingTests.cs

@@ -21,7 +21,8 @@ public when_creating_an_execution_activity()
  theEnvelope.CorrelationId = Guid.NewGuid().ToString();
  theEnvelope.Destination = new Uri("tcp:https://localhost:6666");
 
- theActivity = JasperTracing.StartExecution("process", theEnvelope);
+ theActivity = new Activity("process");
+ theEnvelope.WriteTags(theActivity);
  }
 
  [Fact]

src/Jasper/Envelope.Internals.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Threading.Tasks;
+using Jasper.Runtime;
 using Jasper.Serialization;
 using Jasper.Transports;
 using Jasper.Transports.Sending;
@@ -168,4 +170,16 @@ internal static Envelope ForPing(Uri destination)
  Destination = destination
  };
  }
+
+ internal void WriteTags(Activity activity)
+ {
+ activity.MaybeSetTag(JasperTracing.MessagingSystem, Destination?.Scheme); // This needs to vary
+ activity.MaybeSetTag(JasperTracing.MessagingDestination, Destination);
+ activity.SetTag(JasperTracing.MessagingMessageId, Id);
+ activity.SetTag(JasperTracing.MessagingConversationId, CorrelationId);
+ activity.SetTag(JasperTracing.MessageType, MessageType); // Jasper specific
+ activity.MaybeSetTag(JasperTracing.PayloadSizeBytes, MessagePayloadSize);
+
+ activity.MaybeSetTag(JasperTracing.MessagingCausationId, CausationId);
+ }
 }

src/Jasper/Runtime/HandlerPipeline.cs

@@ -49,7 +49,7 @@ public Task InvokeAsync(Envelope envelope, IChannelCallback channel)
  return InvokeAsync(envelope, channel, activity);
  }
 
- public async Task InvokeAsync(Envelope envelope, IChannelCallback channel, Activity activity)
+ public async Task InvokeAsync(Envelope envelope, IChannelCallback channel, Activity? activity)
  {
  try
  {
@@ -77,7 +77,7 @@ public async Task InvokeAsync(Envelope envelope, IChannelCallback channel, Activ
  }
  finally
  {
- activity.Stop();
+ activity?.Stop();
  }
  }
 
@@ -114,7 +114,7 @@ public async Task InvokeNowAsync(Envelope envelope, CancellationToken cancellati
  {
  Logger.ExecutionFinished(envelope);
  _contextPool.Return(context);
- activity.Stop();
+ activity?.Stop();
  }
  }
 

src/Jasper/Runtime/JasperTracing.cs

@@ -32,18 +32,13 @@ internal static class JasperTracing
 
 
 
- public static Activity StartExecution(string spanName, Envelope envelope,
+ public static Activity? StartExecution(string spanName, Envelope envelope,
  ActivityKind kind = ActivityKind.Internal)
  {
- var activity = ActivitySource.StartActivity(spanName, kind) ?? new Activity(spanName);
- activity.MaybeSetTag(MessagingSystem, envelope.Destination?.Scheme); // This needs to vary
- activity.MaybeSetTag(MessagingDestination, envelope.Destination);
- activity.SetTag(MessagingMessageId, envelope.Id);
- activity.SetTag(MessagingConversationId, envelope.CorrelationId);
- activity.SetTag(MessageType, envelope.MessageType); // Jasper specific
- activity.MaybeSetTag(PayloadSizeBytes, envelope.MessagePayloadSize);
-
- activity.MaybeSetTag(MessagingCausationId, envelope.CausationId);
+ var activity = ActivitySource.StartActivity(spanName, kind);
+ if (activity == null) return null;
+
+ envelope.WriteTags(activity);
 
  return activity;
  }

src/Jasper/Runtime/WorkerQueues/DurableReceiver.cs

@@ -150,7 +150,7 @@ public async ValueTask ReceivedAsync(IListener listener, Envelope envelope)
  }
  finally
  {
- activity.Stop();
+ activity?.Stop();
  }
  }
 

src/Jasper/Runtime/WorkerQueues/InlineReceiver.cs

@@ -66,7 +66,7 @@ public async ValueTask ReceivedAsync(IListener listener, Envelope envelope)
  }
  finally
  {
- activity.Stop();
+ activity?.Stop();
  }
  }
 }