From e5dd03bd75f4d9ce9d7af65df7edc6e6dd5783e6 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Sun, 10 Mar 2024 12:13:45 +1100
Subject: [PATCH] move to local time for timestamps

---
 .../MessageAudit/LogIncomingBehavior.cs               |  4 ++--
 .../SagaAudit/CaptureSagaStateBehavior.cs             |  4 ++--
 src/Tests/IntegrationTests.Handler.verified.txt       |  4 ++--
 src/Tests/ModuleInit.cs                               | 11 -----------
 src/Tests/TestConfig/ModuleInitializer.cs             |  5 ++++-
 5 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 src/Tests/ModuleInit.cs

diff --git a/src/NServiceBus.Serilog/MessageAudit/LogIncomingBehavior.cs b/src/NServiceBus.Serilog/MessageAudit/LogIncomingBehavior.cs
index 31f8c6e6..b016eeb4 100644
--- a/src/NServiceBus.Serilog/MessageAudit/LogIncomingBehavior.cs
+++ b/src/NServiceBus.Serilog/MessageAudit/LogIncomingBehavior.cs
@@ -34,9 +34,9 @@ public override async Task Invoke(IIncomingLogicalMessageContext context, Func<T
     {
         var message = context.Message;
         var logger = context.Logger();
-        var startTime = DateTimeOffset.UtcNow;
+        var startTime = DateTimeOffset.Now;
         await next();
-        var finishTime = DateTimeOffset.UtcNow;
+        var finishTime = DateTimeOffset.Now;
         var properties = new List<LogEventProperty>
         {
             new("StartTime", new ScalarValue(startTime.ToLogString())),
diff --git a/src/NServiceBus.Serilog/SagaAudit/CaptureSagaStateBehavior.cs b/src/NServiceBus.Serilog/SagaAudit/CaptureSagaStateBehavior.cs
index c91d3c2d..a6dce210 100644
--- a/src/NServiceBus.Serilog/SagaAudit/CaptureSagaStateBehavior.cs
+++ b/src/NServiceBus.Serilog/SagaAudit/CaptureSagaStateBehavior.cs
@@ -27,11 +27,11 @@ public override async Task Invoke(IInvokeHandlerContext context, Func<Task> next
 
         var sagaAudit = new SagaUpdatedMessage();
         context.Extensions.Set(sagaAudit);
-        var startTime = DateTimeOffset.UtcNow;
+        var startTime = DateTimeOffset.Now;
 
         await next();
 
-        var finishTime = DateTimeOffset.UtcNow;
+        var finishTime = DateTimeOffset.Now;
 
         if (!context.Extensions.TryGet(out ActiveSagaInstance activeSagaInstance))
         {
diff --git a/src/Tests/IntegrationTests.Handler.verified.txt b/src/Tests/IntegrationTests.Handler.verified.txt
index 0d02c032..4d833d76 100644
--- a/src/Tests/IntegrationTests.Handler.verified.txt
+++ b/src/Tests/IntegrationTests.Handler.verified.txt
@@ -41,8 +41,8 @@
         ProcessingEndpoint: SerilogTestsStartHandler,
         ReplyToAddress: SerilogTestsStartHandler,
         SourceContext: StartHandler,
-        StartTime: DateTimeOffset_1,
-        TimeSent: DateTimeOffset_2
+        StartTime: DateTimeOffset_2,
+        TimeSent: DateTimeOffset_3
       }
     },
     {
diff --git a/src/Tests/ModuleInit.cs b/src/Tests/ModuleInit.cs
deleted file mode 100644
index 7a71bacc..00000000
--- a/src/Tests/ModuleInit.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-public static class ModuleInit
-{
-    [ModuleInitializer]
-    public static void Init()
-    {
-        VerifierSettings
-            .ScrubMember("ElapsedTime");
-        VerifierSettings.AddExtraDateTimeOffsetFormat("yyyy-MM-ddTHH:mm:ss.fffzz");
-        VerifierSettings.InitializePlugins();
-    }
-}
\ No newline at end of file
diff --git a/src/Tests/TestConfig/ModuleInitializer.cs b/src/Tests/TestConfig/ModuleInitializer.cs
index 000afc36..0b8255ca 100644
--- a/src/Tests/TestConfig/ModuleInitializer.cs
+++ b/src/Tests/TestConfig/ModuleInitializer.cs
@@ -16,6 +16,9 @@ public static void Initialize()
             _.Converters.Add(new ScalarValueConverter());
             _.Converters.Add(new PropertyEnricherConverter());
         });
-        VerifierSettings.AddExtraDatetimeOffsetFormat("yyyy-MM-dd HH:mm:ss:ffffff Z");
+        VerifierSettings.AddExtraDateTimeOffsetFormat("yyyy-MM-dd HH:mm:ss:ffffff Z");
+        VerifierSettings
+            .ScrubMember("ElapsedTime");
+        VerifierSettings.AddExtraDateTimeOffsetFormat("yyyy-MM-ddTHH:mm:ss.fffzz");
     }
 }
\ No newline at end of file