Revert non-validation changes

Author: sbomer

src/Extensions/S3Storage/S3StorageEgressProviderOptions.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.ComponentModel.DataAnnotations;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.Diagnostics.Monitoring.Extension.S3Storage
 {
@@ -52,7 +51,6 @@ internal sealed partial class S3StorageEgressProviderOptions
             ResourceType = typeof(OptionsDisplayStrings),
             Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_S3StorageEgressProviderOptions_PreSignedUrlExpiry))]
         [Range(typeof(TimeSpan), "00:01:00", "1.00:00:00")]
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Addressed by DynamicDependency on ValidationHelper.TryValidateOptions method")]
         public TimeSpan? PreSignedUrlExpiry { get; set; }
 
         [Display(

src/Microsoft.Diagnostics.Monitoring.WebApi/Models/Activity.cs

@@ -12,7 +12,7 @@ public class Activity
         public string Id { get; set; } = string.Empty;
 
         [JsonPropertyName("idFormat")]
-        [JsonConverter(typeof(JsonStringEnumConverter<ActivityIdFormat>))]
+        [JsonConverter(typeof(JsonStringEnumConverter))]
         public ActivityIdFormat IdFormat { get; set; } = ActivityIdFormat.Unknown;
     }
 }

src/Microsoft.Diagnostics.Monitoring.WebApi/Models/EgressOperationStatus.cs

@@ -60,7 +60,7 @@ public class OperationStatus : OperationSummary
         public OperationError? Error { get; set; }
     }
 
-    [JsonConverter(typeof(JsonStringEnumConverter<OperationState>))]
+    [JsonConverter(typeof(JsonStringEnumConverter))]
     public enum OperationState
     {
         Starting,

src/Microsoft.Diagnostics.Monitoring.WebApi/MonitorJsonSerializerContext.cs

@@ -71,7 +71,7 @@
     <Compile Include="..\..\Tools\dotnet-monitor\CollectionRules\Options\Triggers\EventMeterOptions.cs" Link="Options\CollectionRules\Triggers\EventMeterOptions.cs" />
     <Compile Include="..\..\Tools\dotnet-monitor\CollectionRules\Options\Triggers\IAspNetActionPathFilters.cs" Link="Options\CollectionRules\Triggers\IAspNetActionPathFilters.cs" />
     <Compile Include="..\..\Tools\dotnet-monitor\CollectionRules\Options\Triggers\TriggerOptionsConstants.cs" Link="Options\CollectionRules\Triggers\TriggerOptionsConstants.cs" />
-    <Compile Include="..\..\Tools\dotnet-monitor\CommonOptionsMapper.cs" Link="Options\CommonOptionsMapper.cs" />
+    <Compile Include="..\..\Tools\dotnet-monitor\CommonOptionsExtensions.cs" Link="Options\CommonOptionsExtensions.cs" />
     <Compile Include="..\..\Tools\dotnet-monitor\LoggingEventIds.cs" Link="LoggingEventIds.cs" />
     <Compile Include="..\..\Tools\dotnet-monitor\OutputFormat.cs" Link="Options\OutputFormat.cs" />
     <Compile Include="..\..\Tools\dotnet-monitor\RootOptions.cs" Link="Options\RootOptions.cs" />

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj

@@ -165,8 +165,7 @@ public virtual async Task StartAsync(string command, string[] args, Cancellation
             _adapter.Environment.Add("ASPNETCORE_HOSTINGSTARTUPASSEMBLIES", TestHostingStartupAssemblyName);
 
             // Set configuration via environment variables
-            var optionsMapper = new CommonOptionsMapper();
-            var configurationViaEnvironment = optionsMapper.ToEnvironmentConfiguration(ConfigurationFromEnvironment, useDotnetMonitorPrefix: true);
+            var configurationViaEnvironment = ConfigurationFromEnvironment.ToEnvironmentConfiguration(useDotnetMonitorPrefix: true);
             if (configurationViaEnvironment.Count > 0)
             {
                 // Set additional environment variables from configuration
@@ -198,8 +197,7 @@ protected virtual void StandardOutputCallback(string line)
 
         public void WriteKeyPerValueConfiguration(RootOptions options)
         {
-            CommonOptionsMapper optionsMapper = new();
-            foreach (KeyValuePair<string, string> entry in optionsMapper.ToKeyPerFileConfiguration(options))
+            foreach (KeyValuePair<string, string> entry in options.ToKeyPerFileConfiguration())
             {
                 File.WriteAllText(
                     Path.Combine(SharedConfigDirectoryPath, entry.Key),

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Runners/MonitorRunner.cs

@@ -10,7 +10,6 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Threading.Tasks;
 using Xunit.Abstractions;
 
@@ -74,9 +73,7 @@ public static IHost CreateHost(
                     RootOptions options = new();
                     setup(options);
 
-                    CommonOptionsMapper optionsMapper = new();
-                    optionsMapper.AddActionSettings<PassThroughOptions>(nameof(PassThroughAction), MapPassThroughOptions);
-                    IDictionary<string, string> configurationValues = optionsMapper.ToConfigurationValues(options);
+                    IDictionary<string, string> configurationValues = options.ToConfigurationValues();
                     outputHelper.WriteLine("Begin Configuration:");
                     foreach ((string key, string value) in configurationValues)
                     {
@@ -133,21 +130,5 @@ public static IHost CreateHost(
                 })
                 .Build();
         }
-
-        private static void MapPassThroughOptions(PassThroughOptions obj, string valueName, string separator, IDictionary<string, string> map)
-        {
-            if (null != obj)
-            {
-                string prefix = FormattableString.Invariant($"{valueName}{separator}");
-                MapString(obj.Input1, FormattableString.Invariant($"{prefix}{nameof(obj.Input1)}"));
-                MapString(obj.Input2, FormattableString.Invariant($"{prefix}{nameof(obj.Input2)}"));
-                MapString(obj.Input3, FormattableString.Invariant($"{prefix}{nameof(obj.Input3)}"));
-            }
-
-            void MapString(string value, string valueName)
-            {
-                map.Add(valueName, ConvertUtils.ToString(value, CultureInfo.InvariantCulture));
-            }
-        }
     }
 }

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/TestHostHelper.cs

@@ -54,7 +54,7 @@ public static GeneratedJwtKey Create(TimeSpan expirationOffset)
             ECDsa pubDsa = ECDsa.Create(dsa.ExportParameters(includePrivateParameters: false));
             ECDsaSecurityKey pubSecKey = new ECDsaSecurityKey(pubDsa);
             JsonWebKey jwk = JsonWebKeyConverter.ConvertFromECDsaSecurityKey(pubSecKey);
-            string publicKeyJson = JsonSerializer.Serialize(jwk, JsonWebKeyContext.Default.JsonWebKey);
+            string publicKeyJson = JsonSerializer.Serialize(jwk, new JsonSerializerOptions() { DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull });
             string publicKeyEncoded = Base64UrlEncoder.Encode(publicKeyJson);
 
             JwtSecurityTokenHandler tokenHandler = new JwtSecurityTokenHandler();
@@ -63,9 +63,4 @@ public static GeneratedJwtKey Create(TimeSpan expirationOffset)
             return new GeneratedJwtKey(output, subjectStr, publicKeyEncoded);
         }
     }
-
-    [JsonSerializable(typeof(JsonWebKey))]
-    partial class JsonWebKeyContext : JsonSerializerContext
-    {
-    }
 }

src/Tools/dotnet-monitor/Auth/ApiKey/GeneratedJwtKey.cs

@@ -164,11 +164,7 @@ public IList<CollectionRuleActionOptions> GetActionDependencies(int actionIndex)
             }
             string? commandLine = _ruleContext.EndpointInfo.CommandLine;
 
