Use separate action descriptor types

sbomer · sbomer · commit 04aed2fd2705 · 2025-04-18T18:10:12.000Z
diff --git a/src/Tests/CollectionRuleActions.UnitTests/ActionListExecutorTests.cs b/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>();
             });
         }
 
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/CollectionRules/Actions/ActionsServiceCollectionExtensions.cs b/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;
         }
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/CollectionRules/Actions/CallbackAction.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/CollectionRules/Actions/CallbackAction.cs
@@ -3,6 +3,7 @@
 
 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 System;
 using System.Collections.Generic;
@@ -73,6 +74,13 @@ 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);
+    }
+
     internal sealed class DelayedCallbackAction : ICollectionRuleAction
     {
         public const string ActionName = nameof(DelayedCallbackAction);
@@ -111,6 +119,13 @@ 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);
+    }
+
     internal sealed class CallbackActionService
     {
         public TimeProvider TimeProvider { get; }
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/CollectionRules/Actions/PassThroughAction.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/CollectionRules/Actions/PassThroughAction.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 System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -53,6 +55,13 @@ 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);
+    }
+
     internal sealed record class PassThroughOptions : BaseRecordOptions
     {
         [ActionOptionsDependencyProperty]
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/ActionDependencyAnalyzerTests.cs b/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>();
             });
         }
     }
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectDumpAction.cs b/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectDumpAction.cs
@@ -3,6 +3,7 @@
 
 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.DependencyInjection;
 using System;
@@ -66,4 +67,11 @@ 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);
+    }
 }
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectExceptionsAction.cs b/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectExceptionsAction.cs
@@ -3,6 +3,7 @@
 
 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 System;
 using System.ComponentModel.DataAnnotations;
@@ -55,4 +56,11 @@ 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);
+    }
 }
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectGCDumpAction.cs b/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectGCDumpAction.cs
@@ -7,6 +7,7 @@
 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 +60,11 @@ 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);
+    }
 }
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectLiveMetricsAction.cs b/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectLiveMetricsAction.cs
@@ -5,6 +5,7 @@
 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.DependencyInjection;
 using Microsoft.Extensions.Options;
 using System;
@@ -95,4 +96,11 @@ 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);
+    }
 }
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectLogsAction.cs b/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectLogsAction.cs
@@ -5,6 +5,7 @@
 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 System;
@@ -83,4 +84,11 @@ 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);
+    }
 }
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectStacksAction.cs b/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectStacksAction.cs
@@ -3,6 +3,7 @@
 
 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 System;
 using System.ComponentModel.DataAnnotations;
@@ -71,4 +72,11 @@ 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);
+    }
 }
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectTraceAction.cs b/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectTraceAction.cs
@@ -5,6 +5,7 @@
 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.DependencyInjection;
 using Microsoft.Extensions.Options;
 using System;
@@ -107,4 +108,11 @@ protected override EgressOperation CreateArtifactOperation(CollectionRuleMetadat
             }
         }
     }
+
+    internal sealed class CollectTraceActionDescriptor : ICollectionRuleActionDescriptor
+    {
+        public string ActionName => KnownCollectionRuleActions.CollectTrace;
+        public Type FactoryType => typeof(CollectTraceActionFactory);
+        public Type OptionsType => typeof(CollectTraceOptions);
+    }
 }
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Actions/ExecuteAction.cs b/src/Tools/dotnet-monitor/CollectionRules/Actions/ExecuteAction.cs
@@ -4,6 +4,7 @@
 using Microsoft.Diagnostics.Monitoring.EventPipe;
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -105,4 +106,11 @@ internal static void ValidateExitCode(bool ignoreExitCode, int exitCode)
             }
         }
     }
+
+    internal sealed class ExecuteActionDescriptor : ICollectionRuleActionDescriptor
+    {
+        public string ActionName => KnownCollectionRuleActions.Execute;
+        public Type FactoryType => typeof(ExecuteActionFactory);
+        public Type OptionsType => typeof(ExecuteOptions);
+    }
 }
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Actions/GetEnvironmentVariableAction.cs b/src/Tools/dotnet-monitor/CollectionRules/Actions/GetEnvironmentVariableAction.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.NETCore.Client;
+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
 using Microsoft.Extensions.Logging;
 using System;
@@ -83,4 +84,11 @@ protected override async Task<CollectionRuleActionResult> ExecuteCoreAsync(
             }
         }
     }
+
+    internal sealed class GetEnvironmentVariableActionDescriptor : ICollectionRuleActionDescriptor
+    {
+        public string ActionName => KnownCollectionRuleActions.GetEnvironmentVariable;
+        public Type OptionsType => typeof(GetEnvironmentVariableOptions);
+        public Type FactoryType => typeof(GetEnvironmentVariableActionFactory);
+    }
 }
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Actions/LoadProfilerAction.cs b/src/Tools/dotnet-monitor/CollectionRules/Actions/LoadProfilerAction.cs
@@ -4,6 +4,7 @@
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.NETCore.Client;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
 using Microsoft.Extensions.Logging;
 using System;
 using System.ComponentModel.DataAnnotations;
