Skip to content

Commit 4f835c9

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #115 from TransactionProcessing/task/#112_correlationid
End to End Correlation Id added
2 parents fc6ff8b + 8d34ba5 commit 4f835c9

File tree

11 files changed

+43
-73
lines changed

11 files changed

+43
-73
lines changed

‎CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ItemGroup>
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
1111
<PackageReference Include="Moq" Version="4.20.72" />
12-
<PackageReference Include="Shared.EventStore" Version="2025.6.2" />
12+
<PackageReference Include="Shared.EventStore" Version="2025.7.9" />
1313
<PackageReference Include="Shouldly" Version="4.3.0" />
1414
<PackageReference Include="xunit" Version="2.9.3" />
1515
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">

‎CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageReference Include="MediatR" Version="12.5.0" />
8-
<PackageReference Include="Shared" Version="2025.6.2" />
9-
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.6.2" />
10-
<PackageReference Include="Shared.EventStore" Version="2025.6.2" />
8+
<PackageReference Include="Shared" Version="2025.7.9" />
9+
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.7.9" />
10+
<PackageReference Include="Shared.EventStore" Version="2025.7.9" />
1111
</ItemGroup>
1212
<ItemGroup>
1313
<ProjectReference Include="..\CallbackHandler.CallbackMessageAggregate\CallbackHandler.CallbackMessageAggregate.csproj" />

‎CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<DebugType>None</DebugType>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Shared" Version="2025.6.2" />
9-
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.6.2" />
8+
<PackageReference Include="Shared" Version="2025.7.9" />
9+
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.7.9" />
1010
</ItemGroup>
1111
</Project>

‎CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
11-
<PackageReference Include="Shared.EventStore" Version="2025.6.2" />
11+
<PackageReference Include="Shared.EventStore" Version="2025.7.9" />
1212
<PackageReference Include="Shouldly" Version="4.3.0" />
1313
<PackageReference Include="xunit" Version="2.9.3" />
1414
<PackageReference Include="xunit.extensibility.core" Version="2.9.3" />

‎CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</ItemGroup>
1111
<ItemGroup>
1212
<PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
13-
<PackageReference Include="Shared" Version="2025.6.2" />
14-
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.6.2" />
15-
<PackageReference Include="Shared.EventStore" Version="2025.6.2" />
13+
<PackageReference Include="Shared" Version="2025.7.9" />
14+
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.7.9" />
15+
<PackageReference Include="Shared.EventStore" Version="2025.7.9" />
1616
</ItemGroup>
1717
</Project>

‎CallbackHandler.Tests/CallbackHandler.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ItemGroup>
1010
<PackageReference Include="Lamar" Version="15.0.0" />
1111
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.5" />
12-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
12+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
1414
<PackageReference Include="Moq" Version="4.20.72" />
1515
<PackageReference Include="xunit" Version="2.9.3" />

‎CallbackHandler/CallbackHandler.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<ItemGroup>
99
<PackageReference Include="Lamar" Version="15.0.0" />
1010
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="15.0.0" />
11-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
11+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
1212
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
1313
<PackageReference Include="MediatR" Version="12.5.0" />
1414
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
15-
<PackageReference Include="Shared" Version="2025.6.2" />
15+
<PackageReference Include="Shared" Version="2025.7.9" />
1616
<PackageReference Include="SimpleResults.AspNetCore" Version="4.0.0" />
1717
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.2" />
1818
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.1.2" />
@@ -33,9 +33,6 @@
3333
<Content Update="nlog.config">
3434
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
3535
</Content>
36-
<Content Update="nlog.development.config">
37-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
38-
</Content>
3936
</ItemGroup>
4037

4138
<ItemGroup>

‎CallbackHandler/Program.cs‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,19 @@
66
using System.Collections.Generic;
77
using System.Linq;
88
using System.Threading.Tasks;
9+
using NLog.Extensions.Logging;
10+
using Shared.Logger;
11+
using Shared.Middleware;
912

