fix: doing logging the right way

Elders · Sep 12, 2023 · aff0b6a · aff0b6a
1 parent 8eb0d98
commit aff0b6a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/Elders.Cronus/Projections/Rebuilding/RebuildProjection_Job.cs b/src/Elders.Cronus/Projections/Rebuilding/RebuildProjection_Job.cs
@@ -11,6 +11,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using System.Collections.Concurrent;
 using Elders.Cronus.Projections.Cassandra.EventSourcing;
+using Elders.Cronus.Workflow;
 
 namespace Elders.Cronus.Projections.Rebuilding
 {
@@ -24,6 +25,14 @@ public sealed class RebuildProjection_Job : CronusJob<RebuildProjection_JobData>
         private readonly IProjectionWriter projectionWriter;
         private readonly ProgressTracker progressTracker;
         private readonly ProjectionVersionHelper projectionVersionHelper;
+        private static readonly Action<ILogger, string, uint, Exception> LogProjectionProgress =
+            LoggerMessage.Define<string, uint>(LogLevel.Information, CronusLogEvent.CronusJobOk, "Rebuild projection job progress for version {cronus_projection_version}: {counter}");
+
+        private static readonly Action<ILogger, string, Exception> LogRebuildProjectionCanceled =
+            LoggerMessage.Define<string>(LogLevel.Information, CronusLogEvent.CronusJobError, "The rebuild job for version {cronus_projection_version} was cancelled.");
+
+        private static readonly Action<ILogger, string, uint, Exception> LogRebuildProjectionCompleted =
+            LoggerMessage.Define<string, uint>(LogLevel.Information, CronusLogEvent.CronusJobOk, "The rebuild job for version {cronus_projection_version} has completed. Total events: {counter}");
 
         public RebuildProjection_Job(
             IInitializableProjectionStore projectionStoreInitializer,
@@ -126,7 +135,7 @@ await projectionWriter
                         Data = await cluster.PingAsync(Data);
                     }
 
-                    logger.Info(() => "Rebuild projection job progress for version {version}: {counter}", version, counter);
+                    LogProjectionProgress(logger, version.ToString(), counter, null);
                 }
             };
 
@@ -139,7 +148,7 @@ await projectionWriter
                     if (Data.IsCanceled == false)
                         await CancelJobAsync(cluster).ConfigureAwait(false);
 
-                    logger.Info(() => "The rebuild job for version {version} was cancelled.", version);
+                    LogRebuildProjectionCanceled(logger, version.ToString(), null);
                     return JobExecutionStatus.Canceled;
                 }
 
@@ -175,7 +184,7 @@ await projectionWriter
             var finishSignal = progressTracker.GetProgressFinishedSignal();
             signalPublisher.Publish(finishSignal);
 
-            logger.Info(() => "The rebuild job for version {version} has completed.", version);
+            LogRebuildProjectionCompleted(logger, version.ToString(), counter, null);
             return JobExecutionStatus.Completed;
         }
 

diff --git a/src/Elders.Cronus/Workflow/DiagnosticsWorkflow.cs b/src/Elders.Cronus/Workflow/DiagnosticsWorkflow.cs
@@ -17,6 +17,8 @@ internal static class CronusLogEvent
         public static EventId CronusWorkflowHandle = new EventId(74001, "CronusWorkflowHandle");
         public static EventId CronusProjectionRead = new EventId(74020, "CronusProjectionRead");
         public static EventId CronusProjectionWrite = new EventId(74021, "CronusProjectionWrite");
+        public static EventId CronusJobOk = new EventId(74100, "CronusJobOk");
+        public static EventId CronusJobError = new EventId(74101, "CronusJobError");
     }
 
     public class DiagnosticsWorkflow<TContext> : Workflow<TContext> where TContext : HandleContext