Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,60 +3,60 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="ClientProxyBase" Version="2026.8.3" />
<PackageVersion Include="Shared.Results" Version="2026.8.3" />
<PackageVersion Include="ClientProxyBase" Version="2026.9.3" />
<PackageVersion Include="Shared.Results" Version="2026.9.3" />
<PackageVersion Include="NLog.Extensions.Logging" Version="6.2.0" />
<PackageVersion Include="MediatR" Version="14.2.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.11" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.11" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.11" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.12" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.12" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.12" />
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" />
<PackageVersion Include="SimpleResults" Version="4.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.3.3" />
<PackageVersion Include="Shared.EventStore" Version="2026.8.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.4.0" />
<PackageVersion Include="Shared.EventStore" Version="2026.9.3" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="xunit.v3.mtp-v2" Version="4.0.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.10.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.11.0" />
<PackageVersion Include="Grpc.Net.Client" Version="2.83.0" />
<PackageVersion Include="Shared" Version="2026.8.3" />
<PackageVersion Include="Shared.DomainDrivenDesign" Version="2026.8.3" />
<PackageVersion Include="Shared.IntegrationTesting" Version="2026.8.3" />
<PackageVersion Include="Shared.Logger" Version="2026.8.3" />
<PackageVersion Include="Shared.Results.Web" Version="2026.8.3" />
<PackageVersion Include="Shared" Version="2026.9.3" />
<PackageVersion Include="Shared.DomainDrivenDesign" Version="2026.9.3" />
<PackageVersion Include="Shared.IntegrationTesting" Version="2026.9.3" />
<PackageVersion Include="Shared.Logger" Version="2026.9.3" />
<PackageVersion Include="Shared.Results.Web" Version="2026.9.3" />
<PackageVersion Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageVersion Include="Reqnroll.Tools.MsBuild.Generation" Version="3.3.4" />
<PackageVersion Include="NUnit" Version="4.6.1" />
<PackageVersion Include="Lamar" Version="16.0.0" />
<PackageVersion Include="Imposter" Version="0.1.9" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.12" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.11" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.11" />
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.6.1" />
<PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="7.6.1" />
<PackageVersion Include="Imposter" Version="0.1.11" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.13" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.12" />
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.7.0" />
<PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="7.7.0" />
<PackageVersion Include="Lamar.Microsoft.DependencyInjection" Version="16.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.11" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.11" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.12" />
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
<PackageVersion Include="OpenIddict.Core" Version="7.6.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.11" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.11" />
<PackageVersion Include="OpenIddict.Core" Version="7.7.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.12" />
<PackageVersion Include="SimpleResults.AspNetCore" Version="4.0.0" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.3" />
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="10.2.3" />
<PackageVersion Include="Swashbuckle.AspNetCore.Filters" Version="10.0.1" />
<PackageVersion Include="Swashbuckle.AspNetCore.Swagger" Version="10.2.3" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.2.3" />
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.2.3" />
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.11" />
<PackageVersion Include="Sentry.AspNetCore" Version="6.9.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.12" />
<PackageVersion Include="Sentry.AspNetCore" Version="6.11.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="6.3.0" />
<PackageVersion Include="Reqnroll" Version="3.3.4" />
<PackageVersion Include="Reqnroll.NUnit" Version="3.3.4" />
<PackageVersion Include="SecurityService.Client" Version="2026.8.1" />
<PackageVersion Include="SecurityService.IntegrationTesting.Helpers" Version="2026.8.1" />
<PackageVersion Include="SecurityService.Client" Version="2026.9.2.177" />
<PackageVersion Include="SecurityService.IntegrationTesting.Helpers" Version="2026.9.2.177" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
</ItemGroup>
</Project>
</Project>
5 changes: 4 additions & 1 deletion MessagingService/Bootstrapper/MiddlewareRegistry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
using Microsoft.IdentityModel.Tokens;
using Microsoft.OpenApi;
using Shared.Authorisation;
using Shared.Serialisation;
using System;
using System.Text.Json;
using System.Text.Json.Serialization;
using Shared.Serialisation;

namespace MessagingService.Bootstrapper
{
Expand All @@ -20,6 +20,7 @@ namespace MessagingService.Bootstrapper
using Shared.EventStore.Extensions;
using Shared.General;
using Shared.Middleware;
using Shared.Monitoring;
using Swashbuckle.AspNetCore.Filters;
using System;
using System.Diagnostics.CodeAnalysis;
Expand Down Expand Up @@ -56,6 +57,8 @@ public MiddlewareRegistry() {
this.AddSingleton(config);

this.ConfigureHttpJsonOptions(jsonOptions => JsonSerializerConfiguration.ConfigureMinimalApi(jsonOptions.SerializerOptions));

this.AddUptimeKuma();
}

private void ConfigureAuthentication() {
Expand Down
22 changes: 21 additions & 1 deletion MessagingService/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;

namespace MessagingService
{
Expand All @@ -26,6 +27,7 @@ namespace MessagingService
using Shared.General;
using Shared.Logger;
using Shared.Middleware;
using Shared.Monitoring;
using Shared.Serialisation;
using SMSMessage.DomainEvents;
using System.Diagnostics;
Expand Down Expand Up @@ -66,7 +68,8 @@ public void ConfigureContainer(ServiceRegistry services)
}

// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory,
IHostApplicationLifetime lifetime, IHost host)
{
if (env.IsDevelopment())
{
Expand Down Expand Up @@ -113,7 +116,24 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF

app.UseSwaggerUI();

lifetime.ApplicationStarted.Register(() =>
{
_ = RegisterWithUptimeKumaAsync(host);
});

app.PreWarm();
}

private static async Task RegisterWithUptimeKumaAsync(IHost host)
{
try
{
await host.RegisterWithUptimeKumaAsync();
}
catch (Exception ex)
{
Shared.Logger.Logger.LogError("Failed to register the Messaging Service with Uptime Kuma.", ex);
}
}
}
}
11 changes: 9 additions & 2 deletions MessagingService/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,14 @@
]
}
},
"SecurityConfiguration": {
"ApiName": "messagingService"
"SecurityConfiguration": {
"ApiName": "messagingService"
},
"UptimeKuma": {
"Monitor": {
"Name": "Messaging Service",
"Url": "http://localhost:5006/health",
"IntervalInSeconds": 60
}
}
}
Loading