Add more validatable types, mapping logic

Author: sbomer

src/Tests/CollectionRuleActions.UnitTests/ActionListExecutorTests.cs

@@ -82,7 +82,7 @@ public Task ActionListExecutor_SecondActionFail_DeferredCompletion()
             return ActionListExecutor_SecondActionFail(waitForCompletion: false);
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/dotnet/aspnetcore/pull/61402")]
         public Task ActionListExecutor_SecondActionFail_WaitedCompletion()
         {
             return ActionListExecutor_SecondActionFail(waitForCompletion: true);

src/Tests/CollectionRuleActions.UnitTests/CollectGCDumpActionTests.cs

@@ -5,6 +5,7 @@
 using Microsoft.Diagnostics.Monitoring.TestCommon.Options;
 using Microsoft.Diagnostics.Monitoring.TestCommon.Runners;
 using Microsoft.Diagnostics.Monitoring.WebApi;
+using Microsoft.Diagnostics.Tools.Monitor;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Actions;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Exceptions;
@@ -104,7 +105,7 @@ await runner.ExecuteAsync(async () =>
 
                     await runner.SendCommandAsync(TestAppScenarios.AsyncWait.Commands.Continue);
                 });
-            });
+            }, TestValidatableTypes.AddValidation);
         }
 
         private static async Task ValidateGCDump(Stream gcdumpStream)

src/Tests/CollectionRuleActions.UnitTests/CollectLiveMetricsActionTests.cs

@@ -7,6 +7,7 @@
 using Microsoft.Diagnostics.Monitoring.TestCommon.Runners;
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Monitoring.WebApi.Models;
+using Microsoft.Diagnostics.Tools.Monitor;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Actions;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
@@ -111,7 +112,7 @@ await LiveMetricsTestUtilities.ValidateMetrics(new[] { providerName },
 
                     await runner.SendCommandAsync(TestAppScenarios.AsyncWait.Commands.Continue);
                 });
-            });
+            }, TestValidatableTypes.AddValidation);
         }
 
         [Theory(Skip = "Flaky")]

src/Tests/CollectionRuleActions.UnitTests/TestValidatableType.cs

@@ -7,6 +7,7 @@
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
 using Microsoft.Diagnostics.Monitoring.WebApi;
+using Microsoft.Diagnostics.Tools.Monitor.Egress.FileSystem;
 
 namespace Microsoft.Diagnostics.Tools.Monitor
 {
@@ -29,6 +30,14 @@ internal sealed class TestValidatableTypes
 
         public required GlobalCounterOptions GlobalCounterOptions { get; init; }
 
+        public required CollectGCDumpOptions CollectGCDumpOptions { get; init; }
+
+        public required CollectLiveMetricsOptions CollectLiveMetricsOptions { get; init; }
+
+        public required RootOptions RootOptions { get; init; }
+
+        public required FileSystemEgressProviderOptions FileSystemEgressProviderOptions { get; init; }
+
         public static void AddValidation(IServiceCollection services)
         {
             GeneratedServiceCollectionExtensions.AddValidation(services);