@@ -68,4 +69,11 @@ protected override async Task<CollectionRuleActionResult> ExecuteCoreAsync(
             }
         }
     }
+
+    internal sealed class LoadProfilerActionDescriptor : ICollectionRuleActionDescriptor
+    {
+        public string ActionName => KnownCollectionRuleActions.LoadProfiler;
+        public Type FactoryType => typeof(LoadProfilerActionFactory);
+        public Type OptionsType => typeof(LoadProfilerOptions);
+    }
 }
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Actions/SetEnvironmentVariableAction.cs b/src/Tools/dotnet-monitor/CollectionRules/Actions/SetEnvironmentVariableAction.cs
@@ -4,6 +4,7 @@
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.NETCore.Client;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;
 using Microsoft.Extensions.Logging;
 using System;
 using System.ComponentModel.DataAnnotations;
@@ -68,4 +69,11 @@ protected override async Task<CollectionRuleActionResult> ExecuteCoreAsync(
             }
         }
     }
+
+    internal sealed class SetEnvironmentVariableActionDescriptor : ICollectionRuleActionDescriptor
+    {
+        public string ActionName => KnownCollectionRuleActions.SetEnvironmentVariable;
+        public Type FactoryType => typeof(SetEnvironmentVariableActionFactory);
+        public Type OptionsType => typeof(SetEnvironmentVariableOptions);
+    }
 }
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Configuration/CollectionRuleActionDescriptor.cs b/src/Tools/dotnet-monitor/CollectionRules/Configuration/CollectionRuleActionDescriptor.cs
diff --git a/src/Tools/dotnet-monitor/ServiceCollectionExtensions.cs b/src/Tools/dotnet-monitor/ServiceCollectionExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>`
`186`	`186`	`Assert.Throws<OptionsValidationException>(() => host.Services.GetRequiredService<IOptionsMonitor<CollectionRuleOptions>>().Get(DefaultRuleName));`
`187`	`187`	`}, serviceCollection =>`
`188`	`188`	`{`
`189`		`- serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions>(nameof(PassThroughAction));`
	`189`	`+ serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions, PassThroughActionDescriptor>();`
`190`	`190`	`});`
`191`	`191`	`}`
`192`	`192`
Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,15 @@ internal static class ActionsServiceCollectionExtensions`
`14`	`14`	`public static IServiceCollection RegisterTestAction(this IServiceCollection services, CallbackActionService callback)`
`15`	`15`	`{`
`16`	`16`	`services.AddSingleton(callback);`
`17`		`- services.RegisterCollectionRuleAction<CallbackActionFactory, BaseRecordOptions>(CallbackAction.ActionName);`
	`17`	`+ services.RegisterCollectionRuleAction<CallbackActionFactory, BaseRecordOptions, CallbackActionDescriptor>();`
`18`	`18`
`19`	`19`	`return services;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public static IServiceCollection RegisterDelayedTestAction(this IServiceCollection services, CallbackActionService callback)`
`23`	`23`	`{`
`24`	`24`	`services.AddSingleton(callback);`
`25`		`- services.RegisterCollectionRuleAction<DelayedCallbackActionFactory, BaseRecordOptions>(DelayedCallbackAction.ActionName);`
	`25`	`+ services.RegisterCollectionRuleAction<DelayedCallbackActionFactory, BaseRecordOptions, DelayedCallbackActionDescriptor>();`
`26`	`26`
`27`	`27`	`return services;`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`using Microsoft.Diagnostics.Monitoring.WebApi;`
`5`	`5`	`using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Actions;`
	`6`	`+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;`
`6`	`7`	`using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;`
`7`	`8`	`using System;`
`8`	`9`	`using System.Collections.Generic;`
`@@ -73,6 +74,13 @@ public ICollectionRuleAction Create(IProcessInfo processInfo, BaseRecordOptions`
`73`	`74`	`}`
`74`	`75`	`}`
`75`	`76`
	`77`	`+ internal sealed class CallbackActionDescriptor : ICollectionRuleActionDescriptor`
	`78`	`+ {`
	`79`	`+ public string ActionName => CallbackAction.ActionName;`
	`80`	`+ public Type OptionsType => typeof(BaseRecordOptions);`
	`81`	`+ public Type FactoryType => typeof(CallbackActionFactory);`
	`82`	`+ }`
	`83`	`+`
`76`	`84`	`internal sealed class DelayedCallbackAction : ICollectionRuleAction`
`77`	`85`	`{`
`78`	`86`	`public const string ActionName = nameof(DelayedCallbackAction);`
`@@ -111,6 +119,13 @@ public Task<CollectionRuleActionResult> WaitForCompletionAsync(CancellationToken`
`111`	`119`	`}`
`112`	`120`	`}`
`113`	`121`
	`122`	`+ internal sealed class DelayedCallbackActionDescriptor : ICollectionRuleActionDescriptor`
	`123`	`+ {`
	`124`	`+ public string ActionName => DelayedCallbackAction.ActionName;`
	`125`	`+ public Type OptionsType => typeof(BaseRecordOptions);`
	`126`	`+ public Type FactoryType => typeof(DelayedCallbackActionFactory);`
	`127`	`+ }`
	`128`	`+`
