Fix GlobalCounterOptions ValidationResult

sbomer · sbomer · commit 02e83492c2ed · 2025-04-25T19:00:45.000Z
diff --git a/src/Microsoft.Diagnostics.Monitoring.Options/GlobalCounterOptions.cs b/src/Microsoft.Diagnostics.Monitoring.Options/GlobalCounterOptions.cs
@@ -64,7 +64,8 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
                     {
                         // We prefix the validation error with the provider.
                         results.AddRange(providerResults.Select(r => new ValidationResult(
-                            string.Format(CultureInfo.CurrentCulture, OptionsDisplayStrings.ErrorMessage_NestedProviderValidationError, provider, r.ErrorMessage))));
+                            string.Format(CultureInfo.CurrentCulture, OptionsDisplayStrings.ErrorMessage_NestedProviderValidationError, provider, r.ErrorMessage),
+                            [nameof(Providers)])));
                     }
                 }
             }
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Options/Actions/CollectTraceOptions.Validate.cs b/src/Tools/dotnet-monitor/CollectionRules/Options/Actions/CollectTraceOptions.Validate.cs
@@ -81,7 +81,7 @@ IEnumerable<ValidationResult> IValidatableObject.Validate(ValidationContext vali
                 }
                 catch (OptionsValidationException e)
                 {
-                    results.AddRange(e.Failures.Select((string failure) => new ValidationResult(e.Message)));
+                    results.AddRange(e.Failures.Select((string failure) => new ValidationResult(e.Message, [e.OptionsType.Name])));
                 }
 
                 // Validate that each provider is valid.

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,8 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex`
`64`	`64`	`{`
`65`	`65`	`// We prefix the validation error with the provider.`
`66`	`66`	`results.AddRange(providerResults.Select(r => new ValidationResult(`
`67`		`- string.Format(CultureInfo.CurrentCulture, OptionsDisplayStrings.ErrorMessage_NestedProviderValidationError, provider, r.ErrorMessage))));`
	`67`	`+ string.Format(CultureInfo.CurrentCulture, OptionsDisplayStrings.ErrorMessage_NestedProviderValidationError, provider, r.ErrorMessage),`
	`68`	`+ [nameof(Providers)])));`
`68`	`69`	`}`
`69`	`70`	`}`
`70`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ IEnumerable<ValidationResult> IValidatableObject.Validate(ValidationContext vali`
`81`	`81`	`}`
`82`	`82`	`catch (OptionsValidationException e)`
`83`	`83`	`{`
`84`		`- results.AddRange(e.Failures.Select((string failure) => new ValidationResult(e.Message)));`
	`84`	`+ results.AddRange(e.Failures.Select((string failure) => new ValidationResult(e.Message, [e.OptionsType.Name])));`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`// Validate that each provider is valid.`