Adapt to SystemClock removal

FoundatioFx · Aug 7, 2024 · 45f3e09 · 45f3e09
1 parent c33252d
commit 45f3e09
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/Foundatio.AzureServiceBus/Messaging/AzureServiceBusMessageBus.cs b/src/Foundatio.AzureServiceBus/Messaging/AzureServiceBusMessageBus.cs
@@ -5,7 +5,6 @@
 using Foundatio.AsyncEx;
 using Foundatio.Extensions;
 using Foundatio.Serializer;
-using Foundatio.Utility;
 using Microsoft.Azure.ServiceBus;
 using Microsoft.Azure.ServiceBus.Management;
 using Microsoft.Extensions.Logging;
@@ -133,7 +132,7 @@ protected override Task PublishImplAsync(string messageType, object message, Mes
         if (options.DeliveryDelay.HasValue && options.DeliveryDelay.Value > TimeSpan.Zero)
         {
             _logger.LogTrace("Schedule delayed message: {messageType} ({delay}ms)", messageType, options.DeliveryDelay.Value.TotalMilliseconds);
-            brokeredMessage.ScheduledEnqueueTimeUtc = SystemClock.UtcNow.Add(options.DeliveryDelay.Value);
+            brokeredMessage.ScheduledEnqueueTimeUtc = _timeProvider.GetUtcNow().UtcDateTime.Add(options.DeliveryDelay.Value);
         }
         else
         {

diff --git a/src/Foundatio.AzureServiceBus/Queues/AzureServiceBusQueue.cs b/src/Foundatio.AzureServiceBus/Queues/AzureServiceBusQueue.cs
@@ -8,7 +8,6 @@
 using Foundatio.AzureServiceBus.Queues;
 using Foundatio.Extensions;
 using Foundatio.Serializer;
-using Foundatio.Utility;
 using Microsoft.Azure.ServiceBus;
 using Microsoft.Azure.ServiceBus.Core;
 using Microsoft.Azure.ServiceBus.Management;
@@ -147,7 +146,7 @@ protected override async Task<string> EnqueueImplAsync(T data, QueueEntryOptions
 
         await _queueSender.SendAsync(brokeredMessage).AnyContext();
 
-        var entry = new QueueEntry<T>(brokeredMessage.MessageId, brokeredMessage.CorrelationId, data, this, SystemClock.UtcNow, 0);
+        var entry = new QueueEntry<T>(brokeredMessage.MessageId, brokeredMessage.CorrelationId, data, this, _timeProvider.GetUtcNow().UtcDateTime, 0);
         entry.SetLockToken(brokeredMessage);
         foreach (var property in brokeredMessage.UserProperties)
             entry.Properties.Add(property.Key, property.Value.ToString());

diff --git a/tests/Foundatio.AzureServiceBus.Tests/Queues/AzureServiceBusQueueTests.cs b/tests/Foundatio.AzureServiceBus.Tests/Queues/AzureServiceBusQueueTests.cs
@@ -19,7 +19,7 @@ public AzureServiceBusQueueTests(ITestOutputHelper output) : base(output)
         Log.SetLogLevel<AzureServiceBusQueue<SimpleWorkItem>>(LogLevel.Trace);
     }
 
-    protected override IQueue<SimpleWorkItem> GetQueue(int retries = 1, TimeSpan? workItemTimeout = null, TimeSpan? retryDelay = null, int[] retryMultipliers = null, int deadLetterMaxItems = 100, bool runQueueMaintenance = true)
+    protected override IQueue<SimpleWorkItem> GetQueue(int retries = 1, TimeSpan? workItemTimeout = null, TimeSpan? retryDelay = null, int[] retryMultipliers = null, int deadLetterMaxItems = 100, bool runQueueMaintenance = true, TimeProvider timeProvider = null)
     {
         string connectionString = Configuration.GetConnectionString("AzureServiceBusConnectionString");
         if (String.IsNullOrEmpty(connectionString))
@@ -44,6 +44,7 @@ protected override IQueue<SimpleWorkItem> GetQueue(int retries = 1, TimeSpan? wo
             RequiresSession = false,
             Retries = retries,
             RetryPolicy = retryPolicy,
+            TimeProvider = timeProvider,
             WorkItemTimeout = workItemTimeout.GetValueOrDefault(TimeSpan.FromMinutes(5)),
             LoggerFactory = Log
         });