elias/booking-microservices
1
0
Fork 0
mirror of https://github.com/meysamhadeli/booking-microservices.git synced 2026-04-12 03:12:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor logging

Browse Source
This commit is contained in:
meysamhadeli 2022-09-10 21:31:15 +04:30
parent 0151c7b2c9
commit 4583b5eca7
11 changed files with 129 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Directory.Build.props
View File

@ -1,21 +1,12 @@
<Project>
<ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="1.0.688" Condition="$(MSBuildProjectExtension) == '.csproj'" PrivateAssets="all">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference
Include="StyleCop.Analyzers"
Version="1.2.0-beta.354"
PrivateAssets="all"
Condition="$(MSBuildProjectExtension) == '.csproj'"
/>
<PackageReference
Include="SonarAnalyzer.CSharp"
Version="8.29.0.36737"
PrivateAssets="all"
Condition="$(MSBuildProjectExtension) == '.csproj'"
/>
<PackageReference
Include="Roslynator.Analyzers"
@ -47,18 +38,20 @@
PrivateAssets="all"
Condition="$(MSBuildProjectExtension) == '.csproj'"
/>
<PackageReference
Include="SerilogAnalyzer"
Version="0.15.0"
PrivateAssets="all"
Condition="$(MSBuildProjectExtension) == '.csproj'"
/>
</ItemGroup>
<PackageReference
Include="Meziantou.Analyzer"
Version="1.0.723"
PrivateAssets="all"
Condition="$(MSBuildProjectExtension) == '.csproj'"
/>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>

2
src/BuildingBlocks/HealthCheck/Extensions.cs
View File

@ -26,7 +26,7 @@ public static class Extensions
var healthChecksBuilder = services.AddHealthChecks()
.AddSqlServer(sqlOptions.DefaultConnection)
.AddRabbitMQ(rabbitConnectionString: $"amqp://{rabbitMqOptions.UserName}:{rabbitMqOptions.Password}@{rabbitMqOptions.HostName}")
.AddElasticsearch(logOptions.ElasticUri);
.AddElasticsearch(logOptions.Elastic.ElasticServiceUrl);
if (mongoOptions.ConnectionString is not null)
healthChecksBuilder.AddMongoDb(mongoOptions.ConnectionString);

8
src/BuildingBlocks/Logging/ElasticOptions.cs Normal file
View File

@ -0,0 +1,8 @@
namespace BuildingBlocks.Logging;
public class ElasticOptions
{
public bool Enable { get; set; }
public string ElasticServiceUrl { get; set; }
public string ElasticSearchIndex { get; set; }
}

78
src/BuildingBlocks/Logging/Extensions.cs
View File

@ -1,47 +1,67 @@
using System.Reflection;
using System.Text;
using BuildingBlocks.Web;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Serilog;
using Serilog.Enrichers.Span;
using Serilog.Events;
using Serilog.Exceptions;
using Serilog.Sinks.Elasticsearch;
using Serilog.Sinks.SpectreConsole;
namespace BuildingBlocks.Logging;
public static class Extensions
namespace BuildingBlocks.Logging
{
public static WebApplicationBuilder AddCustomSerilog(this WebApplicationBuilder builder)
public static class Extensions
{
builder.Host.UseSerilog((context, loggerConfiguration) =>
public static WebApplicationBuilder AddCustomSerilog(this WebApplicationBuilder builder)
{
var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
var loggOptions = context.Configuration.GetSection(nameof(LogOptions)).Get<LogOptions>();
var appOptions = context.Configuration.GetSection(nameof(AppOptions)).Get<AppOptions>();
builder.Host.UseSerilog((context, services, loggerConfiguration) =>
{
var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
var logOptions = context.Configuration.GetSection(nameof(LogOptions)).Get<LogOptions>();
var appOptions = context.Configuration.GetSection(nameof(AppOptions)).Get<AppOptions>();
var logLevel = Enum.TryParse<LogEventLevel>(loggOptions.Level, true, out var level)
? level
: LogEventLevel.Information;
loggerConfiguration
.WriteTo.Elasticsearch(new ElasticsearchSinkOptions(new Uri(loggOptions.ElasticUri))
var logLevel = Enum.TryParse<LogEventLevel>(logOptions.Level, true, out var level)
? level
: LogEventLevel.Information;
loggerConfiguration
.MinimumLevel.Is(logLevel)
.WriteTo.SpectreConsole(logOptions.LogTemplate, logLevel)
.MinimumLevel.Override("Microsoft", LogEventLevel.Information)
// Only show ef-core information in error level
.MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Error)
// Filter out ASP.NET Core infrastructure logs that are Information and below
.MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Warning)
.Enrich.WithExceptionDetails()
.Enrich.FromLogContext()
.ReadFrom.Configuration(context.Configuration);
if (logOptions.Elastic.Enable)
{
AutoRegisterTemplate = true,
IndexFormat =
$"{appOptions.Name}-{environment?.ToLower().Replace(".", "-")}-{DateTime.UtcNow:yyyy-MM}"
})
.WriteTo.SpectreConsole(loggOptions.LogTemplate, logLevel)
.MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Error)
.Enrich.WithSpan()
.Enrich.WithExceptionDetails()
.Enrich.FromLogContext()
.ReadFrom.Configuration(context.Configuration);
});
loggerConfiguration.WriteTo.Elasticsearch(
new ElasticsearchSinkOptions(new Uri(logOptions.Elastic.ElasticServiceUrl))
{
AutoRegisterTemplate = true,
IndexFormat =
$"{appOptions.Name}-{environment?.ToLower().Replace(".", "-")}-{DateTime.UtcNow:yyyy-MM}"
});
}
return builder;
if (logOptions.File.Enable)
{
var path = string.IsNullOrWhiteSpace(logOptions.File.Path) ? "logs/.txt" : logOptions.File.Path;
if (!Enum.TryParse<RollingInterval>(logOptions.File.Interval, true, out var interval))
{
interval = RollingInterval.Day;
}
loggerConfiguration.WriteTo.File(path, rollingInterval: interval, encoding: Encoding.UTF8,
outputTemplate: logOptions.LogTemplate);
}
});
return builder;
}
}
}

