Merge pull request #24 from Bardin08/vbardin/logs-filters

Implement fluent api based logs filters

Author: Bardin08

examples/ConsoleApp/Program.cs

@@ -18,7 +18,7 @@
 while (logsCounter <= logsThreshold)
 {
     var level = Random.Shared.NextInt64(0, 6);
-    Log.Logger.Write((LogEventLevel)level, "Message");
+    Log.Logger.Write((LogEventLevel)level, "Message {counter}", logsCounter);
     await Task.Delay(500);
 
     logsCounter++;

examples/WebApp/Program.cs

@@ -4,11 +4,9 @@
 using Serilog;
 using Serilog.Events;
 using System.Collections.Immutable;
-using X.Serilog.Sinks.Telegram;
 using X.Serilog.Sinks.Telegram.Batch.Rules;
 using X.Serilog.Sinks.Telegram.Configuration;
 using X.Serilog.Sinks.Telegram.Extensions;
-using X.Serilog.Sinks.Telegram.Filters;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -29,12 +27,6 @@
         config.LogFiltersConfiguration = new LogsFiltersConfiguration
         {
             ApplyLogFilters = false,
-            FiltersOperator = LogFiltersOperator.And,
-            Filters = new IFilter[]
-            {
-                new LogMessageContainsFilter("absolutely required term"),
-                new LogMessageNotContainsFilter("term to skip")
-            }.ToImmutableList()
         };
         config.FormatterConfiguration = new FormatterConfiguration
         {

src/X.Serilog.Sinks.Telegram/Configuration/LogsFiltersConfiguration.cs

@@ -1,5 +1,4 @@
-using System.Collections.Immutable;
-using X.Serilog.Sinks.Telegram.Filters;
+using X.Serilog.Sinks.Telegram.Filters.Fluent;
 
 namespace X.Serilog.Sinks.Telegram.Configuration;
 
@@ -14,12 +13,7 @@ public class LogsFiltersConfiguration
     public bool ApplyLogFilters { get; init; }
 
     /// <summary>
-    /// Gets or initializes the operator used for combining filters. The default is 'And'.
+    /// Logs filtering query builder
     /// </summary>
-    public LogFiltersOperator FiltersOperator { get; init; } = LogFiltersOperator.And;
-
-    /// <summary>
-    /// Gets or initializes the list of filters to be applied.
-    /// </summary>
-    public IImmutableList<IFilter>? Filters { get; init; }
+    public ILogQueryBuilder? QueryBuilder { get; set; }
 }

src/X.Serilog.Sinks.Telegram/Extensions/DependencyInjectionExtensions.cs

@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using X.Serilog.Sinks.Telegram.Batch.Rules;
 using X.Serilog.Sinks.Telegram.Configuration;
-using X.Serilog.Sinks.Telegram.Filters;
+using X.Serilog.Sinks.Telegram.Filters.Fluent;
 
 namespace X.Serilog.Sinks.Telegram.Extensions;
 
@@ -48,8 +48,7 @@ private static LoggerConfiguration TelegramCoreInternal(
                 config.FormatterConfiguration = FormatterConfiguration.Default;
                 config.LogFiltersConfiguration = new LogsFiltersConfiguration
                 {
-                    ApplyLogFilters = false,
-                    Filters = new ImmutableArray<IFilter>()
+                    ApplyLogFilters = false
                 };
             },
             messageFormatter: null!,

src/X.Serilog.Sinks.Telegram/Filters/Fluent/Condition.cs

@@ -0,0 +1,6 @@
+namespace X.Serilog.Sinks.Telegram.Filters.Fluent;
+
+public class Condition(LogEntryPredicate predicate)
+{
+    public LogEntryPredicate Predicate { get; set; } = predicate;
+}

src/X.Serilog.Sinks.Telegram/Filters/Fluent/ConditionGroup.cs

@@ -0,0 +1,7 @@
+namespace X.Serilog.Sinks.Telegram.Filters.Fluent;
+
+public class ConditionGroup(bool isOrGroup = false)
+{
+    public List<object> Conditions { get; set; } = [];
+    public bool IsOrGroup { get; set; } = isOrGroup;
+}

src/X.Serilog.Sinks.Telegram/Filters/Fluent/IExceptionRuleBuilder.cs

@@ -0,0 +1,11 @@
+namespace X.Serilog.Sinks.Telegram.Filters.Fluent;
+
+public interface IExceptionRuleBuilder : ILogQueryBuilder
+{
+    ILogQueryBuilder Contains(string substring);
+    ILogQueryBuilder NotContains(string substring);
+    ILogQueryBuilder Equals(string message, StringComparison comparison);
+    ILogQueryBuilder NotEquals(string message, StringComparison comparison);
+    ILogQueryBuilder Null();
+    ILogQueryBuilder NotNull();
+}

src/X.Serilog.Sinks.Telegram/Filters/Fluent/IFilterExecutor.cs

@@ -0,0 +1,6 @@
+namespace X.Serilog.Sinks.Telegram.Filters.Fluent;
+
+public interface IFilterExecutor
+{
+    bool Evaluate(LogEvent entry);
+}

src/X.Serilog.Sinks.Telegram/Filters/Fluent/ILevelRuleBuilder.cs

@@ -0,0 +1,9 @@
+namespace X.Serilog.Sinks.Telegram.Filters.Fluent;
+
+public interface ILevelRuleBuilder : ILogQueryBuilder
+{
+    ILogQueryBuilder InRange(LogEventLevel min, LogEventLevel max);
+    ILogQueryBuilder NotInRange(LogEventLevel min, LogEventLevel max);
+    ILogQueryBuilder Equals(LogEventLevel level);
+    ILogQueryBuilder NotEquals(LogEventLevel level);
+}

src/X.Serilog.Sinks.Telegram/Filters/Fluent/ILogQueryBuilder.cs

@@ -0,0 +1,11 @@
+namespace X.Serilog.Sinks.Telegram.Filters.Fluent;
+
+public interface ILogQueryBuilder
+{
+    IMessageRuleBuilder Message { get; }
+    IExceptionRuleBuilder Exception { get; }
+    IPropertiesRuleBuilder Properties { get; }
+    ILevelRuleBuilder Level { get; }
+    ILogQueryBuilder And();
+    ILogQueryBuilder Or();
+}