Merge pull request #124 from Cysharp/hadashiA/update-builder-api

Update builder api (take 2)
Cysharp · Dec 1, 2023 · 9efe96e · 9efe96e
2 parents f2d31e7 + 6dd095b
commit 9efe96e
Show file tree

Hide file tree

Showing 22 changed files with 191 additions and 250 deletions.
diff --git a/sandbox/Benchmark/Benchmarks/PostLogEntry.cs b/sandbox/Benchmark/Benchmarks/PostLogEntry.cs
@@ -2,21 +2,18 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
-using System.Threading;
 using System.Threading.Channels;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
 using BenchmarkDotNet.Jobs;
-using log4net.Repository.Hierarchy;
 using Microsoft.Extensions.Logging;
 using NLog;
 using NLog.Extensions.Logging;
 using NLog.Targets.Wrappers;
 using Serilog;
 using ZLogger;
-using ZLogger.Formatters;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace Benchmark.Benchmarks;
@@ -106,16 +103,9 @@ public void SetUp()
 
         var zLoggerFactory = LoggerFactory.Create(logging =>
         {
-            logging.AddZLogger(builder =>
+            logging.AddZLoggerStream(Stream.Null, options =>
             {
-                //builder.AddLogProcessor(new NullProcessor());
-
-                //builder.AddStream(Stream.Null);
-
-                builder.AddStream(Stream.Null, options =>
-                {
-                    options.UsePlainTextFormatter(formatter => formatter.SetPrefixFormatter($"{0} [{1}]", (template, info) => template.Format(info.Timestamp, info.LogLevel)));
-                });
+                options.UsePlainTextFormatter(formatter => formatter.SetPrefixFormatter($"{0} [{1}]", (template, info) => template.Format(info.Timestamp, info.LogLevel)));
             });
         });
         disposables.Add(zLoggerFactory);

diff --git a/sandbox/Benchmark/Benchmarks/WriteJsonToConsole.cs b/sandbox/Benchmark/Benchmarks/WriteJsonToConsole.cs
@@ -60,12 +60,9 @@ public void SetUpLogger()
 
         zLoggerFactory = LoggerFactory.Create(logging =>
         {
-            logging.AddZLogger(builder =>
+            logging.AddZLoggerConsole(console =>
             {
-                builder.AddConsole(console =>
-                {
-                    console.UseJsonFormatter();
-                });
+                console.UseJsonFormatter();
             });
         });
 

diff --git a/sandbox/Benchmark/Benchmarks/WriteJsonToFile.cs b/sandbox/Benchmark/Benchmarks/WriteJsonToFile.cs
@@ -72,16 +72,11 @@ public void SetUpLogger()
 
         // ZLogger
 
-        zLoggerFactory = LoggerFactory.Create(logging =>
-        {
-            logging.AddZLogger(builder =>
+        zLoggerFactory = LoggerFactory.Create(logging => logging
+            .AddZLoggerFile(GetLogFilePath("zlogger.log"), options =>
             {
-                builder.AddFile(GetLogFilePath("zlogger.log"), options =>
-                {
-                    options.UseJsonFormatter();
-                });
-            });
-        });
+                options.UseJsonFormatter();
+            }));
 
         zLogger = zLoggerFactory.CreateLogger<WritePlainTextToFile>();
 

diff --git a/sandbox/Benchmark/Benchmarks/WritePlainTextToConsole.cs b/sandbox/Benchmark/Benchmarks/WritePlainTextToConsole.cs
@@ -55,14 +55,12 @@ public void SetUpLogger()
     {
         zLoggerFactory = LoggerFactory.Create(logging =>
         {
-            logging.AddZLogger(builder =>
+            logging.AddZLoggerConsole(console =>
             {
-                builder.AddConsole(console =>
+                console.UsePlainTextFormatter(formatter =>
                 {
-                    console.UsePlainTextFormatter(formatter =>
-                    {
-                        formatter.SetPrefixFormatter($"{0} [{1}]", (template, info) => template.Format(info.Timestamp, info.LogLevel));
-                    });
+                    formatter.SetPrefixFormatter($"{0} [{1}]",
+                        (template, info) => template.Format(info.Timestamp, info.LogLevel));
                 });
             });
         });

diff --git a/sandbox/Benchmark/Benchmarks/WritePlainTextToFile.cs b/sandbox/Benchmark/Benchmarks/WritePlainTextToFile.cs
@@ -75,17 +75,13 @@ public void SetUpLogger()
 
         zLoggerFactory = LoggerFactory.Create(logging =>
         {
-            logging.AddZLogger(zLogger =>
+            logging.AddZLoggerFile(GetLogFilePath("zlogger.log"), options =>
             {
-                zLogger.AddFile(GetLogFilePath("zlogger.log"),
-                    options =>
-                    {
-                        options.UsePlainTextFormatter(formatter =>
-                        {
-                            formatter.SetPrefixFormatter($"{0} [{1}]",
-                                (template, info) => template.Format(info.Timestamp, info.LogLevel));
-                        });
-                    });
+                options.UsePlainTextFormatter(formatter =>
+                {
+                    formatter.SetPrefixFormatter($"{0} [{1}]",
+                        (template, info) => template.Format(info.Timestamp, info.LogLevel));
+                });
             });
         });
 

diff --git a/sandbox/Benchmark/InternalBenchmarks/EmptyLogging.cs b/sandbox/Benchmark/InternalBenchmarks/EmptyLogging.cs
@@ -89,38 +89,27 @@ public void SetUpLogger()
 
         zLoggerFactory = LoggerFactory.Create(logging =>
         {
-            logging.AddZLogger(zLogger =>
-            {
-                zLogger.AddLogProcessor(new EmptyLogProcessor());
-            });
+            logging.AddZLoggerLogProcessor(new EmptyLogProcessor());
         });
 
         zLogger = zLoggerFactory.CreateLogger<EmptyLogging>();
 
         zLoggerFactory2 = LoggerFactory.Create(logging =>
         {
-            logging.AddZLogger(z =>
-            {
-                z.AddLogProcessor(options => new WriteUtf8LogProcessor(options));
-            });
+            logging.AddZLoggerLogProcessor(options => new WriteUtf8LogProcessor(options));
         });
 
         zLogger2 = zLoggerFactory2.CreateLogger<EmptyLogging>();
 
         zLoggerFactory3 = LoggerFactory.Create(logging =>
         {
-            logging.AddZLogger(z =>
+            logging.AddZLoggerLogProcessor(options =>
             {
-                z.AddLogProcessor(options =>
+                options.UsePlainTextFormatter(formatter =>
                 {
-                    options.UsePlainTextFormatter(formatter =>
-                    {
-                        formatter.SetPrefixFormatter($"{0} [{1}]", (template, info) => template.Format(info.Timestamp, info.LogLevel));
-                    });
-
-                    return new WriteUtf8LogProcessor(options);
+                    formatter.SetPrefixFormatter($"{0} [{1}]", (template, info) => template.Format(info.Timestamp, info.LogLevel));
                 });
-
+                return new WriteUtf8LogProcessor(options);
             });
         });
 

diff --git a/sandbox/Benchmark/SimpleBench.cs b/sandbox/Benchmark/SimpleBench.cs
@@ -61,7 +61,7 @@ protected override Microsoft.Extensions.Logging.ILogger GetLogger()
                 var serviceCollection = new ServiceCollection();
                 serviceCollection.AddLogging(logging =>
                 {
-                    logging.AddZLogger(zLogger => zLogger.AddFile("ZLogger.log"));
+                    logging.AddZLoggerFile("ZLogger.log");
                     //options.AddZLoggerConsole();
                 });
                 var serviceProvider = serviceCollection.BuildServiceProvider();

diff --git a/sandbox/ConsoleApp/ConsoleApp.csproj b/sandbox/ConsoleApp/ConsoleApp.csproj
@@ -15,6 +15,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/sandbox/ConsoleApp/Program.cs b/sandbox/ConsoleApp/Program.cs
@@ -1,42 +1,20 @@
-using ConsoleAppFramework;
-using ZLogger;
+using ZLogger;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Hosting;
 using System.Threading.Tasks;
 using System;
-using Microsoft.Extensions.DependencyInjection;
 using System.Threading.Channels;
-using Utf8StringInterpolation;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using JetBrains.Profiler.Api;
-using System.Threading;
-using ZLogger.Formatters;
-using ZLogger.Internal;
-using ZLogger.Providers;
-using System.Numerics;
-using System.Text.Json;
 using System.IO.Hashing;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Net.Sockets;
 using System.Net.Http;
 using System.Buffers;
-using System.Reflection.PortableExecutable;
-using System.Net.Mail;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-
-
-
 
 
 var zLoggerFactory = LoggerFactory.Create(logging =>
 {
-    logging.AddZLogger(zLogger =>
-    {
-        zLogger.AddLogProcessor(new EmptyLogProcessor());
-    });
+    logging.AddZLoggerLogProcessor(new EmptyLogProcessor());
 });
 
 var zLogger = zLoggerFactory.CreateLogger("my");

diff --git a/src/ZLogger/Providers/ZLoggerRollingFileLoggerProvider.cs b/src/ZLogger/Providers/ZLoggerRollingFileLoggerProvider.cs
@@ -12,17 +12,28 @@ public enum RollingInterval
     Minute
 }
 
+public sealed class ZLoggerRollingFileOptions : ZLoggerOptions
+{
+    public Func<DateTimeOffset, int, string>? FilePathSelector { get; set; }
+    public RollingInterval RollingInterval { get; set; } = RollingInterval.Day;
+    public int RollingSizeKB { get; set; } = 512 * 1024;
+}
+
 [ProviderAlias("ZLoggerRollingFile")]
 public class ZLoggerRollingFileLoggerProvider : ILoggerProvider, ISupportExternalScope, IAsyncDisposable
 {
-    readonly ZLoggerOptions options;
+    readonly ZLoggerRollingFileOptions options;
     readonly AsyncStreamLineMessageWriter streamWriter;
     IExternalScopeProvider? scopeProvider;
 
-    public ZLoggerRollingFileLoggerProvider(Func<DateTimeOffset, int, string> fileNameSelector, RollingInterval rollInterval, int rollSizeKB, ZLoggerOptions options)
+    public ZLoggerRollingFileLoggerProvider(ZLoggerRollingFileOptions options)
     {
+        if (options.FilePathSelector is null)
+        {
+            throw new ArgumentException(nameof(options.FilePathSelector));
+        }
         this.options = options;
-        var stream = new RollingFileStream(fileNameSelector, rollInterval, rollSizeKB, options.TimeProvider);
+        var stream = new RollingFileStream(options.FilePathSelector!, options.RollingInterval, options.RollingSizeKB, options.TimeProvider);
         this.streamWriter = new AsyncStreamLineMessageWriter(stream, this.options);
     }