Skip to content

Commit b676215

Browse files
committed
Revert options validation changes
1 parent 0791d94 commit b676215

9 files changed

+12
-34
lines changed

src/Tools/dotnet-monitor/CollectionRules/Options/Actions/CollectExceptionsOptions.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions
1717
[NJsonSchema.Annotations.JsonSchemaFlatten]
1818
#endif
1919

20-
internal sealed partial record class CollectExceptionsOptions :
21-
BaseRecordOptions,
22-
// IValidateOptions<CollectExceptionsOptions>,
23-
IEgressProviderProperties
20+
internal sealed partial record class CollectExceptionsOptions : BaseRecordOptions, IEgressProviderProperties
2421
{
2522
[Display(
2623
ResourceType = typeof(OptionsDisplayStrings),

src/Tools/dotnet-monitor/CollectionRules/Options/Triggers/AspNetRequestCountOptions.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
using Microsoft.Diagnostics.Monitoring.WebApi;
77
using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.CollectionRuleDefaultsInterfaces;
8-
using Microsoft.Extensions.Options;
98
using System;
109
using System.ComponentModel.DataAnnotations;
1110

@@ -14,10 +13,8 @@ namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers
1413
/// <summary>
1514
/// Options for the AspNetRequestCount trigger.
1615
/// </summary>
17-
[OptionsValidator]
18-
internal sealed partial class AspNetRequestCountOptions :
19-
IAspNetActionPathFilters, ISlidingWindowDurationProperties, IRequestCountProperties,
20-
IValidateOptions<AspNetRequestCountOptions>
16+
internal sealed class AspNetRequestCountOptions :
17+
IAspNetActionPathFilters, ISlidingWindowDurationProperties, IRequestCountProperties
2118
{
2219
[Display(
2320
ResourceType = typeof(OptionsDisplayStrings),

src/Tools/dotnet-monitor/CollectionRules/Options/Triggers/AspNetRequestDurationOptions.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
using Microsoft.Diagnostics.Monitoring.WebApi;
77
using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.CollectionRuleDefaultsInterfaces;
8-
using Microsoft.Extensions.Options;
98
using System;
109
using System.ComponentModel;
1110
using System.ComponentModel.DataAnnotations;
@@ -15,10 +14,8 @@ namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers
1514
/// <summary>
1615
/// Options for the AspNetRequestDuration trigger.
1716
/// </summary>
18-
[OptionsValidator]
19-
internal sealed partial class AspNetRequestDurationOptions :
20-
IAspNetActionPathFilters, ISlidingWindowDurationProperties, IRequestCountProperties,
21-
IValidateOptions<AspNetRequestDurationOptions>
17+
internal sealed class AspNetRequestDurationOptions :
18+
IAspNetActionPathFilters, ISlidingWindowDurationProperties, IRequestCountProperties
2219
{
2320
public const string RequestDuration_MaxValue = "01:00:00";
2421
public const string RequestDuration_MinValue = "00:00:00";

src/Tools/dotnet-monitor/CollectionRules/Options/Triggers/AspNetResponseStatusOptions.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
using Microsoft.Diagnostics.Monitoring.WebApi;
77
using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.CollectionRuleDefaultsInterfaces;
8-
using Microsoft.Extensions.Options;
98
using System;
109
using System.ComponentModel.DataAnnotations;
1110

@@ -14,10 +13,8 @@ namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers
1413
/// <summary>
1514
/// Options for the AspNetResponseStatus trigger.
1615
/// </summary>
17-
[OptionsValidator]
18-
internal sealed partial class AspNetResponseStatusOptions :
19-
IAspNetActionPathFilters, ISlidingWindowDurationProperties,
20-
IValidateOptions<AspNetResponseStatusOptions>
16+
internal sealed class AspNetResponseStatusOptions :
17+
IAspNetActionPathFilters, ISlidingWindowDurationProperties
2118
{
2219
private const string StatusCodeRegex = "[1-5][0-9]{2}";
2320
private const string StatusCodesRegex = StatusCodeRegex + "(-" + StatusCodeRegex + ")?";

src/Tools/dotnet-monitor/CollectionRules/Options/Triggers/EventCounterOptions.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using Microsoft.Diagnostics.Monitoring.WebApi;
55
using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.CollectionRuleDefaultsInterfaces;
6-
using Microsoft.Extensions.Options;
76
using System;
87
using System.ComponentModel.DataAnnotations;
98

@@ -12,8 +11,7 @@ namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers
1211
/// <summary>
1312
/// Options for the EventCounter trigger.
1413
/// </summary>
15-
[OptionsValidator]
16-
internal sealed partial class EventCounterOptions : IValidateOptions<EventCounterOptions>, ISlidingWindowDurationProperties
14+
internal sealed partial class EventCounterOptions : ISlidingWindowDurationProperties
1715
{
1816
[Display(
1917
ResourceType = typeof(OptionsDisplayStrings),

src/Tools/dotnet-monitor/CollectionRules/Options/Triggers/EventCounterShortcuts/CPUUsageOptions.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using Microsoft.Diagnostics.Monitoring.WebApi;
55
using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.CollectionRuleDefaultsInterfaces;
6-
using Microsoft.Extensions.Options;
76
using System;
87
using System.ComponentModel;
98
using System.ComponentModel.DataAnnotations;
@@ -13,8 +12,7 @@ namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers.E
1312
/// <summary>
1413
/// Options for the CPUUsage trigger.
1514
/// </summary>
16-
[OptionsValidator]
17-
internal sealed partial class CPUUsageOptions : IValidateOptions<CPUUsageOptions>, IEventCounterShortcuts, ISlidingWindowDurationProperties
15+
internal sealed partial class CPUUsageOptions : IEventCounterShortcuts, ISlidingWindowDurationProperties
1816
{
1917
[Display(
2018
ResourceType = typeof(OptionsDisplayStrings),

src/Tools/dotnet-monitor/CollectionRules/Options/Triggers/EventCounterShortcuts/GCHeapSizeOptions.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using Microsoft.Diagnostics.Monitoring.WebApi;
55
using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.CollectionRuleDefaultsInterfaces;
6-
using Microsoft.Extensions.Options;
76
using System;
87
using System.ComponentModel;
98
using System.ComponentModel.DataAnnotations;
@@ -13,8 +12,7 @@ namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers.E
1312
/// <summary>
1413
/// Options for the GCHeapSize trigger.
1514
/// </summary>
16-
[OptionsValidator]
17-
internal sealed partial class GCHeapSizeOptions : IValidateOptions<GCHeapSizeOptions>, IEventCounterShortcuts, ISlidingWindowDurationProperties
15+
internal sealed partial class GCHeapSizeOptions : IEventCounterShortcuts, ISlidingWindowDurationProperties
1816
{
1917
[Display(
2018
ResourceType = typeof(OptionsDisplayStrings),

src/Tools/dotnet-monitor/CollectionRules/Options/Triggers/EventCounterShortcuts/ThreadpoolQueueLengthOptions.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using Microsoft.Diagnostics.Monitoring.WebApi;
55
using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.CollectionRuleDefaultsInterfaces;
6-
using Microsoft.Extensions.Options;
76
using System;
87
using System.ComponentModel;
98
using System.ComponentModel.DataAnnotations;
@@ -13,8 +12,7 @@ namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers.E
1312
/// <summary>
1413
/// Options for the ThreadpoolQueueLength trigger.
1514
/// </summary>
16-
[OptionsValidator]
17-
internal sealed partial class ThreadpoolQueueLengthOptions : IValidateOptions<ThreadpoolQueueLengthOptions>, IEventCounterShortcuts, ISlidingWindowDurationProperties
15+
internal sealed partial class ThreadpoolQueueLengthOptions : IEventCounterShortcuts, ISlidingWindowDurationProperties
1816
{
1917
[Display(
2018
ResourceType = typeof(OptionsDisplayStrings),

src/Tools/dotnet-monitor/CollectionRules/Options/Triggers/EventMeterOptions.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using Microsoft.Diagnostics.Monitoring.WebApi;
55
using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.CollectionRuleDefaultsInterfaces;
6-
using Microsoft.Extensions.Options;
76
using System;
87
using System.ComponentModel.DataAnnotations;
98

@@ -12,8 +11,7 @@ namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers
1211
/// <summary>
1312
/// Options for the EventMeter trigger.
1413
/// </summary>
15-
[OptionsValidator]
16-
internal sealed partial class EventMeterOptions : IValidateOptions<EventMeterOptions>, ISlidingWindowDurationProperties
14+
internal sealed partial class EventMeterOptions : ISlidingWindowDurationProperties
1715
{
1816
[Display(
1917
ResourceType = typeof(OptionsDisplayStrings),

0 commit comments

Comments
 (0)