Activity Execute/Compensate exceptions should be logged!

RJSonnenberg · May 25, 2023 · 8ef45cf · 8ef45cf
1 parent e450919
commit 8ef45cf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/MassTransit/Courier/CompensateActivityHost.cs b/src/MassTransit/Courier/CompensateActivityHost.cs
@@ -42,9 +42,15 @@ public async Task Send(ConsumeContext<RoutingSlip> context, IPipe<ConsumeContext
 
                     await result.Evaluate().ConfigureAwait(false);
                 }
-                catch (Exception ex)
+                catch (Exception exception)
                 {
-                    await compensateContext.Failed(ex).Evaluate().ConfigureAwait(false);
+                    await context.NotifyFaulted(timer.Elapsed, TypeCache<TActivity>.ShortName, exception).ConfigureAwait(false);
+
+                    activity?.AddExceptionEvent(exception);
+
+                    instrument?.AddException(exception);
+
+                    await compensateContext.Failed(exception).Evaluate().ConfigureAwait(false);
                 }
 
                 await context.NotifyConsumed(timer.Elapsed, TypeCache<TActivity>.ShortName).ConfigureAwait(false);

diff --git a/src/MassTransit/Courier/ExecuteActivityHost.cs b/src/MassTransit/Courier/ExecuteActivityHost.cs
@@ -49,6 +49,11 @@ public async Task Send(ConsumeContext<RoutingSlip> context, IPipe<ConsumeContext
                     if (executeContext.Result == null || !executeContext.Result.IsFaulted(out var faultException) || faultException != exception)
                         executeContext.Result = executeContext.Faulted(exception);
 
+                    await context.NotifyFaulted(timer.Elapsed, TypeCache<TActivity>.ShortName, exception).ConfigureAwait(false);
+
+                    activity?.AddExceptionEvent(exception);
+                    instrument?.AddException(exception);
+
                     await executeContext.Result.Evaluate().ConfigureAwait(false);
                 }