diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitoringOptions.Linux.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitoringOptions.Linux.cs deleted file mode 100644 index cb6038826f9..00000000000 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitoringOptions.Linux.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; -using Microsoft.Shared.Data.Validation; - -namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring; - -public partial class ResourceMonitoringOptions -{ - internal const int MinimumCachingInterval = 100; - internal const int MaximumCachingInterval = 900000; // 15 minutes. - internal static readonly TimeSpan DefaultRefreshInterval = TimeSpan.FromSeconds(5); - - /// - /// Gets or sets the default interval used for refreshing values reported by "process.cpu.utilization" metrics. - /// - /// - /// The default value is 5 seconds. - /// - /// - /// This property is Linux-specific and has no effect on other operating systems. - /// This is the time interval for a metric value to fetch resource utilization data from the operating system. - /// - [TimeSpan(MinimumCachingInterval, MaximumCachingInterval)] - public TimeSpan CpuConsumptionRefreshInterval { get; set; } = DefaultRefreshInterval; - - /// - /// Gets or sets the default interval used for refreshing values reported by "dotnet.process.memory.virtual.utilization" metrics. - /// - /// - /// The default value is 5 seconds. - /// - /// - /// This property is Linux-specific and has no effect on other operating systems. - /// This is the time interval for a metric value to fetch resource utilization data from the operating system. - /// - [TimeSpan(MinimumCachingInterval, MaximumCachingInterval)] - public TimeSpan MemoryConsumptionRefreshInterval { get; set; } = DefaultRefreshInterval; -} diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitoringOptions.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitoringOptions.cs index 68dc7cb9ac3..531615bded7 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitoringOptions.cs +++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitoringOptions.cs @@ -15,8 +15,11 @@ public partial class ResourceMonitoringOptions internal const int MaximumSamplingWindow = 900000; // 15 minutes. internal const int MinimumSamplingPeriod = 1; internal const int MaximumSamplingPeriod = 900000; // 15 minutes. + internal const int MinimumCachingInterval = 100; + internal const int MaximumCachingInterval = 900000; // 15 minutes. internal static readonly TimeSpan DefaultCollectionWindow = TimeSpan.FromSeconds(5); internal static readonly TimeSpan DefaultSamplingInterval = TimeSpan.FromSeconds(1); + internal static readonly TimeSpan DefaultRefreshInterval = TimeSpan.FromSeconds(5); /// /// Gets or sets the maximum time window for which utilization can be requested. @@ -54,4 +57,28 @@ public partial class ResourceMonitoringOptions /// [TimeSpan(MinimumSamplingWindow, MaximumSamplingWindow)] public TimeSpan PublishingWindow { get; set; } = DefaultCollectionWindow; + + /// + /// Gets or sets the default interval used for refreshing values reported by "process.cpu.utilization" metrics. + /// + /// + /// The default value is 5 seconds. + /// + /// + /// This is the time interval for a metric value to fetch resource utilization data from the operating system. + /// + [TimeSpan(MinimumCachingInterval, MaximumCachingInterval)] + public TimeSpan CpuConsumptionRefreshInterval { get; set; } = DefaultRefreshInterval; + + /// + /// Gets or sets the default interval used for refreshing values reported by "dotnet.process.memory.virtual.utilization" metrics. + /// + /// + /// The default value is 5 seconds. + /// + /// + /// This is the time interval for a metric value to fetch resource utilization data from the operating system. + /// + [TimeSpan(MinimumCachingInterval, MaximumCachingInterval)] + public TimeSpan MemoryConsumptionRefreshInterval { get; set; } = DefaultRefreshInterval; }