Merge pull request #468 from TransactionProcessing/task/#465_correlationid

StuartFerguson · web-flow · commit b1dd45929fcf · 2025-07-11T20:22:41.000+01:00
End to End Correlation id
diff --git a/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj b/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj
@@ -6,17 +6,17 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
-		<PackageReference Include="SecurityService.Client" Version="2025.5.2-build82" />
-		<PackageReference Include="Shared" Version="2025.6.2" />
-		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.6.2" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
+		<PackageReference Include="SecurityService.Client" Version="2025.7.1" />
+		<PackageReference Include="Shared" Version="2025.7.9" />
+		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.7.9" />
 		<PackageReference Include="MediatR" Version="12.5.0" />
-		<PackageReference Include="Shared.EventStore" Version="2025.6.2" />
+		<PackageReference Include="Shared.EventStore" Version="2025.7.9" />
 		<PackageReference Include="System.IO.Abstractions" Version="22.0.14" />
-		<PackageReference Include="TransactionProcessor.Client" Version="2025.5.2-build186" />
+		<PackageReference Include="TransactionProcessor.Client" Version="2025.7.1" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.5" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
-		<PackageReference Include="TransactionProcessor.Database" Version="2025.5.2-build186" />
+		<PackageReference Include="TransactionProcessor.Database" Version="2025.7.1" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/FileProcessor.Client/FileProcessor.Client.csproj b/FileProcessor.Client/FileProcessor.Client.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="2025.6.2" />
-    <PackageReference Include="Shared.Results" Version="2025.6.2" />
+    <PackageReference Include="ClientProxyBase" Version="2025.7.9" />
+    <PackageReference Include="Shared.Results" Version="2025.7.9" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj b/FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.6.2" />
+		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.7.9" />
 	</ItemGroup>
 
 </Project>
diff --git a/FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj b/FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj
@@ -6,9 +6,9 @@
 
 	<ItemGroup>
 		<PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
-		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.6.2" />
-		<PackageReference Include="Shared.EventStore" Version="2025.6.2" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
+		<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.7.9" />
+		<PackageReference Include="Shared.EventStore" Version="2025.7.9" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.DomainEvents.csproj b/FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.DomainEvents.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="2025.6.2" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="2025.7.9" />
   </ItemGroup>
 
 </Project>
diff --git a/FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj b/FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj
@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
-    <PackageReference Include="Shared.EventStore" Version="2025.6.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
+    <PackageReference Include="Shared.EventStore" Version="2025.7.9" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj b/FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Shared.IntegrationTesting" Version="2025.6.2" />
-	  <PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.5.2-build186" />
+	  <PackageReference Include="Shared.IntegrationTesting" Version="2025.7.9" />
+	  <PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.7.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj b/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
 	  <PackageReference Include="EventStoreProjections" Version="2023.12.3" />
-	  <PackageReference Include="MessagingService.IntegrationTesting.Helpers" Version="2025.3.2-build77" />
+	  <PackageReference Include="MessagingService.IntegrationTesting.Helpers" Version="2025.7.1" />
 	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.5" />
 	  <PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
 	  <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
@@ -22,13 +22,13 @@
 	  <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
 	  <PackageReference Include="Reqnroll" Version="2.4.1" />
 	  <PackageReference Include="Reqnroll.NUnit" Version="2.4.1" />
-    <PackageReference Include="SecurityService.Client" Version="2025.5.2-build82" />
-    <PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2025.5.2-build82" />
-	  <PackageReference Include="Shared" Version="2025.6.2" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="2025.6.2" />
+    <PackageReference Include="SecurityService.Client" Version="2025.7.1" />
+    <PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2025.7.1" />
+	  <PackageReference Include="Shared" Version="2025.7.9" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2025.7.9" />
     <PackageReference Include="Shouldly" Version="4.3.0" />
