Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DP-671: Include version in logs #695

Merged
merged 1 commit into from
Oct 2, 2024
Merged

DP-671: Include version in logs #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Frontend/CO.CDP.OrganisationApp/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
.AddAwsS3Service()
.AddLoggingConfiguration(builder.Configuration)
.AddAmazonCloudWatchLogsService()
.AddCloudWatchSerilog();
.AddCloudWatchSerilog(builder.Configuration);


var app = builder.Build();
Expand Down
18 changes: 10 additions & 8 deletions Libraries/CO.CDP.AwsServices/CloudWatchExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
}
Expand Down
2 changes: 1 addition & 1 deletion Services/CO.CDP.DataSharing.WebApi/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
.AddAwsConfiguration(builder.Configuration)
.AddLoggingConfiguration(builder.Configuration)
.AddAmazonCloudWatchLogsService()
.AddCloudWatchSerilog();
.AddCloudWatchSerilog(builder.Configuration);
}

var app = builder.Build();
Expand Down
2 changes: 1 addition & 1 deletion Services/CO.CDP.EntityVerification/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
.AddAwsConfiguration(builder.Configuration)
.AddLoggingConfiguration(builder.Configuration)
.AddAmazonCloudWatchLogsService()
.AddCloudWatchSerilog();
.AddCloudWatchSerilog(builder.Configuration);
}

builder.Services
Expand Down
2 changes: 1 addition & 1 deletion Services/CO.CDP.Forms.WebApi/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
.AddAwsConfiguration(builder.Configuration)
.AddLoggingConfiguration(builder.Configuration)
.AddAmazonCloudWatchLogsService()
.AddCloudWatchSerilog();
.AddCloudWatchSerilog(builder.Configuration);
}

var app = builder.Build();
Expand Down
2 changes: 1 addition & 1 deletion Services/CO.CDP.Organisation.Authority/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
.AddAwsConfiguration(builder.Configuration)
.AddLoggingConfiguration(builder.Configuration)
.AddAmazonCloudWatchLogsService()
.AddCloudWatchSerilog();
.AddCloudWatchSerilog(builder.Configuration);
}

var app = builder.Build();
Expand Down
2 changes: 1 addition & 1 deletion Services/CO.CDP.Organisation.WebApi/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
.AddAwsConfiguration(builder.Configuration)
.AddLoggingConfiguration(builder.Configuration)
.AddAmazonCloudWatchLogsService()
.AddCloudWatchSerilog();
.AddCloudWatchSerilog(builder.Configuration);
}

var app = builder.Build();
Expand Down
2 changes: 1 addition & 1 deletion Services/CO.CDP.Person.WebApi/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
.AddAwsConfiguration(builder.Configuration)
.AddLoggingConfiguration(builder.Configuration)
.AddAmazonCloudWatchLogsService()
.AddCloudWatchSerilog();
.AddCloudWatchSerilog(builder.Configuration);
}

var app = builder.Build();
Expand Down
2 changes: 1 addition & 1 deletion Services/CO.CDP.Tenant.WebApi/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
.AddAwsConfiguration(builder.Configuration)
.AddLoggingConfiguration(builder.Configuration)
.AddAmazonCloudWatchLogsService()
.AddCloudWatchSerilog();
.AddCloudWatchSerilog(builder.Configuration);

builder.Services.AddHealthChecks()
.AddNpgSql(ConnectionStringHelper.GetConnectionString(builder.Configuration,
Expand Down
Loading