DP-671: Include version in logs

cabinetoffice · Oct 2, 2024 · e3c052d · e3c052d
1 parent 704801e
commit e3c052d
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 16 deletions.
diff --git a/Frontend/CO.CDP.OrganisationApp/Program.cs b/Frontend/CO.CDP.OrganisationApp/Program.cs
@@ -164,7 +164,7 @@
     .AddAwsS3Service()
     .AddLoggingConfiguration(builder.Configuration)
     .AddAmazonCloudWatchLogsService()
-    .AddCloudWatchSerilog();
+    .AddCloudWatchSerilog(builder.Configuration);
 
 
 var app = builder.Build();

diff --git a/Libraries/CO.CDP.AwsServices/CloudWatchExtensions.cs b/Libraries/CO.CDP.AwsServices/CloudWatchExtensions.cs
@@ -63,23 +63,25 @@ private static IServiceCollection AddCloudWatchLogs(this IServiceCollection serv
         });
     }
 
-    public static IServiceCollection AddCloudWatchSerilog(this IServiceCollection services)
+    public static IServiceCollection AddCloudWatchSerilog(
+        this IServiceCollection services, IConfiguration configuration)
     {
-        return AddCloudWatchSerilog(services, (_, _) => { });
+        return AddCloudWatchSerilog(services, configuration, (_, _) => { });
     }
 
     private static IServiceCollection AddCloudWatchSerilog(
-        this IServiceCollection services,
+        this IServiceCollection services, IConfiguration configuration,
         Action<IServiceProvider, LoggerConfiguration> configureLogger)
     {
         return services.AddSerilog((serviceProvider, lc) =>
         {
-            var configuration = serviceProvider.GetRequiredService<IOptions<LoggingConfiguration>>().Value;
+            var loggingConfiguration = serviceProvider.GetRequiredService<IOptions<LoggingConfiguration>>().Value;
             lc.WriteTo.AmazonCloudWatch(serviceProvider)
-                .MinimumLevel.Is(configuration.MinimumLevel.Default)
-                .OverrideLogLevels(configuration.MinimumLevel.Override)
-                .EnableConsole(configuration.Console)
-                .Enrich.FromLogContext();
+                .MinimumLevel.Is(loggingConfiguration.MinimumLevel.Default)
+                .OverrideLogLevels(loggingConfiguration.MinimumLevel.Override)
+                .EnableConsole(loggingConfiguration.Console)
+                .Enrich.FromLogContext()
+                .Enrich.WithProperty("Version", configuration.GetValue<string>("Version"));
             configureLogger(serviceProvider, lc);
         });
     }

diff --git a/Services/CO.CDP.DataSharing.WebApi/Program.cs b/Services/CO.CDP.DataSharing.WebApi/Program.cs
@@ -55,7 +55,7 @@
         .AddAwsConfiguration(builder.Configuration)
         .AddLoggingConfiguration(builder.Configuration)
         .AddAmazonCloudWatchLogsService()
-        .AddCloudWatchSerilog();
+        .AddCloudWatchSerilog(builder.Configuration);
 }
 
 var app = builder.Build();

diff --git a/Services/CO.CDP.EntityVerification/Program.cs b/Services/CO.CDP.EntityVerification/Program.cs
@@ -58,7 +58,7 @@
         .AddAwsConfiguration(builder.Configuration)
         .AddLoggingConfiguration(builder.Configuration)
         .AddAmazonCloudWatchLogsService()
-        .AddCloudWatchSerilog();
+        .AddCloudWatchSerilog(builder.Configuration);
 }
 
 builder.Services

diff --git a/Services/CO.CDP.Forms.WebApi/Program.cs b/Services/CO.CDP.Forms.WebApi/Program.cs
@@ -48,7 +48,7 @@
         .AddAwsConfiguration(builder.Configuration)
         .AddLoggingConfiguration(builder.Configuration)
         .AddAmazonCloudWatchLogsService()
-        .AddCloudWatchSerilog();
+        .AddCloudWatchSerilog(builder.Configuration);
 }
 
 var app = builder.Build();

diff --git a/Services/CO.CDP.Organisation.Authority/Program.cs b/Services/CO.CDP.Organisation.Authority/Program.cs
@@ -32,7 +32,7 @@
         .AddAwsConfiguration(builder.Configuration)
         .AddLoggingConfiguration(builder.Configuration)
         .AddAmazonCloudWatchLogsService()
-        .AddCloudWatchSerilog();
+        .AddCloudWatchSerilog(builder.Configuration);
 }
 
 var app = builder.Build();

diff --git a/Services/CO.CDP.Organisation.WebApi/Program.cs b/Services/CO.CDP.Organisation.WebApi/Program.cs
@@ -99,7 +99,7 @@
         .AddAwsConfiguration(builder.Configuration)
         .AddLoggingConfiguration(builder.Configuration)
         .AddAmazonCloudWatchLogsService()
-        .AddCloudWatchSerilog();
+        .AddCloudWatchSerilog(builder.Configuration);
 }
 
 var app = builder.Build();

diff --git a/Services/CO.CDP.Person.WebApi/Program.cs b/Services/CO.CDP.Person.WebApi/Program.cs
@@ -43,7 +43,7 @@
         .AddAwsConfiguration(builder.Configuration)
         .AddLoggingConfiguration(builder.Configuration)
         .AddAmazonCloudWatchLogsService()
-        .AddCloudWatchSerilog();
+        .AddCloudWatchSerilog(builder.Configuration);
 }
 
 var app = builder.Build();

diff --git a/Services/CO.CDP.Tenant.WebApi/Program.cs b/Services/CO.CDP.Tenant.WebApi/Program.cs
@@ -46,7 +46,7 @@
         .AddAwsConfiguration(builder.Configuration)
         .AddLoggingConfiguration(builder.Configuration)
         .AddAmazonCloudWatchLogsService()
-        .AddCloudWatchSerilog();
+        .AddCloudWatchSerilog(builder.Configuration);
 
     builder.Services.AddHealthChecks()
         .AddNpgSql(ConnectionStringHelper.GetConnectionString(builder.Configuration,