Apply event source FilterSpec to filter options (#883)

Author: pakrym

src/Microsoft.Extensions.Logging.EventSource/EventLogFiltersConfigureOptions.cs

@@ -0,0 +1,26 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.Extensions.Logging.EventSource;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.Extensions.Logging
+{
+    internal class EventLogFiltersConfigureOptions : IConfigureOptions<LoggerFilterOptions>
+    {
+        private readonly LoggingEventSource _eventSource;
+
+        public EventLogFiltersConfigureOptions(LoggingEventSource eventSource)
+        {
+            _eventSource = eventSource;
+        }
+
+        public void Configure(LoggerFilterOptions options)
+        {
+            foreach (var rule in _eventSource.GetFilterRules())
+            {
+                options.Rules.Add(rule);
+            }
+        }
+    }
+}

src/Microsoft.Extensions.Logging.EventSource/EventLogFiltersConfigureOptionsChangeSource.cs

@@ -0,0 +1,23 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.Extensions.Logging.EventSource;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.Extensions.Logging
+{
+    internal class EventLogFiltersConfigureOptionsChangeSource: IOptionsChangeTokenSource<LoggerFilterOptions>
+    {
+        private readonly LoggingEventSource _eventSource;
+
+        public EventLogFiltersConfigureOptionsChangeSource(LoggingEventSource eventSource)
+        {
+            _eventSource = eventSource;
+        }
+
+        public IChangeToken GetChangeToken() => _eventSource.GetFilterChangeToken();
+
+        public string Name { get; }
+    }
+}

src/Microsoft.Extensions.Logging.EventSource/EventSourceLogger.cs

@@ -28,7 +28,7 @@ public EventSourceLogger(string categoryName, int factoryID, LoggingEventSource
             CategoryName = categoryName;
 
             // Default is to turn off logging
-            Level = LoggingEventSource.LoggingDisabled;
+            Level = LogLevel.None;
 
             _factoryID = factoryID;
             _eventSource = eventSource;
@@ -37,22 +37,7 @@ public EventSourceLogger(string categoryName, int factoryID, LoggingEventSource
 
         public string CategoryName { get; }
 
-        private LogLevel _level;
-
-        public LogLevel Level
-        {
-            get
-            {
-                // need to check if the filter spec and internal event source level has changed
-                // and update the loggers level if it has
-                _eventSource.ApplyFilterSpec();
-                return _level;
-            }
-            set
-            {
-                _level = value;
-            }
-        }
+        public LogLevel Level { get; set; }
 
         // Loggers created by a single provider form a linked list
         public EventSourceLogger Next { get; }

src/Microsoft.Extensions.Logging.EventSource/EventSourceLoggerFactoryExtensions.cs

@@ -5,6 +5,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging.EventSource;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.Logging
 {
@@ -24,9 +25,10 @@ public static ILoggingBuilder AddEventSourceLogger(this ILoggingBuilder builder)
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            var loggerProvider = LoggingEventSource.Instance.CreateLoggerProvider();
-            builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<ILoggerProvider>(loggerProvider));
-
+            builder.Services.TryAddSingleton(LoggingEventSource.Instance);
+            builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<ILoggerProvider, EventSourceLoggerProvider>());
+            builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<LoggerFilterOptions>, EventLogFiltersConfigureOptions>());
+            builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IOptionsChangeTokenSource<LoggerFilterOptions>, EventLogFiltersConfigureOptionsChangeSource>());
             return builder;
         }
 
@@ -41,8 +43,7 @@ public static ILoggerFactory AddEventSourceLogger(this ILoggerFactory factory)
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            var loggerProvider = LoggingEventSource.Instance.CreateLoggerProvider();
-            factory.AddProvider(loggerProvider);
+            factory.AddProvider(new EventSourceLoggerProvider(LoggingEventSource.Instance, handleFilters: true));
 
             return factory;
         }