add health check to code and docker (#7)

Co-authored-by: Piotr Rojek <[email protected]>
piotr-rojek · Feb 12, 2023 · 59d3173 · 59d3173
1 parent 7c17f94
commit 59d3173
Show file tree

Hide file tree

Showing 9 changed files with 128 additions and 45 deletions.
diff --git a/src/ServiceBusEmulator.Host/Dockerfile b/src/ServiceBusEmulator.Host/Dockerfile
@@ -23,13 +23,17 @@ FROM --platform=amd64 mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
     WORKDIR /app/src/ServiceBusEmulator.Host
     RUN dotnet publish -c Release -o /app/out
 
-FROM mcr.microsoft.com/dotnet/runtime:7.0
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
 
     ENV DOTNET_ENVIRONMENT=Docker
 
+    RUN apt-get update 
+    RUN apt-get --yes install curl
+    HEALTHCHECK --interval=5s --timeout=10s --retries=3 CMD curl --fail http://localhost:80/health || exit 1
+
     WORKDIR /app
     COPY --from=build-env /app/out .
     COPY --from=server-cert /home/testca/cert.pfx .
     COPY --from=server-cert /home/testca/cacert.cer .
-
+    
     ENTRYPOINT ["dotnet", "ServiceBusEmulator.Host.dll"]
diff --git a/src/ServiceBusEmulator.Host/Program.cs b/src/ServiceBusEmulator.Host/Program.cs
@@ -2,15 +2,14 @@
 using ServiceBusEmulator;
 using ServiceBusEmulator.RabbitMq;
 
-IHost host = Host.CreateDefaultBuilder(args)
-    .ConfigureServices(services =>
-    {
-        _ = services.AddServiceBusEmulator();
-        _ = services.AddServiceBusEmulatorRabbitMqBackend();
-    })
-    .Build();
-
 Trace.TraceLevel = TraceLevel.Frame;
 Trace.TraceListener = (l, f, a) => Console.WriteLine(DateTime.Now.ToString("[hh:mm:ss.fff]") + " " + string.Format(f, a));
 
-host.Run();
+var builder = WebApplication.CreateBuilder(args);
+builder.Services.AddServiceBusEmulator();
+builder.Services.AddServiceBusEmulatorRabbitMqBackend();
+
+var app = builder.Build();
+app.UseHealthChecks("/health");
+app.UseRouting();
+app.Run();
diff --git a/src/ServiceBusEmulator.Host/ServiceBusEmulator.Host.csproj b/src/ServiceBusEmulator.Host/ServiceBusEmulator.Host.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Worker">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>

diff --git a/src/ServiceBusEmulator.RabbitMq/Extensions.cs b/src/ServiceBusEmulator.RabbitMq/Extensions.cs
@@ -15,6 +15,7 @@ public static IServiceCollection AddServiceBusEmulatorRabbitMqBackend(this IServ
 
             _ = services.AddSingleton<ILinkProcessor, RabbitMqLinkProcessor>();
             _ = services.AddSingleton<IRabbitMqLinkRegister, RabbitMqLinkRegister>();
+            _ = services.AddSingleton<IRabbitMqChannelFactory, RabbitMqChannelFactory>();
             _ = services.AddTransient<IRabbitMqLinkEndpointFactory, RabbitMqLinkEndpointFactory>();
             _ = services.AddTransient<IRabbitMqManagementCommandFactory, RabbitMqManagementCommandFactory>();
             _ = services.AddTransient<IRabbitMqDeliveryTagTracker, RabbitMqDeliveryTagTracker>();
@@ -35,6 +36,8 @@ public static IServiceCollection AddServiceBusEmulatorRabbitMqBackend(this IServ
 
             _ = services.AddOptions<RabbitMqBackendOptions>().Configure(configure).BindConfiguration("Emulator:RabbitMq");
 
+            _ = services.AddHealthChecks().AddCheck<RabbitMqHealthCheck>("rabbitmq");
+
             return services;
         }
     }

diff --git a/src/ServiceBusEmulator.RabbitMq/Links/IRabbitMqChannelFactory.cs b/src/ServiceBusEmulator.RabbitMq/Links/IRabbitMqChannelFactory.cs
@@ -0,0 +1,9 @@
+using RabbitMQ.Client;
+
+namespace ServiceBusEmulator.RabbitMq.Links
+{
+    public interface IRabbitMqChannelFactory
+    {
+        IModel CreateChannel();
+    }
+}
diff --git a/src/ServiceBusEmulator.RabbitMq/Links/RabbitMqChannelFactory.cs b/src/ServiceBusEmulator.RabbitMq/Links/RabbitMqChannelFactory.cs
@@ -0,0 +1,68 @@
+using Microsoft.Extensions.Options;
+using RabbitMQ.Client;
+using ServiceBusEmulator.RabbitMq.Options;
+
+namespace ServiceBusEmulator.RabbitMq.Links
+{
+    public class RabbitMqChannelFactory : IRabbitMqChannelFactory, IDisposable
+    {
+        private readonly RabbitMqBackendOptions _options;
+
+        private IConnection? _connection;
+        private ConnectionFactory _connectionFactory;
+
+        private bool _disposed;
+
+        public RabbitMqChannelFactory(IOptions<RabbitMqBackendOptions> options)
+        {
+            _options = options.Value;
+
+            _connectionFactory = new()
+            {
+                Password = _options.Password,
+                UserName = _options.Username,
+                HostName = _options.Host,
+                Port = _options.Port
+            };
+        }
+
+        protected IConnection Connection
+        {
+            get
+            {
+                if (_disposed)
+                {
+                    throw new ObjectDisposedException(nameof(RabbitMqChannelFactory));
+                }
+
+                if (!(_connection?.IsOpen ?? false))
+                {
+                    lock (_connectionFactory)
+                    {
+                        if (!(_connection?.IsOpen ?? false))
+                        {
+                            _connection = _connectionFactory.CreateConnection();
+                        }
+                    }
+                }
+
+                return _connection;
+            }
+        }
+
+        public IModel CreateChannel()
+        {
+            return Connection.CreateModel();
+        }
+
+        public void Dispose()
+        {
+            if (!_disposed && _connection != null)
+            {
+                _connection.Dispose();
+                _connection = null;
+            }
+            _disposed = true;
+        }
+    }
+}
diff --git a/src/ServiceBusEmulator.RabbitMq/Links/RabbitMqLinkProcessor.cs b/src/ServiceBusEmulator.RabbitMq/Links/RabbitMqLinkProcessor.cs
@@ -2,60 +2,31 @@
 using Amqp.Framing;
 using Amqp.Listener;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 using RabbitMQ.Client;
 using ServiceBusEmulator.Abstractions.Security;
-using ServiceBusEmulator.RabbitMq.Options;
 
 namespace ServiceBusEmulator.RabbitMq.Links
 {
     public class RabbitMqLinkProcessor : ILinkProcessor
     {
-        private readonly RabbitMqBackendOptions _options;
         private readonly IRabbitMqLinkEndpointFactory _linkEndpointFactory;
         private readonly IRabbitMqLinkRegister _linkRegister;
+        private readonly IRabbitMqChannelFactory _channelFactory;
         private readonly IRabbitMqInitializer _initializer;
         private readonly ISecurityContext _securityContext;
         private readonly ILogger _logger;
 
-        private RabbitMQ.Client.IConnection? _connection;
-        private RabbitMQ.Client.ConnectionFactory _connectionFactory;
 
-        public RabbitMqLinkProcessor(IRabbitMqInitializer intializer, ISecurityContext securityContext, IOptions<RabbitMqBackendOptions> options, ILogger<RabbitMqLinkProcessor> logger, IRabbitMqLinkRegister linkRegister, IRabbitMqLinkEndpointFactory linkEndpointFactory)
+        public RabbitMqLinkProcessor(IRabbitMqChannelFactory channelFactory,IRabbitMqInitializer intializer, ISecurityContext securityContext, ILogger<RabbitMqLinkProcessor> logger, IRabbitMqLinkRegister linkRegister, IRabbitMqLinkEndpointFactory linkEndpointFactory)
         {
-            _options = options.Value;
-            _connectionFactory = new()
-            {
-                Password = _options.Password,
-                UserName = _options.Username,
-                HostName = _options.Host,
-                Port = _options.Port
-            };
+            _channelFactory = channelFactory;
             _initializer = intializer;
             _securityContext = securityContext;
             _logger = logger;
             _linkRegister = linkRegister;
             _linkEndpointFactory = linkEndpointFactory;
         }
 
-        protected RabbitMQ.Client.IConnection Connection
-        {
-            get
-            {
-                if (!(_connection?.IsOpen ?? false))
-                {
-                    lock (_connectionFactory)
-                    {
-                        if (!(_connection?.IsOpen ?? false))
-                        {
-                            _connection = _connectionFactory.CreateConnection();
-                        }
-                    }
-                }
-
-                return _connection;
-            }
-        }
 
         public void Process(AttachContext attachContext)
         {
@@ -73,7 +44,7 @@ public void Process(AttachContext attachContext)
                 return;
             }
 
-            IModel channel = Connection.CreateModel();
+            IModel channel = _channelFactory.CreateChannel();
             _initializer.Initialize(channel);
 
             (var linkEndpoint, int initialCredit) = _linkEndpointFactory.CreateEndpoint(channel, attachContext.Attach, attachContext.Link.Role);

diff --git a/src/ServiceBusEmulator.RabbitMq/RabbitMqHealthCheck.cs b/src/ServiceBusEmulator.RabbitMq/RabbitMqHealthCheck.cs
@@ -0,0 +1,28 @@
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using ServiceBusEmulator.RabbitMq.Links;
+
+namespace ServiceBusEmulator.RabbitMq
+{
+    public class RabbitMqHealthCheck : IHealthCheck
+    {
+        private readonly IRabbitMqChannelFactory _channelFactory;
+
+        public RabbitMqHealthCheck(IRabbitMqChannelFactory channelFactory)
+        {
+            _channelFactory = channelFactory;
+        }
+
+        public Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                using var model = _channelFactory.CreateChannel();
+                return Task.FromResult(HealthCheckResult.Healthy());
+            }
+            catch (Exception ex)
+            {
+                return Task.FromResult(new HealthCheckResult(context.Registration.FailureStatus, exception: ex));
+            }
+        }
+    }
+}
diff --git a/src/ServiceBusEmulator.RabbitMq/ServiceBusEmulator.RabbitMq.csproj b/src/ServiceBusEmulator.RabbitMq/ServiceBusEmulator.RabbitMq.csproj
@@ -7,6 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.2" />
 		<PackageReference Include="RabbitMQ.Client" Version="6.4.0" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
 	</ItemGroup>