[feature/10.0] Move binding logic to descriptors

src/Tests/CollectionRuleActions.UnitTests/ActionListExecutorTests.cs

@@ -186,7 +186,7 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>
                 Assert.Throws<OptionsValidationException>(() => host.Services.GetRequiredService<IOptionsMonitor<CollectionRuleOptions>>().Get(DefaultRuleName));
             }, serviceCollection =>
             {
-                serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions>(nameof(PassThroughAction));
+                serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions, PassThroughActionDescriptor>();
             });
         }
 

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/CollectionRules/Actions/ActionsServiceCollectionExtensions.cs

@@ -14,15 +14,15 @@ internal static class ActionsServiceCollectionExtensions
         public static IServiceCollection RegisterTestAction(this IServiceCollection services, CallbackActionService callback)
         {
             services.AddSingleton(callback);
-            services.RegisterCollectionRuleAction<CallbackActionFactory, BaseRecordOptions>(CallbackAction.ActionName);
+            services.RegisterCollectionRuleAction<CallbackActionFactory, BaseRecordOptions, CallbackActionDescriptor>();
 
             return services;
         }
 
         public static IServiceCollection RegisterDelayedTestAction(this IServiceCollection services, CallbackActionService callback)
         {
             services.AddSingleton(callback);
-            services.RegisterCollectionRuleAction<DelayedCallbackActionFactory, BaseRecordOptions>(DelayedCallbackAction.ActionName);
+            services.RegisterCollectionRuleAction<DelayedCallbackActionFactory, BaseRecordOptions, DelayedCallbackActionDescriptor>();
 
             return services;
         }

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/CollectionRules/Actions/CallbackAction.cs

@@ -3,7 +3,9 @@
 
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Actions;
+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
+using Microsoft.Extensions.Configuration;
 using System;
 using System.Collections.Generic;
 using System.Threading;
@@ -73,6 +75,20 @@ public ICollectionRuleAction Create(IProcessInfo processInfo, BaseRecordOptions
         }
     }
 
+    internal sealed class CallbackActionDescriptor : ICollectionRuleActionDescriptor
+    {
+        public string ActionName => CallbackAction.ActionName;
+        public Type OptionsType => typeof(BaseRecordOptions);
+        public Type FactoryType => typeof(CallbackActionFactory);
+
+        public void BindOptions(IConfigurationSection settingsSection, out object settings)
+        {
+            BaseRecordOptions options = new();
+            settingsSection.Bind(options);
+            settings = options;
+        }
+    }
+
     internal sealed class DelayedCallbackAction : ICollectionRuleAction
     {
         public const string ActionName = nameof(DelayedCallbackAction);
@@ -111,6 +127,20 @@ public Task<CollectionRuleActionResult> WaitForCompletionAsync(CancellationToken
         }
     }
 
+    internal sealed class DelayedCallbackActionDescriptor : ICollectionRuleActionDescriptor
+    {
+        public string ActionName => DelayedCallbackAction.ActionName;
+        public Type OptionsType => typeof(BaseRecordOptions);
+        public Type FactoryType => typeof(DelayedCallbackActionFactory);
+
+        public void BindOptions(IConfigurationSection settingsSection, out object settings)
+        {
+            BaseRecordOptions options = new();
+            settingsSection.Bind(options);
+            settings = options;
+        }
+    }
+
     internal sealed class CallbackActionService
     {
         public TimeProvider TimeProvider { get; }

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/CollectionRules/Actions/PassThroughAction.cs

@@ -3,7 +3,10 @@
 
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Actions;
+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
+using Microsoft.Extensions.Configuration;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -53,6 +56,20 @@ public Task<CollectionRuleActionResult> WaitForCompletionAsync(CancellationToken
         }
     }
 
