Upgrade to latest

README.md

@@ -118,4 +118,36 @@ There is a number of packages required to run the demo. Here's a list of debian
 #### Client
 
 - tmux
-- gh
+- gh
+
+## Starting up
+
+- Power up all devices
+- Ensure Gateway Pi can connect to the Internet
+- Open browser on the Gateway and verify:
+  - PostgreSQL database is up
+  - RabbitMQ broker is up
+  - All containers are up in Dockge
+- Open terminal window in Gateway
+- In one tab run `tmux-panes.sh`
+  - Log in to all panes using password `particular`
+  - In each pane run `sales/Sales X` where X is 1..3
+  - Verify all Sales endpoint are running
+- In Clockwork Pi (Client Pi) open a terminal window
+  - Run `start-client.sh`
+  - Press `b` a couple of times and verify is messages are processed by Sales
+- In Gateway browser verify that messages are properly bridged to Azure and not stuck in RabbitMQ
+- In Gateway terminal window open a new tab
+  - Run `attach-client.sh`
+  - Verify if you can see the same screen as on the Clockwork Pi
+- In Gateway terminal window open a new tab
+  - Run `pyhton3 mqtt-bridge.py`
+  - Press the button a couple of times
+  - Verify that Sales endpoint is processing messages
+- In Gateway terminal window open a new tab
+  - Run `sudo evtest` to see which device file is associated with the controller
+  - Run `python3 button-box.py <device file>` or `python3 button-box-saitek.py <device file>` to forward controller events to Sales
+  - Press some buttons to verify if events are forwrded
+- In Gateway terminal window open a new tab
+  - Run `python3 button-box-client <device file>` or `python3 button-box-client-saitek.py <device file>` to forward controller events to Client
+  - Press some buttons to verify if events are forwarded

src/Billing/Billing.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -19,11 +19,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.Heartbeat" Version="5.*" />
-    <PackageReference Include="NServiceBus.Metrics.ServiceControl" Version="5.*" />
-    <PackageReference Include="NServiceBus.Persistence.NonDurable" Version="2.*" />
-    <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="5.*" />
-    <PackageReference Include="NServiceBus.Extensions.Hosting" Version="3.*" />
+    <PackageReference Include="NServiceBus.Heartbeat" Version="6.*" />
+    <PackageReference Include="NServiceBus.Metrics.ServiceControl" Version="6.*" />
+    <PackageReference Include="NServiceBus.Persistence.NonDurable" Version="3.*" />
+    <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="6.*" />
+    <PackageReference Include="NServiceBus.Extensions.Hosting" Version="4.*" />
   </ItemGroup>
 
 </Project>

src/Billing/Program.cs

@@ -4,6 +4,7 @@
 using NServiceBus.Transport;
 using Shared;
 using System.Text.Json;
+using NServiceBus;
 
 var instancePostfix = args.FirstOrDefault();
 
@@ -23,7 +24,7 @@
     OpenTelemetryUtils.ConfigureOpenTelemetry("Billing", instanceId.ToString(), int.Parse(prometheusPortString));
 }
 
-builder.UseNServiceBus(endpointConfiguration);
+builder.Services.AddNServiceBusEndpoint(endpointConfiguration);
 await builder.Build().RunAsync();
 
 EndpointConfiguration PrepareEndpointConfiguration(Guid guid, string s, string? prometheusPortString1)
