#169 - zlogger (#181)

* #169 - zlogger

* fix

* fix build

* exclude LoggingWriter.cs from cov

Author: Stepami

Directory.Packages.props

@@ -7,12 +7,13 @@
     </PackageVersion>
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.9" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.9" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24126.1" />
     <PackageVersion Include="System.IO.Abstractions" Version="22.0.16" />
     <PackageVersion Include="Visitor.NET" Version="4.2.0" />
     <PackageVersion Include="Visitor.NET.AutoVisitableGen" Version="1.5.2" />
+    <PackageVersion Include="ZLogger" Version="2.5.10" />
   </ItemGroup>
 </Project>

benchmarks/HydraScript.Benchmarks/HydraScript.Benchmarks.csproj

@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <PackageReference Include="BenchmarkDotNet"/>
-        <PackageReference Include="Microsoft.Extensions.Logging.Console"/>
+        <PackageReference Include="Microsoft.Extensions.Logging"/>
     </ItemGroup>
 
 </Project>

benchmarks/HydraScript.Benchmarks/InvokeBenchmark.cs

@@ -1,4 +1,5 @@
-using BenchmarkDotNet.Attributes;
+using System.Diagnostics.CodeAnalysis;
+using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Running;
 using HydraScript.Benchmarks;
 using HydraScript.Infrastructure;
@@ -7,6 +8,8 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 
+[assembly: ExcludeFromCodeCoverage]
+
 BenchmarkRunner.Run<InvokeBenchmark>();
 
 [InProcess, MemoryDiagnoser]

src/HydraScript/HydraScript.csproj

@@ -18,7 +18,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" />
         <PackageReference Include="System.CommandLine" />
     </ItemGroup>
 

src/HydraScript/Program.cs

@@ -4,7 +4,7 @@
 using HydraScript.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Console;
+using ZLogger;
 
 return CliParser.Parse(GetCommand(), args).Invoke();
 
@@ -25,26 +25,11 @@ private static ExecuteCommand GetCommand()
         return command;
     }
 
-    private const string SuppressMessage = $"{nameof(ConsoleFormatterOptions)} is used";
-
-    [UnconditionalSuppressMessage(
-        category: "ReflectionAnalysis",
-        checkId: "IL2026:RequiresUnreferencedCode",
-        Justification = SuppressMessage)]
-    [UnconditionalSuppressMessage(
-        category: "AotAnalysis",
-        checkId: "IL3050:RequiresDynamicCode",
-        Justification = SuppressMessage)]
-    private static ServiceProvider GetServiceProvider(FileInfo fileInfo, bool dump)
-    {
-        var services = new ServiceCollection();
-        services.AddLogging(c => c.ClearProviders()
-            .AddConsole(options => options.FormatterName = nameof(SimplestConsoleFormatter))
-            .AddConsoleFormatter<SimplestConsoleFormatter, ConsoleFormatterOptions>());
-        services
+    private static ServiceProvider GetServiceProvider(FileInfo fileInfo, bool dump) =>
+        new ServiceCollection()
+            .AddLogging(c => c.ClearProviders().AddZLoggerConsole())
             .AddDomain()
             .AddApplication()
-            .AddInfrastructure(dump, fileInfo);
-        return services.BuildServiceProvider();
-    }
+            .AddInfrastructure(dump, fileInfo)
+            .BuildServiceProvider();
 }

src/HydraScript/SimplestConsoleFormatter.cs

@@ -13,9 +13,11 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Logging" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
         <PackageReference Include="Microsoft.Extensions.Options" />
         <PackageReference Include="System.IO.Abstractions" />
+        <PackageReference Include="ZLogger" />
     </ItemGroup>
 
     <ItemGroup>

src/Infrastructure/HydraScript.Infrastructure/HydraScript.Infrastructure.csproj

@@ -1,19 +1,20 @@
+using System.Diagnostics.CodeAnalysis;
 using HydraScript.Domain.BackEnd;
 using Microsoft.Extensions.Logging;
+using ZLogger;
 
 namespace HydraScript.Infrastructure;
 
+[ExcludeFromCodeCoverage]
 internal partial class LoggingWriter(ILogger<LoggingWriter> logger) : IOutputWriter
 {
-    [LoggerMessage(
-        EventId = 0,
-        Level = LogLevel.Information,
-        Message = "{obj}")]
-    public partial void WriteLine(object? obj);
+    [ZLoggerMessage(Level = LogLevel.Information, Message = "{obj}")]
+    private static partial void WriteLine(ILogger<LoggingWriter> logger, object? obj);
 
-    [LoggerMessage(
-        EventId = 1,
-        Level = LogLevel.Error,
-        Message = "{message}")]
-    public partial void WriteError(Exception e, string message);
+    public void WriteLine(object? obj) => WriteLine(logger, obj);
+
+    [ZLoggerMessage(Level = LogLevel.Error, Message = "{message}")]
+    private static partial void WriteError(ILogger<LoggingWriter> logger, Exception e, string message);
+
+    public void WriteError(Exception e, string message) => WriteError(logger, e, message);
 }