-            if (!_actionOperations.TryGetOptionsType(actionOptions.Type, out Type settingsType))
-            {
-                throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, Strings.ErrorMessage_UnknownActionType, actionOptions.Name));
-            }
-            settings = _tokenParser.SubstituteOptionValues(settings, settingsType, new TokenContext
+            settings = _tokenParser.SubstituteOptionValues(settings, new TokenContext
             {
                 CloneOnSubstitution = ReferenceEquals(originalSettings, settings),
                 RuntimeId = _ruleContext.EndpointInfo.RuntimeInstanceCookie,
@@ -199,11 +195,7 @@ private void EnsureDependencies()
 
         private void EnsureDependencies(CollectionRuleActionOptions options, int actionIndex)
         {
-            if (!_actionOperations.TryGetOptionsType(options.Type, out Type optionsType))
-            {
-                throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, Strings.ErrorMessage_UnknownActionType, options.Name));
-            }
-            foreach (PropertyInfo property in GetDependencyPropertiesFromSettings(optionsType))
+            foreach (PropertyInfo property in GetDependencyPropertiesFromSettings(options))
             {
                 string? originalValue = (string?)property.GetValue(options.Settings);
                 if (string.IsNullOrEmpty(originalValue))
@@ -299,9 +291,9 @@ private bool GetActionResultReference(string actionReference, int actionIndex,
             return true;
         }
 
-        private static IEnumerable<PropertyInfo> GetDependencyPropertiesFromSettings([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] Type optionsType)
+        private static IEnumerable<PropertyInfo> GetDependencyPropertiesFromSettings(CollectionRuleActionOptions options)
         {
-            return ConfigurationTokenParser.GetPropertiesFromSettings(optionsType, p => p.GetCustomAttributes(typeof(ActionOptionsDependencyPropertyAttribute), inherit: true).Any());
+            return ConfigurationTokenParser.GetPropertiesFromSettings(options.Settings, p => p.GetCustomAttributes(typeof(ActionOptionsDependencyPropertyAttribute), inherit: true).Any());
         }
     }
 }

src/Tools/dotnet-monitor/CollectionRules/ActionOptionsDependencyAnalyzer.cs

@@ -93,20 +93,5 @@ public bool TryValidateOptions(
                 return false;
             }
         }
-
-        /// <inheritdoc/>
-        public bool TryGetOptionsType(
-            string actionName,
-            out Type optionsType)
-        {
-            if (_map.TryGetValue(actionName, out ICollectionRuleActionDescriptor descriptor))
-            {
-                optionsType = descriptor.OptionsType;
-                return true;
-            }
-
-            optionsType = null;
-            return false;
-        }
     }
 }