@@ -76,7 +77,7 @@ EndpointConfiguration PrepareEndpointConfiguration(Guid guid, string s, string?
     cfg.UsePersistence<NonDurablePersistence>();
     cfg.EnableOutbox();
 
-    cfg.EnableOpenTelemetry();
+   // cfg.EnableOpenTelemetry();
     cfg.EnableInstallers();
 
     return cfg;

src/ClientUI/ClientUI.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -14,10 +14,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.Heartbeat" Version="5.*" />
-    <PackageReference Include="NServiceBus.RabbitMQ" Version="10.*" />
-    <PackageReference Include="NServiceBus.Metrics.ServiceControl" Version="5.*" />
-    <PackageReference Include="NServiceBus.Extensions.Logging" Version="3.*" />
+    <PackageReference Include="NServiceBus.Heartbeat" Version="6.*" />
+    <PackageReference Include="NServiceBus.RabbitMQ" Version="11.*" />
+    <PackageReference Include="NServiceBus.Metrics.ServiceControl" Version="6.*" />
+    <PackageReference Include="NServiceBus.Extensions.Logging" Version="4.*" />
   </ItemGroup>
 
 </Project>

src/ClientUI/Program.cs

@@ -47,7 +47,7 @@
     .UsingCustomIdentifier(instanceId)
     .UsingCustomDisplayName(instanceName);
 
-endpointConfiguration.EnableOpenTelemetry();
+//endpointConfiguration.EnableOpenTelemetry();
 endpointConfiguration.EnableInstallers();
 
 var metrics = endpointConfiguration.EnableMetrics();

src/Messages/Messages.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <SignAssembly>true</SignAssembly>

src/RabbitToAzureBridge/RabbitToAzureBridge.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

src/Raffle/Program.cs

@@ -21,7 +21,7 @@
 
 var endpointConfiguration = PrepareEndpointConfiguration();
 
-builder.UseNServiceBus(endpointConfiguration);
+builder.Services.AddNServiceBusEndpoint(endpointConfiguration);
 await builder.Build().RunAsync();
 
 EndpointConfiguration PrepareEndpointConfiguration()

src/Raffle/Raffle.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -19,9 +19,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.Persistence.NonDurable" Version="2.*" />
-    <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="5.*" />
-    <PackageReference Include="NServiceBus.Extensions.Hosting" Version="3.*" />
+    <PackageReference Include="NServiceBus.Persistence.NonDurable" Version="3.*" />
+    <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="6.*" />
+    <PackageReference Include="NServiceBus.Extensions.Hosting" Version="4.*" />
   </ItemGroup>
 
 </Project>

src/Sales/Program.cs

@@ -91,7 +91,7 @@ EndpointConfiguration PrepareEndpointConfiguration(Guid guid, string displayName
 
     endpointConfiguration.EnableOutbox();
 
-    endpointConfiguration.EnableOpenTelemetry();
+   // endpointConfiguration.EnableOpenTelemetry();
     endpointConfiguration.EnableInstallers();
 
     var loggerFactory = LoggerFactory.Create(builder =>

src/Sales/Sales.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -14,14 +14,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.Heartbeat" Version="5.*" />
-    <PackageReference Include="NServiceBus.RabbitMQ" Version="10.*" />
-    <PackageReference Include="NServiceBus.Metrics.ServiceControl" Version="5.*" />
-    <PackageReference Include="NServiceBus.SagaAudit" Version="5.*" />
-    <PackageReference Include="NServiceBus.Persistence.NonDurable" Version="2.*" />
-    <PackageReference Include="NServiceBus.Persistence.Sql" Version="8.*" />
-    <PackageReference Include="npgsql" Version="8.*" />
-    <PackageReference Include="NServiceBus.Extensions.Logging" Version="3.*" />
+    <PackageReference Include="NServiceBus.Heartbeat" Version="6.*" />
+    <PackageReference Include="NServiceBus.RabbitMQ" Version="11.*" />
+    <PackageReference Include="NServiceBus.Metrics.ServiceControl" Version="6.*" />
+    <PackageReference Include="NServiceBus.SagaAudit" Version="6.*" />
+    <PackageReference Include="NServiceBus.Persistence.NonDurable" Version="3.*" />
+    <PackageReference Include="NServiceBus.Persistence.Sql" Version="9.*" />
+    <PackageReference Include="npgsql" Version="10.*" />
+    <PackageReference Include="NServiceBus.Extensions.Logging" Version="4.*" />
   </ItemGroup>
 
 </Project>

src/Shared/OpenTelemetryUtils.cs

@@ -20,7 +20,7 @@ public static IDisposable ConfigureOpenTelemetry(string name, string id, int por
             .SetResourceBuilder(resourceBuilder)
             .AddMeter("NServiceBus.Core*");
 
-        meterProviderBuilder.AddPrometheusHttpListener(options => options.UriPrefixes = [$"http://127.0.0.1:{port}"]);
+        meterProviderBuilder.AddPrometheusHttpListener();
 
         var meterProvider = meterProviderBuilder.Build();
 

src/Shared/Shared.csproj

@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="9.*" />
+    <PackageReference Include="NServiceBus" Version="10.2.9" />
     <PackageReference Include="OpenTelemetry.Exporter.Prometheus.HttpListener" Version="1.*-*" />
-    <PackageReference Include="Spectre.Console" Version="0.55.0" />
-    <PackageReference Include="Spectre.Console.ImageSharp" Version="0.55.0" />
-    <PackageReference Include="Spectre.Console.Json" Version="0.55.0" />
-    <PackageReference Include="Spectre.Console.Testing" Version="0.55.0" />
+    <PackageReference Include="Spectre.Console" Version="0.57.2" />
+    <PackageReference Include="Spectre.Console.ImageSharp" Version="0.57.2" />
+    <PackageReference Include="Spectre.Console.Json" Version="0.57.2" />
+    <PackageReference Include="Spectre.Console.Testing" Version="0.57.2" />
   </ItemGroup>
 
 </Project>

src/Shipping/Program.cs

@@ -73,7 +73,7 @@ EndpointConfiguration PrepareEndpointConfiguration(Guid guid, string s)
     cfg.UsePersistence<NonDurablePersistence>();
     cfg.EnableOutbox();
 
-    cfg.EnableOpenTelemetry();
+   // cfg.EnableOpenTelemetry();
     cfg.EnableInstallers();
 
     return cfg;

src/Shipping/Shipping.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -19,11 +19,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.Heartbeat" Version="5.*" />
-    <PackageReference Include="NServiceBus.Metrics.ServiceControl" Version="5.*" />
-    <PackageReference Include="NServiceBus.Persistence.NonDurable" Version="2.*" />
-    <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="5.*" />
-    <PackageReference Include="NServiceBus.Extensions.Hosting" Version="3.*" />
+    <PackageReference Include="NServiceBus.Heartbeat" Version="6.*" />
+    <PackageReference Include="NServiceBus.Metrics.ServiceControl" Version="6.*" />
+    <PackageReference Include="NServiceBus.Persistence.NonDurable" Version="3.*" />
+    <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="6.*" />
+    <PackageReference Include="NServiceBus.Extensions.Hosting" Version="4.*" />
   </ItemGroup>
 
 </Project>

src/global.json

@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "10.0.0",
+    "rollForward": "latestMajor",
+    "allowPrerelease": false
+  }
+}