-	  <PackageReference Include="TransactionProcessor.Client" Version="2025.5.2-build186" />
-	  <PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.5.2-build186" />
+	  <PackageReference Include="TransactionProcessor.Client" Version="2025.7.1" />
+	  <PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.7.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
diff --git a/FileProcessor.Tests/FileProcessor.Tests.csproj b/FileProcessor.Tests/FileProcessor.Tests.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="Shouldly" Version="4.3.0" />
     <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="22.0.14" />
diff --git a/FileProcessor/Bootstrapper/ClientRegistry.cs b/FileProcessor/Bootstrapper/ClientRegistry.cs
@@ -1,4 +1,6 @@
-﻿namespace FileProcessor.Bootstrapper;
+﻿using ClientProxyBase;
+
+namespace FileProcessor.Bootstrapper;
 
 using System;
 using System.Diagnostics.CodeAnalysis;
@@ -18,26 +20,14 @@ public class ClientRegistry : ServiceRegistry
     /// Initializes a new instance of the <see cref="ClientRegistry"/> class.
     /// </summary>
     public ClientRegistry() {
-        this.AddSingleton<ISecurityServiceClient, SecurityServiceClient>();
-        this.AddSingleton<ITransactionProcessorClient, TransactionProcessorClient>();
+        this.AddHttpContextAccessor();
+        this.RegisterHttpClient<ISecurityServiceClient, SecurityServiceClient>();
+        this.RegisterHttpClient<ITransactionProcessorClient, TransactionProcessorClient>();
 
         //this.AddSingleton<Func<String, String>>(container => serviceName => { return ConfigurationReader.GetBaseServerUri(serviceName).OriginalString; });
         Func<String, String> resolver(IServiceProvider container) => serviceName => { return ConfigurationReader.GetBaseServerUri(serviceName).OriginalString; };
-        Func<String, String> resolver1() => serviceName => { return ConfigurationReader.GetBaseServerUri(serviceName).OriginalString; };
-
-        this.AddSingleton<Func<String, String>>(resolver);
         
-        SocketsHttpHandler httpMessageHandler = new SocketsHttpHandler {
-                                                                           SslOptions = {
-                                                                                            RemoteCertificateValidationCallback = (sender,
-                                                                                                certificate,
-                                                                                                chain,
-                                                                                                errors) => true,
-                                                                                        }
-                                                                       };
-
-        HttpClient httpClient = new(httpMessageHandler);
-        this.AddSingleton(httpClient);
+        this.AddSingleton<Func<String, String>>(resolver);
     }
 
     #endregion
diff --git a/FileProcessor/FileProcessor.csproj b/FileProcessor/FileProcessor.csproj
@@ -6,10 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+	  <PackageReference Include="ClientProxyBase" Version="2025.7.9" />
 	  <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
 	  <PackageReference Include="Lamar" Version="15.0.0" />
 	  <PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="15.0.0" />
-	  <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
+	  <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
 	  <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
 	  <PackageReference Include="AspNetCore.HealthChecks.UI" Version="9.0.0" />
 	  <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
@@ -18,12 +19,12 @@
 	  <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.5" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Shared" Version="2025.6.2" />
+    <PackageReference Include="Shared" Version="2025.7.9" />
 	  <PackageReference Include="NLog.Extensions.Logging" Version="5.5.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.5" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.5" />
-    <PackageReference Include="Shared.Results.Web" Version="2025.6.2" />
+    <PackageReference Include="Shared.Results.Web" Version="2025.7.9" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.4" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.1.4" />
     <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.3" />