+    internal sealed class PassThroughActionDescriptor : ICollectionRuleActionDescriptor
+    {
+        public string ActionName => nameof(PassThroughAction);
+        public Type OptionsType => typeof(PassThroughOptions);
+        public Type FactoryType => typeof(PassThroughActionFactory);
+
+        public void BindOptions(IConfigurationSection settingsSection, out object settings)
+        {
+            PassThroughOptions options = new();
+            settingsSection.Bind(options);
+            settings = options;
+        }
+    }
+
     internal sealed record class PassThroughOptions : BaseRecordOptions
     {
         [ActionOptionsDependencyProperty]

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/ActionDependencyAnalyzerTests.cs

@@ -135,7 +135,7 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>
                 Assert.Equal("Output a1input3 trail", a2output3);
             }, serviceCollection =>
             {
-                serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions>(nameof(PassThroughAction));
+                serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions, PassThroughActionDescriptor>();
             });
         }
 
@@ -174,7 +174,7 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>
 
             }, serviceCollection =>
             {
-                serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions>(nameof(PassThroughAction));
+                serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions, PassThroughActionDescriptor>();
             });
         }
 
@@ -211,7 +211,7 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>
             }, serviceCollection =>
             {
                 serviceCollection.AddSingleton<TimeProvider, MockTimeProvider>();
-                serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions>(nameof(PassThroughAction));
+                serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions, PassThroughActionDescriptor>();
             });
         }
 
@@ -254,7 +254,7 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>
 
             }, serviceCollection =>
             {
-                serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions>(nameof(PassThroughAction));
+                serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions, PassThroughActionDescriptor>();
             }, loggingBuilder =>
             {
                 loggingBuilder.AddProvider(new TestLoggerProvider(record));
@@ -290,7 +290,7 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>
 
             }, serviceCollection =>
             {
-                serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions>(nameof(PassThroughAction));
+                serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions, PassThroughActionDescriptor>();
             });
         }
 
@@ -352,7 +352,7 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>
                 Assert.Equal("Output a1input3 trail", a2output3);
             }, serviceCollection =>
             {
-                serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions>(nameof(PassThroughAction));
+                serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions, PassThroughActionDescriptor>();
             });
         }
     }

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

@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 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;
@@ -59,6 +61,19 @@ private void NotifyHandler(object sender, EventArgs args)
         }
     }
 
+    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
     {
         public event EventHandler NotifyStarted;

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

@@ -11,7 +11,7 @@ internal static class TriggersServiceCollectionExtensions
         public static IServiceCollection RegisterManualTrigger(this IServiceCollection services, ManualTriggerService service)
         {
             services.AddSingleton(service);
-            return services.RegisterCollectionRuleTrigger<ManualTriggerFactory>(ManualTrigger.TriggerName);
+            return services.RegisterCollectionRuleTrigger<ManualTriggerFactory, ManualTriggerDescriptor>();
         }
     }
 }

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

@@ -3,7 +3,9 @@
 
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Monitoring.WebApi.Models;
+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.ComponentModel.DataAnnotations;
@@ -66,4 +68,18 @@ protected override EgressOperation CreateArtifactOperation(CollectionRuleMetadat
             }
         }
     }
+
+    internal sealed class CollectDumpActionDescriptor : ICollectionRuleActionDescriptor
+    {
+        public string ActionName => KnownCollectionRuleActions.CollectDump;
+        public Type FactoryType => typeof(CollectDumpActionFactory);
+        public Type OptionsType => typeof(CollectDumpOptions);
+
+        public void BindOptions(IConfigurationSection settingsSection, out object settings)
+        {
+            CollectDumpOptions options = new();
+            settingsSection.Bind(options);
+            settings = options;
+        }
+    }
 }

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

@@ -3,7 +3,9 @@
 
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Configuration;
 using System;
 using System.ComponentModel.DataAnnotations;
 using Utils = Microsoft.Diagnostics.Monitoring.WebApi.Utilities;
@@ -55,4 +57,18 @@ protected override EgressOperation CreateArtifactOperation(CollectionRuleMetadat
             return egressOperation;
         }
     }