1013
namespace CallbackHandler
1114
{
12-
using System.Diagnostics.CodeAnalysis;
13-
using System.IO;
1415
using Lamar.Microsoft.DependencyInjection;
1516
using Microsoft.Extensions.DependencyInjection;
17+
using NLog;
1618
using Shared.DomainDrivenDesign.EventSourcing;
1719
using Shared.EventStore.Aggregate;
20+
using System.Diagnostics.CodeAnalysis;
21+
using System.IO;
1822

1923
[ExcludeFromCodeCoverage]
2024
public class Program
@@ -34,12 +38,28 @@ public static IHostBuilder CreateHostBuilder(string[] args)
3438
.AddJsonFile("hosting.development.json", optional: true)
3539
.AddEnvironmentVariables().Build();
3640

41+
String contentRoot = Directory.GetCurrentDirectory();
42+
String nlogConfigPath = Path.Combine(contentRoot, "nlog.config");
43+
44+
LogManager.Setup(b =>
45+
{
46+
b.SetupLogFactory(setup =>
47+
{
48+
setup.AddCallSiteHiddenAssembly(typeof(NlogLogger).Assembly);
49+
setup.AddCallSiteHiddenAssembly(typeof(Shared.Logger.Logger).Assembly);
50+
setup.AddCallSiteHiddenAssembly(typeof(TenantMiddleware).Assembly);
51+
});
52+
b.LoadConfigurationFromFile(nlogConfigPath);
53+
});
54+
55+
3756
IHostBuilder hostBuilder = Host.CreateDefaultBuilder(args);
3857
hostBuilder.UseWindowsService();
3958
hostBuilder.UseLamar();
4059
hostBuilder.ConfigureLogging(logging =>
4160
{
4261
logging.AddConsole();
62+
logging.AddNLog();
4363

4464
});
4565
hostBuilder.ConfigureWebHostDefaults(webBuilder =>

‎CallbackHandler/Startup.cs‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010

1111
namespace CallbackHandler
1212
{
13-
using System.Diagnostics.CodeAnalysis;
14-
using System.IO;
15-
using System.Net.Http;
16-
using System.Reflection;
1713
using Bootstrapper;
1814
using BusinessLogic.Common;
1915
using BusinessLogic.RequestHandler;
@@ -37,7 +33,12 @@ namespace CallbackHandler
3733
using Shared.Extensions;
3834
using Shared.General;
3935
using Shared.Logger;
36+
using Shared.Middleware;
4037
using Swashbuckle.AspNetCore.Filters;
38+
using System.Diagnostics.CodeAnalysis;
39+
using System.IO;
40+
using System.Net.Http;
41+
using System.Reflection;
4142
using ILogger = Microsoft.Extensions.Logging.ILogger;
4243

4344
[ExcludeFromCodeCoverage]
@@ -92,28 +93,18 @@ public void ConfigureContainer(ServiceRegistry services)
9293
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
9394
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
9495
{
95-
String nlogConfigFilename = "nlog.config";
96-
9796
if (env.IsDevelopment())
9897
{
99-
var developmentNlogConfigFilename = "nlog.development.config";
100-
if (File.Exists(Path.Combine(env.ContentRootPath, developmentNlogConfigFilename)))
101-
{
102-
nlogConfigFilename = developmentNlogConfigFilename;
103-
}
10498
app.UseDeveloperExceptionPage();
10599
}
106-
107-
loggerFactory.ConfigureNLog(Path.Combine(env.ContentRootPath, nlogConfigFilename));
108-
loggerFactory.AddNLog();
109-
100+
110101
ILogger logger = loggerFactory.CreateLogger("CallbackHandler");
111102

112103
Logger.Initialise(logger);
113104
Startup.Configuration.LogConfiguration(Logger.LogWarning);
114105

115106
ConfigurationReader.Initialise(Startup.Configuration);
116-
107+
app.UseMiddleware<TenantMiddleware>();
117108
app.AddRequestLogging();
118109
app.AddResponseLogging();
119110
app.AddExceptionHandler();

‎CallbackHandler/nlog.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<target name="asyncFile" xsi:type="AsyncWrapper">
66
<target name="logfile" xsi:type="File"
77
fileName="/home/txnproc/trace/callbackhandler.log"
8-
layout="${date:format=dd/MM/yyyy HH\:mm\:ss} | ${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= | }"
8+
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= | }"
99
archiveFileName="/home/txnproc/trace/callbackhandler.{#####}.log"
1010
archiveAboveSize="104857600"
1111
archiveNumbering="Sequence"

0 commit comments

Comments
 (0)