Use TimeSpan instead of milliseconds int (#3292)

* Use TimeSpan instead of milisecond int Feature #3220 * Fix Extensions * Fix SQL Timestamp mapping * Address Comments
BrighterCommand · Sep 3, 2024 · 2f68e3c · 2f68e3c
1 parent 6ce26a8
commit 2f68e3c
Show file tree

Hide file tree

Showing 72 changed files with 260 additions and 260 deletions.
diff --git a/samples/TaskQueue/RMQTaskQueue/GreetingsSender/Program.cs b/samples/TaskQueue/RMQTaskQueue/GreetingsSender/Program.cs
@@ -79,7 +79,7 @@ static void Main(string[] args)
                 {
                     configure.ProducerRegistry = producerRegistry;
                     configure.MaxOutStandingMessages = 5;
-                    configure.MaxOutStandingCheckIntervalMilliSeconds = 500;
+                    configure.MaxOutStandingCheckInterval = TimeSpan.FromMilliseconds(500);
                 })
                 .AutoFromAssemblies();
 

diff --git a/samples/WebAPI/WebAPI_Dapper/GreetingsWeb/Startup.cs b/samples/WebAPI/WebAPI_Dapper/GreetingsWeb/Startup.cs
@@ -112,7 +112,7 @@ private void ConfigureBrighter(IServiceCollection services)
                 configure.TransactionProvider = makeOutbox.transactionProvider;
                 configure.ConnectionProvider = makeOutbox.connectionProvider;
                 configure.MaxOutStandingMessages = 5;
-                configure.MaxOutStandingCheckIntervalMilliSeconds = 500;
+                configure.MaxOutStandingCheckInterval = TimeSpan.FromMilliseconds(500);
             })
             .AutoFromAssemblies(typeof(AddPersonHandlerAsync).Assembly);
     }

diff --git a/samples/WebAPI/WebAPI_Dapper/Greetings_Sweeper/Program.cs b/samples/WebAPI/WebAPI_Dapper/Greetings_Sweeper/Program.cs
@@ -90,12 +90,12 @@
     configure.TransactionProvider = makeOutbox.transactionProvider;
     configure.ConnectionProvider = makeOutbox.connectionProvider;
     configure.MaxOutStandingMessages = 5;
-    configure.MaxOutStandingCheckIntervalMilliSeconds = 500;
+    configure.MaxOutStandingCheckInterval = TimeSpan.FromMilliseconds(500);
 })
 .UseOutboxSweeper(options =>
 {
     options.TimerInterval = 3;
-    options.MinimumMessageAge = 1000;
+    options.MinimumMessageAge = TimeSpan.FromSeconds(1);
     options.BatchSize = 10;
     options.UseBulk = false;
 });

diff --git a/samples/WebAPI/WebAPI_Dapper/SalutationAnalytics/Program.cs b/samples/WebAPI/WebAPI_Dapper/SalutationAnalytics/Program.cs
@@ -132,7 +132,7 @@ static void ConfigureBrighter(HostBuilderContext hostContext, IServiceCollection
             config.ConnectionProvider = makeOutbox.connectionProvider;
             config.TransactionProvider = makeOutbox.transactionProvider;
             config.MaxOutStandingMessages = 5;
-            config.MaxOutStandingCheckIntervalMilliSeconds = 500;
+            config.MaxOutStandingCheckInterval = TimeSpan.FromMilliseconds(500);
         })
         .AutoFromAssemblies();
 

diff --git a/samples/WebAPI/WebAPI_Dapper/Salutation_Sweeper/Program.cs b/samples/WebAPI/WebAPI_Dapper/Salutation_Sweeper/Program.cs
@@ -88,12 +88,12 @@
     configure.TransactionProvider = makeOutbox.transactionProvider;
     configure.ConnectionProvider = makeOutbox.connectionProvider;
     configure.MaxOutStandingMessages = 5;
-    configure.MaxOutStandingCheckIntervalMilliSeconds = 500;
+    configure.MaxOutStandingCheckInterval = TimeSpan.FromMilliseconds(500);
 })
 .UseOutboxSweeper(options =>
 {
     options.TimerInterval = 3;
-    options.MinimumMessageAge = 1000;
+    options.MinimumMessageAge = TimeSpan.FromSeconds(1);
     options.BatchSize = 10;
     options.UseBulk = false;
 });

diff --git a/samples/WebAPI/WebAPI_Dynamo/GreetingsWeb/Startup.cs b/samples/WebAPI/WebAPI_Dynamo/GreetingsWeb/Startup.cs
@@ -106,7 +106,7 @@ private void ConfigureBrighter(IServiceCollection services)
                  configure.ConnectionProvider = typeof(DynamoDbUnitOfWork);
                  configure.TransactionProvider = typeof(DynamoDbUnitOfWork);
                  configure.MaxOutStandingMessages = 5;