8
src/BuildingBlocks/Logging/FileOptions.cs Normal file
View File

@ -0,0 +1,8 @@
namespace BuildingBlocks.Logging;
public class FileOptions
{
public bool Enable { get; set; }
public string Path { get; set; }
public string Interval { get; set; }
}

10
src/BuildingBlocks/Logging/LogOptions.cs Normal file
View File

@ -0,0 +1,10 @@
namespace BuildingBlocks.Logging
{
public class LogOptions
{
public string Level { get; set; }
public ElasticOptions Elastic { get; set; }
public FileOptions File { get; set; }
public string LogTemplate { get; set; }
}
}

8
src/BuildingBlocks/Logging/LoggerOptions.cs
View File

@ -1,8 +0,0 @@
namespace BuildingBlocks.Logging;
public class LogOptions
{
public string Level { get; set; }
public string LogTemplate { get; set; }
public string ElasticUri { get; set; }
}

12
src/Services/Booking/src/Booking.Api/appsettings.json
View File

@ -3,9 +3,17 @@
"Name": "Booking-Service"
},
"LogOptions": {
"Level": "Information",
"Level": "information",
"LogTemplate": "{Timestamp:HH:mm:ss} [{Level:u4}] {Message:lj}{NewLine}{Exception}",
"ElasticUri": "http://localhost:9200"
"Elastic": {
"Enable": true,
"ElasticServiceUrl": "http://localhost:9200"
},
"File": {
"enable": false,
"path": "logs/logs.txt",
"interval": "day"
}
},
"Jwt": {
"Authority": "https://localhost:5005",

12
src/Services/Flight/src/Flight.Api/appsettings.json
View File

@ -3,9 +3,17 @@
"Name": "Flight-Service"
},
"LogOptions": {
"Level": "Information",
"Level": "information",
"LogTemplate": "{Timestamp:HH:mm:ss} [{Level:u4}] {Message:lj}{NewLine}{Exception}",
"ElasticUri": "http://localhost:9200"
"Elastic": {
"Enable": true,
"ElasticServiceUrl": "http://localhost:9200"
},
"File": {
"enable": false,
"path": "logs/logs.txt",
"interval": "day"
}
},
"ConnectionStrings": {
"DefaultConnection": "Server=.\\sqlexpress;Database=FlightDB;Trusted_Connection=True;MultipleActiveResultSets=true"

12
src/Services/Identity/src/Identity.Api/appsettings.json
View File

@ -12,9 +12,17 @@
"Password": "guest"
},
"LogOptions": {
"Level": "Information",
"Level": "information",
"LogTemplate": "{Timestamp:HH:mm:ss} [{Level:u4}] {Message:lj}{NewLine}{Exception}",
"ElasticUri": "http://localhost:9200"
"Elastic": {
"Enable": true,
"ElasticServiceUrl": "http://localhost:9200"
},
"File": {
"enable": false,
"path": "logs/logs.txt",
"interval": "day"
}
},
"PersistMessageOptions": {
"Interval": 30,

12
src/Services/Passenger/src/Passenger.Api/appsettings.json
View File

@ -20,9 +20,17 @@
"Password": "guest"
},
"LogOptions": {
"Level": "Information",
"Level": "information",
"LogTemplate": "{Timestamp:HH:mm:ss} [{Level:u4}] {Message:lj}{NewLine}{Exception}",
"ElasticUri": "http://localhost:9200"
"Elastic": {
"Enable": true,
"ElasticServiceUrl": "http://localhost:9200"
},
"File": {
"enable": false,
"path": "logs/logs.txt",
"interval": "day"
}
},
"PersistMessageOptions": {
"Interval": 30,