Merge pull request #55 from PandaTechAM/development

HaikAsatryan · web-flow · commit 99ff363f642b · 2025-07-09T18:47:20.000+04:00
Logging cleanup and nuget updates
diff --git a/SharedKernel.Demo/SharedKernel.Demo.csproj b/SharedKernel.Demo/SharedKernel.Demo.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.5" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.7" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/SharedKernel/Helpers/MethodTimingStatistics.cs b/src/SharedKernel/Helpers/MethodTimingStatistics.cs
@@ -107,7 +107,7 @@ private static string FormatDuration(double milliseconds)
       if (seconds < 60)
       {
          var wholeSeconds = (int)seconds;
-         var remainderMs = milliseconds - (wholeSeconds * 1000.0);
+         var remainderMs = milliseconds - wholeSeconds * 1000.0;
          return $"{wholeSeconds}s {remainderMs:F3}ms";
       }
 
diff --git a/src/SharedKernel/Logging/OutboundLoggingHandler.cs b/src/SharedKernel/Logging/OutboundLoggingHandler.cs
@@ -29,11 +29,11 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
          response.Content.Headers.ContentType?.MediaType);
 
       logger.LogInformation(
-         "[Outbound Call] HTTP {Method} to {Uri} responded with {StatusCode} in {ElapsedMs}ms. " +
+         "[Outbound Call] HTTP {Method} {Uri} responded with {StatusCode} in {ElapsedMs}ms. " +
          "Request Headers: {RequestHeaders}, Request Body: {RequestBody}, " +
          "Response Headers: {ResponseHeaders}, Response Body: {ResponseBody}",
          request.Method,
-         request.RequestUri,
+         request.RequestUri?.ToString(),
          (int)response.StatusCode,
          elapsed,
          reqHeaders,
diff --git a/src/SharedKernel/Logging/RequestLoggingMiddleware.cs b/src/SharedKernel/Logging/RequestLoggingMiddleware.cs
@@ -1,5 +1,6 @@
 ﻿using System.Diagnostics;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Extensions.Logging;
 using SharedKernel.Logging.Helpers;
 
@@ -52,11 +53,11 @@ public async Task InvokeAsync(HttpContext context)
             await responseBody.CopyToAsync(originalBody);
 
             logger.LogInformation(
-                "[Incoming Request] HTTP {Method} {Query} responded with {StatusCode} in {ElapsedMilliseconds}ms. " +
+                "[Incoming Request] HTTP {Method} {Url} responded with {StatusCode} in {ElapsedMilliseconds}ms. " +
                 "Request Headers: {RequestHeaders}, Request Body: {RequestBody}, " +
                 "Response Headers: {ResponseHeaders}, Response Body: {ResponseBody}",
                 context.Request.Method,
-                context.Request.QueryString,
+                context.Request.GetDisplayUrl(),
                 context.Response.StatusCode,
                 elapsed,
                 reqHeaders,
diff --git a/src/SharedKernel/Logging/SerilogExtensions.cs b/src/SharedKernel/Logging/SerilogExtensions.cs
@@ -125,11 +125,11 @@ private static LoggerConfiguration WriteToFile(this LoggerConfiguration loggerCo
       return loggerConfig.WriteTo.File(formatter, logPath, rollingInterval: RollingInterval.Day);
    }
 
-   #region Filtering
-
    private static LoggerConfiguration FilterOutUnwantedLogs(this LoggerConfiguration loggerConfig)
    {
       return loggerConfig
+             .Filter
+             .ByExcluding(e => e.ShouldExcludeAboveBoardGetLogs()) 
              .Filter
              .ByExcluding(e => e.ShouldExcludeHangfireDashboardLogs())
              .Filter
@@ -139,6 +139,20 @@ private static LoggerConfiguration FilterOutUnwantedLogs(this LoggerConfiguratio
              .Filter
              .ByExcluding(e => e.ShouldExcludeMassTransitHealthCheckLogs());
    }
+   
+   private static bool ShouldExcludeAboveBoardGetLogs(this LogEvent logEvent)
+   {
+      var path = logEvent.Properties.TryGetValue("RequestPath", out var p) && p is ScalarValue sv
+         ? sv.Value?.ToString()
+         : null;
+      
+      var method = logEvent.Properties.TryGetValue("RequestMethod", out var m) && m is ScalarValue mv
+         ? mv.Value?.ToString()
+         : null;
+
+      return string.Equals(method, "GET", StringComparison.OrdinalIgnoreCase)
+             && path?.StartsWith("/above-board", StringComparison.OrdinalIgnoreCase) == true;
+   }
 
    private static bool ShouldExcludeHangfireDashboardLogs(this LogEvent logEvent)
    {
@@ -170,10 +184,6 @@ private static bool ShouldExcludeMassTransitHealthCheckLogs(this LogEvent logEve
       return message.StartsWith("Health check masstransit-bus with status Unhealthy completed after");
    }
 
-   #endregion
-
-   #region File Path Helper
-
    private static string GetLogsPath(this WebApplicationBuilder builder)
    {
       var persistencePath = builder.Configuration.GetPersistentPath();
@@ -185,5 +195,4 @@ private static string GetLogsPath(this WebApplicationBuilder builder)
       return Path.Combine(persistencePath, repoName, envName, "logs", fileName);
    }
 
-   #endregion
 }
diff --git a/src/SharedKernel/SharedKernel.csproj b/src/SharedKernel/SharedKernel.csproj
@@ -8,13 +8,13 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.5.0</Version>
+        <Version>1.5.1</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>FluentValidation nuget change from ASPNETCORE to regular one. This might brake some code</PackageReleaseNotes>
+        <PackageReleaseNotes>Logging cleanup and nuget updates</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>
@@ -29,17 +29,17 @@
     <ItemGroup>
         <PackageReference Include="AspNetCore.HealthChecks.Prometheus.Metrics" Version="9.0.0" />
         <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />        
-        <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.18.1" />
+        <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.18.2" />
         <PackageReference Include="FluentDateTime" Version="3.0.0" />
         <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
-        <PackageReference Include="HtmlSanitizer" Version="9.0.884" />
-        <PackageReference Include="MediatR" Version="12.5.0" />
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.5" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.5" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="9.0.5" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.5" />
-        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.5" />
-        <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.5.0" />
+        <PackageReference Include="HtmlSanitizer" Version="9.0.886" />
+        <PackageReference Include="MediatR" Version="[12.5.0]" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.7" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.7" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="9.0.7" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.7" />
+        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.7" />
+        <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.7.0" />
         <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
         <PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.8.0-rc.1" />
         <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
@@ -53,11 +53,11 @@
         <PackageReference Include="Pandatech.FluentMinimalApiMapper" Version="2.0.3" />
         <PackageReference Include="Pandatech.PandaVaultClient" Version="4.0.5" />
         <PackageReference Include="Pandatech.ResponseCrafter" Version="5.1.10" />
-        <PackageReference Include="Scalar.AspNetCore" Version="2.4.13" />
+        <PackageReference Include="Scalar.AspNetCore" Version="2.5.6" />
         <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
         <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
         <PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.1" />
-        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.4" />
+        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.3" />
     </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ private static string FormatDuration(double milliseconds)`
`107`	`107`	`if (seconds < 60)`
`108`	`108`	`{`
`109`	`109`	`var wholeSeconds = (int)seconds;`
`110`		`- var remainderMs = milliseconds - (wholeSeconds * 1000.0);`
	`110`	`+ var remainderMs = milliseconds - wholeSeconds * 1000.0;`
`111`	`111`	`return $"{wholeSeconds}s {remainderMs:F3}ms";`
`112`	`112`	`}`
`113`	`113`