-                 configure.MaxOutStandingCheckIntervalMilliSeconds = 500;
+                 configure.MaxOutStandingCheckInterval = TimeSpan.FromMilliseconds(500);
                  configure.OutBoxBag = new Dictionary<string, object> { { "Topic", "GreetingMade" } };
              })
              .AutoFromAssemblies(typeof(AddPersonHandlerAsync).Assembly);

diff --git a/samples/WebAPI/WebAPI_Dynamo/Greetings_Sweeper/Program.cs b/samples/WebAPI/WebAPI_Dynamo/Greetings_Sweeper/Program.cs
@@ -32,7 +32,7 @@
     configure.ConnectionProvider = typeof(DynamoDbUnitOfWork);
     configure.TransactionProvider = typeof(DynamoDbUnitOfWork);
     configure.MaxOutStandingMessages = 5;
-    configure.MaxOutStandingCheckIntervalMilliSeconds = 500;
+    configure.MaxOutStandingCheckInterval = TimeSpan.FromMilliseconds(500);
     configure.OutBoxBag = new Dictionary<string, object> { { "Topic", "GreetingMade" } };
 });
 

diff --git a/samples/WebAPI/WebAPI_Dynamo/SalutationAnalytics/Program.cs b/samples/WebAPI/WebAPI_Dynamo/SalutationAnalytics/Program.cs
@@ -119,7 +119,7 @@ static void ConfigureBrighter(
                 configure.ConnectionProvider = typeof(DynamoDbUnitOfWork);
                 configure.TransactionProvider = typeof(DynamoDbUnitOfWork);
                 configure.MaxOutStandingMessages = 5;
-                configure.MaxOutStandingCheckIntervalMilliSeconds = 500;
+                configure.MaxOutStandingCheckInterval = TimeSpan.FromMilliseconds(500);
             }
         )
         .AutoFromAssemblies();

diff --git a/samples/WebAPI/WebAPI_EFCore/GreetingsWeb/Startup.cs b/samples/WebAPI/WebAPI_EFCore/GreetingsWeb/Startup.cs
@@ -109,7 +109,7 @@ private void ConfigureBrighter(IServiceCollection services)
                         configure.TransactionProvider = transactionProvider;
                         configure.ConnectionProvider = connectionProvider;
                         configure.MaxOutStandingMessages = 5;
-                        configure.MaxOutStandingCheckIntervalMilliSeconds = 500;
+                        configure.MaxOutStandingCheckInterval = TimeSpan.FromMilliseconds(500);
                     }
                 )
                 .AutoFromAssemblies();

diff --git a/samples/WebAPI/WebAPI_EFCore/Greetings_Sweeper/Program.cs b/samples/WebAPI/WebAPI_EFCore/Greetings_Sweeper/Program.cs
@@ -43,7 +43,7 @@
     configure.TransactionProvider = makeOutbox.transactionProvider;
     configure.ConnectionProvider = makeOutbox.connectionProvider;
     configure.MaxOutStandingMessages = 5;
-    configure.MaxOutStandingCheckIntervalMilliSeconds = 500;
+    configure.MaxOutStandingCheckInterval = TimeSpan.FromMilliseconds(500);
 });
 
 WebApplication app = builder.Build();

diff --git a/samples/WebAPI/WebAPI_EFCore/SalutationAnalytics/Program.cs b/samples/WebAPI/WebAPI_EFCore/SalutationAnalytics/Program.cs
@@ -131,7 +131,7 @@ static void ConfigureBrighter(HostBuilderContext hostContext, IServiceCollection
             configure.TransactionProvider = makeOutbox.transactionProvider;
             configure.ConnectionProvider = makeOutbox.connectionProvider;
             configure.MaxOutStandingMessages = 5;
-            configure.MaxOutStandingCheckIntervalMilliSeconds = 500;
+            configure.MaxOutStandingCheckInterval = TimeSpan.FromMilliseconds(500);
         })
         .AutoFromAssemblies();
 

diff --git a/src/Paramore.Brighter.Extensions.DependencyInjection/ServiceCollectionExtensions.cs b/src/Paramore.Brighter.Extensions.DependencyInjection/ServiceCollectionExtensions.cs
@@ -348,7 +348,7 @@ private static IAmAnExternalBusService BuildExternalBus(IServiceProvider service
                 RequestContextFactory(serviceProvider),
                 busConfiguration.OutboxTimeout,
                 busConfiguration.MaxOutStandingMessages,
-                busConfiguration.MaxOutStandingCheckIntervalMilliSeconds,
+                busConfiguration.MaxOutStandingCheckInterval,
                 busConfiguration.OutBoxBag,
                 busConfiguration.ArchiveBatchSize,
                 busConfiguration.InstrumentationOptions);

