Move binding to trigger descriptors

Author: sbomer

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/CollectionRules/Triggers/ManualTrigger.cs

@@ -4,6 +4,7 @@
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Triggers;
+using Microsoft.Extensions.Configuration;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -65,6 +66,12 @@ internal sealed class ManualTriggerDescriptor : ICollectionRuleTriggerDescriptor
         public string TriggerName => ManualTrigger.TriggerName;
         public Type FactoryType => typeof(ManualTriggerFactory);
         public Type OptionsType => null;
+
+        public bool TryBindOptions(IConfigurationSection settingsSection, out object settings)
+        {
+            settings = null;
+            return false;
+        }
     }
 
     internal sealed class ManualTriggerService

src/Tools/dotnet-monitor/CollectionRules/Actions/ICollectionRuleActionOperations.cs

@@ -23,7 +23,7 @@ bool TryCreateFactory(
             out ICollectionRuleActionFactoryProxy action);
 
         /// <summary>
-        /// Attempts to create an options instance of the options type
+        /// Attempts to bind an options instance of the options type
         /// associated with the registered action name.
         /// </summary>
         bool TryBindOptions(

src/Tools/dotnet-monitor/CollectionRules/Configuration/CollectionRuleBindingHelper.cs

@@ -22,12 +22,8 @@ public static void BindActionSettings(IConfigurationSection actionSection, Colle
         public static void BindTriggerSettings(IConfigurationSection triggerSection, CollectionRuleTriggerOptions triggerOptions, ICollectionRuleTriggerOperations triggerOperations)
         {
             if (null != triggerOptions &&
-                triggerOperations.TryCreateOptions(triggerOptions.Type, out object triggerSettings))
+                triggerOperations.TryBindOptions(triggerOptions.Type, triggerSection, out object triggerSettings))
             {
-                IConfigurationSection settingsSection = triggerSection.GetSection(nameof(CollectionRuleTriggerOptions.Settings));
-
-                settingsSection.Bind(triggerSettings);
-
                 triggerOptions.Settings = triggerSettings;
             }
         }

src/Tools/dotnet-monitor/CollectionRules/Configuration/ICollectionRuleActionDescriptor.cs

@@ -1,8 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using Microsoft.Extensions.Configuration;
+using System;
 
 namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration
 {

src/Tools/dotnet-monitor/CollectionRules/Configuration/ICollectionRuleTriggerDescriptor.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Configuration;
 using System;
 
 namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration
@@ -12,5 +13,7 @@ interface ICollectionRuleTriggerDescriptor
         Type? OptionsType { get; }
 
         string TriggerName { get; }
+
+        bool TryBindOptions(IConfigurationSection settingsSection, out object? settings);
     }
 }

src/Tools/dotnet-monitor/CollectionRules/Triggers/AspNetRequestCountTriggerFactory.cs

@@ -7,6 +7,7 @@
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
+using Microsoft.Extensions.Configuration;
 using System;
 using System.Globalization;
 
@@ -51,5 +52,13 @@ internal sealed class AspNetRequestCountTriggerDescriptor : ICollectionRuleTrigg
         public Type FactoryType => typeof(AspNetRequestCountTriggerFactory);
         public Type? OptionsType => typeof(AspNetRequestCountOptions);
         public string TriggerName => KnownCollectionRuleTriggers.AspNetRequestCount;
+
+        public bool TryBindOptions(IConfigurationSection settingsSection, out object? settings)
+        {
+            var options = new AspNetRequestCountOptions();
+            settingsSection.Bind(options);
+            settings = options;
+            return true;
+        }
     }
 }

src/Tools/dotnet-monitor/CollectionRules/Triggers/AspNetRequestDurationTriggerFactory.cs

@@ -8,6 +8,7 @@
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
 using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Configuration;
 using System;
 using System.Globalization;
 
@@ -57,5 +58,13 @@ internal sealed class AspNetRequestDurationTriggerDescriptor : ICollectionRuleTr
         public Type FactoryType => typeof(AspNetRequestDurationTriggerFactory);
         public Type? OptionsType => typeof(AspNetRequestDurationOptions);
         public string TriggerName => KnownCollectionRuleTriggers.AspNetRequestDuration;
+
+        public bool TryBindOptions(IConfigurationSection settingsSection, out object? settings)
+        {
+            var options = new AspNetRequestDurationOptions();
+            settingsSection.Bind(options);
+            settings = options;
+            return true;
+        }
     }
 }

src/Tools/dotnet-monitor/CollectionRules/Triggers/AspNetResponseStatusTriggerFactory.cs

@@ -7,6 +7,7 @@
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
+using Microsoft.Extensions.Configuration;
 using System;
 using System.Globalization;
 using System.Linq;
@@ -66,5 +67,13 @@ internal sealed class AspNetResponseStatusTriggerDescriptor : ICollectionRuleTri
         public Type FactoryType => typeof(AspNetResponseStatusTriggerFactory);
         public Type? OptionsType => typeof(AspNetResponseStatusOptions);
         public string TriggerName => KnownCollectionRuleTriggers.AspNetResponseStatus;
+
+        public bool TryBindOptions(IConfigurationSection settingsSection, out object? settings)
+        {
+            var options = new AspNetResponseStatusOptions();
+            settingsSection.Bind(options);
+            settings = options;
+            return true;
+        }
     }
 }

src/Tools/dotnet-monitor/CollectionRules/Triggers/CollectionRuleTriggerOperations.cs

@@ -5,6 +5,7 @@
 
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -71,16 +72,16 @@ public bool TryCreateFactory(
         }
 
         /// <inheritdoc/>
-        public bool TryCreateOptions(
+        public bool TryBindOptions(
             string triggerName,
+            IConfigurationSection triggerSection,
             out object options)
         {
             // Check that the trigger is registered and has options
-            if (_map.TryGetValue(triggerName, out ICollectionRuleTriggerDescriptor descriptor) &&
-                null != descriptor.OptionsType)
+            if (_map.TryGetValue(triggerName, out ICollectionRuleTriggerDescriptor descriptor))
             {
-                options = Activator.CreateInstance(descriptor.OptionsType);
-                return true;
+                IConfigurationSection settingsSection = triggerSection.GetSection(nameof(CollectionRuleTriggerOptions.Settings));
+                return descriptor.TryBindOptions(settingsSection, out options);
             }
 
             options = null;

src/Tools/dotnet-monitor/CollectionRules/Triggers/EventCounterTriggerFactory.cs

@@ -8,6 +8,7 @@
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers.EventCounterShortcuts;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
 using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Configuration;
 using System;
 
 namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Triggers
@@ -116,5 +117,13 @@ internal sealed class EventCounterTriggerDescriptor : ICollectionRuleTriggerDesc
         public Type FactoryType => typeof(EventCounterTriggerFactory);
         public Type? OptionsType => typeof(EventCounterOptions);
         public string TriggerName => KnownCollectionRuleTriggers.EventCounter;
+
+        public bool TryBindOptions(IConfigurationSection settingsSection, out object? settings)
+        {
+            var options = new EventCounterOptions();
+            settingsSection.Bind(options);
+            settings = options;
+            return true;
+        }
     }
 }