Improve reliability of configuration reload (#5)

* Fix config reload loop

* Tidy up options reload logic

* Refactoring

Co-authored-by: James Harling <[email protected]>

Author: jamesharling

src/Runpath.Extensions.Logging.AzureEventHubs/AzureEventHubsLogger.cs

@@ -18,8 +18,6 @@ internal AzureEventHubsLogger(string name, IAzureEventHubsLoggerFormatter logger
 
         internal IExternalScopeProvider ScopeProvider { get; set; }
 
-        internal AzureEventHubsLoggerOptions Options { get; set; }
-
         public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
         {
             if (!IsEnabled(logLevel))

src/Runpath.Extensions.Logging.AzureEventHubs/AzureEventHubsLoggerProvider.cs

@@ -8,42 +8,26 @@ namespace Runpath.Extensions.Logging.AzureEventHubs
     [ProviderAlias("AzureEventHubs")]
     public class AzureEventHubsLoggerProvider : ILoggerProvider, ISupportExternalScope
     {
-        private readonly IOptionsMonitor<AzureEventHubsLoggerOptions> options;
         private readonly ConcurrentDictionary<string, AzureEventHubsLogger> loggers;
         private readonly IAzureEventHubsLoggerFormatter formatter;
         private readonly IAzureEventHubsLoggerProcessor processor;
 
         private IDisposable optionsReloadToken;
         private IExternalScopeProvider scopeProvider;
 
-        public AzureEventHubsLoggerProvider(IOptionsMonitor<AzureEventHubsLoggerOptions> options, IAzureEventHubsLoggerFormatter formatter, IAzureEventHubsLoggerProcessor processor)
+        public AzureEventHubsLoggerProvider(IAzureEventHubsLoggerFormatter formatter, IAzureEventHubsLoggerProcessor processor)
         {
-            this.options = options;
-            this.loggers = new ConcurrentDictionary<string, AzureEventHubsLogger>();
-
-            ReloadLoggerOptions(options.CurrentValue);
-
             this.formatter = formatter;
             this.processor = processor;
+            this.loggers = new ConcurrentDictionary<string, AzureEventHubsLogger>();
 
             SetScopeProvider(NullExternalScopeProvider.Instance);
         }
 
-        private void ReloadLoggerOptions(AzureEventHubsLoggerOptions options)
-        {
-            foreach (var logger in this.loggers)
-            {
-                logger.Value.Options = options;
-            }
-
-            this.optionsReloadToken = this.options.OnChange(ReloadLoggerOptions);
-        }
-
         /// <inheritdoc/>
         public ILogger CreateLogger(string name) => this.loggers.GetOrAdd(name,
             _ => new AzureEventHubsLogger(name, this.formatter, this.processor)
             {
-                Options = this.options.CurrentValue,
                 ScopeProvider = this.scopeProvider
             });
 

src/Runpath.Extensions.Logging.AzureEventHubs/DefaultAzureEventHubsLoggerProcessor.cs

@@ -12,17 +12,15 @@ namespace Runpath.Extensions.Logging.AzureEventHubs
     /// </summary>
     internal class DefaultAzureEventHubsLoggerProcessor : IAzureEventHubsLoggerProcessor
     {
-        private readonly IOptionsMonitor<AzureEventHubsLoggerOptions> options;
         private readonly Channel<EventData> channel;
 
         private IDisposable optionsReloadToken;
         private EventHubClient eventHubClient;
 
         public DefaultAzureEventHubsLoggerProcessor(IOptionsMonitor<AzureEventHubsLoggerOptions> options)
         {
-            this.options = options;
-
             ReloadLoggerOptions(options.CurrentValue);
+            this.optionsReloadToken = options.OnChange(ReloadLoggerOptions);
 
             this.channel = Channel.CreateBounded<EventData>(new BoundedChannelOptions(options.CurrentValue.QueueDepth)
             {
@@ -38,8 +36,6 @@ public DefaultAzureEventHubsLoggerProcessor(IOptionsMonitor<AzureEventHubsLogger
         private void ReloadLoggerOptions(AzureEventHubsLoggerOptions options)
         {
             this.eventHubClient = options.EventHubClientFactory?.Invoke(options);
-
-            this.optionsReloadToken = this.options.OnChange(ReloadLoggerOptions);
         }
 
         public void Process(EventData eventData) => this.channel.Writer.TryWrite(eventData);

src/Runpath.Extensions.Logging.AzureEventHubs/Runpath.Extensions.Logging.AzureEventHubs.csproj

@@ -7,7 +7,7 @@
     <Company>Runpath Digital</Company>
     <Authors>Runpath Digital</Authors>
     <Description>Azure Event Hubs logger provider implementation for Microsoft.Extensions.Logging.</Description>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>logging azure event hubs</PackageTags>
     <PackageProjectUrl>https://github.com/Runpath/Runpath.Extensions.Logging.AzureEventHubs</PackageProjectUrl>