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
1 change: 1 addition & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
<PackageVersion Include="ClientProxyBase" Version="2026.9.4" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
<PackageVersion Include="HealthMonitoring.Client" Version="2026.9.2.30" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.11.2" />
<PackageVersion Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageVersion Include="EventStoreProjections" Version="2023.12.3" />
Expand Down
5 changes: 3 additions & 2 deletions TransactionProcessorACL/Bootstrapper/MiddlewareRegistry.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Microsoft.OpenApi;
using HealthMonitoring.Client;
using Microsoft.OpenApi;
using Shared.Authorisation;
using Shared.Monitoring;

Expand Down Expand Up @@ -39,7 +40,7 @@ public MiddlewareRegistry()
this.ConfigurePasswordTokenHandling();
this.ConfigureJsonOptions();
this.ConfigureControllers();
this.AddUptimeKuma();
this.AddHealthMonitoringRegistration(Startup.Configuration);
}

/// <summary>
Expand Down
10 changes: 7 additions & 3 deletions TransactionProcessorACL/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,14 @@ private static void ConfigureWebHost(IHostBuilder hostBuilder) {
.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true)
.AddJsonFile($"/home/txnproc/config/appsettings.local.json", optional: true, reloadOnChange: true)
.AddEnvironmentVariables();
.AddEnvironmentVariables()
.AddInMemoryCollection(new Dictionary<string, string?>
{
["HealthMonitoring:Service:Version"] = Assembly.GetEntryAssembly()?.GetName().Version?.ToString() ?? "0.0.0.0"
Comment thread
StuartFerguson marked this conversation as resolved.
Resolved
});

// Build a snapshot of configuration so we can use it immediately (e.g. for Sentry)
var builtConfig = configBuilder.Build();
// Build a snapshot of configuration so we can use it immediately (e.g. for Sentry)
var builtConfig = configBuilder.Build();

// Keep existing static usage (if you must), and initialise the ConfigurationReader now.
Startup.Configuration = builtConfig;
Expand Down
7 changes: 0 additions & 7 deletions TransactionProcessorACL/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
InitializeLogger(loggerFactory);
ConfigureMiddleware(app);
ConfigureEndpoints(app);

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

private static void UseDevelopmentExceptionPage(IApplicationBuilder app,
Expand Down
1 change: 1 addition & 0 deletions TransactionProcessorACL/TransactionProcessorACL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="HealthMonitoring.Client" />
<PackageReference Include="KurrentDB.Client" />
<PackageReference Include="OpenIddict.Validation.AspNetCore" />
<PackageReference Include="OpenIddict.Validation.SystemNetHttp" />
Expand Down
25 changes: 20 additions & 5 deletions TransactionProcessorACL/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,26 @@
"SecurityConfiguration": {
"ApiName": "transactionProcessorACL"
},
"UptimeKuma": {
"Monitor": {
"HealthMonitoring": {
"Service": {
"ServiceId": "transaction-processor-acl",
"Name": "Transaction Processor ACL",
"Url": "http://localhost:5003/health",
"IntervalInSeconds": 60
}
"Description": "Transaction Processor ACL",
"HealthUrl": "http://localhost:5003/healthui"
},
"Dependencies": [
{
"DependencyName": "Security Service",
"TargetServiceId": "security-service"
},
{
"DependencyName": "Transaction Processor Service",
"TargetServiceId": "transaction-processor"
},
{
"DependencyName": "Eventstore",
"TargetServiceId": "kurrentdb"
}
]
}
}
Loading