+
+    internal sealed class CollectExceptionsActionDescriptor : ICollectionRuleActionDescriptor
+    {
+        public string ActionName => KnownCollectionRuleActions.CollectExceptions;
+        public Type FactoryType => typeof(CollectExceptionsActionFactory);
+        public Type OptionsType => typeof(CollectExceptionsOptions);
+
+        public void BindOptions(IConfigurationSection settingsSection, out object settings)
+        {
+            CollectExceptionsOptions options = new();
+            settingsSection.Bind(options);
+            settings = options;
+        }
+    }
 }

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

@@ -3,10 +3,12 @@
 
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.ComponentModel.DataAnnotations;
 using Utils = Microsoft.Diagnostics.Monitoring.WebApi.Utilities;
+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
 
 namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Actions
 {
@@ -59,4 +61,18 @@ protected override EgressOperation CreateArtifactOperation(CollectionRuleMetadat
             }
         }
     }
+
+    internal sealed class CollectGCDumpActionDescriptor : ICollectionRuleActionDescriptor
+    {
+        public string ActionName => KnownCollectionRuleActions.CollectGCDump;
+        public Type FactoryType => typeof(CollectGCDumpActionFactory);
+        public Type OptionsType => typeof(CollectGCDumpOptions);
+
+        public void BindOptions(IConfigurationSection settingsSection, out object settings)
+        {
+            CollectGCDumpOptions options = new();
+            settingsSection.Bind(options);
+            settings = options;
+        }
+    }
 }

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

@@ -5,6 +5,8 @@
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Monitoring.WebApi.Models;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using System;
@@ -95,4 +97,18 @@ protected override EgressOperation CreateArtifactOperation(CollectionRuleMetadat
             }
         }
     }
+
+    internal sealed class CollectLiveMetricsActionDescriptor : ICollectionRuleActionDescriptor
+    {
+        public string ActionName => KnownCollectionRuleActions.CollectLiveMetrics;
+        public Type FactoryType => typeof(CollectLiveMetricsActionFactory);
+        public Type OptionsType => typeof(CollectLiveMetricsOptions);
+
+        public void BindOptions(IConfigurationSection settingsSection, out object settings)
+        {
+            CollectLiveMetricsOptions options = new();
+            settingsSection.Bind(options);
+            settings = options;
+        }
+    }
 }

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

@@ -5,8 +5,10 @@
 using Microsoft.Diagnostics.Monitoring.Options;
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -83,4 +85,18 @@ protected override EgressOperation CreateArtifactOperation(CollectionRuleMetadat
             }
         }
     }
+
+    internal sealed class CollectLogsActionDescriptor : ICollectionRuleActionDescriptor
+    {
+        public string ActionName => KnownCollectionRuleActions.CollectLogs;
+        public Type FactoryType => typeof(CollectLogsActionFactory);
+        public Type OptionsType => typeof(CollectLogsOptions);
+
+        public void BindOptions(IConfigurationSection settingsSection, out object settings)
+        {
+            CollectLogsOptions options = new();
+            settingsSection.Bind(options);
+            settings = options;
+        }
+    }
 }

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

@@ -3,7 +3,9 @@
 
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Configuration;
 using System;
 using System.ComponentModel.DataAnnotations;
 using Utils = Microsoft.Diagnostics.Monitoring.WebApi.Utilities;
@@ -71,4 +73,18 @@ private static StackFormat MapCallStackFormat(CallStackFormat format) =>
                 _ => throw new InvalidOperationException()
             };
     }
+
+    internal sealed class CollectStacksActionDescriptor : ICollectionRuleActionDescriptor
+    {
+        public string ActionName => KnownCollectionRuleActions.CollectStacks;
+        public Type FactoryType => typeof(CollectStacksActionFactory);
+        public Type OptionsType => typeof(CollectStacksOptions);
+
+        public void BindOptions(IConfigurationSection settingsSection, out object settings)
+        {
+            CollectStacksOptions options = new();
+            settingsSection.Bind(options);
+            settings = options;
+        }
+    }
 }