`114`	`129`	`internal sealed class CallbackActionService`
`115`	`130`	`{`
`116`	`131`	`public TimeProvider TimeProvider { get; }`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>`
`135`	`135`	`Assert.Equal("Output a1input3 trail", a2output3);`
`136`	`136`	`}, serviceCollection =>`
`137`	`137`	`{`
`138`		`- serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions>(nameof(PassThroughAction));`
	`138`	`+ serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions, PassThroughActionDescriptor>();`
`139`	`139`	`});`
`140`	`140`	`}`
`141`	`141`
`@@ -174,7 +174,7 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>`
`174`	`174`
`175`	`175`	`}, serviceCollection =>`
`176`	`176`	`{`
`177`		`- serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions>(nameof(PassThroughAction));`
	`177`	`+ serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions, PassThroughActionDescriptor>();`
`178`	`178`	`});`
`179`	`179`	`}`
`180`	`180`
`@@ -211,7 +211,7 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>`
`211`	`211`	`}, serviceCollection =>`
`212`	`212`	`{`
`213`	`213`	`serviceCollection.AddSingleton<TimeProvider, MockTimeProvider>();`
`214`		`- serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions>(nameof(PassThroughAction));`
	`214`	`+ serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions, PassThroughActionDescriptor>();`
`215`	`215`	`});`
`216`	`216`	`}`
`217`	`217`
`@@ -254,7 +254,7 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>`
`254`	`254`
`255`	`255`	`}, serviceCollection =>`
`256`	`256`	`{`
`257`		`- serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions>(nameof(PassThroughAction));`
	`257`	`+ serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions, PassThroughActionDescriptor>();`
`258`	`258`	`}, loggingBuilder =>`
`259`	`259`	`{`
`260`	`260`	`loggingBuilder.AddProvider(new TestLoggerProvider(record));`
`@@ -290,7 +290,7 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>`
`290`	`290`
`291`	`291`	`}, serviceCollection =>`
`292`	`292`	`{`
`293`		`- serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions>(nameof(PassThroughAction));`
	`293`	`+ serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions, PassThroughActionDescriptor>();`
`294`	`294`	`});`
`295`	`295`	`}`
`296`	`296`
`@@ -352,7 +352,7 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>`
`352`	`352`	`Assert.Equal("Output a1input3 trail", a2output3);`
`353`	`353`	`}, serviceCollection =>`
`354`	`354`	`{`
`355`		`- serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions>(nameof(PassThroughAction));`
	`355`	`+ serviceCollection.RegisterCollectionRuleAction<PassThroughActionFactory, PassThroughOptions, PassThroughActionDescriptor>();`
`356`	`356`	`});`
`357`	`357`	`}`
`358`	`358`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using System;`
`8`	`8`	`using System.ComponentModel.DataAnnotations;`
`9`	`9`	`using Utils = Microsoft.Diagnostics.Monitoring.WebApi.Utilities;`
	`10`	`+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;`
`10`	`11`
`11`	`12`	`namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Actions`
`12`	`13`	`{`
`@@ -59,4 +60,11 @@ protected override EgressOperation CreateArtifactOperation(CollectionRuleMetadat`
`59`	`60`	`}`
`60`	`61`	`}`
`61`	`62`	`}`
	`63`	`+`
	`64`	`+ internal sealed class CollectGCDumpActionDescriptor : ICollectionRuleActionDescriptor`
	`65`	`+ {`
	`66`	`+ public string ActionName => KnownCollectionRuleActions.CollectGCDump;`
	`67`	`+ public Type FactoryType => typeof(CollectGCDumpActionFactory);`
	`68`	`+ public Type OptionsType => typeof(CollectGCDumpOptions);`
	`69`	`+ }`
`62`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using Microsoft.Diagnostics.Monitoring.WebApi;`
`6`	`6`	`using Microsoft.Diagnostics.Monitoring.WebApi.Models;`
`7`	`7`	`using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;`
	`8`	`+using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration;`
`8`	`9`	`using Microsoft.Extensions.DependencyInjection;`
`9`	`10`	`using Microsoft.Extensions.Options;`
`10`	`11`	`using System;`
`@@ -95,4 +96,11 @@ protected override EgressOperation CreateArtifactOperation(CollectionRuleMetadat`
`95`	`96`	`}`
`96`	`97`	`}`
`97`	`98`	`}`
	`99`	`+`
	`100`	`+ internal sealed class CollectLiveMetricsActionDescriptor : ICollectionRuleActionDescriptor`
	`101`	`+ {`
	`102`	`+ public string ActionName => KnownCollectionRuleActions.CollectLiveMetrics;`
	`103`	`+ public Type FactoryType => typeof(CollectLiveMetricsActionFactory);`
	`104`	`+ public Type OptionsType => typeof(CollectLiveMetricsOptions);`
	`105`	`+ }`
`98`	`106`	`}`