[Host.Outbox] Fails to retrieve bus when no child buses are in use #294

Signed-off-by: Tomasz Maruszak <[email protected]>
zarusz · Sep 11, 2024 · 51385b8 · 51385b8
1 parent 8b66f24
commit 51385b8
Show file tree

Hide file tree

Showing 6 changed files with 190 additions and 112 deletions.
diff --git a/src/Host.Plugin.Properties.xml b/src/Host.Plugin.Properties.xml
@@ -4,7 +4,7 @@
   <Import Project="Common.NuGet.Properties.xml" />
 
   <PropertyGroup>
-    <Version>2.5.2</Version>
+    <Version>2.5.3-rc1</Version>
   </PropertyGroup>
 
 </Project>
diff --git a/src/SlimMessageBus.Host.Outbox/Services/OutboxSendingTask.cs b/src/SlimMessageBus.Host.Outbox/Services/OutboxSendingTask.cs
@@ -1,7 +1,5 @@
 namespace SlimMessageBus.Host.Outbox.Services;
 
-using System.Threading;
-
 using SlimMessageBus;
 using SlimMessageBus.Host;
 using SlimMessageBus.Host.Outbox;
@@ -356,7 +354,11 @@ private static IMasterMessageBus GetBus(ICompositeMessageBus compositeMessageBus
     {
         if (name != null && compositeMessageBus != null)
         {
-            return compositeMessageBus.GetChildBus(name);
+            var childBus = compositeMessageBus.GetChildBus(name);
+            if (childBus != null)
+            {
+                return childBus;
+            }
         }
         if (messageBusTarget != null)
         {

diff --git a/src/SlimMessageBus.Host/MessageBusProxy.cs b/src/SlimMessageBus.Host/MessageBusProxy.cs
@@ -56,7 +56,7 @@ public IEnumerable<IMasterMessageBus> GetChildBuses()
         {
             return composite.GetChildBuses();
         }
-        return Enumerable.Empty<IMasterMessageBus>();
+        return [];
     }
 
     #endregion

diff --git a/src/Tests/SlimMessageBus.Host.Outbox.DbContext.Test/BaseOutboxIntegrationTest.cs b/src/Tests/SlimMessageBus.Host.Outbox.DbContext.Test/BaseOutboxIntegrationTest.cs
@@ -0,0 +1,19 @@
+namespace SlimMessageBus.Host.Outbox.DbContext.Test;
+
+public abstract class BaseOutboxIntegrationTest<T>(ITestOutputHelper testOutputHelper) : BaseIntegrationTest<T>(testOutputHelper)
+{
+    protected async Task PerformDbOperation(Func<CustomerContext, IOutboxMigrationService, Task> action)
+    {
+        var scope = ServiceProvider!.CreateScope();
+        try
+        {
+            var context = scope.ServiceProvider.GetRequiredService<CustomerContext>();
+            var outboxMigrationService = scope.ServiceProvider.GetRequiredService<IOutboxMigrationService>();
+            await action(context, outboxMigrationService);
+        }
+        finally
+        {
+            await ((IAsyncDisposable)scope).DisposeAsync();
+        }
+    }
+}
diff --git a/src/Tests/SlimMessageBus.Host.Outbox.DbContext.Test/OutboxBenchmarkTests.cs b/src/Tests/SlimMessageBus.Host.Outbox.DbContext.Test/OutboxBenchmarkTests.cs
@@ -7,6 +7,7 @@
 using SlimMessageBus.Host.Outbox.Services;
 using SlimMessageBus.Host.RabbitMQ;
 
+
 /// <summary>
 /// This test should help to understand the runtime performance and overhead of the outbox feature.
 /// It will generate the time measurements for a given transport (Azure DB + Azure SQL instance) as the baseline, 
@@ -17,7 +18,7 @@
 [Trait("Category", "Integration")] // for benchmarks
 [Trait("Transport", "Outbox")]
 [Collection(CustomerContext.Schema)]
-public class OutboxBenchmarkTests(ITestOutputHelper testOutputHelper) : BaseIntegrationTest<OutboxBenchmarkTests>(testOutputHelper)
+public class OutboxBenchmarkTests(ITestOutputHelper testOutputHelper) : BaseOutboxIntegrationTest<OutboxBenchmarkTests>(testOutputHelper)
 {
     private bool _useOutbox;
     private BusType _testParamBusType;
@@ -127,21 +128,6 @@ protected override void SetupServices(ServiceCollection services, IConfiguration
                 x => x.MigrationsHistoryTable(HistoryRepository.DefaultTableName, CustomerContext.Schema)));
     }
 
-    private async Task PerformDbOperation(Func<CustomerContext, IOutboxMigrationService, Task> action)
-    {
-        var scope = ServiceProvider!.CreateScope();
-        try
-        {
-            var context = scope.ServiceProvider.GetRequiredService<CustomerContext>();
-            var outboxMigrationService = scope.ServiceProvider.GetRequiredService<IOutboxMigrationService>();
-            await action(context, outboxMigrationService);
-        }
-        finally
-        {
-            await ((IAsyncDisposable)scope).DisposeAsync();
-        }
-    }
-
     [Theory]
     [InlineData([BusType.AzureSB, true, 1000])]     // compare with outbox
     [InlineData([BusType.RabbitMQ, true, 1000])]