Update to NServiceBus 9

Particular · Mar 2, 2024 · 5f7d131 · 5f7d131
1 parent 824ebd9
commit 5f7d131
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 58 deletions.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -16,7 +16,7 @@
     <PackageVersion Include="HdrHistogram" Version="2.5.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.5" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
@@ -27,25 +27,25 @@
     <PackageVersion Include="Mindscape.Raygun4Net.NetCore" Version="8.0.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.5" />
-    <PackageVersion Include="NServiceBus" Version="8.1.6" />
-    <PackageVersion Include="NServiceBus.AcceptanceTesting" Version="8.1.6" />
-    <PackageVersion Include="NServiceBus.AmazonSQS" Version="6.2.0" />
-    <PackageVersion Include="NServiceBus.CustomChecks" Version="4.0.0" />
-    <PackageVersion Include="NServiceBus.Extensions.Hosting" Version="2.0.0" />
-    <PackageVersion Include="NServiceBus.Extensions.Logging" Version="2.0.0" />
-    <PackageVersion Include="NServiceBus.Heartbeat" Version="4.0.0" />
-    <PackageVersion Include="NServiceBus.Metrics" Version="4.0.0" />
-    <PackageVersion Include="NServiceBus.Metrics.ServiceControl" Version="4.0.0" />
+    <PackageVersion Include="NServiceBus" Version="9.0.0" />
+    <PackageVersion Include="NServiceBus.AcceptanceTesting" Version="9.0.0" />
+    <PackageVersion Include="NServiceBus.AmazonSQS" Version="7.0.0" />
+    <PackageVersion Include="NServiceBus.CustomChecks" Version="5.0.0" />
+    <PackageVersion Include="NServiceBus.Extensions.Hosting" Version="3.0.0" />
+    <PackageVersion Include="NServiceBus.Extensions.Logging" Version="3.0.0" />
+    <PackageVersion Include="NServiceBus.Heartbeat" Version="5.0.0" />
+    <PackageVersion Include="NServiceBus.Metrics" Version="5.0.0" />
+    <PackageVersion Include="NServiceBus.Metrics.ServiceControl" Version="5.0.0" />
     <PackageVersion Include="NServiceBus.Metrics.ServiceControl.Msmq" Version="4.0.0" />
-    <PackageVersion Include="NServiceBus.Newtonsoft.Json" Version="3.0.0" />
-    <PackageVersion Include="NServiceBus.Persistence.NonDurable" Version="1.0.0" />
-    <PackageVersion Include="NServiceBus.RabbitMQ" Version="8.0.3" />
-    <PackageVersion Include="NServiceBus.SagaAudit" Version="4.0.0" />
-    <PackageVersion Include="NServiceBus.Testing" Version="8.1.0" />
-    <PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="3.2.2" />
-    <PackageVersion Include="NServiceBus.Transport.AzureStorageQueues" Version="12.0.1" />
-    <PackageVersion Include="NServiceBus.Transport.Msmq" Version="2.0.3" />
-    <PackageVersion Include="NServiceBus.Transport.SqlServer" Version="7.0.2" />
+    <PackageVersion Include="NServiceBus.Newtonsoft.Json" Version="4.0.0" />
+    <PackageVersion Include="NServiceBus.Persistence.NonDurable" Version="2.0.0" />
+    <PackageVersion Include="NServiceBus.RabbitMQ" Version="9.0.0" />
+    <PackageVersion Include="NServiceBus.SagaAudit" Version="5.0.0" />
+    <PackageVersion Include="NServiceBus.Testing" Version="9.0.0" />
+    <PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="4.0.0" />
+    <PackageVersion Include="NServiceBus.Transport.AzureStorageQueues" Version="13.0.0" />
+    <PackageVersion Include="NServiceBus.Transport.Msmq.Sources" Version="3.0.0" />
+    <PackageVersion Include="NServiceBus.Transport.SqlServer" Version="8.0.0" />
     <PackageVersion Include="NuGet.Versioning" Version="6.8.0" />
     <PackageVersion Include="NUnit" Version="3.14.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />

diff --git a/src/ServiceControl.AcceptanceTesting/ScenarioWithEndpointBehaviorExtensions.cs b/src/ServiceControl.AcceptanceTesting/ScenarioWithEndpointBehaviorExtensions.cs
@@ -64,7 +64,7 @@ public IScenarioWithEndpointBehavior<TContext> Done(Func<TContext, bool> doneCri
                 // If sequence is done but test is not finished, small delay to avoid tight loop check
                 await Task.Delay(250);
 
-                // If sequence is not finished immediately return false, since each step will enforce delays 
+                // If sequence is not finished immediately return false, since each step will enforce delays
                 return false;
             });
         }
@@ -127,7 +127,7 @@ public override Task ComponentsStarted(CancellationToken cancellationToken = def
                 return Task.CompletedTask;
             }
 
-            public override async Task Stop()
+            public override async Task Stop(CancellationToken cancellationToken = default)
             {
                 if (checkTask == null)
                 {

diff --git a/src/ServiceControl.AcceptanceTests/TestSupport/AcceptanceTest.cs b/src/ServiceControl.AcceptanceTests/TestSupport/AcceptanceTest.cs
@@ -38,11 +38,8 @@ protected AcceptanceTest()
         public Settings Settings => serviceControlRunnerBehavior.Settings;
         public Func<HttpMessageHandler> HttpMessageHandlerFactory => serviceControlRunnerBehavior.HttpMessageHandlerFactory;
 
-        [OneTimeSetUp]
-        public static void OneTimeSetup()
-        {
-            Scenario.GetLoggerFactory = ctx => new StaticLoggerFactory(ctx);
-        }
+        //[OneTimeSetUp]
+        //public static void OneTimeSetup() => Scenario.GetLoggerFactory = ctx => new StaticLoggerFactory(ctx);
 
         [SetUp]
         public void Setup()

diff --git a/src/ServiceControl.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs b/src/ServiceControl.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs
@@ -4,6 +4,7 @@
     using System.IO;
     using System.Net.Http;
     using System.Text.Json;
+    using System.Threading;
     using System.Threading.Tasks;
     using AcceptanceTesting;
     using Infrastructure.DomainEvents;
@@ -165,11 +166,11 @@ async Task InitializeServiceControl(ScenarioContext context)
             }
         }
 
-        public override async Task Stop()
+        public override async Task Stop(CancellationToken cancellationToken = default)
         {
             using (new DiagnosticTimer($"Test TearDown for {instanceName}"))
             {
-                await host.StopAsync();
+                await host.StopAsync(cancellationToken);
                 HttpClient.Dispose();
                 await host.DisposeAsync();
                 await persistenceToUse.Cleanup();

diff --git a/src/ServiceControl.Audit.AcceptanceTests/AcceptanceTest.cs b/src/ServiceControl.Audit.AcceptanceTests/AcceptanceTest.cs
@@ -36,8 +36,8 @@ protected AcceptanceTest()
         // TODO Check why this is necessary and if it can be removed
         protected IServiceProvider ServiceProvider => serviceControlRunnerBehavior.ServiceProvider;
 
-        [OneTimeSetUp]
-        public static void OneTimeSetup() => Scenario.GetLoggerFactory = ctx => new StaticLoggerFactory(ctx);
+        //[OneTimeSetUp]
+        //public static void OneTimeSetup() => Scenario.GetLoggerFactory = ctx => new StaticLoggerFactory(ctx);
 
         [SetUp]
         public void Setup()

diff --git a/src/ServiceControl.Audit.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs b/src/ServiceControl.Audit.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs
@@ -6,6 +6,7 @@ namespace ServiceControl.Audit.AcceptanceTests.TestSupport
     using System.IO;
     using System.Net.Http;
     using System.Text.Json;
+    using System.Threading;
     using System.Threading.Tasks;
     using AcceptanceTesting;
     using Auditing;
@@ -179,11 +180,11 @@ async Task InitializeServiceControl(ScenarioContext context)
             }
         }
 