diff --git a/FileProcessor/Program.cs b/FileProcessor/Program.cs
@@ -2,26 +2,29 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Shared.Middleware;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace FileProcessor
 {
-    using System.Diagnostics.CodeAnalysis;
-    using System.IO;
-    using System.IO.Abstractions;
-    using System.Net.Http;
     using BusinessLogic.Managers;
     using EventStore.Client;
     using File.DomainEvents;
     using FileImportLog.DomainEvents;
     using Lamar.Microsoft.DependencyInjection;
     using MediatR;
     using Microsoft.Extensions.DependencyInjection;
+    using NLog;
+    using NLog.Extensions.Logging;
     using Shared.EventStore.EventHandling;
     using Shared.Logger;
+    using System.Diagnostics.CodeAnalysis;
+    using System.IO;
+    using System.IO.Abstractions;
+    using System.Net.Http;
 
     [ExcludeFromCodeCoverage]
     public class Program
@@ -41,13 +44,27 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                                                                   .AddJsonFile("hosting.development.json", optional: true)
                                                                   .AddEnvironmentVariables().Build();
 
+            String contentRoot = Directory.GetCurrentDirectory();
+            String nlogConfigPath = Path.Combine(contentRoot, "nlog.config");
+
+            LogManager.Setup(b =>
+            {
+                b.SetupLogFactory(setup =>
+                {
+                    setup.AddCallSiteHiddenAssembly(typeof(NlogLogger).Assembly);
+                    setup.AddCallSiteHiddenAssembly(typeof(Shared.Logger.Logger).Assembly);
+                    setup.AddCallSiteHiddenAssembly(typeof(TenantMiddleware).Assembly);
+                });
+                b.LoadConfigurationFromFile(nlogConfigPath);
+            });
+
             IHostBuilder hostBuilder = Host.CreateDefaultBuilder(args);
             hostBuilder.UseWindowsService();
             hostBuilder.UseLamar();
             hostBuilder.ConfigureLogging(logging =>
                                          {
                                              logging.AddConsole();
-
+                                             logging.AddNLog();
                                          });
             hostBuilder.ConfigureWebHostDefaults(webBuilder =>
                                                  {
diff --git a/FileProcessor/Startup.cs b/FileProcessor/Startup.cs
@@ -135,30 +135,19 @@ public static void LoadDomainEventsTypeDynamically(List<string> assemblyFilters
         // 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)
         {
-            String nlogConfigFilename = "nlog.config";
-
             if (env.IsDevelopment())
             {
-                var developmentNlogConfigFilename = "nlog.development.config";
-                if (System.IO.File.Exists(Path.Combine(env.ContentRootPath, developmentNlogConfigFilename)))
-                {
-                    nlogConfigFilename = developmentNlogConfigFilename;
-                }
-
                 app.UseDeveloperExceptionPage();
             }
 
-            loggerFactory.ConfigureNLog(Path.Combine(env.ContentRootPath, nlogConfigFilename));
-            loggerFactory.AddNLog();
-
             ILogger logger = loggerFactory.CreateLogger("FileProcessor");
 
             Logger.Initialise(logger);
 
             Startup.Configuration.LogConfiguration(Logger.LogWarning);
 
             ConfigurationReader.Initialise(Startup.Configuration);
-
+            app.UseMiddleware<TenantMiddleware>();
             app.AddRequestLogging();
             app.AddResponseLogging();
             app.AddExceptionHandler();
diff --git a/FileProcessor/nlog.config b/FileProcessor/nlog.config
@@ -4,7 +4,7 @@
 		<target name="asyncFile" xsi:type="AsyncWrapper">
 			<target name="logfile" xsi:type="File"
 			        fileName="/home/txnproc/trace/fileprocessor.log"
-			        layout="${date:format=dd/MM/yyyy HH\:mm\:ss.ffff} | ${level} | ${callsite:className=true} | ${message} | ${exception:format=type,method:maxInnerExceptionLevel=5:innerFormat=shortType,message,method:InnerExceptionSeparator= | }"
+			        layout="${date:format=dd/MM/yyyy HH\:mm\:ss.ffff} | ${level} |${mdlc:CorrelationId:fallback=NO-ID}| ${callsite:className=true} | ${message} | ${exception:format=type,method:maxInnerExceptionLevel=5:innerFormat=shortType,message,method:InnerExceptionSeparator= | }"
 				archiveFileName="/home/txnproc/trace/fileprocessor.{#####}.log"
 			        archiveAboveSize="104857600"
 			        archiveNumbering="Sequence"
