Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 SharedKernel.Demo/SharedKernel.Demo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="9.0.0"/>
<PackageReference Include="MassTransit.RabbitMQ" Version="8.5.4" />
<PackageReference Include="MassTransit.RabbitMQ" Version="8.5.5" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.8"/>
</ItemGroup>
Expand Down
39 changes: 31 additions & 8 deletions src/SharedKernel/Logging/SerilogExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ public static WebApplicationBuilder AddSerilog(this WebApplicationBuilder builde
LogBackend logBackend,
Dictionary<string, string>? logAdditionalProperties = null,
int daysToRetain = 7,
bool asyncSinks = false)
bool asyncSinks = false,
bool suppressAspNetExceptionHandler = true)
{
builder.Logging.ClearProviders();

var loggerConfig = new LoggerConfiguration()
.FilterOutUnwantedLogs()
.FilterOutUnwantedLogs(suppressAspNetExceptionHandler)
.Enrich
.FromLogContext()
.ConfigureDestinations(builder, logBackend, asyncSinks)
Expand Down Expand Up @@ -159,13 +160,35 @@ private static LoggerConfiguration WriteToFile(this LoggerConfiguration loggerCo
return loggerConfig.WriteTo.File(formatter, logPath, rollingInterval: RollingInterval.Day);
}

private static LoggerConfiguration FilterOutUnwantedLogs(this LoggerConfiguration loggerConfig)
private static LoggerConfiguration FilterOutUnwantedLogs(this LoggerConfiguration loggerConfig,
bool suppressAspNetExceptionHandler)
{
return loggerConfig
.Filter
.ByExcluding(IsEfOutboxQuery)
.Filter
.ByExcluding(ShouldDropByPath);
var filteredConfig = loggerConfig
.Filter
.ByExcluding(IsEfOutboxQuery)
.Filter
.ByExcluding(ShouldDropByPath);
if (suppressAspNetExceptionHandler)
{
filteredConfig = filteredConfig
.Filter
.ByExcluding(ShouldDropExceptionHandlerLogs);
}

return filteredConfig;
}

private static bool ShouldDropExceptionHandlerLogs(LogEvent evt)
{
if (!evt.Properties.TryGetValue("SourceContext", out var sc) || sc is not ScalarValue sv)
{
return false;
}

var sourceContext = sv.Value as string ?? "";

return sourceContext.Equals("Microsoft.AspNetCore.Diagnostics.ExceptionHandlerMiddleware",
StringComparison.OrdinalIgnoreCase);
}

private static bool ShouldDropByPath(LogEvent evt)
Expand Down
14 changes: 7 additions & 7 deletions src/SharedKernel/SharedKernel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<PackageReadmeFile>Readme.md</PackageReadmeFile>
<Authors>Pandatech</Authors>
<Copyright>MIT</Copyright>
<Version>1.8.4</Version>
<Version>1.8.5</Version>
<PackageId>Pandatech.SharedKernel</PackageId>
<Title>Pandatech Shared Kernel Library</Title>
<PackageTags>Pandatech, shared kernel, library, OpenAPI, Swagger, utilities, scalar</PackageTags>
<Description>Pandatech.SharedKernel provides centralized configurations, utilities, and extensions for ASP.NET Core projects. For more information refere to readme.md document.</Description>
<RepositoryUrl>https://github.com/PandaTechAM/be-lib-sharedkernel</RepositoryUrl>
<PackageReleaseNotes>tag ordering added to open api</PackageReleaseNotes>
<PackageReleaseNotes>logging option to remove duplicate logs</PackageReleaseNotes>
</PropertyGroup>

<ItemGroup>
Expand All @@ -39,13 +39,13 @@
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="9.0.8"/>
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.8"/>
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.8.0"/>
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0"/>
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.8.0-rc.1"/>
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0"/>
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0"/>
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.12"/>
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0"/>
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0"/>
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
<PackageReference Include="Pandatech.CommissionCalculator" Version="4.0.1" />
<PackageReference Include="Pandatech.Crypto" Version="6.1.1" />
<PackageReference Include="Pandatech.DistributedCache" Version="4.0.9"/>
Expand Down
4 changes: 2 additions & 2 deletions test/SharedKernel.Tests/SharedKernel.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="xunit" Version="2.9.3"/>
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down