-        public override async Task Stop()
+        public override async Task Stop(CancellationToken cancellationToken = default)
         {
             using (new DiagnosticTimer($"Test TearDown for {instanceName}"))
             {
-                await host.StopAsync();
+                await host.StopAsync(cancellationToken);
                 HttpClient.Dispose();
                 await host.DisposeAsync();
             }

diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/AcceptanceTest.cs b/src/ServiceControl.Monitoring.AcceptanceTests/AcceptanceTest.cs
@@ -31,11 +31,8 @@ protected AcceptanceTest()
         public HttpClient HttpClient => serviceControlRunnerBehavior.HttpClient;
         public JsonSerializerOptions SerializerOptions => serviceControlRunnerBehavior.SerializerOptions;
 
-        [OneTimeSetUp]
-        public static void OneTimeSetup()
-        {
-            Scenario.GetLoggerFactory = ctx => new StaticLoggerFactory(ctx);
-        }
+        //[OneTimeSetUp]
+        //public static void OneTimeSetup() => Scenario.GetLoggerFactory = ctx => new StaticLoggerFactory(ctx);
 
         [SetUp]
         public void Setup()

diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs b/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs
@@ -1,10 +1,10 @@
 namespace ServiceControl.Monitoring.AcceptanceTests.TestSupport
 {
     using System;
-    using System.Configuration;
     using System.IO;
     using System.Net.Http;
     using System.Text.Json;
+    using System.Threading;
     using System.Threading.Tasks;
     using AcceptanceTesting;
     using Infrastructure;
@@ -19,7 +19,6 @@ namespace ServiceControl.Monitoring.AcceptanceTests.TestSupport
     using NServiceBus.AcceptanceTesting.Support;
     using NServiceBus.Configuration.AdvancedExtensibility;
     using NServiceBus.Logging;
-    using TestHelper;
 
     class ServiceControlComponentRunner : ComponentRunner, IAcceptanceTestInfrastructureProvider
     {
@@ -148,11 +147,11 @@ async Task InitializeServiceControl(ScenarioContext context)
             }
         }
 
-        public override async Task Stop()
+        public override async Task Stop(CancellationToken cancellationToken = default)
         {
             using (new DiagnosticTimer($"Test TearDown for {instanceName}"))
             {
-                await host.StopAsync();
+                await host.StopAsync(cancellationToken);
                 HttpClient.Dispose();
                 await host.DisposeAsync();
             }

diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_disconnected_count.cs b/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_disconnected_count.cs
@@ -1,7 +1,6 @@
 namespace ServiceControl.Monitoring.AcceptanceTests.Tests
 {
     using System;
-    using System.Configuration;
     using System.Threading.Tasks;
     using NServiceBus;
     using NServiceBus.AcceptanceTesting;
@@ -25,17 +24,17 @@ public async Task Should_report_via_http()
             await Define<TestContext>(ctx => context = ctx)
                 .WithEndpoint<MonitoredEndpoint>(b =>
                 b.CustomConfig(endpointConfig => endpointConfig.EnableMetrics().SendMetricDataToServiceControl(Settings.DEFAULT_ENDPOINT_NAME, TimeSpan.FromMilliseconds(200), "First"))
-                .ToCreateInstance(endpointConfig => Endpoint.Create(endpointConfig), async startableEndpoint =>
+                .ToCreateInstance(endpointConfig => Endpoint.Create(endpointConfig), async (startableEndpoint, cancellationToken) =>
                 {
-                    context.FirstInstance = await startableEndpoint.Start();
+                    context.FirstInstance = await startableEndpoint.Start(cancellationToken);
 
                     return context.FirstInstance;
                 }))
                 .WithEndpoint<MonitoredEndpoint>(b =>
                 b.CustomConfig(endpointConfig => endpointConfig.EnableMetrics().SendMetricDataToServiceControl(Settings.DEFAULT_ENDPOINT_NAME, TimeSpan.FromMilliseconds(200), "Second"))
-                .ToCreateInstance(endpointConfig => Endpoint.Create(endpointConfig), async startableEndpoint =>
+                .ToCreateInstance(endpointConfig => Endpoint.Create(endpointConfig), async (startableEndpoint, cancellationToken) =>
                 {
-                    context.SecondInstance = await startableEndpoint.Start();
+                    context.SecondInstance = await startableEndpoint.Start(cancellationToken);
 
                     return context.SecondInstance;
                 }))

diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/AcceptanceTest.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/AcceptanceTest.cs
@@ -36,8 +36,8 @@ protected AcceptanceTest()
         public Dictionary<string, JsonSerializerOptions> SerializerOptions => serviceControlRunnerBehavior.SerializerOptions;
         public Dictionary<string, dynamic> SettingsPerInstance => serviceControlRunnerBehavior.SettingsPerInstance;
 
-        [OneTimeSetUp]
-        public static void OneTimeSetup() => Scenario.GetLoggerFactory = ctx => new StaticLoggerFactory(ctx);
+        //[OneTimeSetUp]
+        //public static void OneTimeSetup() => Scenario.GetLoggerFactory = ctx => new StaticLoggerFactory(ctx);
 
         [SetUp]
         public void Setup()

diff --git a/...ServiceControl.MultiInstance.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs b/...ServiceControl.MultiInstance.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs
@@ -6,6 +6,7 @@ namespace ServiceControl.MultiInstance.AcceptanceTests.TestSupport
     using System.Net.Http;
     using System.Reflection;
     using System.Text.Json;
+    using System.Threading;
     using System.Threading.Tasks;
     using AcceptanceTesting;
     using Audit.AcceptanceTests;
@@ -16,11 +17,11 @@ namespace ServiceControl.MultiInstance.AcceptanceTests.TestSupport
     using NServiceBus.AcceptanceTesting;
     using NServiceBus.AcceptanceTesting.Support;
     using ServiceBus.Management.Infrastructure.Settings;
-    using EndpointConfiguration = NServiceBus.EndpointConfiguration;
+    using AuditInstanceSettings = ServiceControl.Audit.Infrastructure.Settings.Settings;
     using AuditInstanceTestsSupport = ServiceControl.Audit.AcceptanceTests.TestSupport;
-    using PrimaryInstanceTestsSupport = ServiceControl.AcceptanceTests.TestSupport;
+    using EndpointConfiguration = NServiceBus.EndpointConfiguration;
     using PrimaryInstanceSettings = ServiceBus.Management.Infrastructure.Settings.Settings;
-    using AuditInstanceSettings = ServiceControl.Audit.Infrastructure.Settings.Settings;
+    using PrimaryInstanceTestsSupport = ServiceControl.AcceptanceTests.TestSupport;
 
     class ServiceControlComponentRunner : ComponentRunner, IAcceptanceTestInfrastructureProviderMultiInstance
     {
@@ -140,10 +141,10 @@ public async Task Initialize(RunDescriptor run)
             SerializerOptions[PrimaryInstanceSettings.DEFAULT_SERVICE_NAME] = primaryInstanceComponentRunner.SerializerOptions;
         }
 
-        public override async Task Stop()
+        public override async Task Stop(CancellationToken cancellationToken = default)
         {
-            await auditInstanceComponentRunner.Stop();
-            await primaryInstanceComponentRunner.Stop();
+            await auditInstanceComponentRunner.Stop(cancellationToken);
+            await primaryInstanceComponentRunner.Stop(cancellationToken);
         }
 
         ITransportIntegration transportToUse;

diff --git a/src/ServiceControl.Transports.RabbitMQ/ConnectionFactory.cs b/src/ServiceControl.Transports.RabbitMQ/ConnectionFactory.cs
@@ -45,7 +45,6 @@ public ConnectionFactory(string endpointName, ConnectionConfiguration connection
                 Password = connectionConfiguration.Password,
                 RequestedHeartbeat = heartbeatInterval ?? connectionConfiguration.RequestedHeartbeat,
                 NetworkRecoveryInterval = networkRecoveryInterval ?? connectionConfiguration.RetryDelay,
-                UseBackgroundThreadsForIO = true
             };
 
             connectionFactory.Ssl.ServerName = connectionConfiguration.Host;

diff --git a/src/ServiceControl.Transports.Tests/TransportTestFixture.cs b/src/ServiceControl.Transports.Tests/TransportTestFixture.cs
@@ -6,7 +6,6 @@
     using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
-    using NServiceBus.AcceptanceTesting;
     using NServiceBus.AcceptanceTesting.Customization;
     using NServiceBus.Transport;
     using NUnit.Framework;
@@ -16,8 +15,8 @@
     [TestFixture]
     class TransportTestFixture
     {
-        [OneTimeSetUp]
-        public static void OneTimeSetup() => Scenario.GetLoggerFactory = ctx => new StaticLoggerFactory(ctx);
+        //[OneTimeSetUp]
+        //public static void OneTimeSetup() => Scenario.GetLoggerFactory = ctx => new StaticLoggerFactory(ctx);
 
         [SetUp]
         public virtual async Task Setup()