diff --git a/src/Paramore.Brighter.Extensions.Hosting/TimedOutboxArchiverOptions.cs b/src/Paramore.Brighter.Extensions.Hosting/TimedOutboxArchiverOptions.cs
@@ -22,6 +22,8 @@ THE SOFTWARE. */
 
 #endregion
 
+using System;
+
 namespace Paramore.Brighter.Extensions.Hosting
 {
     public class TimedOutboxArchiverOptions
@@ -34,6 +36,6 @@ public class TimedOutboxArchiverOptions
         /// <summary>
         /// The minimum age in hours to Archive
         /// </summary>
-        public int MinimumAge { get; set; } = 24;
+        public TimeSpan MinimumAge { get; set; } = TimeSpan.FromHours(24);
     }
 }
diff --git a/src/Paramore.Brighter.Extensions.Hosting/TimedOutboxSweeper.cs b/src/Paramore.Brighter.Extensions.Hosting/TimedOutboxSweeper.cs
@@ -115,7 +115,7 @@ private void Sweep(object state)
                     IAmACommandProcessor commandProcessor = scope.ServiceProvider.GetService<IAmACommandProcessor>();
 
                     var outBoxSweeper = new OutboxSweeper(
-                        millisecondsSinceSent: _options.MinimumMessageAge,
+                        timeSinceSent: _options.MinimumMessageAge,
                         commandProcessor: commandProcessor,
                         new InMemoryRequestContextFactory(),
                         _options.BatchSize,

diff --git a/src/Paramore.Brighter.Extensions.Hosting/TimedOutboxSweeperOptions.cs b/src/Paramore.Brighter.Extensions.Hosting/TimedOutboxSweeperOptions.cs
@@ -22,6 +22,7 @@ THE SOFTWARE. */
 
 #endregion
 
+using System;
 using System.Collections.Generic;
 
 namespace Paramore.Brighter.Extensions.Hosting
@@ -38,7 +39,7 @@ public class TimedOutboxSweeperOptions
         /// <summary>
         /// The age a message to pickup by the sweeper in milliseconds.
         /// </summary>
-        public int MinimumMessageAge { get; set; } = 5000;
+        public TimeSpan MinimumMessageAge { get; set; } = TimeSpan.FromSeconds(5);
 
         /// <summary>
         /// The maximum number of messages to dispatch.

diff --git a/src/Paramore.Brighter.MessagingGateway.Kafka/KafkaDefaultMessageHeaderBuilder.cs b/src/Paramore.Brighter.MessagingGateway.Kafka/KafkaDefaultMessageHeaderBuilder.cs
@@ -48,7 +48,7 @@ public Headers Build(Message message)
             };
 
             if (message.Header.TimeStamp != default)
-                headers.Add(HeaderNames.TIMESTAMP, new DateTimeOffset(message.Header.TimeStamp).ToString().ToByteArray());
+                headers.Add(HeaderNames.TIMESTAMP, message.Header.TimeStamp.ToString().ToByteArray());
             else
                 headers.Add(HeaderNames.TIMESTAMP, DateTimeOffset.UtcNow.ToString().ToByteArray());
 

diff --git a/src/Paramore.Brighter.MessagingGateway.RMQ/RmqMessagePublisher.cs b/src/Paramore.Brighter.MessagingGateway.RMQ/RmqMessagePublisher.cs
@@ -177,7 +177,7 @@ public void RequeueMessage(Message message, string queueName, int delayMilliseco
                 message.Body.Bytes);
         }
 
-        private IBasicProperties CreateBasicProperties(string id, DateTime timeStamp, string type, string contentType,
+        private IBasicProperties CreateBasicProperties(string id, DateTimeOffset timeStamp, string type, string contentType,
             string replyTo, bool persistMessage, IDictionary<string, object> headers = null)
         {
             var basicProperties = _channel.CreateBasicProperties();
@@ -186,7 +186,7 @@ private IBasicProperties CreateBasicProperties(string id, DateTime timeStamp, st
             basicProperties.ContentType = contentType;
             basicProperties.Type = type;
             basicProperties.MessageId = id;
-            basicProperties.Timestamp = new AmqpTimestamp(UnixTimestamp.GetUnixTimestampSeconds(timeStamp));
+            basicProperties.Timestamp = new AmqpTimestamp(UnixTimestamp.GetUnixTimestampSeconds(timeStamp.DateTime));
             if (!string.IsNullOrEmpty(replyTo))
                 basicProperties.ReplyTo = replyTo;